diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 12:55:21 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 12:55:21 -0700 |
| commit | 73bbcfb07bdb0ea5828a2e214b87c4fabe805eaa (patch) | |
| tree | c395415163893b341dfbc3c54da77b8b924725af /indra/newview/llfloaterregioninfo.cpp | |
| parent | c32b0122ab915ce9bd0cfd8ec330495f2832d97d (diff) | |
| parent | bc014c2e9e17a97c4dc5e0f9cb19654cad4b8980 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index fc6976755f..6b3e3088d5 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -82,6 +82,7 @@ #include "llvlcomposition.h" #include "lltrans.h" #include "llagentui.h" +#include "llmeshrepository.h" const S32 TERRAIN_TEXTURE_COUNT = 4; const S32 CORNER_COUNT = 4; @@ -590,9 +591,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(); + 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 |