diff options
| author | Richard Linden <none@none> | 2011-11-02 10:35:09 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-02 10:35:09 -0700 |
| commit | 2c3fc19aac83b92651cc058126aff0ba66d1ad3c (patch) | |
| tree | a829e2086442b09baa84fa6ae74c30595844b1a9 /indra/newview/app_settings | |
| parent | 148e5f436dbb6f9126f1f6235e9056d4fb14ca66 (diff) | |
| parent | 5e1bb6fbaaba4b1fbcb2b25a3fe9b9d9148e806a (diff) | |
Automated merge with bundle:c:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.ybhs9f\ssh__richard@hg.lindenlab.com_callum_viewer-experience-llqtwebkit_w9twsb.hg
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 3771222455..8f660008e5 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> |