From ba8fcdcd19c59e7b34bad87948a120f4ad67c4b8 Mon Sep 17 00:00:00 2001
From: leyla_linden <none@none>
Date: Fri, 28 Jan 2011 12:17:00 -0800
Subject: [PATCH] SH-887 Upload model options available when MeshEnabled set to
False
---
indra/newview/llviewermenufile.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index d0bb93d1b60..9ecb11d253f 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();
}
};
--
GitLab