diff options
| author | Jonathan Goodman <geenz@lindenlab.com> | 2022-10-10 15:19:04 +0000 |
|---|---|---|
| committer | Jonathan Goodman <geenz@lindenlab.com> | 2022-10-10 15:19:04 +0000 |
| commit | 7ff19ec98c25c6ad17b979078e77ec2cab9f7ebd (patch) | |
| tree | ed8934f91cbbcd1591bf79bd46eef9b0b847500b /indra/newview/llpanelobjectinventory.cpp | |
| parent | a73b226f9ee1df4803da8acbcfcef579254a51a4 (diff) | |
| parent | ace892b8f5b12f4c85aec70caa032a13f8d0fd2c (diff) | |
Merged DRTVWR-559 into SL-18290
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index c5bf18a065..d61cc26f62 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1198,10 +1198,12 @@ void LLTaskMaterialBridge::openItem() LLSD floater_key; floater_key["taskid"] = mPanel->getTaskUUID(); floater_key["itemid"] = mUUID; - LLMaterialEditor* mat = LLFloaterReg::showTypedInstance<LLMaterialEditor>("material_editor", floater_key, TAKE_FOCUS_YES); + LLMaterialEditor* mat = LLFloaterReg::getTypedInstance<LLMaterialEditor>("material_editor", floater_key); if (mat) { mat->setObjectID(mPanel->getTaskUUID()); + mat->openFloater(floater_key); + mat->setFocus(TRUE); } } } |