diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-09 09:05:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-09 09:05:14 -0500 |
| commit | 03290257345c22f909cf1cfac3981e7e07820d21 (patch) | |
| tree | 4b4be7538fb1768f32d6b3c2e7cd060b48d2faca /indra/newview/llfloatertools.cpp | |
| parent | 889d4d292b2318a2be4988a700d5f56a193a377a (diff) | |
| parent | 41ceee848bbbaec892471b6396bd2d2383d10aa3 (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 4 |
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); - } ////////////////////////////////////////////////////////////////////////////// |