diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-10-06 21:57:06 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-10-06 21:57:06 -0700 |
| commit | dc738f6757671af44fb39cb4cf35ec68a5c16b71 (patch) | |
| tree | a6334029adc5b8815a440e2db07610f0d0f98ef0 /indra/newview/app_settings/settings.xml | |
| parent | 5ded6ef85b971a2be9287f11be5acca2b343f364 (diff) | |
| parent | 788ce7a8cdbbbf98566ce75ec281ec00c21dc6d8 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a666c72686..2d835fb2f7 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4181,6 +4181,17 @@ <key>Value</key> <integer>255</integer> </map> + <key>ForceLoginURL</key> + <map> + <key>Comment</key> + <string>Force a specified URL for login page content - used if exists</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string></string> + </map> <key>ForceShowGrid</key> <map> <key>Comment</key> @@ -5314,6 +5325,18 @@ <key>Value</key> <integer>1</integer> </map> + <key>LoginContentVersion</key> + <map> + <key>Comment</key> + <string>Version of login page web based content to display</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>2</string> + </map> + <key>LoginSRVTimeout</key> <map> <key>Comment</key> @@ -6129,16 +6152,16 @@ <integer>0</integer> </map> <key>MemoryLogFrequency</key> - <map> - <key>Comment</key> - <string>Seconds between display of Memory in log (0 for never)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> + <map> + <key>Comment</key> + <string>Seconds between display of Memory in log (0 for never)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> <real>30.0</real> - </map> + </map> <key>MemoryPrivatePoolEnabled</key> <map> <key>Comment</key> |