diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index d0bb93d1b6096f94c8d4ecc394e580a3ace5ef0d..9ecb11d253f628a569132b35d243f49172cd0c8f 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();
 	}
 };