livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-1444 "Allow mesh objects" setting is visible on a non-mesh region.

meow-7.2.2
Loren Shih 2011-05-09 13:50:07 -04:00
parent 781af27e9c
commit 155d96000f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloaterregioninfo.cpp
View File

@ -590,6 +590,11 @@ 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();
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);

1
indra/newview/skins/default/xui/en/panel_region_general.xml
View File

@ -134,6 +134,7 @@
top="190"
width="80" />
<check_box
visible="FALSE"
height="20"
label="Allow Mesh Objects"
layout="topleft"