diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-31 15:20:02 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-31 15:20:02 -0500 |
| commit | 94afae5b1552439f69126ecf7cd6716fa692fed6 (patch) | |
| tree | 52abb39e749f4c2e2835e89ff3afd39034d34fba /indra/newview/llviewermenufile.cpp | |
| parent | 29e344bbd0043bb1cd5f1defd6f9a193b0cc728e (diff) | |
| parent | 4cb5439e425dbfd354a27cbfbfe071904d068d5d (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index ffa2ce865e..25eb3eff1d 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -106,8 +106,7 @@ class LLFileEnableUploadMaterial : public view_listener_t { bool handleEvent(const LLSD& userdata) { - LLMaterialEditor* me = (LLMaterialEditor*)LLFloaterReg::findInstance("material_editor"); - if (me && me->isShown()) + if (!gAgent.getRegionCapability("UpdateMaterialAgentInventory").empty()) { return false; } @@ -1145,6 +1144,7 @@ void init_menu_file() view_listener_t::addEnable(new LLFileEnableUpload(), "File.EnableUpload"); view_listener_t::addEnable(new LLFileEnableUploadModel(), "File.EnableUploadModel"); + view_listener_t::addEnable(new LLFileEnableUploadMaterial(), "File.EnableUploadMaterial"); view_listener_t::addMenu(new LLMeshEnabled(), "File.MeshEnabled"); view_listener_t::addMenu(new LLMeshUploadVisible(), "File.VisibleUploadModel"); |