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

SH-1467 WIP Viewer checks the wrong cap for mesh-ui disable 

Fixes that need to go into trunk because certain Mesh UI elements are showing up on DRTSIM-52.  These fixes will probably be overwritten by the actual resolution of SH-1467 but I need this workaround now.
meow-7.2.2
Loren Shih 2011-05-26 16:58:31 -04:00
parent 5a39eeb70f
commit 7c042e1bcd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloatertools.cpp
View File

@ -423,7 +423,7 @@ void LLFloaterTools::refresh()
// Refresh object and prim count labels
LLLocale locale(LLLocale::USER_LOCALE);
if ((gAgent.getRegion() && gAgent.getRegion()->getCapability("GetMesh").empty()) || !gSavedSettings.getBOOL("MeshEnabled"))
if ((gAgent.getRegion() && (gAgent.getRegion()->getCapability("GetMesh").empty() || gAgent.getRegion()->getCapability("ObjectAdd").empty())) || !gSavedSettings.getBOOL("MeshEnabled"))
{
std::string obj_count_string;
LLResMgr::getInstance()->getIntegerString(obj_count_string, LLSelectMgr::getInstance()->getSelection()->getRootObjectCount());
@ -790,7 +790,8 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
bool show_mesh_cost = gAgent.getRegion() &&
!gAgent.getRegion()->getCapability("GetMesh").empty() &&
gSavedSettings.getBOOL("MeshEnabled");
gSavedSettings.getBOOL("MeshEnabled") &&
!gAgent.getRegion()->getCapability("ObjectAdd").empty();
getChildView("obj_count")->setVisible( !land_visible && !show_mesh_cost);
getChildView("prim_count")->setVisible( !land_visible && !show_mesh_cost);

3
indra/newview/llpanelobject.cpp
View File

@ -1742,7 +1742,8 @@ void LLPanelObject::refresh()
bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled") &&
gAgent.getRegion() &&
!gAgent.getRegion()->getCapability("GetMesh").empty();
!gAgent.getRegion()->getCapability("GetMesh").empty() &&
!gAgent.getRegion()->getCapability("ObjectAdd").empty();
F32 max_scale = get_default_max_prim_scale(LLPickInfo::isFlora(mObject));