diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-08 15:59:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-08 15:59:50 -0500 |
| commit | 6b516b7a6c4a59ebd3bf9e84075bb4539be072e4 (patch) | |
| tree | f910bb425c05a74eb2f7df0eab050de4d648ac20 /indra/newview/app_settings | |
| parent | 89b75e75315592da9f4aac2ed851b61f1ac20851 (diff) | |
| parent | 32dca99fe59196fa4a92a815b441b4e6e9f747f0 (diff) | |
merge changes for vmrg-182
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | 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 55e28cd60e..9c055bdc5a 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2619,17 +2619,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> |