diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:19:27 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:19:27 -0400 |
commit | 32940ee90b6dae898f83cf99516f18f106246ace (patch) | |
tree | 1fca162d8adc5b7aed5a0193627d6caf773f09fd /indra/newview/llinventorybridge.cpp | |
parent | cddfcda1677c4a5d25d2adc54eb4c3aef0953ee1 (diff) | |
parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) |
merge
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rwxr-xr-x | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index cd45d0a4f3..a047ed6fee 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4528,11 +4528,11 @@ void LLTextureBridge::performAction(LLInventoryModel* model, std::string action) { if ("save_as" == action) { - LLFloaterReg::showInstance("preview_texture", LLSD(mUUID), TAKE_FOCUS_YES); - LLPreviewTexture* preview_texture = LLFloaterReg::findTypedInstance<LLPreviewTexture>("preview_texture", mUUID); + LLPreviewTexture* preview_texture = LLFloaterReg::getTypedInstance<LLPreviewTexture>("preview_texture", mUUID); if (preview_texture) { preview_texture->openToSave(); + preview_texture->saveAs(); } } else LLItemBridge::performAction(model, action); |