diff options
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 78 |
1 files changed, 61 insertions, 17 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ced072efaa..cb30cada70 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -276,7 +276,7 @@ <key>Value</key> <real>0.5</real> </map> - <key>AudioStreaming</key> + <key>AudioSteamingMedia</key> <map> <key>Comment</key> <string>Enable streaming</string> @@ -1112,6 +1112,28 @@ <key>Value</key> <string /> </map> + <key>CacheLocationTopFolder</key> + <map> + <key>Comment</key> + <string>Controls the top folder location of the local disk cache</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> + <key>CacheLocationTopFolder</key> + <map> + <key>Comment</key> + <string>Controls the location of the local disk cache</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> <key>CacheSize</key> <map> <key>Comment</key> @@ -2753,6 +2775,17 @@ <string>Boolean</string> <key>Value</key> <integer>0</integer> + </map> + <key>FirstSelectedEnabledPopups</key> + <map> + <key>Comment</key> + <string>Return false if there is not enable popup selected in the list of floater preferences popups</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> </map> <key>FixedWeather</key> <map> @@ -4617,6 +4650,17 @@ <key>Value</key> <string /> </map> + <key>NewCacheLocationTopFolder</key> + <map> + <key>Comment</key> + <string>Change the top folder location of the local disk cache to this</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> <key>NextLoginLocation</key> <map> <key>Comment</key> @@ -5887,7 +5931,7 @@ <key>Value</key> <integer>0</integer> </map> - <key>RenderHideGroupTitleAll</key> + <key>RenderShowGroupTitleAll</key> <map> <key>Comment</key> <string>Show group titles in name labels</string> @@ -5896,7 +5940,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>RenderInitError</key> <map> @@ -5964,17 +6008,6 @@ <key>Value</key> <integer>512</integer> </map> - <key>RenderName</key> - <map> - <key>Comment</key> - <string>Controls display of names above avatars (0 = never, 1 = fade, 2 = always)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>2</integer> - </map> <key>RenderNameFadeDuration</key> <map> <key>Comment</key> @@ -5986,16 +6019,16 @@ <key>Value</key> <real>1.0</real> </map> - <key>RenderNameHideSelf</key> + <key>RenderNameShowSelf</key> <map> <key>Comment</key> - <string>Don't display own name above avatar</string> + <string>Display own name above avatar</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>RenderNameShowTime</key> <map> @@ -6608,6 +6641,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>AvatarNameTagMode</key> + <map> + <key>Comment</key> + <string>Select Avatar Name Tag Mode</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>1</integer> + </map> <key>ShowAxes</key> <map> <key>Comment</key> |