Merge remote-tracking branch 'shyotl/sunshine'

2013-01-21 11:25:10 +01:00
parent 4cd2de0fff dc106c5442
commit 18816ae146
415 changed files with 20229 additions and 16924 deletions
--- 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