diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-01 15:10:19 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-01 15:10:19 -0800 |
| commit | fe71dd340ab396b93bde45df438041af5d85fd47 (patch) | |
| tree | b07b92b80e5a8f113252ea0b650684567557c851 /indra/newview/app_settings | |
| parent | 1a9d19d95527d717b89d4ebf45af81824fcbdf44 (diff) | |
Merge giab-viewer-trunk 2497, general merge of more
secapi stuff as well as certificate handling stuff.
Grid manager as well
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/logcontrol.xml | 8 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 24 |
2 files changed, 26 insertions, 6 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index d7bb64ce8a..0eb98e3311 100644 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -20,11 +20,7 @@ <key>tags</key> <array> <string>AppInit</string> - <string>SystemInfo</string> - <string>TextureCache</string> - <string>AppCache</string> - <string>Window</string> - <string>RenderInit</string> + <string>LLLogin</string> </array> </map> <map> @@ -40,6 +36,8 @@ </array> <key>tags</key> <array> + <string>AppInit</string> + <string>LLLogin</string> </array> </map> </array> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7d98a4b6ce..75ee389750 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1629,6 +1629,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>CurrentGrid</key> + <map> + <key>Comment</key> + <string>Currently Selected Grid</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string></string> + </map> <key>CustomServer</key> <map> <key>Comment</key> @@ -3420,7 +3431,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>ForceMandatoryUpdate</key> <map> @@ -7594,6 +7605,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>SecondLifeEnterprise</key> + <map> + <key>Comment</key> + <string>Enables Second Life Enterprise features</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>SelectMovableOnly</key> <map> <key>Comment</key> |