diff options
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 38 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 6 | 
2 files changed, 33 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3048f8d492..b602362cd0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3232,14 +3232,14 @@    <map>      <key>Comment</key>      <string>Specifies that you have not logged in with the viewer since you performed a clean install</string> -    <key>Persist</key> -    <integer>1</integer> -    <key>Type</key> -    <string>Boolean</string> -    <key>Value</key> -    <integer>1</integer> -  </map> -  <key>FirstSelectedDisabledPopups</key> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>Boolean</string> +      <key>Value</key> +      <integer>1</integer> +    </map> +    <key>FirstSelectedDisabledPopups</key>      <map>        <key>Comment</key>        <string>Return false if there is not disabled popup selected in the list of floater preferences popups</string> @@ -12641,5 +12641,27 @@        <key>Value</key>        <integer>1</integer>      </map> +    <key>GenericErrorPageURL</key> +    <map> +      <key>Comment</key> +      <string>URL to set as a property on LLMediaControl to navigate to if the a page completes with a 400-499 HTTP status code</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>String</string> +      <key>Value</key> +      <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/404.html</string> +    </map> +    <key>DestinationsAndAvatarsVisibility</key> +    <map> +      <key>Comment</key> +      <string>Whether destination panel or avatar picker are open (0=destination guide, 1=avatar picker, default=nothing)</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>S32</string> +      <key>Value</key> +      <integer>0</integer> +    </map>  </map>  </llsd> diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 03656f2a53..490da2c9d4 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -61,7 +61,7 @@          <key>Type</key>              <string>String</string>          <key>Value</key> -            <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/howto/index.html?topic=[TOPIC]</string> +            <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/howto/index.html?topic=[TOPIC]</string>          </map>      <key>PreferredMaturity</key>          <map> @@ -345,7 +345,7 @@        <key>Type</key>        <string>String</string>        <key>Value</key> -      <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/guide.html</string> +      <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/guide.html</string>      </map>      <key>AvatarPickerURL</key>      <map> @@ -356,7 +356,7 @@        <key>Type</key>        <string>String</string>        <key>Value</key> -      <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/avatars.html</string> +      <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/avatars.html</string>      </map>      <key>LogInventoryDecline</key>      <map>  | 
