diff options
| -rwxr-xr-x | indra/llappearance/llwearable.cpp | 2 | ||||
| -rw-r--r-- | indra/lscript/lscript_compile/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp index 78ff510909..5d53d1ae39 100755 --- a/indra/llappearance/llwearable.cpp +++ b/indra/llappearance/llwearable.cpp @@ -502,6 +502,8 @@ void LLWearable::setLocalTextureObject(S32 index, LLLocalTextureObject <o) 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++) diff --git a/indra/lscript/lscript_compile/CMakeLists.txt b/indra/lscript/lscript_compile/CMakeLists.txt index f67aa86ce9..2cfd389893 100644 --- a/indra/lscript/lscript_compile/CMakeLists.txt +++ b/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 |