diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-04 15:03:51 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-04 15:03:51 -0800 |
| commit | b8cc4605d5bb748f12d0990f6344a1f72954ca29 (patch) | |
| tree | e64db172bec16f025d0df32a63fdee39b7ede266 /indra/newview | |
| parent | 5684a9d1bbeb236c033c97105b50dcc3242021df (diff) | |
| parent | a3781e07df303542f458dae5649ab24cde1117d8 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview')
| -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 241497aeaf..4edd09b02c 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"); |