diff options
| author | leyla_linden <none@none> | 2011-01-28 12:17:00 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-01-28 12:17:00 -0800 |
| commit | ba8fcdcd19c59e7b34bad87948a120f4ad67c4b8 (patch) | |
| tree | 202edf7d1f2b343403969233bf6f90dde3687e02 /indra/newview/llviewermenufile.cpp | |
| parent | 9c58022a2e96cf97d42bf284f2cc97ad8e8d9882 (diff) | |
SH-887 Upload model options available when MeshEnabled set to False
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index d0bb93d1b6..9ecb11d253 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -107,7 +107,9 @@ class LLMeshUploadVisible : public view_listener_t { bool handleEvent(const LLSD& userdata) { - return LLViewerParcelMgr::getInstance()->allowAgentBuild() && !gAgent.getRegion()->getCapability("ObjectAdd").empty(); + return gSavedSettings.getBOOL("MeshEnabled") && + LLViewerParcelMgr::getInstance()->allowAgentBuild() && + !gAgent.getRegion()->getCapability("ObjectAdd").empty(); } }; |