summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-04 17:34:11 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-04 17:34:11 -0800
commit990b5aea2b92ac8c06651ad94db9506a42ba1be0 (patch)
tree809cf37694e41b8efdb6c11c61a868f55ce3ad58 /indra/newview/llfloatertools.cpp
parent377a9ab9ac3b098492cbd010f3091c713ac6dc83 (diff)
EXP-1769 FIX -- Crash in ASSERT (mInDraw == false) - can trigger with selecting build tool
* Fixed build window to not fail assert at construction time.
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
-rw-r--r--indra/newview/llfloatertools.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 1008b4a6e4..bd5b5f4eb0 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -529,7 +529,7 @@ void LLFloaterTools::refresh()
mPanelLandInfo->refresh();
// Refresh the advanced weights floater
- LLFloaterObjectWeights* object_weights_floater = LLFloaterReg::getTypedInstance<LLFloaterObjectWeights>("object_weights");
+ LLFloaterObjectWeights* object_weights_floater = LLFloaterReg::findTypedInstance<LLFloaterObjectWeights>("object_weights");
if(object_weights_floater && object_weights_floater->getVisible())
{
object_weights_floater->refresh();
@@ -1409,9 +1409,7 @@ bool LLFloaterTools::deleteMediaConfirm(const LLSD& notification, const LLSD& re
//
void LLFloaterTools::clearMediaSettings()
{
- LLFloaterMediaSettings::getInstance();
LLFloaterMediaSettings::clearValues(false);
-
}
//////////////////////////////////////////////////////////////////////////////