diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-05-27 11:50:39 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-05-27 11:50:39 -0700 |
| commit | 31e850d04885bed2ac779c66bb6b7923a0a51d96 (patch) | |
| tree | 834cac4630edfae9dca3d44e9c20b1d1c68ff484 /indra/newview/llviewermenufile.cpp | |
| parent | 51bc6c01c10723d1682392fe8a15528fc7f4b7cb (diff) | |
transplant fix for SH-1467
viewer now uses simulatorfeatures to check whether to show
UI elements for mesh or not
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 37640ad0d4..b2080a5b82 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -107,9 +107,7 @@ class LLMeshUploadVisible : public view_listener_t { bool handleEvent(const LLSD& userdata) { - return gSavedSettings.getBOOL("MeshEnabled") && - LLViewerParcelMgr::getInstance()->allowAgentBuild() && - !gAgent.getRegion()->getCapability("ObjectAdd").empty(); + return gMeshRepo.meshUploadEnabled(); } }; |