diff options
| author | James Cook <james@lindenlab.com> | 2008-04-03 18:43:54 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-04-03 18:43:54 +0000 |
| commit | 55c25229b79b1755c989e5996c8e8d118f369721 (patch) | |
| tree | 1fa882bc7e11dc8aec031d5e268131809874168a /indra/newview/app_settings/settings.xml | |
| parent | b3fcfa16ba8b984163c38904e165052a34be6dab (diff) | |
svn merge -r 83778:83944 maint-ui-10-merge
QAR-442
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 43 |
1 files changed, 38 insertions, 5 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7e687a5e64..93c06a474c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2224,6 +2224,28 @@ <integer>0</integer> </array> </map> + <key>FloaterActiveSpeakersSortColumn</key> + <map> + <key>Comment</key> + <string>Column name to sort on</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>speaker_name</string> + </map> + <key>FloaterActiveSpeakersSortAscending</key> + <map> + <key>Comment</key> + <string>Whether to sort up or down</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>FloaterAudioVolumeRect</key> <map> <key>Comment</key> @@ -2304,7 +2326,7 @@ <integer>0</integer> </array> </map> - <key>FloaterCameraRect2</key> + <key>FloaterCameraRect3</key> <map> <key>Comment</key> <string>Rectangle for camera control window</string> @@ -2314,10 +2336,10 @@ <string>Rect</string> <key>Value</key> <array> - <integer>166</integer> - <integer>128</integer> - <integer>342</integer> + <integer>0</integer> <integer>64</integer> + <integer>176</integer> + <integer>0</integer> </array> </map> <key>FloaterChatRect</key> @@ -6062,6 +6084,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>ShowActiveSpeakers</key> + <map> + <key>Comment</key> + <string>Display active speakers list on login</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>ShowAxes</key> <map> <key>Comment</key> @@ -6082,7 +6115,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>ShowChatHistory</key> <map> |