diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-01 22:07:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-01 22:07:12 -0400 |
| commit | 8bfd3201de0d135ef984dc270e83ea88d8f03dd6 (patch) | |
| tree | 040272fc843ed2b00c9b9b162dad9fa503ef078a /indra/newview/llfloaterregioninfo.cpp | |
| parent | 68088a27ba92d8a3ce84ee6e5691e9e2e08b7b32 (diff) | |
| parent | 361384ebb9f41dbccbaab779a085edb773f0a734 (diff) | |
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index db1eae5835..ad63300259 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -631,6 +631,12 @@ bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region) getChildView("im_btn")->setEnabled(allow_modify); getChildView("manage_telehub_btn")->setEnabled(allow_modify); + const bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled") && + gAgent.getRegion() && + !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 return LLPanelRegionInfo::refreshFromRegion(region); |