merge

indra/llappearance/llwearable.cpp

@@ -502,6 +502,8 @@ void LLWearable::setLocalTextureObject(S32 index, LLLocalTextureObject &lto)
 
 void LLWearable::revertValues()
 {
+	// FIXME DRANO - this triggers changes to driven params on avatar, potentially clobbering baked appearance.
+
 	//update saved settings so wearable is no longer dirty
 	// non-driver params first
 	for (param_map_t::const_iterator iter = mSavedVisualParamMap.begin(); iter != mSavedVisualParamMap.end(); iter++)

indra/lscript/lscript_compile/CMakeLists.txt

@@ -115,7 +115,7 @@ if (WINDOWS)
       COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bison.bat
       ARGS
         ${BISON} ${M4_PATH}
-      -p indra_
+        -p indra_
         -d -o ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
       DEPENDS