diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-18 14:51:26 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-18 14:51:26 +0200 |
commit | 97f35b18f08a80ca03437593b9e092ce34a7e6bb (patch) | |
tree | b15ebbe9253899e668fbe3c255f54d26b899012d /indra/newview/llpanelobject.cpp | |
parent | 5c4ab75cdab1b9de08d482457f9d245dd18b90da (diff) | |
parent | a3ca39a437b645be986b9a1fa65821d971d26bcc (diff) |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
-rw-r--r-- | indra/newview/llpanelobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 6a61e0f02f..d17c287cc7 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -73,7 +73,7 @@ #include "pipeline.h" #include "llviewercontrol.h" #include "lluictrlfactory.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "lldrawpool.h" @@ -682,7 +682,7 @@ void LLPanelObject::getState( ) if (objectp->getParameterEntryInUse(LLNetworkData::PARAMS_SCULPT)) { selected_item = MI_SCULPT; - LLFirstUse::useSculptedPrim(); + //LLFirstUse::useSculptedPrim(); } |