diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 07:35:03 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 07:35:03 +0000 |
commit | 197c78fa4bf372d09b315b1bad3cf6649627eb48 (patch) | |
tree | d49217ad4a9b10fa907cfbefeba1453042b66f9a /indra/newview/llfloatertools.cpp | |
parent | 05e15ccb82541494bf7145652140de187d838cda (diff) | |
parent | 367fda833cb5633564c2518f613a00484eb73ec5 (diff) |
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
-rw-r--r-- | indra/newview/llfloatertools.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 302f6044d0..a33ab6f346 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1321,7 +1321,7 @@ bool LLFloaterTools::deleteMediaConfirm(const LLSD& notification, const LLSD& re switch( option ) { case 0: // "Yes" - LLSelectMgr::getInstance()->selectionSetMedia( 0 ); + LLSelectMgr::getInstance()->selectionSetMedia( 0, LLSD() ); if(LLFloaterReg::instanceVisible("media_settings")) { LLFloaterReg::hideInstance("media_settings"); |