diff options
| author | leyla_linden <none@none> | 2011-01-10 12:10:36 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-01-10 12:10:36 -0800 |
| commit | b63a404613182edfd230abda595f064c7bcc1c10 (patch) | |
| tree | 18a4cb6abdfa52bb68ded012f9f4b53d491b0c48 /indra/newview/app_settings | |
| parent | 523722652259d37841be2ad4ad283df4887ad372 (diff) | |
| parent | fdf19a526821291bd3d6a6e1f6b78dcaeac63705 (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 18 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_per_account.xml | 11 |
2 files changed, 25 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a7e7e913c2..bc181b5f8b 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3992,6 +3992,17 @@ <key>Value</key> <string>http://search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD]</string> </map> + <key>WebProfileURL</key> + <map> + <key>Comment</key> + <string>URL for Web Profiles</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>https://my.secondlife.com/[AGENT_NAME]</string> + </map> <key>HighResSnapshot</key> <map> <key>Comment</key> @@ -7694,7 +7705,6 @@ <key>Value</key> <real>0.01</real> </map> - <key>RenderShadowBiasError</key> <map> <key>Comment</key> @@ -8952,7 +8962,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>0.125f</real> + <real>0.125</real> </map> <key>MeshThreadCount</key> <map> @@ -11923,7 +11933,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>3.0</integer> + <real>3.0</real> </map> <key>InterpolationPhaseOut</key> <map> @@ -11934,7 +11944,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>1.0</integer> + <real>1.0</real> </map> <key>VerboseLogs</key> <map> diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 705c73cbf7..8efec1cff0 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -160,6 +160,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>ShowFavoritesOnLogin</key> + <map> + <key>Comment</key> + <string>Determines whether favorites of last logged in user will be saved on exit from viewer and shown on login screen</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <!-- End of back compatibility settings --> </map> </llsd> |