diff options
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 11 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 197 | ||||
| -rw-r--r-- | indra/newview/app_settings/static_data.db2 | bin | 576578 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/app_settings/static_index.db2 | bin | 9894 -> 0 bytes | 
4 files changed, 158 insertions, 50 deletions
| diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index d0480ca47e..3dfe3f6634 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -276,4 +276,15 @@           is_running_function="Floater.IsOpen"           is_running_parameters="my_environments"             /> +  <command name="360capture" +         available_in_toybox="true" +         is_flashing_allowed="true" +         icon="Command_360_Capture_Icon" +         label_ref="Command_360_Capture_Label" +         tooltip_ref="Command_360_Capture_Tooltip" +         execute_function="Floater.ToggleOrBringToFront" +         execute_parameters="360capture" +         is_running_function="Floater.IsOpen" +         is_running_parameters="360capture" +           />  </commands> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index feb50db2ef..0e55331cdc 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1362,6 +1362,39 @@        <key>Value</key>        <integer>23</integer>      </map> +    <key>EnableDiskCacheDebugInfo</key> +    <map> +      <key>Comment</key> +      <string>When set, display additional cache debugging information</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>Boolean</string> +      <key>Value</key> +      <integer>0</integer> +    </map> +    <key>DiskCachePercentOfTotal</key> +    <map> +      <key>Comment</key> +      <string>The percent of total cache size (defined by CacheSize) to use for the disk cache</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>F32</string> +      <key>Value</key> +      <real>20.0</real> +    </map> +    <key>DiskCacheDirName</key> +    <map> +      <key>Comment</key> +      <string>The name of the disk cache (within the standard Viewer disk cache directory)</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>String</string> +      <key>Value</key> +      <string>cache</string> +    </map>      <key>CacheLocation</key>      <map>        <key>Comment</key> @@ -2077,6 +2110,28 @@        <key>Value</key>        <integer>1</integer>      </map> +    <key>BrowserFileAccessFromFileUrls</key> +    <map> +      <key>Comment</key> +      <string>Allow access to local files via file urls in the embedded browser</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>Boolean</string> +      <key>Value</key> +      <integer>1</integer> +    </map> +    <key>BrowserPluginsEnabled</key> +    <map> +      <key>Comment</key> +      <string>Enable Web plugins in the built-in Web browser?</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>Boolean</string> +      <key>Value</key> +      <integer>1</integer> +    </map>      <key>ChatBarCustomWidth</key>      <map>        <key>Comment</key> @@ -2826,17 +2881,6 @@        <key>Value</key>        <integer>-1</integer>      </map> -    <key>DebugStatModeVFSPendingOps</key> -    <map> -      <key>Comment</key> -      <string>Mode of stat in Statistics floater</string> -      <key>Persist</key> -      <integer>1</integer> -      <key>Type</key> -      <string>S32</string> -      <key>Value</key> -      <integer>-1</integer> -    </map>      <key>DebugStatModeTimeDialation</key>      <map>        <key>Comment</key> @@ -3541,7 +3585,7 @@        <key>Value</key>        <integer>0</integer>      </map> -    <key>DoubleClickTeleport</key>  +    <key>DoubleClickTeleport</key>      <map>        <key>Comment</key>        <string>Enable double-click to teleport where allowed (afects minimap and people panel)</string> @@ -3629,17 +3673,6 @@        <key>Value</key>        <integer>4</integer>      </map> -    <key>DumpVFSCaches</key> -    <map> -      <key>Comment</key> -      <string>Dump VFS caches on startup.</string> -      <key>Persist</key> -      <integer>1</integer> -      <key>Type</key> -      <string>Boolean</string> -      <key>Value</key> -      <integer>0</integer> -    </map>      <key>DynamicCameraStrength</key>      <map>        <key>Comment</key> @@ -8862,7 +8895,7 @@      <key>Value</key>      <integer>0</integer>    </map> -   <key>RenderHiDPI</key> +    <key>RenderHiDPI</key>    <map>      <key>Comment</key>      <string>Enable support for HiDPI displays, like Retina (MacOS X ONLY, requires restart)</string> @@ -11584,7 +11617,7 @@              <string>Boolean</string>          <key>Value</key>              <integer>0</integer> -    </map>  +    </map>      <key>NearbyListShowMap</key>      <map>        <key>Comment</key> @@ -14274,28 +14307,6 @@        <key>Value</key>        <string/>      </map> -    <key>VFSOldSize</key> -    <map> -      <key>Comment</key> -      <string>[DO NOT MODIFY] Controls resizing of local file cache</string> -      <key>Persist</key> -      <integer>1</integer> -      <key>Type</key> -      <string>U32</string> -      <key>Value</key> -      <integer>0</integer> -    </map> -    <key>VFSSalt</key> -    <map> -      <key>Comment</key> -      <string>[DO NOT MODIFY] Controls local file caching behavior</string> -      <key>Persist</key> -      <integer>1</integer> -      <key>Type</key> -      <string>U32</string> -      <key>Value</key> -      <integer>1</integer> -    </map>      <key>VelocityInterpolate</key>      <map>        <key>Comment</key> @@ -16670,9 +16681,95 @@        <key>Type</key>        <string>Boolean</string>        <key>Value</key> -      <integer>1</integer>         +      <integer>1</integer> +  </map> +  <key>360CaptureUseInterestListCap</key> +  <map> +    <key>Comment</key> +    <string>Flag if set, uses the new InterestList cap to ask the simulator for full content</string> +    <key>Persist</key> +    <integer>1</integer> +    <key>Type</key> +    <string>Boolean</string> +    <key>Value</key> +    <integer>1</integer> +  </map> +  <key>360CaptureJPEGEncodeQuality</key> +  <map> +    <key>Comment</key> +    <string>Quality value to use in the JPEG encoder (0..100)</string> +    <key>Persist</key> +    <integer>1</integer> +    <key>Type</key> +    <string>U32</string> +    <key>Value</key> +    <integer>95</integer> +  </map> +  <key>360CaptureDebugSaveImage</key> +  <map> +    <key>Comment</key> +    <string>Flag if set, saves off each cube map as an image, as well as the JavaScript data URL, for debugging purposes</string> +    <key>Persist</key> +    <integer>1</integer> +    <key>Type</key> +    <string>Boolean</string> +    <key>Value</key> +    <integer>0</integer> +  </map> +  <key>360CaptureOutputImageWidth</key> +  <map> +    <key>Comment</key> +    <string>Width of the output 360 equirectangular image</string> +    <key>Persist</key> +    <integer>1</integer> +    <key>Type</key> +    <string>U32</string> +    <key>Value</key> +    <integer>4096</integer> +  </map> +  <key>360CaptureHideAvatars</key> +  <map> +    <key>Comment</key> +    <string>Flag if set, removes all the avatars from the 360 snapshot</string> +    <key>Persist</key> +    <integer>1</integer> +    <key>Type</key> +    <string>Boolean</string> +    <key>Value</key> +    <integer>0</integer>      </map> +  <key>360CaptureCameraFOV</key> +  <map> +    <key>Comment</key> +    <string>Field of view of the WebGL camera that converts the cubemap to an equirectangular image</string> +    <key>Persist</key> +    <integer>1</integer> +    <key>Type</key> +    <string>U32</string> +    <key>Value</key> +    <integer>75</integer> +  </map> +  <key>360CaptureNumRenderPasses</key> +  <map> +    <key>Comment</key> +    <string>Number of times to render the scene while taking a snapshot</string> +    <key>Persist</key> +    <integer>1</integer> +    <key>Type</key> +    <string>U32</string> +    <key>Value</key> +    <integer>3</integer> +  </map> +  <key>ResetUIScaleOnFirstRun</key> +  <map> +  <key>Comment</key> +  <string>Resets the UI scale factor on first run due to changed display scaling behavior</string> +  <key>Persist</key> +  <integer>1</integer> +  <key>Type</key> +  <string>Boolean</string> +  <key>Value</key> +  <integer>1</integer> +  </map>  </map>  </llsd> - - diff --git a/indra/newview/app_settings/static_data.db2 b/indra/newview/app_settings/static_data.db2Binary files differ deleted file mode 100644 index f85aa81601..0000000000 --- a/indra/newview/app_settings/static_data.db2 +++ /dev/null diff --git a/indra/newview/app_settings/static_index.db2 b/indra/newview/app_settings/static_index.db2Binary files differ deleted file mode 100644 index a5440f96f2..0000000000 --- a/indra/newview/app_settings/static_index.db2 +++ /dev/null | 
