SH-887 Upload model options available when MeshEnabled set to False

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();
 	}
 };