diff options
| author | Richard Linden <none@none> | 2011-11-07 11:15:40 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-07 11:15:40 -0800 |
| commit | 32dca99fe59196fa4a92a815b441b4e6e9f747f0 (patch) | |
| tree | 6a257d591ad0f241c7fbd42acca72ea79e4c9cf6 /indra/newview/app_settings | |
| parent | 8f47f2222c207938c8fc55158a6fff64ccf1e781 (diff) | |
| parent | d6d4bfa02a46c5c7f2e5376b9fad79f2624dda83 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_per_account.xml | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5c0ea2f774..6bb4564860 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2630,17 +2630,6 @@ <key>Value</key> <integer>-1</integer> </map> - <key>DebugToolbarFUI</key> - <map> - <key>Comment</key> - <string>Turn on the FUI Toolbars</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> <key>DebugViews</key> <map> <key>Comment</key> diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 6ed4480cb1..8cdd8ed838 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -36,7 +36,7 @@ <key>DisplayDestinationsOnInitialRun</key> <map> <key>Comment</key> - <string>Display the destinations guide when a user first launches FUI.</string> + <string>Display the destinations guide when a user first launches Second Life.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |