diff --git a/indra/newview/app_settings/settings_hybrid.xml b/indra/newview/app_settings/settings_hybrid.xml
index 90fe92a4bf..88026168bf 100644
--- a/indra/newview/app_settings/settings_hybrid.xml
+++ b/indra/newview/app_settings/settings_hybrid.xml
@@ -1,207 +1,207 @@
-
-
-
+
+
+
+ ChatOnlineNotification
+
+ Comment
+ Provide notifications for when friend log on and off of SL
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ OnlineOfflinetoNearbyChat
+
+ Comment
+ Send online/offline notifications to Nearby Chat panel (v1-style behavior)
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ OpenSidePanelsInFloaters
+
+ Comment
+ Open Panels in Floaters
+ Type
+ Boolean
+ Value
+ 0
+
+
+ FSShowMouselookInstructions
+
+ Comment
+ If true, instructions about leaving Mouseview are displayed.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ SkinCurrent
+
+ Comment
+ The currently selected skin.
+ Persist
+ 1
+ Type
+ String
+ Value
+ metaharper
+
+
+ SkinCurrentTheme
+
+ Comment
+ The selected theme for the current skin.
+ Persist
+ 1
+ Type
+ String
+ Value
+ modern
+
+
+ LetterKeysFocusChatBar
+
+ Comment
+ When printable characters keys (possibly with Shift held) are pressed, the chat bar takes focus
+ Persist
+ 1
+ Type
+ S32
+ Value
+ 0
+
+
+ FSColorClienttags
+
+ Comment
+ Color Clienttags by: 0=Off, 1=Single color per Viewer, 2=Userdefinied color (one color per UUID), 3=New Tagsystem Color
+ Persist
+ 1
+ Type
+ U32
+ Value
+ 2
+
+
+ FSScriptDialogNoTransparency
+
+ Comment
+ If true, script dialogs will be shown opaque and ignore the floater opacity settings.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ ShowRadarMinimap
+
+ Comment
+ Toggle visibility of the embedded minimap in the radar panel
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ PhoenixUseNearbyChatConsole
+
+ Comment
+ Display popup chat embedded into the read-only world console (v1-style) instead of overlayed floaters (v2-style)
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ ShowScriptDialogsTopRight
+
+ Comment
+ Show script llDialog floaters always in the top right corner of the screen.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ EnableGroupChatPopups
+
+ Comment
+ Enable Incoming Group Chat Popups
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ EnableIMChatPopups
+
+ Comment
+ Enable Incoming IM Chat Popups
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ PlainTextChatHistory
+
+ Comment
+ Enable/Disable plain text chat history style
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ ShowChatMiniIcons
+
+ Comment
+ Toggles the display of mini icons in chat history
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ ChatWindow
+
+ Comment
+ Show chat in multiple windows(by default) or in one multi-tabbed window(requires restart)
+ Persist
+ 1
+ Type
+ S32
+ Value
+ 1
+
+
+
+
diff --git a/indra/newview/app_settings/settings_phoenix.xml b/indra/newview/app_settings/settings_phoenix.xml
index e0476cfe85..8d957c7f99 100644
--- a/indra/newview/app_settings/settings_phoenix.xml
+++ b/indra/newview/app_settings/settings_phoenix.xml
@@ -1,207 +1,207 @@
-
-
-
- OnlineOfflinetoNearbyChat
-
- Comment
- Send online/offline notifications to Nearby Chat panel (v1-style behavior)
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- ChatOnlineNotification
-
- Comment
- Provide notifications for when friend log on and off of SL
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- OpenSidePanelsInFloaters
-
- Comment
- Open Panels in Floaters
- Type
- Boolean
- Value
- 1
-
-
- FSShowMouselookInstructions
-
- Comment
- If true, instructions about leaving Mouseview are displayed.
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- SkinCurrent
-
- Comment
- The currently selected skin.
- Persist
- 1
- Type
- String
- Value
- firestorm
-
-
- SkinCurrentTheme
-
- Comment
- The selected theme for the current skin.
- Persist
- 1
- Type
- String
- Value
- grey
-
-
- LetterKeysFocusChatBar
-
- Comment
- When printable characters keys (possibly with Shift held) are pressed, the chat bar takes focus
- Persist
- 1
- Type
- S32
- Value
- 0
-
-
- FSColorClienttags
-
- Comment
- Color Clienttags by: 0=Off, 1=Single color per Viewer, 2=Userdefinied color (one color per UUID), 3=New Tagsystem Color
- Persist
- 1
- Type
- U32
- Value
- 2
-
-
- FSScriptDialogNoTransparency
-
- Comment
- If true, script dialogs will be shown opaque and ignore the floater opacity settings.
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- ShowRadarMinimap
-
- Comment
- Toggle visibility of the embedded minimap in the radar panel
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- PhoenixUseNearbyChatConsole
-
- Comment
- Display popup chat embedded into the read-only world console (v1-style) instead of overlayed floaters (v2-style)
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- ShowScriptDialogsTopRight
-
- Comment
- Show script llDialog floaters always in the top right corner of the screen.
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- EnableGroupChatPopups
-
- Comment
- Enable Incoming Group Chat Popups
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- EnableIMChatPopups
-
- Comment
- Enable Incoming IM Chat Popups
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- PlainTextChatHistory
-
- Comment
- Enable/Disable plain text chat history style
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- ShowChatMiniIcons
-
- Comment
- Toggles the display of mini icons in chat history
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- ChatWindow
-
- Comment
- Show chat in multiple windows(by default) or in one multi-tabbed window(requires restart)
- Persist
- 1
- Type
- S32
- Value
- 1
-
-
-
-
+
+
+
+ OnlineOfflinetoNearbyChat
+
+ Comment
+ Send online/offline notifications to Nearby Chat panel (v1-style behavior)
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ ChatOnlineNotification
+
+ Comment
+ Provide notifications for when friend log on and off of SL
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ OpenSidePanelsInFloaters
+
+ Comment
+ Open Panels in Floaters
+ Type
+ Boolean
+ Value
+ 1
+
+
+ FSShowMouselookInstructions
+
+ Comment
+ If true, instructions about leaving Mouseview are displayed.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ SkinCurrent
+
+ Comment
+ The currently selected skin.
+ Persist
+ 1
+ Type
+ String
+ Value
+ firestorm
+
+
+ SkinCurrentTheme
+
+ Comment
+ The selected theme for the current skin.
+ Persist
+ 1
+ Type
+ String
+ Value
+ grey
+
+
+ LetterKeysFocusChatBar
+
+ Comment
+ When printable characters keys (possibly with Shift held) are pressed, the chat bar takes focus
+ Persist
+ 1
+ Type
+ S32
+ Value
+ 0
+
+
+ FSColorClienttags
+
+ Comment
+ Color Clienttags by: 0=Off, 1=Single color per Viewer, 2=Userdefinied color (one color per UUID), 3=New Tagsystem Color
+ Persist
+ 1
+ Type
+ U32
+ Value
+ 2
+
+
+ FSScriptDialogNoTransparency
+
+ Comment
+ If true, script dialogs will be shown opaque and ignore the floater opacity settings.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ ShowRadarMinimap
+
+ Comment
+ Toggle visibility of the embedded minimap in the radar panel
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ PhoenixUseNearbyChatConsole
+
+ Comment
+ Display popup chat embedded into the read-only world console (v1-style) instead of overlayed floaters (v2-style)
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ ShowScriptDialogsTopRight
+
+ Comment
+ Show script llDialog floaters always in the top right corner of the screen.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ EnableGroupChatPopups
+
+ Comment
+ Enable Incoming Group Chat Popups
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ EnableIMChatPopups
+
+ Comment
+ Enable Incoming IM Chat Popups
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ PlainTextChatHistory
+
+ Comment
+ Enable/Disable plain text chat history style
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ ShowChatMiniIcons
+
+ Comment
+ Toggles the display of mini icons in chat history
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ ChatWindow
+
+ Comment
+ Show chat in multiple windows(by default) or in one multi-tabbed window(requires restart)
+ Persist
+ 1
+ Type
+ S32
+ Value
+ 1
+
+
+
+
diff --git a/indra/newview/app_settings/settings_v3.xml b/indra/newview/app_settings/settings_v3.xml
index 694a7d5055..c8c38c8858 100644
--- a/indra/newview/app_settings/settings_v3.xml
+++ b/indra/newview/app_settings/settings_v3.xml
@@ -1,231 +1,231 @@
-
-
-
- UsePieMenu
-
- Comment
- Use the classic V1.x circular menu instead of the rectangular context menus when right clicking on land, avatars, objects or attachments.
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- ShowHomeButton
-
- Comment
- Shows/Hides home sidebar button in the bottom tray.
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- ShowMenuBarLocation
-
- Comment
- Show/Hide location info in the menu bar
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- ShowNavbarNavigationPanel
-
- Comment
- Show/Hide Navigation Bar Navigation Panel
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- OpenSidePanelsInFloaters
-
- Comment
- Open Panels in Floaters
- Type
- Boolean
- Value
- 0
-
-
- FSShowMouselookInstructions
-
- Comment
- If true, instructions about leaving Mouseview are displayed.
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- SkinCurrent
-
- Comment
- The currently selected skin.
- Persist
- 1
- Type
- String
- Value
- starlight
-
-
- SkinCurrentTheme
-
- Comment
- The selected theme for the current skin.
- Persist
- 1
- Type
- String
- Value
- original_orange
-
-
- LetterKeysFocusChatBar
-
- Comment
- When printable characters keys (possibly with Shift held) are pressed, the chat bar takes focus
- Persist
- 1
- Type
- S32
- Value
- 1
-
-
- FSColorClienttags
-
- Comment
- Color Clienttags by: 0=Off, 1=Single color per Viewer, 2=Userdefinied color (one color per UUID), 3=New Tagsystem Color
- Persist
- 1
- Type
- U32
- Value
- 0
-
-
- FSScriptDialogNoTransparency
-
- Comment
- If true, script dialogs will be shown opaque and ignore the floater opacity settings.
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- ShowRadarMinimap
-
- Comment
- Toggle visibility of the embedded minimap in the radar panel
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- PhoenixUseNearbyChatConsole
-
- Comment
- Display popup chat embedded into the read-only world console (v1-style) instead of overlayed floaters (v2-style)
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- ShowScriptDialogsTopRight
-
- Comment
- Show script llDialog floaters always in the top right corner of the screen.
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- EnableGroupChatPopups
-
- Comment
- Enable Incoming Group Chat Popups
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- EnableIMChatPopups
-
- Comment
- Enable Incoming IM Chat Popups
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- PlainTextChatHistory
-
- Comment
- Enable/Disable plain text chat history style
- Persist
- 1
- Type
- Boolean
- Value
- 0
-
-
- ShowChatMiniIcons
-
- Comment
- Toggles the display of mini icons in chat history
- Persist
- 1
- Type
- Boolean
- Value
- 1
-
-
- ChatWindow
-
- Comment
- Show chat in multiple windows(by default) or in one multi-tabbed window(requires restart)
- Persist
- 1
- Type
- S32
- Value
- 0
-
-
-
-
+
+
+
+ UsePieMenu
+
+ Comment
+ Use the classic V1.x circular menu instead of the rectangular context menus when right clicking on land, avatars, objects or attachments.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ ShowHomeButton
+
+ Comment
+ Shows/Hides home sidebar button in the bottom tray.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ ShowMenuBarLocation
+
+ Comment
+ Show/Hide location info in the menu bar
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ ShowNavbarNavigationPanel
+
+ Comment
+ Show/Hide Navigation Bar Navigation Panel
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ OpenSidePanelsInFloaters
+
+ Comment
+ Open Panels in Floaters
+ Type
+ Boolean
+ Value
+ 0
+
+
+ FSShowMouselookInstructions
+
+ Comment
+ If true, instructions about leaving Mouseview are displayed.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ SkinCurrent
+
+ Comment
+ The currently selected skin.
+ Persist
+ 1
+ Type
+ String
+ Value
+ starlight
+
+
+ SkinCurrentTheme
+
+ Comment
+ The selected theme for the current skin.
+ Persist
+ 1
+ Type
+ String
+ Value
+ original_orange
+
+
+ LetterKeysFocusChatBar
+
+ Comment
+ When printable characters keys (possibly with Shift held) are pressed, the chat bar takes focus
+ Persist
+ 1
+ Type
+ S32
+ Value
+ 1
+
+
+ FSColorClienttags
+
+ Comment
+ Color Clienttags by: 0=Off, 1=Single color per Viewer, 2=Userdefinied color (one color per UUID), 3=New Tagsystem Color
+ Persist
+ 1
+ Type
+ U32
+ Value
+ 0
+
+
+ FSScriptDialogNoTransparency
+
+ Comment
+ If true, script dialogs will be shown opaque and ignore the floater opacity settings.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ ShowRadarMinimap
+
+ Comment
+ Toggle visibility of the embedded minimap in the radar panel
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ PhoenixUseNearbyChatConsole
+
+ Comment
+ Display popup chat embedded into the read-only world console (v1-style) instead of overlayed floaters (v2-style)
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ ShowScriptDialogsTopRight
+
+ Comment
+ Show script llDialog floaters always in the top right corner of the screen.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ EnableGroupChatPopups
+
+ Comment
+ Enable Incoming Group Chat Popups
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ EnableIMChatPopups
+
+ Comment
+ Enable Incoming IM Chat Popups
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ PlainTextChatHistory
+
+ Comment
+ Enable/Disable plain text chat history style
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+
+ ShowChatMiniIcons
+
+ Comment
+ Toggles the display of mini icons in chat history
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 1
+
+
+ ChatWindow
+
+ Comment
+ Show chat in multiple windows(by default) or in one multi-tabbed window(requires restart)
+ Persist
+ 1
+ Type
+ S32
+ Value
+ 0
+
+
+
+