diff options
| author | Richard Linden <none@none> | 2011-03-30 14:24:36 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-30 14:24:36 -0700 |
| commit | 5f4a85be9111793f25261b0551460e09e1656f18 (patch) | |
| tree | 3a85977c765291c93710ecc59abd5ae717d72b91 /indra/newview/app_settings/settings.xml | |
| parent | 2f190297f0ff37452b3e966c0878e14a6aacc41b (diff) | |
| parent | 84b179b0bf254ae039dfdba330d25ac2df1c0a67 (diff) | |
Automated merge with bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.l2uc4d\http__bitbucket.org_merov_linden_viewer-autobuild2010_j2aqwu.hg
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f0e28d4ae3..04045585a0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3210,14 +3210,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> @@ -12597,5 +12597,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> |