Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear up a few issues revealed upon forced full recompile. (VS is dumb sometimes)

Browse Source
This commit is contained in:
Shyotl
2012-12-22 23:44:43 -06:00
parent 295fcb53b0
commit cdaa4b4e99
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfloaterbuycontents.cpp
View File

@@ -54,6 +54,7 @@
#include "llviewerregion.h" #include "llviewerregion.h"
#include "lluictrlfactory.h" #include "lluictrlfactory.h"
#include "llviewerwindow.h" #include "llviewerwindow.h"
#include "llinventoryicon.h"
#include "hippogridmanager.h" #include "hippogridmanager.h"

1
indra/newview/llpanelobjectinventory.cpp
View File

@@ -48,6 +48,7 @@
#include "llinventorydefines.h" #include "llinventorydefines.h"
#include "llinventoryfilter.h" #include "llinventoryfilter.h"
#include "llinventoryfunctions.h" #include "llinventoryfunctions.h"
#include "llinventoryicon.h"
#include "llpreviewanim.h" #include "llpreviewanim.h"
#include "llpreviewgesture.h" #include "llpreviewgesture.h"
#include "llpreviewnotecard.h" #include "llpreviewnotecard.h"

6
indra/newview/lltoolmorph.cpp
View File

@@ -205,15 +205,15 @@ BOOL LLVisualParamHint::render()
const std::string& cam_target_mesh_name = mVisualParam->getCameraTargetName(); const std::string& cam_target_mesh_name = mVisualParam->getCameraTargetName();
if( !cam_target_mesh_name.empty() ) 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 ) if( !cam_target_joint )
{ {
cam_target_joint = (LLViewerJointMesh*)gMorphView->getCameraTargetJoint(); cam_target_joint = dynamic_cast<LLViewerJointMesh*>(gMorphView->getCameraTargetJoint());
} }
if( !cam_target_joint ) if( !cam_target_joint )
{ {
cam_target_joint = (LLViewerJointMesh*)gAgentAvatarp->getJoint("mHead"); cam_target_joint = dynamic_cast<LLViewerJointMesh*>(gAgentAvatarp->getJoint("mHead"));
} }
LLQuaternion avatar_rotation; LLQuaternion avatar_rotation;

2
indra/newview/statemachine/CMakeLists.txt
View File

@@ -16,6 +16,7 @@ include(LLImage)
include(LLCharacter) include(LLCharacter)
include(LLInventory) include(LLInventory)
include(LLPrimitive) include(LLPrimitive)
include(LLAppearance)
include_directories( include_directories(
${CMAKE_SOURCE_DIR}/newview ${CMAKE_SOURCE_DIR}/newview
@@ -32,6 +33,7 @@ include_directories(
${LLCHARACTER_INCLUDE_DIRS} ${LLCHARACTER_INCLUDE_DIRS}
${LLINVENTORY_INCLUDE_DIRS} ${LLINVENTORY_INCLUDE_DIRS}
${LLPRIMITIVE_INCLUDE_DIRS} ${LLPRIMITIVE_INCLUDE_DIRS}
${LLAPPEARANCE_INCLUDE_DIRS}
) )
set(statemachine_SOURCE_FILES set(statemachine_SOURCE_FILES