summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-08-29 10:45:32 -0700
committerMerov Linden <merov@lindenlab.com>2012-08-29 10:45:32 -0700
commit01a154809d650f7905aaa208150a1070b19e5c2b (patch)
treef0dda921e97830d68e41553137459a3dbcca07b6 /indra/newview/app_settings
parentca7abc4c3be9310f4e5fec00b7d6ffadaba58ff0 (diff)
parent051bc99573d7c571cea0e2e1df332c1e5e97ff19 (diff)
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 61bc58b1df..ab1ea6bdbc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1639,6 +1639,17 @@
<key>Value</key>
<string />
</map>
+ <key>ConversationHistoryPageSize</key>
+ <map>
+ <key>Comment</key>
+ <string>Chat history of conversation opened from call log is displayed by pages. So this is number of entries per page.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>100</integer>
+ </map>
<key>NearbyChatIsNotTornOff</key>
<map>
<key>Comment</key>