diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-26 16:04:36 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-26 16:04:36 -0400 |
| commit | d5ae682e113d6a6f861b0d873a2fd061f8d03750 (patch) | |
| tree | a387bba02d3933cd108f6fcb50607805cd2d6b9e | |
| parent | 303a59e7bc8537a63aee42f738fff8a79049c2a2 (diff) | |
SH-1444 FIXED "Allow mesh objects" setting is visible on non-mesh region.
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 |