diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
| commit | 13de92740e55e8ba5111e1cd16e239ebeda3a578 (patch) | |
| tree | 5da5b829085d2a19422ce1f2f987b395080369cc /indra/newview/llfloaterregioninfo.cpp | |
| parent | ab431d1774d5b282836a3327dd0bfa8b3b91632b (diff) | |
| parent | 9a2e35f7cab1ba119e9887cd307f021fc6ae0bd5 (diff) | |
merge latest viewer-development
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 4535ad0240..b13233d684 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -90,6 +90,7 @@ #include "llwaterparammanager.h" #include "lltrans.h" #include "llagentui.h" +#include "llmeshrepository.h" // contains includes needed for WL estate settings #include "llfloaterwater.h" @@ -631,10 +632,7 @@ 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(); + const bool enable_mesh = gMeshRepo.meshRezEnabled(); 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 |