From d2c2150b8f564f432734effa417209ec9a2d6543 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 21 May 2013 15:39:57 -0700
Subject: [PATCH 1/3] include QtGui dir with isystem flag to remove warning

---
 interface/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index dac0749f8d..a1a69d8ecd 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -57,6 +57,7 @@ endif (APPLE)
 
 find_package(Qt4 REQUIRED QtCore QtGui QtOpenGL)
 include(${QT_USE_FILE})
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -isystem ${QT_QTGUI_INCLUDE_DIR}")
 
 # run qt moc on qt-enabled headers
 qt4_wrap_cpp(INTERFACE_SRCS src/Application.h)

From 910683c047af12a4dfcb72e517a58742e8f9cfa4 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 21 May 2013 15:43:29 -0700
Subject: [PATCH 2/3] remove an extra space

---
 interface/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index a1a69d8ecd..621942249f 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -57,7 +57,7 @@ endif (APPLE)
 
 find_package(Qt4 REQUIRED QtCore QtGui QtOpenGL)
 include(${QT_USE_FILE})
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -isystem ${QT_QTGUI_INCLUDE_DIR}")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${QT_QTGUI_INCLUDE_DIR}")
 
 # run qt moc on qt-enabled headers
 qt4_wrap_cpp(INTERFACE_SRCS src/Application.h)

From 944e7a32e993a9502a9f10487348335195b1fa99 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 21 May 2013 15:53:58 -0700
Subject: [PATCH 3/3] trivial fix for the continously dying animation server

---
 libraries/shared/src/AgentList.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp
index 3da956a04a..8f97135eab 100644
--- a/libraries/shared/src/AgentList.cpp
+++ b/libraries/shared/src/AgentList.cpp
@@ -250,7 +250,9 @@ Agent* AgentList::addOrUpdateAgent(sockaddr* publicSocket, sockaddr* localSocket
         return newAgent;
     } else {
         
-        if (agent->getType() == AGENT_TYPE_AUDIO_MIXER || agent->getType() == AGENT_TYPE_VOXEL) {
+        if (agent->getType() == AGENT_TYPE_AUDIO_MIXER ||
+            agent->getType() == AGENT_TYPE_VOXEL ||
+            agent->getType() == AGENT_TYPE_ANIMATION_SERVER) {
             // until the Audio class also uses our agentList, we need to update
             // the lastRecvTimeUsecs for the audio mixer so it doesn't get killed and re-added continously
             agent->setLastHeardMicrostamp(usecTimestampNow());