diff options
| author | simon <none@none> | 2015-04-15 15:07:13 -0700 |
|---|---|---|
| committer | simon <none@none> | 2015-04-15 15:07:13 -0700 |
| commit | a219cf1c98527faa0e7addeb9660f679208bb0e7 (patch) | |
| tree | 78a14774f7ff79dd92c022caa2d9d68ec85fba85 /indra/newview/llinventorybridge.cpp | |
| parent | b5324afb6f2e45deefb9b79e7e2192bc686b181a (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
Merge viewer-release
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 1910656066..1dc5558555 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4462,11 +4462,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); |