diff options
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 30 | 
1 files changed, 18 insertions, 12 deletions
| diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b1120c18b2..898c5a5273 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1584,10 +1584,11 @@        <key>Value</key>        <real>1.0</real>      </map> -    <key>CameraPreset</key>  <!-- deprecated (see SL-12429) --> +    <key>CameraPreset</key> +    <!-- deprecated (see SL-12429) -->      <map>        <key>Comment</key> -      <string>Preset camera position - view (0 - rear, 1 - front, 2 - group)</string> +      <string>(Deprecated) Preset camera position - view (0 - rear, 1 - front, 2 - group)</string>        <key>Persist</key>        <integer>1</integer>        <key>Type</key> @@ -2494,10 +2495,11 @@        <key>Value</key>        <integer>0</integer>      </map> -    <key>DEPRECATED: DebugShowPrivateMem</key>  <!-- deprecated (see MAINT-8091) --> +    <key>DebugShowPrivateMem</key> +    <!-- deprecated (see MAINT-8091) -->      <map>        <key>Comment</key> -      <string>Show Private Mem Info</string> +      <string>(Deprecated) Show Private Mem Info</string>        <key>Persist</key>        <integer>1</integer>        <key>Type</key> @@ -5797,7 +5799,7 @@    <key>LoginSRVPump</key>    <map>      <key>Comment</key> -    <string>Name of the message pump that handles SRV request (deprecated)</string> +    <string>(Deprecated) Name of the message pump that handles SRV request)</string>      <key>Persist</key>      <integer>0</integer>      <key>Type</key> @@ -6608,10 +6610,11 @@          <key>Value</key>              <real>600.0</real>          </map> -    <key>MemoryPrivatePoolEnabled</key>  <!-- deprecated (see MAINT-8091) --> +    <key>MemoryPrivatePoolEnabled</key> +    <!-- deprecated (see MAINT-8091) -->      <map>        <key>Comment</key> -      <string>DEPRECATED: Enable the private memory pool management</string> +      <string>(Deprecated) Enable the private memory pool management</string>        <key>Persist</key>        <integer>1</integer>        <key>Type</key> @@ -6619,10 +6622,11 @@        <key>Value</key>        <integer>0</integer>      </map> -    <key>MemoryPrivatePoolSize</key>  <!-- deprecated (see MAINT-8091) --> +    <key>MemoryPrivatePoolSize</key> +    <!-- deprecated (see MAINT-8091) -->      <map>        <key>Comment</key> -      <string>DEPRECATED: Size of the private memory pool in MB (min. value is 256)</string> +      <string>(Deprecated) Size of the private memory pool in MB (min. value is 256)</string>        <key>Persist</key>        <integer>1</integer>        <key>Type</key> @@ -8315,7 +8319,7 @@      <key>QAModeEventHostPort</key>      <map>        <key>Comment</key> -      <string>DEPRECATED: Port on which lleventhost should listen</string> +      <string>(Deprecated) Port on which lleventhost should listen</string>        <key>Persist</key>        <integer>0</integer>        <key>Type</key> @@ -14049,10 +14053,11 @@        <key>Value</key>        <string>Default</string>      </map> -    <key>UseExternalBrowser</key> <!-- deprecated (see MAINT-4127) --> +    <key>UseExternalBrowser</key> +    <!-- deprecated (see MAINT-4127) -->      <map>        <key>Comment</key> -      <string>Use default browser when opening web pages instead of in-world browser.</string> +      <string>(Deprecated) Use default browser when opening web pages instead of in-world browser.</string>        <key>Persist</key>        <integer>1</integer>        <key>Type</key> @@ -14458,6 +14463,7 @@      <integer>0</integer>    </map>    <key>VoiceCallsFriendsOnly</key> +  <!-- deprecated (see SL-12871) -->      <map>        <key>Comment</key>        <string>(Deprecated) Only accept voice calls from residents on your friends list</string> | 
