diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-03 20:03:52 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-03 20:03:52 -0400 |
| commit | db2d21a89b62acc14025e7c529721e994ca96a9f (patch) | |
| tree | 5124aa04ff7a212c00891b517740afd050c724e5 /indra/newview/llfloatertools.cpp | |
| parent | d5f96c38e6f5838672c87e540aaaa3b1663837f8 (diff) | |
| parent | eef9016ca15631783e0d61b98da858a971b2ab72 (diff) | |
reconciled .hgtags
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 73c1f99fa0..edcb96314b 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -85,6 +85,7 @@ #include "llviewerwindow.h" #include "llvovolume.h" #include "lluictrlfactory.h" +#include "llaccountingquotamanager.h" // Globals LLFloaterTools *gFloaterTools = NULL; @@ -422,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()); @@ -789,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); |