From d5ae682e113d6a6f861b0d873a2fd061f8d03750 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 26 May 2011 16:04:36 -0400 Subject: SH-1444 FIXED "Allow mesh objects" setting is visible on non-mesh region. --- indra/newview/llfloaterregioninfo.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index fc6976755f..232b8e9096 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -592,7 +592,8 @@ bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region) const bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled") && gAgent.getRegion() && - !gAgent.getRegion()->getCapability("GetMesh").empty(); + !gAgent.getRegion()->getCapability("GetMesh").empty() && + !gAgent.getRegion()->getCapability("ObjectAdd").empty(); getChildView("mesh_rez_enabled_check")->setVisible(enable_mesh); getChildView("mesh_rez_enabled_check")->setEnabled(getChildView("mesh_rez_enabled_check")->getEnabled() && enable_mesh); // Data gets filled in by processRegionInfo -- cgit v1.2.3