From cdaa4b4e9943fbf2d96f65f2f10c2297ca53340c Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 22 Dec 2012 23:44:43 -0600
Subject: [PATCH] Clear up a few issues revealed upon forced full recompile.
 (VS is dumb sometimes)

---
 indra/newview/llfloaterbuycontents.cpp    | 1 +
 indra/newview/llpanelobjectinventory.cpp  | 1 +
 indra/newview/lltoolmorph.cpp             | 6 +++---
 indra/newview/statemachine/CMakeLists.txt | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
index 66a417dda..0bde0cfee 100644
--- a/indra/newview/llfloaterbuycontents.cpp
+++ b/indra/newview/llfloaterbuycontents.cpp
@@ -54,6 +54,7 @@
 #include "llviewerregion.h"
 #include "lluictrlfactory.h"
 #include "llviewerwindow.h"
+#include "llinventoryicon.h"
 
 #include "hippogridmanager.h"
 
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index cd9d17587..41563bfc1 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -48,6 +48,7 @@
 #include "llinventorydefines.h"
 #include "llinventoryfilter.h"
 #include "llinventoryfunctions.h"
+#include "llinventoryicon.h"
 #include "llpreviewanim.h"
 #include "llpreviewgesture.h"
 #include "llpreviewnotecard.h"
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
index 867ec94ec..f7929713e 100644
--- a/indra/newview/lltoolmorph.cpp
+++ b/indra/newview/lltoolmorph.cpp
@@ -205,15 +205,15 @@ BOOL LLVisualParamHint::render()
 	const std::string& cam_target_mesh_name = mVisualParam->getCameraTargetName();
 	if( !cam_target_mesh_name.empty() )
 	{
-		cam_target_joint = (LLViewerJointMesh*)gAgentAvatarp->getJoint( cam_target_mesh_name );
+		cam_target_joint = dynamic_cast<LLViewerJointMesh*>(gAgentAvatarp->getJoint( cam_target_mesh_name ));
 	}
 	if( !cam_target_joint )
 	{
-		cam_target_joint = (LLViewerJointMesh*)gMorphView->getCameraTargetJoint();
+		cam_target_joint = dynamic_cast<LLViewerJointMesh*>(gMorphView->getCameraTargetJoint());
 	}
 	if( !cam_target_joint )
 	{
-		cam_target_joint = (LLViewerJointMesh*)gAgentAvatarp->getJoint("mHead");
+		cam_target_joint = dynamic_cast<LLViewerJointMesh*>(gAgentAvatarp->getJoint("mHead"));
 	}
 
 	LLQuaternion avatar_rotation;
diff --git a/indra/newview/statemachine/CMakeLists.txt b/indra/newview/statemachine/CMakeLists.txt
index 2da2ec4cd..03d273235 100644
--- a/indra/newview/statemachine/CMakeLists.txt
+++ b/indra/newview/statemachine/CMakeLists.txt
@@ -16,6 +16,7 @@ include(LLImage)
 include(LLCharacter)
 include(LLInventory)
 include(LLPrimitive)
+include(LLAppearance)
 
 include_directories(
 	${CMAKE_SOURCE_DIR}/newview
@@ -32,6 +33,7 @@ include_directories(
 	${LLCHARACTER_INCLUDE_DIRS}
 	${LLINVENTORY_INCLUDE_DIRS}
 	${LLPRIMITIVE_INCLUDE_DIRS}
+	${LLAPPEARANCE_INCLUDE_DIRS}
     )
 
 set(statemachine_SOURCE_FILES