summaryrefslogtreecommitdiff
path: root/indra/newview/llcallfloater.cpp
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-12 10:57:23 -0800
committerrichard <none@none>2010-01-12 10:57:23 -0800
commit2d9d3d5d8653176b82578578c8c44769a03b102d (patch)
tree25b9b5ab91aab8294eb175e74e55f4284e7a0390 /indra/newview/llcallfloater.cpp
parent145dd30b9aaf6d2f53c606f5b0f30d3aefc1024b (diff)
moved floater-specific setting to settings.xml frmo string embedded in floater
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
-rw-r--r--indra/newview/llcallfloater.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 0025c10b24..008ebf43b4 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -864,9 +864,8 @@ S32 LLCallFloater::getParticipantItemHeight()
S32 LLCallFloater::getMaxVisibleItems()
{
- S32 value = 5; // default value, in case convertToS32() fails.
- LLStringUtil::convertToS32(getString("max_visible_items"), value);
- return value;
+ static LLCachedControl<S32> max_visible_items(*LLUI::sSettingGroups["config"],"CallFloaterMaxItems");
+ return max_visible_items;
}
//EOF