automated merge from mesh-development

9 files changed, 35 insertions, 36 deletions

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 5d9a971b1e..148abe49ed 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -170,6 +170,7 @@ Blakar Ogre
 blino Nakamura
 	VWR-17
 Boroondas Gupte
+	CTS-320
 	SNOW-278
 	SNOW-503
 	SNOW-510
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 93cdf3422c..85bb281354 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -295,7 +295,7 @@ copy_if_different(
     ${vivox_src_dir}
     "${SHARED_LIB_STAGING_DIR_DEBUG}"
     out_targets 
-   ${vivox_files}
+    ${vivox_files}
     )
 set(third_party_targets ${third_party_targets} ${out_targets})
 
@@ -376,7 +376,9 @@ if(NOT EXISTS ${internal_llkdu_path})
 endif (NOT EXISTS ${internal_llkdu_path})
 
 
-add_custom_target(stage_third_party_libs ALL
-  DEPENDS 
-    ${third_party_targets}
-  )
+if(NOT STANDALONE)
+  add_custom_target(
+      stage_third_party_libs ALL
+      DEPENDS ${third_party_targets}
+      )
+endif(NOT STANDALONE)
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 7c3f1f12e9..79c3bb7da2 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -107,7 +107,7 @@ INCLUDE(GoogleMock)
 
     # Setup target
     ADD_EXECUTABLE(PROJECT_${project}_TEST_${name} ${${name}_test_SOURCE_FILES})
-    SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXE_STAGING_DIR})
+    SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
 
     #
     # Per-codefile additional / external project dep and lib dep property extraction
@@ -196,7 +196,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
     message(STATUS "ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})")
   endif(TEST_DEBUG)
   ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})
-  SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXE_STAGING_DIR})
+  SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
 
   # Add link deps to the executable
   if(TEST_DEBUG)
diff --git a/indra/llcommon/lleventtimer.h b/indra/llcommon/lleventtimer.h
index 62586dd92f..7f42623d01 100644
--- a/indra/llcommon/lleventtimer.h
+++ b/indra/llcommon/lleventtimer.h
@@ -33,7 +33,7 @@
 #include "lltimer.h"
 
 // class for scheduling a function to be called at a given frequency (approximate, inprecise)
-class LL_COMMON_API LLEventTimer : protected LLInstanceTracker<LLEventTimer>
+class LL_COMMON_API LLEventTimer : public LLInstanceTracker<LLEventTimer>
 {
 public:
 	LLEventTimer(F32 period);	// period is the amount of time between each call to tick() in seconds
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 67cc707a01..f3cbfab77a 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -33,7 +33,12 @@
 
 #include <iostream>
 #include "apr_base64.h"
-#include "zlib/zlib.h"  // for davep's dirty little zip functions
+
+#ifdef LL_STANDALONE
+# include <zlib.h>
+#else
+# include "zlib/zlib.h"  // for davep's dirty little zip functions
+#endif
 
 #if !LL_WINDOWS
 #include <netinet/in.h> // htonl & ntohl
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index eacf2377fe..b486e17194 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -34,7 +34,13 @@
 #include "dae/daeErrorHandler.h"
 #include "dom/domConstants.h"
 #include "dom/domMesh.h"
-#include "zlib/zlib.h"
+
+#ifdef LL_STANDALONE
+# include <zlib.h>
+#else
+# include "zlib/zlib.h"
+#endif
+
 
 
 std::string model_names[] =
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 92c70c9eaf..68c7e3c1a2 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1173,21 +1173,7 @@ void LLModelLoader::run()
 								
 							}
 							
-							/*{
-							 LLMatrix4 rotation;
-							 if (up == UPAXISTYPE_X_UP)
-							 {
-							 rotation.initRotation(0.0f, 90.0f * DEG_TO_RAD, 0.0f);
-							 }
-							 else if (up == UPAXISTYPE_Z_UP)
-							 {
-							 rotation.initRotation(90.0f * DEG_TO_RAD, 90.0f * DEG_TO_RAD, 0.0f);
-							 }
-							 
-							 rotation *= model->mBindShapeMatrix;
-							 model->mBindShapeMatrix = rotation;
-							 }*/
-							
+														
 							//The joint transfom map that we'll populate below
 							std::map<std::string,LLMatrix4> jointTransforms;
 							jointTransforms.clear();
@@ -1195,6 +1181,7 @@ void LLModelLoader::run()
 							//Some collada setup for accessing the skeleton
 							daeElement* pElement = 0;
 							dae.getDatabase()->getElement( &pElement, 0, 0, "skeleton" );
+							
 							//Try to get at the skeletal instance controller
 							domInstance_controller::domSkeleton* pSkeleton = daeSafeCast<domInstance_controller::domSkeleton>( pElement );
 							bool missingSkeletonOrScene = false;
@@ -1281,8 +1268,6 @@ void LLModelLoader::run()
 											//Store the joint transform w/respect to it's name.
 											jointTransforms[(*jointIt).second.c_str()] = workingTransform;                                                                                                                             
                                         }
-										
-										
 									}
 									
 									//If anything failed in regards to extracting the skeleton, joints or translation id,
@@ -1317,17 +1302,16 @@ void LLModelLoader::run()
 											llwarns<<"Tried to apply joint position from .dae, but it did not exist in the avatar rig." << llendl;
 										}
 										//Reposition the avatars pelvis (avPos+offset)
-										if ( lookingForJoint == "mPelvis" )
-										{												
-											const LLVector3& pos = gAgentAvatarp->getCharacterPosition();
-											gAgentAvatarp->setPelvisOffset( true, jointTransform.getTranslation() );
-											gAgentAvatarp->setPosition( pos + jointTransform.getTranslation() );											
-										}
+										//if ( lookingForJoint == "mPelvis" )
+										//{												
+										//	const LLVector3& pos = gAgentAvatarp->getCharacterPosition();
+										//	gAgentAvatarp->setPelvisOffset( true, jointTransform.getTranslation() );
+										//	gAgentAvatarp->setPosition( pos + jointTransform.getTranslation() );											
+										//}
 									}
 								}
 							} //missingSkeletonOrScene
-					
-														
+																				
 							domSkin::domJoints* joints = skin->getJoints();
 							
 							domInputLocal_Array& joint_input = joints->getInput_array();
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 7e9978f330..05106644dc 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -97,6 +97,7 @@ public:
 	LLColor4 getDaeColor(daeElement* element);
 	
 	daeElement* getChildFromElement( daeElement* pElement, std::string const & name );
+	
 	bool isNodeAJoint( domNode* pNode );
 	void processJointNode( domNode* pNode, std::map<std::string,LLMatrix4>& jointTransforms );
 	void extractTranslation( domTranslate* pTranslate, LLMatrix4& transform );
diff --git a/install.xml b/install.xml
index e28eda0bb5..e4735034a3 100644
--- a/install.xml
+++ b/install.xml
@@ -1100,7 +1100,7 @@ anguage Infrstructure (CLI) international standard</string>
             <key>md5sum</key>
             <string>349fa0e287fb275bbee43ced194a1db1</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-darwin-20101015.tar.bz</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-darwin-20101015.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>