diff options
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 150 |
1 files changed, 125 insertions, 25 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dcaefbba39..a9bf9466de 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3542,28 +3542,28 @@ <string>S32</string> <key>Value</key> <integer>400</integer> - </map> - <key>HelpHomeURL</key> + </map> + <key>HelpUseLocal</key> <map> <key>Comment</key> - <string>URL of initial help page</string> + <string>If set, always use this for help: skins/default/html/[LANGUAGE]/help-offline/index.html</string> <key>Persist</key> - <integer>1</integer> + <integer>0</integer> <key>Type</key> - <string>String</string> + <string>Boolean</string> <key>Value</key> - <string>help/index.html</string> + <integer>0</integer> </map> - <key>HelpLastVisitedURL</key> + <key>HelpURLFormat</key> <map> <key>Comment</key> - <string>URL of last help page, will be shown next time help is accessed</string> + <string>URL pattern for help page; arguments will be encoded; see llviewerhelp.cpp:buildHelpURL for arguments</string> <key>Persist</key> - <integer>1</integer> + <integer>0</integer> <key>Type</key> <string>String</string> <key>Value</key> - <string>help/index.html</string> + <string>http://www.google.com/search?q=site%3Awiki.secondlife.com+[TOPIC]&ignore_channel=[CHANNEL]&ignore_version=[VERSION]&ignore_os=[OS]&ignore_language=[LANGUAGE]&ignore_version_major=[VERSION_MAJOR]&ignore_version_minor=[VERSION_MINOR]&ignore_version_patch=[VERSION_PATCH]&ignore_version_build=[VERSION_BUILD]</string> </map> <key>HighResSnapshot</key> <map> @@ -3994,6 +3994,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>LastMediaSettingsTab</key> + <map> + <key>Comment</key> + <string>Last selected tab in media settings window</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>0</integer> + </map> <key>LastRunVersion</key> <map> <key>Comment</key> @@ -4455,7 +4466,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>MemoryLogFrequency</key> <map> @@ -4884,18 +4895,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <integer>10</integer> - </map> - <key>NavBarMargin</key> - <map> - <key>Comment</key> - <string>Width of notification messages</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>60</integer> + <integer>35</integer> </map> <key>OverflowToastHeight</key> <map> @@ -5227,6 +5227,51 @@ <key>Value</key> <integer>1</integer> </map> + + <key>PluginInstancesCPULimit</key> + <map> + <key>Comment</key> + <string>Amount of total plugin CPU usage before inworld plugins start getting turned down to "slideshow" priority. Set to 0 to disable this check.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.0</real> + </map> + <key>PluginInstancesLow</key> + <map> + <key>Comment</key> + <string>Limit on the number of inworld media plugins that will run at "low" priority</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>4</integer> + </map> + <key>PluginInstancesNormal</key> + <map> + <key>Comment</key> + <string>Limit on the number of inworld media plugins that will run at "normal" priority</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>4</integer> + </map> + <key>PluginInstancesTotal</key> + <map> + <key>Comment</key> + <string>Hard limit on the number of plugins that will be instantiated at once</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>16</integer> + </map> <key>PrecachingDelay</key> <map> <key>Comment</key> @@ -5249,6 +5294,28 @@ <key>Value</key> <integer>13</integer> </map> + <key>PrimMediaFetchQueueDelay</key> + <map> + <key>Comment</key> + <string>Timer delay for fetching media from the queue (in seconds).</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>1.0</real> + </map> + <key>PrimMediaRetryTimerDelay</key> + <map> + <key>Comment</key> + <string>Timer delay for retrying on media queries (in seconds).</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>5.0</real> + </map> <key>ProbeHardwareOnStartup</key> <map> <key>Comment</key> @@ -7531,10 +7598,10 @@ <key>Value</key> <integer>1</integer> </map> - <key>ShowCameraAndMoveControls</key> + <key>ShowCameraButton</key> <map> <key>Comment</key> - <string>Show/Hide Camera and Move controls in the bottom tray</string> + <string>Show/Hide Camera button in the bottom tray</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -7542,6 +7609,28 @@ <key>Value</key> <integer>1</integer> </map> + <key>ShowMoveButton</key> + <map> + <key>Comment</key> + <string>Show/Hide Move button in the bottom tray</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>ShowGestureButton</key> + <map> + <key>Comment</key> + <string>Show/Hide Gesture button in the bottom tray</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>ShowNavbarFavoritesPanel</key> <map> <key>Comment</key> @@ -7564,6 +7653,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>GroupListShowIcons</key> + <map> + <key>Comment</key> + <string>Show/hide group icons in the group list</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>ShowPGSearchAll</key> <map> <key>Comment</key> |