summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-10-04 11:19:37 -0400
committerLoren Shih <seraph@lindenlab.com>2010-10-04 11:19:37 -0400
commitcafefd3f5f161d79ecd62bc00b769e6b2b94dc82 (patch)
tree8a42224d4593ac72cc9dd1d80364c948565f0a6b /indra/newview
parent83bd99df5dfbe1fec188d20922cf3b367b79c827 (diff)
SH-270 FIXED As a SL user, I want my speaker order settings to persist between sessions
SH-271 FIXED Add #ifdefs to llparticipantlist.h Changed speaker order to store its speaker ordering using settings.xml. Did some superficial code cleanup.
Diffstat (limited to 'indra/newview')
-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 b641a16847..b67530215b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11079,6 +11079,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>SpeakerParticipantDefaultOrder</key>
+ <map>
+ <key>Comment</key>
+ <string>Order for displaying speakers in voice controls. 0 = alphabetical. 1 = recent.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>SpeakerParticipantRemoveDelay</key>
<map>
<key>Comment</key>