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

merge changes for storm-1393

meow-7.2.2
Oz Linden 2011-06-28 09:20:53 -04:00
parent 23d3b834bb edc0e31bc2
commit b24f9295a2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -911,6 +911,7 @@ WolfPup Lowenhar
STORM-825
STORM-859
STORM-1098
STORM-1393
VWR-20741
VWR-20933
Zai Lynch

4
indra/newview/llfloatertools.cpp
View File

@ -424,8 +424,7 @@ void LLFloaterTools::refresh()
// Refresh object and prim count labels
LLLocale locale(LLLocale::USER_LOCALE);
#if 0
if (gMeshRepo.meshRezEnabled())
if (!gMeshRepo.meshRezEnabled())
{
std::string obj_count_string;
LLResMgr::getInstance()->getIntegerString(obj_count_string, LLSelectMgr::getInstance()->getSelection()->getRootObjectCount());
@ -449,7 +448,6 @@ void LLFloaterTools::refresh()
getChildView("RenderingCost")->setEnabled(have_selection && sShowObjectCost);
}
else
#endif
{
// Get the number of objects selected
std::string root_object_count_string;