diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-07 19:27:40 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-07 19:27:40 -0500 |
| commit | ace892b8f5b12f4c85aec70caa032a13f8d0fd2c (patch) | |
| tree | 58b5ca8b643fe0ddedf0d4ddd6d91eb3595fa058 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 25bff0c21dafcfca4d098f2d51a46a09c543a12c (diff) | |
| parent | 2fa8bce1cffe932089a05ad1c7834bb20b435fcf (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
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); } } } |