From 3fbc4a1dba0cf0e72061b2bd9761137f6256be4f Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Thu, 12 May 2011 13:35:08 -0400
Subject: [PATCH 01/22] Added money transactions to local chat

---
 indra/newview/llviewermessage.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 99844508f..8115bca09 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5256,6 +5256,10 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 		args["MESSAGE"] = desc;
 		LLNotifications::instance().add("SystemMessage", args);
 
+		// Also send notification to chat -- MC
+		LLChat chat(desc);
+		LLFloaterChat::addChat(desc);
+
 		// Once the 'recent' container gets large enough, chop some
 		// off the beginning.
 		const U32 MAX_LOOKBACK = 30;

From 3f426fcb6734f6b8f08c8cdd314b8260065cebe7 Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Thu, 12 May 2011 13:35:31 -0400
Subject: [PATCH 02/22] Added Open History button to local chat

---
 indra/newview/llfloaterchat.cpp                       | 11 +++++++++++
 indra/newview/llfloaterchat.h                         |  1 +
 .../skins/default/xui/en-us/floater_chat_history.xml  |  7 ++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 3f5641558..88030b6b0 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -115,6 +115,7 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
 	childSetValue("translate chat", gSavedSettings.getBOOL("TranslateChat"));
 	childSetVisible("Chat History Editor with mute",FALSE);
 	childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
+	childSetAction("chat_history_open", onClickChatHistoryOpen, this);
 	setDefaultBtn("Chat");
 }
 
@@ -666,6 +667,16 @@ void LLFloaterChat::onClickToggleActiveSpeakers(void* userdata)
 	//self->childSetVisible("active_speakers_panel", !self->childIsVisible("active_speakers_panel"));
 }
 
+// static
+void LLFloaterChat::onClickChatHistoryOpen(void* userdata)
+{
+	char command[256];
+	sprintf(command, "\"%s\\%s\"", gDirUtilp->getPerAccountChatLogsDir().c_str(), "chat.txt");
+	gViewerWindow->getWindow()->ShellEx(command);
+
+	llinfos << command << llendl;
+}
+
 //static 
 bool LLFloaterChat::visible(LLFloater* instance, const LLSD& key)
 {
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h
index f75a32b7e..775f21be6 100644
--- a/indra/newview/llfloaterchat.h
+++ b/indra/newview/llfloaterchat.h
@@ -82,6 +82,7 @@ public:
 	static void onClickToggleShowMute(LLUICtrl* caller, void *data);
 	static void onClickToggleTranslateChat(LLUICtrl* caller, void *data);
 	static void onClickToggleActiveSpeakers(void* userdata);
+    static void onClickChatHistoryOpen(void* userdata);
 	static void chatFromLogFile(LLLogChat::ELogLineType type,std::string line, void* userdata);
 	static void loadHistory();
 	static void* createSpeakersPanel(void* data);
diff --git a/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 8f954de46..63f0818f3 100644
--- a/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -81,7 +81,12 @@
 			<check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall"
 			     height="20" initial_value="false" label="Translate Chat (powered by Google)" left_delta="0"
 			     name="translate chat" radio_style="false" width="100" />
-			<button bottom_delta="7" follows="right|top" height="20" label="&lt; &lt;"
+
+      <button bottom_delta="8" left_delta="250" follows="left|top" font="SansSerifSmall"
+           height="20" width="100" label="Open History" name="chat_history_open"
+           tool_top="Click here to open chat history in external editor." />
+
+      <button bottom_delta="7" follows="right|top" height="20" label="&lt; &lt;"
 			     label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn"
 			     right="305"
 			     tool_tip="Click here to show list of active participants in this IM session."

From e2a220ac3c116862eb77743228ab98013a50c655 Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Thu, 12 May 2011 14:08:57 -0400
Subject: [PATCH 03/22] Tweaks to UI sizes so they fit better

---
 indra/newview/skins/default/xui/en-us/panel_friends.xml     | 6 +++---
 indra/newview/skins/default/xui/en-us/panel_groups.xml      | 2 +-
 .../default/xui/en-us/panel_preferences_ascent_vanity.xml   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_friends.xml b/indra/newview/skins/default/xui/en-us/panel_friends.xml
index 017e38351..d4b6534cd 100644
--- a/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -68,16 +68,16 @@
 	<button bottom_delta="-25" follows="top|right" height="22" label="Add..."
 	    left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
 	    width="80" />
-	<text bottom_delta="-50" follows="right|top" font="SansSerif" height="32" left_delta="10" name="friends" width="95">
+	<text bottom_delta="-35" follows="right|top" font="SansSerif" height="32" left_delta="0" name="friends" width="95">
 		Online:
     </text>
 	<text bottom_delta="-15" follows="right|top" font="SansSerif" height="32" left_delta="0" name="f_num" width="95">
 		0000
     </text>
-	<text bottom_delta="-20" follows="right|top" font="SansSerif" height="32" left_delta="0" name="sel" width="95">
+	<text bottom_delta="-15" follows="right|top" font="SansSerif" height="32" left_delta="0" name="sel" width="95">
 		Selected:
     </text>
-	<text bottom_delta="-15" follows="right|top" font="SansSerif" height="32" left_delta="0" name="s_num" width="95">
+	<text bottom_delta="0" follows="right|top" font="SansSerif" height="32" left_delta="55" name="s_num" width="95">
 		0000
     </text>		 
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_groups.xml b/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 31aa6d006..75ad985fb 100644
--- a/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -30,7 +30,7 @@
 	     label="Activate" name="Activate" width="80" />
 	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
 	     label="Leave" name="Leave" width="80" />
-	<button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
 	     label="Create..." name="Create" width="80" />
 	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
 	     label="Search..." name="Search..." width="80" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
index 751d173a7..3e441be8d 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
@@ -127,7 +127,7 @@
 				mouse_opaque="true" name="update_tags_check" radio_style="false"
 				width="400" />
 			<button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="left|top" 
-				label="Manual Update" height="18" left_delta="340" width="100"/>
+				label="Manual Update" height="18" left_delta="340" width="110"/>
 			<!-- End of Client Tag settings -->
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 				bottom="-178" drop_shadow_visible="true" enabled="true" follows="left|top"

From 9706141b8f4674a50641a7978290391ab596caf7 Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Sun, 15 May 2011 20:12:43 -0400
Subject: [PATCH 04/22] Tweaked Pay floater to not have overlapping elements.

---
 .../skins/default/xui/en-us/floater_pay.xml        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_pay.xml b/indra/newview/skins/default/xui/en-us/floater_pay.xml
index 9bcebab09..d9646885b 100644
--- a/indra/newview/skins/default/xui/en-us/floater_pay.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_pay.xml
@@ -16,14 +16,14 @@
 	     label="L$20" label_selected="L$20" left="203" mouse_opaque="true"
 	     name="fastpay 20" scale_image="true" width="80" />
 	<button bottom="-162" enabled="false" font="SansSerif" halign="center" height="20"
-	     label="Pay" label_selected="Pay" left="120" mouse_opaque="true"
-	     name="pay btn" scale_image="true" width="80" />
+	     label="Pay" label_selected="Pay" left="140" mouse_opaque="true"
+	     name="pay btn" scale_image="true" width="70" />
 	<button bottom="-162" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Cancel" label_selected="Cancel" left="203" mouse_opaque="true"
-	     name="cancel btn" scale_image="true" width="80" />
+	     label="Cancel" label_selected="Cancel" left="213" mouse_opaque="true"
+	     name="cancel btn" scale_image="true" width="70" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="18" left="12"
+	     font="SansSerif" h_pad="0" halign="left" height="18" left="8"
 	     mouse_opaque="true" name="payee_label" v_pad="0" width="75">
 		Pay resident:
 	</text>
@@ -56,7 +56,7 @@
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-160"
 	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="18" left="60" max_length="9"
+	     handle_edit_keys_directly="false" height="18" left="81" max_length="9"
 	     mouse_opaque="true" name="amount" select_all_on_focus_received="false"
-	     select_on_focus="false" width="57" />
+	     select_on_focus="false" width="54" />
 </floater>

From 14dd55a0350997ba15b900e469a91c92bf93eb2b Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Mon, 16 May 2011 00:26:31 -0400
Subject: [PATCH 05/22] Bug fix on Avatar Cloth setting not working properly.

---
 indra/newview/llpaneldisplay.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp
index c8906fc53..47a48755c 100644
--- a/indra/newview/llpaneldisplay.cpp
+++ b/indra/newview/llpaneldisplay.cpp
@@ -502,7 +502,6 @@ void LLPanelDisplay::refreshEnabledState()
 
 	mCtrlDeferred->setEnabled(can_defer);
 	mCtrlSunShadow->setEnabled(can_defer && gSavedSettings.getBOOL("RenderDeferred"));
-	mCtrlAvatarCloth->setValue(gSavedSettings.getBOOL("RenderAvatarVP"));	//Enabling RenderDeferred changes this setting behind this floaters back.
 
 	// Vertex Shaders
 //	mCtrlShaderEnable->setEnabled(LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"));

From 2b412bffec4c3572307968b229b7ee34a319db36 Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Tue, 17 May 2011 12:54:30 -0400
Subject: [PATCH 06/22] Updated preferences system for bug fixes and user
 friendliness.

---
 indra/newview/CMakeLists.txt                  |   2 +
 indra/newview/ascentprefschat.cpp             | 462 +++++++++
 indra/newview/ascentprefschat.h               | 102 ++
 indra/newview/ascentprefssys.cpp              | 696 +++----------
 indra/newview/ascentprefssys.h                |  66 +-
 indra/newview/lggdicdownload.cpp              |   6 +-
 indra/newview/llappviewer.cpp                 |   1 -
 indra/newview/llfloaterpreference.cpp         |  13 +
 indra/newview/llfloaterpreference.h           |   2 +
 indra/newview/llhudeffectlookat.cpp           |  17 +-
 indra/newview/llhudeffectlookat.h             |   1 -
 indra/newview/llimpanel.cpp                   |   2 +-
 indra/newview/llstartup.cpp                   |   4 -
 indra/newview/llviewermenu.cpp                |   6 +-
 indra/newview/llvotree.cpp                    |   5 +-
 indra/newview/llwind.cpp                      |  16 +-
 indra/newview/llwind.h                        |   2 -
 .../en-us/panel_preferences_ascent_chat.xml   | 303 ++++++
 .../en-us/panel_preferences_ascent_system.xml | 937 ++++++------------
 .../en-us/panel_preferences_ascent_vanity.xml |   4 +-
 20 files changed, 1415 insertions(+), 1232 deletions(-)
 create mode 100644 indra/newview/ascentprefschat.cpp
 create mode 100644 indra/newview/ascentprefschat.h
 create mode 100644 indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4ee02c06e..eb4dc6539 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -78,6 +78,7 @@ set(viewer_SOURCE_FILES
     ascentdaycyclemanager.cpp
     ascentfloatercontactgroups.cpp
     ascentkeyword.cpp
+    ascentprefschat.cpp
     ascentprefssys.cpp
     ascentprefsvan.cpp
     dhparam.cpp
@@ -552,6 +553,7 @@ set(viewer_HEADER_FILES
     ascentdaycyclemanager.h
     ascentfloatercontactgroups.h
     ascentkeyword.h
+    ascentprefschat.h
     ascentprefssys.h
     ascentprefsvan.h
     emerald.h
diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp
new file mode 100644
index 000000000..58502b83f
--- /dev/null
+++ b/indra/newview/ascentprefschat.cpp
@@ -0,0 +1,462 @@
+/** 
+ * @file ascentprefssys.cpp
+ * @Ascent Viewer preferences panel
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008, Henri Beauchamp.
+ * Rewritten in its entirety 2010 Hg Beeks. 
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+//File include
+#include "ascentprefschat.h"
+#include "llagent.h"
+#include "llcolorswatch.h"
+#include "llcombobox.h"
+#include "llradiogroup.h"
+#include "lluictrlfactory.h"
+#include "llviewercontrol.h"
+#include "lgghunspell_wrapper.h"
+
+
+LLPrefsAscentChat::LLPrefsAscentChat()
+{
+    LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_chat.xml");
+
+    childSetCommitCallback("SpellBase", onSpellBaseComboBoxCommit, this);
+    childSetAction("EmSpell_EditCustom", onSpellEditCustom, this);
+    childSetAction("EmSpell_GetMore", onSpellGetMore, this);
+    childSetAction("EmSpell_Add", onSpellAdd, this);
+    childSetAction("EmSpell_Remove", onSpellRemove, this);
+
+    childSetCommitCallback("Keywords_Alert", onCommitCheckBox, this);
+
+    refreshValues();
+    refresh();
+}
+
+LLPrefsAscentChat::~LLPrefsAscentChat()
+{
+}
+
+//static
+void LLPrefsAscentChat::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
+{
+    LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;	
+
+    if (ctrl->getName() == "Keywords_Alert")
+    {
+        bool enabled = self->childGetValue("Keywords_Alert").asBoolean();
+        self->childSetEnabled("Keywords_Entries", enabled);
+        self->childSetEnabled("Keywords_LocalChat", enabled);
+        self->childSetEnabled("Keywords_IM", enabled);
+        self->childSetEnabled("Keywords_Highlight", enabled);
+        self->childSetEnabled("Keywords_Color", enabled);
+        self->childSetEnabled("Keywords_PlaySound", enabled);
+        self->childSetEnabled("Keywords_SoundUUID", enabled);
+    }
+}
+
+void LLPrefsAscentChat::onSpellAdd(void* data)
+{
+    LLPrefsAscentChat* self = (LLPrefsAscentChat*)data;
+
+    if(self)
+    {
+        glggHunSpell->addButton(self->childGetValue("EmSpell_Avail").asString());
+    }
+
+    self->refresh();
+}
+
+void LLPrefsAscentChat::onSpellRemove(void* data)
+{
+    LLPrefsAscentChat* self = (LLPrefsAscentChat*)data;
+
+    if(self)
+    {
+        glggHunSpell->removeButton(self->childGetValue("EmSpell_Installed").asString());
+    }
+
+    self->refresh();
+}
+
+void LLPrefsAscentChat::onSpellGetMore(void* data)
+{
+    glggHunSpell->getMoreButton(data);
+}
+
+void LLPrefsAscentChat::onSpellEditCustom(void* data)
+{
+    glggHunSpell->editCustomButton();
+}
+
+void LLPrefsAscentChat::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
+{
+    LLComboBox* box = (LLComboBox*)ctrl;
+
+    if (box)
+    {
+        glggHunSpell->newDictSelection(box->getValue().asString());
+    }
+}
+
+void LLPrefsAscentChat::refreshValues()
+{
+    //Chat/IM -----------------------------------------------------------------------------
+    mWoLfVerticalIMTabs             = gSavedSettings.getBOOL("WoLfVerticalIMTabs");
+    mIMAnnounceIncoming             = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming");
+	mHideTypingNotification         = gSavedSettings.getBOOL("HideTypingNotification");
+    mShowGroupNameInChatIM          = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM");
+	mPlayTypingSound                = gSavedSettings.getBOOL("PlayTypingSound");
+    mHideNotificationsInChat        = gSavedSettings.getBOOL("HideNotificationsInChat");
+    mEnableMUPose                   = gSavedSettings.getBOOL("AscentAllowMUpose");
+    mEnableOOCAutoClose             = gSavedSettings.getBOOL("AscentAutoCloseOOC");
+    mLinksForChattingObjects        = gSavedSettings.getU32("LinksForChattingObjects");
+    mSecondsInChatAndIMs            = gSavedSettings.getBOOL("SecondsInChatAndIMs");
+
+    std::string format = gSavedSettings.getString("ShortTimeFormat");
+    if (format.find("%p") == -1)
+    {
+        mTimeFormat = 0;
+    }
+    else
+    {
+        mTimeFormat = 1;
+    }
+
+    format = gSavedSettings.getString("ShortDateFormat");
+    if (format.find("%m/%d/%") != -1)
+    {
+        mDateFormat = 2;
+    }
+    else if (format.find("%d/%m/%") != -1)
+    {
+        mDateFormat = 1;
+    }
+    else
+    {
+        mDateFormat = 0;
+    }
+
+    mIMResponseAnyone               = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseAnyone");
+    mIMResponseFriends              = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseFriends");
+    mIMResponseMuted                = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted");
+    mIMShowOnTyping                 = gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowOnTyping");
+    mIMShowResponded                = gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowResponded");
+    mIMResponseRepeat               = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat");
+    mIMResponseItem                 = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseItem");
+    mIMResponseText                 = gSavedPerAccountSettings.getString("AscentInstantMessageResponse");
+
+    //Spam --------------------------------------------------------------------------------
+    mBlockChatSpam                  = gSavedSettings.getBOOL("SGBlockChatSpam");
+    mChatSpamCount                  = gSavedSettings.getU32("SGChatSpamCount");
+    mChatSpamTime                   = gSavedSettings.getF32("SGChatSpamTime");
+    mBlockDialogSpam                = gSavedSettings.getBOOL("SGBlockDialogSpam");
+    mBlockCardSpam                  = gSavedSettings.getBOOL("SGBlockCardSpam");
+    mSpamCount                      = gSavedSettings.getU32("SGSpamCount");
+    mSpamTime                       = gSavedSettings.getF32("SGSpamTime");
+
+    //Text Options ------------------------------------------------------------------------
+    mSpellDisplay                   = gSavedSettings.getBOOL("SpellDisplay");
+    mKeywordsOn                     = gSavedPerAccountSettings.getBOOL("KeywordsOn");
+    mKeywordsList                   = gSavedPerAccountSettings.getString("KeywordsList");
+    mKeywordsInChat                 = gSavedPerAccountSettings.getBOOL("KeywordsInChat");
+    mKeywordsInIM                   = gSavedPerAccountSettings.getBOOL("KeywordsInIM");
+    mKeywordsChangeColor            = gSavedPerAccountSettings.getBOOL("KeywordsChangeColor");
+    mKeywordsColor                  = gSavedPerAccountSettings.getColor4("KeywordsColor");
+    mKeywordsPlaySound              = gSavedPerAccountSettings.getBOOL("KeywordsPlaySound");
+    mKeywordsSound                  = static_cast<LLUUID>(gSavedPerAccountSettings.getString("KeywordsSound"));
+}
+
+void LLPrefsAscentChat::refresh()
+{
+    //Chat --------------------------------------------------------------------------------
+/*
+    LLRadioGroup* radioLinkOptions = getChild<LLRadioGroup>("objects_link");
+    radioLinkOptions->selectNthItem(mLinksForChattingObjects);
+*/
+    // time format combobox
+    LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
+    if (combo)
+    {
+        combo->setCurrentByIndex(mTimeFormat);
+    }
+
+    // date format combobox
+    combo = getChild<LLComboBox>("date_format_combobox");
+    if (combo)
+    {
+        combo->setCurrentByIndex(mDateFormat);
+    }
+
+    childSetValue("AscentInstantMessageResponseAnyone",  mIMResponseAnyone);
+    childSetValue("AscentInstantMessageResponseFriends", mIMResponseFriends);
+    childSetValue("AscentInstantMessageResponseMuted",   mIMResponseMuted);
+    childSetValue("AscentInstantMessageShowOnTyping",    mIMShowOnTyping);
+    childSetValue("AscentInstantMessageShowResponded",   mIMShowResponded);
+    childSetValue("AscentInstantMessageResponseRepeat",  mIMResponseRepeat);
+    childSetValue("AscentInstantMessageResponseItem",    mIMResponseItem);
+
+    LLWString auto_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("AscentInstantMessageResponse") );
+    LLWStringUtil::replaceChar(auto_response, '^', '\n');
+    LLWStringUtil::replaceChar(auto_response, '%', ' ');
+    childSetText("im_response", wstring_to_utf8str(auto_response));
+
+    //Text Options ------------------------------------------------------------------------
+    combo = getChild<LLComboBox>("SpellBase");
+
+    if (combo != NULL) 
+    {
+        combo->removeall();
+        std::vector<std::string> names = glggHunSpell->getDicts();
+
+        for (int i = 0; i < (int)names.size(); i++) 
+        {
+            combo->add(names[i]);
+        }
+
+        combo->setSimple(gSavedSettings.getString("SpellBase"));
+    }
+
+    combo = getChild<LLComboBox>("EmSpell_Avail");
+
+    if (combo != NULL) 
+    {
+        combo->removeall();
+
+        combo->add("");
+        std::vector<std::string> names = glggHunSpell->getAvailDicts();
+
+        for (int i = 0; i < (int)names.size(); i++) 
+        {
+            combo->add(names[i]);
+        }
+
+        combo->setSimple(std::string(""));
+    }
+
+    combo = getChild<LLComboBox>("EmSpell_Installed");
+
+    if (combo != NULL) 
+    {
+        combo->removeall();
+
+        combo->add("");
+        std::vector<std::string> names = glggHunSpell->getInstalledDicts();
+
+        for (int i = 0; i < (int)names.size(); i++) 
+        {
+            combo->add(names[i]);
+        }
+
+        combo->setSimple(std::string(""));
+    }
+
+    bool enabled = childGetValue("Keywords_Alert").asBoolean();
+    childSetEnabled("Keywords_Entries",   enabled);
+    childSetEnabled("Keywords_LocalChat", enabled);
+    childSetEnabled("Keywords_IM",        enabled);
+    childSetEnabled("Keywords_Highlight", enabled);
+    childSetEnabled("Keywords_Color",     enabled);
+    childSetEnabled("Keywords_PlaySound", enabled);
+    childSetEnabled("Keywords_SoundUUID", enabled);
+
+    childSetValue("Keywords_Alert",     mKeywordsOn);
+    childSetValue("Keywords_Entries",   mKeywordsList);
+    childSetValue("Keywords_LocalChat", mKeywordsInChat);
+    childSetValue("Keywords_IM",        mKeywordsInIM);
+    childSetValue("Keywords_Highlight", mKeywordsChangeColor);
+
+    LLColorSwatchCtrl* colorctrl = getChild<LLColorSwatchCtrl>("Keywords_Color");
+    colorctrl->set(LLColor4(mKeywordsColor),TRUE);
+
+    childSetValue("Keywords_PlaySound", mKeywordsPlaySound);
+    childSetValue("Keywords_SoundUUID", mKeywordsSound);
+}
+
+void LLPrefsAscentChat::cancel()
+{
+    //Chat/IM -----------------------------------------------------------------------------
+    gSavedSettings.setBOOL("WoLfVerticalIMTabs",                   mWoLfVerticalIMTabs);
+    gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming);
+	gSavedSettings.setBOOL("HideTypingNotification",               mHideTypingNotification);
+    gSavedSettings.setBOOL("OptionShowGroupNameInChatIM",          mShowGroupNameInChatIM);
+	gSavedSettings.setBOOL("PlayTypingSound",                      mPlayTypingSound);
+    gSavedSettings.setBOOL("HideNotificationsInChat",              mHideNotificationsInChat);
+    gSavedSettings.setBOOL("AscentAllowMUpose",                    mEnableMUPose);
+    gSavedSettings.setBOOL("AscentAutoCloseOOC",                   mEnableOOCAutoClose);
+    gSavedSettings.setU32("LinksForChattingObjects",               mLinksForChattingObjects);
+    gSavedSettings.setBOOL("SecondsInChatAndIMs",                  mSecondsInChatAndIMs);
+
+    std::string short_date, long_date, short_time, long_time, timestamp;
+
+    if (mTimeFormat == 0)
+    {
+        short_time = "%H:%M";
+        long_time  = "%H:%M:%S";
+        timestamp  = " %H:%M:%S";
+    }
+    else
+    {
+        short_time = "%I:%M %p";
+        long_time  = "%I:%M:%S %p";
+        timestamp  = " %I:%M %p";
+    }
+
+    if (mDateFormat == 0)
+    {
+        short_date = "%Y-%m-%d";
+        long_date  = "%A %d %B %Y";
+        timestamp  = "%a %d %b %Y" + timestamp;
+    }
+    else if (mDateFormat == 1)
+    {
+        short_date = "%d/%m/%Y";
+        long_date  = "%A %d %B %Y";
+        timestamp  = "%a %d %b %Y" + timestamp;
+    }
+    else
+    {
+        short_date = "%m/%d/%Y";
+        long_date  = "%A, %B %d %Y";
+        timestamp  = "%a %b %d %Y" + timestamp;
+    }
+
+    gSavedSettings.setString("ShortDateFormat", short_date);
+    gSavedSettings.setString("LongDateFormat",  long_date);
+    gSavedSettings.setString("ShortTimeFormat", short_time);
+    gSavedSettings.setString("LongTimeFormat",  long_time);
+    gSavedSettings.setString("TimestampFormat", timestamp);
+
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone",  mIMResponseAnyone);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", mIMResponseFriends);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted",   mIMResponseMuted);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping",    mIMShowOnTyping);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded",   mIMShowResponded);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat",  mIMResponseRepeat);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem",    mIMResponseItem);
+    gSavedPerAccountSettings.setString("AscentInstantMessageResponse",      mIMResponseText);
+
+    //Spam --------------------------------------------------------------------------------
+    gSavedSettings.setBOOL("SGBlockChatSpam",   mBlockChatSpam);
+    gSavedSettings.setU32("SGChatSpamCount",    mChatSpamCount);
+    gSavedSettings.setF32("SGChatSpamTime",     mChatSpamTime);
+    gSavedSettings.setBOOL("SGBlockDialogSpam", mBlockDialogSpam);
+    gSavedSettings.setBOOL("SGBlockCardSpam",   mBlockCardSpam);
+    gSavedSettings.setU32("SGSpamCount",        mSpamCount);
+    gSavedSettings.setF32("SGSpamTime",         mSpamTime);
+
+    //Text Options ------------------------------------------------------------------------
+    gSavedSettings.setBOOL("SpellDisplay",                  mSpellDisplay);
+    gSavedPerAccountSettings.setBOOL("KeywordsOn",          mKeywordsOn);
+    gSavedPerAccountSettings.setString("KeywordsList",      mKeywordsList);
+    gSavedPerAccountSettings.setBOOL("KeywordsInChat",      mKeywordsInChat);
+    gSavedPerAccountSettings.setBOOL("KeywordsInIM",        mKeywordsInIM);
+    gSavedPerAccountSettings.setBOOL("KeywordsChangeColor", mKeywordsChangeColor);
+    gSavedPerAccountSettings.setColor4("KeywordsColor",     mKeywordsColor);
+    gSavedPerAccountSettings.setBOOL("KeywordsPlaySound",   mKeywordsPlaySound);
+    gSavedPerAccountSettings.setString("KeywordsSound",     mKeywordsSound.asString());
+}
+
+void LLPrefsAscentChat::apply()
+{
+    //Chat/IM -----------------------------------------------------------------------------
+    LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
+    if (combo)
+    {
+        mTimeFormat = combo->getCurrentIndex();
+    }
+
+    combo = getChild<LLComboBox>("date_format_combobox");
+    if (combo)
+    {
+        mDateFormat = combo->getCurrentIndex();
+    }
+
+    std::string short_date, long_date, short_time, long_time, timestamp;
+
+    if (mTimeFormat == 0)
+    {
+        short_time = "%H:%M";
+        long_time  = "%H:%M:%S";
+        timestamp  = " %H:%M:%S";
+    }
+    else
+    {
+        short_time = "%I:%M %p";
+        long_time  = "%I:%M:%S %p";
+        timestamp  = " %I:%M %p";
+    }
+
+    if (mDateFormat == 0)
+    {
+        short_date = "%Y-%m-%d";
+        long_date  = "%A %d %B %Y";
+        timestamp  = "%a %d %b %Y" + timestamp;
+    }
+    else if (mDateFormat == 1)
+    {
+        short_date = "%d/%m/%Y";
+        long_date  = "%A %d %B %Y";
+        timestamp  = "%a %d %b %Y" + timestamp;
+    }
+    else
+    {
+        short_date = "%m/%d/%Y";
+        long_date  = "%A, %B %d %Y";
+        timestamp  = "%a %b %d %Y" + timestamp;
+    }
+
+    gSavedSettings.setString("ShortDateFormat", short_date);
+    gSavedSettings.setString("LongDateFormat",  long_date);
+    gSavedSettings.setString("ShortTimeFormat", short_time);
+    gSavedSettings.setString("LongTimeFormat",  long_time);
+    gSavedSettings.setString("TimestampFormat", timestamp);
+
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone",  mIMResponseAnyone);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", mIMResponseFriends);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted",   mIMResponseMuted);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping",    mIMShowOnTyping);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded",   mIMShowResponded);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat",  mIMResponseRepeat);
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem",    mIMResponseItem);
+    gSavedPerAccountSettings.setString("AscentInstantMessageResponse",      mIMResponseText);
+
+    //Text Options ------------------------------------------------------------------------
+    gSavedPerAccountSettings.setBOOL("KeywordsOn",          mKeywordsOn);
+    gSavedPerAccountSettings.setString("KeywordsList",      mKeywordsList);
+    gSavedPerAccountSettings.setBOOL("KeywordsInChat",      mKeywordsInChat);
+    gSavedPerAccountSettings.setBOOL("KeywordsInIM",        mKeywordsInIM);
+    gSavedPerAccountSettings.setBOOL("KeywordsChangeColor", mKeywordsChangeColor);
+    gSavedPerAccountSettings.setColor4("KeywordsColor",     mKeywordsColor);
+    gSavedPerAccountSettings.setBOOL("KeywordsPlaySound",   mKeywordsPlaySound);
+    gSavedPerAccountSettings.setString("KeywordsSound",     mKeywordsSound.asString());
+
+    refreshValues();
+    refresh();
+}
diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h
new file mode 100644
index 000000000..ddf26b7b9
--- /dev/null
+++ b/indra/newview/ascentprefschat.h
@@ -0,0 +1,102 @@
+/** 
+ * @file hbprefsinert.h
+ * @brief  Ascent Viewer preferences panel
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008, Henri Beauchamp.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef ASCENTPREFSCHAT_H
+#define ASCENTPREFSCHAT_H
+
+
+#include "llpanel.h"
+
+
+class LLPrefsAscentChat : public LLPanel
+{
+public:
+	LLPrefsAscentChat();
+	~LLPrefsAscentChat();
+
+	void apply();
+	void cancel();
+    void refresh();
+	void refreshValues();
+
+protected:
+	static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
+    static void onSpellAdd(void* data);
+    static void onSpellRemove(void* data);
+    static void onSpellGetMore(void* data);
+    static void onSpellEditCustom(void* data);
+    static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
+
+    //Chat/IM -----------------------------------------------------------------------------
+    BOOL mWoLfVerticalIMTabs;
+    BOOL mIMAnnounceIncoming;
+	BOOL mHideTypingNotification;
+    BOOL mShowGroupNameInChatIM;
+	BOOL mPlayTypingSound;
+    BOOL mHideNotificationsInChat;
+    BOOL mEnableMUPose;
+    BOOL mEnableOOCAutoClose;
+    U32 mLinksForChattingObjects;
+    U32 mTimeFormat;
+	U32 mDateFormat;
+    BOOL mSecondsInChatAndIMs;
+
+    BOOL mIMResponseAnyone;
+    BOOL mIMResponseFriends;
+    BOOL mIMResponseMuted;
+    BOOL mIMShowOnTyping;
+    BOOL mIMShowResponded;
+    BOOL mIMResponseRepeat;
+    BOOL mIMResponseItem;
+    std::string mIMResponseText;
+
+    //Spam --------------------------------------------------------------------------------
+    BOOL mBlockChatSpam;
+    U32  mChatSpamCount;
+    F32  mChatSpamTime;
+    BOOL mBlockDialogSpam;
+    BOOL mBlockCardSpam;
+    U32  mSpamCount;
+    F32  mSpamTime;
+
+    //Text Options ------------------------------------------------------------------------
+    BOOL mSpellDisplay;
+    BOOL mKeywordsOn;
+	std::string mKeywordsList;
+	BOOL mKeywordsInChat;
+    BOOL mKeywordsInIM;
+	BOOL mKeywordsChangeColor;
+	LLColor4 mKeywordsColor;
+    BOOL mKeywordsPlaySound;
+	LLUUID mKeywordsSound;
+};
+
+#endif
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index b8461ea0b..9ddb1d6e0 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -34,43 +34,29 @@
 
 //File include
 #include "ascentprefssys.h"
-#include "llcolorswatch.h"
-#include "llvoavatar.h"
-#include "llhudeffectlookat.h"
 #include "llagent.h"
 #include "llaudioengine.h" //For POWER USER affirmation.
-#include "llfloaterchat.h" //For POWER USER affirmation.
-#include "llstartup.h"
-#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
+#include "llchat.h"
+#include "llcolorswatch.h"
 #include "llcombobox.h"
+#include "llfloaterchat.h" //For POWER USER affirmation.
 #include "llradiogroup.h"
-#include "llwind.h"
-#include "llviewernetwork.h"
-#include "pipeline.h"
-#include "lgghunspell_wrapper.h"
+#include "lluictrlfactory.h"
+#include "llviewercontrol.h"
 
 
 LLPrefsAscentSys::LLPrefsAscentSys()
 {
-	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_system.xml");
-	childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
-	childSetCommitCallback("double_click_teleport_check", onCommitCheckBox, this);
-	childSetCommitCallback("system_folder_check", onCommitCheckBox, this);
-	childSetCommitCallback("show_look_at_check", onCommitCheckBox, this);
-	childSetCommitCallback("enable_clouds", onCommitCheckBox, this);
+    LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_system.xml");
 
-	childSetCommitCallback("SpellBase", onSpellBaseComboBoxCommit, this);
-    childSetAction("EmSpell_EditCustom", onSpellEditCustom, this);
-    childSetAction("EmSpell_GetMore", onSpellGetMore, this);
-    childSetAction("EmSpell_Add", onSpellAdd, this);
-    childSetAction("EmSpell_Remove", onSpellRemove, this);
+    childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
+    childSetCommitCallback("double_click_teleport_check", onCommitCheckBox, this);
+    childSetCommitCallback("system_folder_check", onCommitCheckBox, this);
+    childSetCommitCallback("show_look_at_check", onCommitCheckBox, this);
+    childSetCommitCallback("enable_clouds", onCommitCheckBox, this);
 
-	childSetCommitCallback("Keywords_Alert", onCommitCheckBox, this);
-
-
-	refreshValues();
-	refresh();
+    refreshValues();
+    refresh();
 }
 
 LLPrefsAscentSys::~LLPrefsAscentSys()
@@ -80,531 +66,173 @@ LLPrefsAscentSys::~LLPrefsAscentSys()
 //static
 void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
 {
-	LLPrefsAscentSys* self = (LLPrefsAscentSys*)user_data;	
-	
-	llinfos << "Change to " << ctrl->getControlName()  << " aka " << ctrl->getName() << llendl;
-	
-	if (ctrl->getName() == "speed_rez_check")   // Why is this one getControlName() and the rest are getName()?
-	{
-		bool enabled = self->childGetValue("speed_rez_check").asBoolean();
-		self->childSetEnabled("speed_rez_interval", enabled);
-		self->childSetEnabled("speed_rez_seconds", enabled);
-	}
-	else if (ctrl->getName() == "show_look_at_check")
-	{
-		BOOL lookAt = self->childGetValue("show_look_at_check").asBoolean();
-		LLHUDEffectLookAt::sDebugLookAt = lookAt;
-		gSavedSettings.setBOOL("AscentShowLookAt", lookAt);
-	}
-	else if (ctrl->getName() == "double_click_teleport_check")
-	{
-		bool enabled = self->childGetValue("double_click_teleport_check").asBoolean();
-		self->childSetEnabled("center_after_teleport_check", enabled);
-		self->childSetEnabled("offset_teleport_check", enabled);
-	}
-	else if (ctrl->getName() == "system_folder_check")
-	{
-		bool enabled = self->childGetValue("system_folder_check").asBoolean();
-		self->childSetEnabled("temp_in_system_check", enabled);
-	}
-	else if (ctrl->getName() == "enable_clouds")
-	{
-		bool enabled = self->childGetValue("enable_clouds").asBoolean();
-		self->childSetEnabled("enable_classic_clouds", enabled);
-	}
-	else if (ctrl->getName() == "Keywords_Alert")
-	{
-		bool enabled = self->childGetValue("Keywords_Alert").asBoolean();
-		self->childSetEnabled("Keywords_Entries", enabled);
-		self->childSetEnabled("Keywords_LocalChat", enabled);
-		self->childSetEnabled("Keywords_IM", enabled);
-		self->childSetEnabled("Keywords_Highlight", enabled);
-		self->childSetEnabled("Keywords_Color", enabled);
-		self->childSetEnabled("Keywords_PlaySound", enabled);
-		self->childSetEnabled("Keywords_SoundUUID", enabled);
-	}
-}
-
-void LLPrefsAscentSys::onSpellAdd(void* data)
-{
-	LLPrefsAscentSys* self = (LLPrefsAscentSys*)data;
-
-	if(self)
-	{
-		glggHunSpell->addButton(self->childGetValue("EmSpell_Avail").asString());
-	}
-
-	self->refresh();
-}
-
-void LLPrefsAscentSys::onSpellRemove(void* data)
-{
-	LLPrefsAscentSys* self = (LLPrefsAscentSys*)data;
-
-	if(self)
-	{
-		glggHunSpell->removeButton(self->childGetValue("EmSpell_Installed").asString());
-	}
-
-	self->refresh();
-}
-
-void LLPrefsAscentSys::onSpellGetMore(void* data)
-{
-	glggHunSpell->getMoreButton(data);
-}
-
-void LLPrefsAscentSys::onSpellEditCustom(void* data)
-{
-	glggHunSpell->editCustomButton();
-}
-
-void LLPrefsAscentSys::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
-{
-	LLComboBox* box = (LLComboBox*)ctrl;
-
-    if (box)
-	{
-		glggHunSpell->newDictSelection(box->getValue().asString());
-	}
+    LLPrefsAscentSys* self = (LLPrefsAscentSys*)user_data;	
+    
+    llinfos << "Change to " << ctrl->getControlName()  << " aka " << ctrl->getName() << llendl;
+    
+    if (ctrl->getName() == "speed_rez_check")   // Why is this one getControlName() and the rest are getName()?
+    {
+        bool enabled = self->childGetValue("speed_rez_check").asBoolean();
+        self->childSetEnabled("speed_rez_interval", enabled);
+        self->childSetEnabled("speed_rez_seconds", enabled);
+    }
+    else if (ctrl->getName() == "double_click_teleport_check")
+    {
+        bool enabled = self->childGetValue("double_click_teleport_check").asBoolean();
+        self->childSetEnabled("center_after_teleport_check", enabled);
+        self->childSetEnabled("offset_teleport_check", enabled);
+    }
+    else if (ctrl->getName() == "system_folder_check")
+    {
+        bool enabled = self->childGetValue("system_folder_check").asBoolean();
+        self->childSetEnabled("temp_in_system_check", enabled);
+    }
+    else if (ctrl->getName() == "enable_clouds")
+    {
+        bool enabled = self->childGetValue("enable_clouds").asBoolean();
+        self->childSetEnabled("enable_classic_clouds", enabled);
+    }
 }
 
 void LLPrefsAscentSys::refreshValues()
 {
-	//General -----------------------------------------------------------------------------
-	mDoubleClickTeleport		= gSavedSettings.getBOOL("DoubleClickTeleport");
-		mResetCameraAfterTP		= gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
-		mOffsetTPByUserHeight	= gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
-	mPreviewAnimInWorld			= gSavedSettings.getBOOL("PreviewAnimInWorld");
-	mSaveScriptsAsMono			= gSavedSettings.getBOOL("SaveScriptsAsMono");
-	mAlwaysRezInGroup			= gSavedSettings.getBOOL("AscentAlwaysRezInGroup");
-	//always show Build
-	mAlwaysShowFly				= gSavedSettings.getBOOL("AscentFlyAlwaysEnabled");
-	//Disable camera minimum distance
-	mPowerUser					= gSavedSettings.getBOOL("AscentPowerfulWizard");
-	mUseSystemFolder			= gSavedSettings.getBOOL("AscentUseSystemFolder");
-		mUploadToSystem				= gSavedSettings.getBOOL("AscentSystemTemporary");
-	//Chat/IMs ----------------------------------------------------------------------------
-	mHideNotificationsInChat	= gSavedSettings.getBOOL("HideNotificationsInChat");
-	mHideTypingNotification		= gSavedSettings.getBOOL("AscentHideTypingNotification");
-	mPlayTypingSound			= gSavedSettings.getBOOL("PlayTypingSound");
-	mEnableMUPose				= gSavedSettings.getBOOL("AscentAllowMUpose");
-	mEnableOOCAutoClose			= gSavedSettings.getBOOL("AscentAutoCloseOOC");
-	mLinksForChattingObjects	= gSavedSettings.getU32("LinksForChattingObjects");
-	//Time format
-	//Date Format
-	mSecondsInChatAndIMs		= gSavedSettings.getBOOL("SecondsInChatAndIMs");
-	
-	//Performance -------------------------------------------------------------------------
-	mFetchInventoryOnLogin		= gSavedSettings.getBOOL("FetchInventoryOnLogin");
-	mEnableLLWind				= gSavedSettings.getBOOL("WindEnabled");
+    //General -----------------------------------------------------------------------------
+    mDoubleClickTeleport		= gSavedSettings.getBOOL("DoubleClickTeleport");
+        mResetCameraAfterTP		= gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
+        mOffsetTPByUserHeight	= gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
+    mPreviewAnimInWorld			= gSavedSettings.getBOOL("PreviewAnimInWorld");
+    mSaveScriptsAsMono			= gSavedSettings.getBOOL("SaveScriptsAsMono");
+    mAlwaysRezInGroup			= gSavedSettings.getBOOL("AscentAlwaysRezInGroup");
+    mBuildAlwaysEnabled			= gSavedSettings.getBOOL("AscentBuildAlwaysEnabled");
+    mAlwaysShowFly				= gSavedSettings.getBOOL("AscentFlyAlwaysEnabled");
+    mDisableMinZoom				= gSavedSettings.getBOOL("AscentDisableMinZoomDist");
+    mPowerUser					= gSavedSettings.getBOOL("AscentPowerfulWizard");
+    mUseSystemFolder			= gSavedSettings.getBOOL("AscentUseSystemFolder");
+        mUploadToSystem				= gSavedSettings.getBOOL("AscentSystemTemporary");
+    mFetchInventoryOnLogin		= gSavedSettings.getBOOL("FetchInventoryOnLogin");
+    mEnableLLWind				= gSavedSettings.getBOOL("WindEnabled");
+    mEnableClouds				= gSavedSettings.getBOOL("CloudsEnabled");
+        mEnableClassicClouds		= gSavedSettings.getBOOL("SkyUseClassicClouds");
+    mSpeedRez					= gSavedSettings.getBOOL("SpeedRez");
+        mSpeedRezInterval			= gSavedSettings.getU32("SpeedRezInterval");
 
-	mEnableClouds				= gSavedSettings.getBOOL("CloudsEnabled");
-	mEnableClassicClouds		= gSavedSettings.getBOOL("SkyUseClassicClouds");
+    //Command Line ------------------------------------------------------------------------
+    mCmdLine                    = gSavedSettings.getBOOL("chat_cmd_toggle");
+    mCmdLinePos                 = gSavedSettings.getString("AscentCmdLinePos");
+    mCmdLineGround              = gSavedSettings.getString("AscentCmdLineGround");
+    mCmdLineHeight              = gSavedSettings.getString("AscentCmdLineHeight");
+    mCmdLineTeleportHome        = gSavedSettings.getString("AscentCmdLineTeleportHome");
+    mCmdLineRezPlatform         = gSavedSettings.getString("AscentCmdLineRezPlatform");
+    mCmdLineCalc                = gSavedSettings.getString("AscentCmdLineCalc");
+    mCmdLineClearChat           = gSavedSettings.getString("AscentCmdLineClearChat");
+    mCmdLineDrawDistance        = gSavedSettings.getString("AscentCmdLineDrawDistance");
+    mCmdTeleportToCam           = gSavedSettings.getString("AscentCmdTeleportToCam");
+    mCmdLineKeyToName           = gSavedSettings.getString("AscentCmdLineKeyToName");
+    mCmdLineOfferTp             = gSavedSettings.getString("AscentCmdLineOfferTp");
+    mCmdLineMapTo               = gSavedSettings.getString("AscentCmdLineMapTo");
+    mCmdLineTP2                 = gSavedSettings.getString("AscentCmdLineTP2");
 
-	mSpeedRez					= gSavedSettings.getBOOL("SpeedRez");
-	mSpeedRezInterval			= gSavedSettings.getU32("SpeedRezInterval");
-
-	//Command Line ------------------------------------------------------------------------
-
-
-	//Privacy -----------------------------------------------------------------------------
-	mBroadcastViewerEffects		= gSavedSettings.getBOOL("BroadcastViewerEffects");
-	mDisablePointAtAndBeam		= gSavedSettings.getBOOL("DisablePointAtAndBeam");
-	mPrivateLookAt				= gSavedSettings.getBOOL("PrivateLookAt");
-	mShowLookAt					= LLHUDEffectLookAt::sDebugLookAt;
-	mRevokePermsOnStandUp		= gSavedSettings.getBOOL("RevokePermsOnStandUp");
-	mDisableClickSit			= gSavedSettings.getBOOL("DisableClickSit");
-	//Text Options ------------------------------------------------------------------------
-    mSpellDisplay               = gSavedSettings.getBOOL("SpellDisplay");
-
-    mKeywordsOn                 = gSavedPerAccountSettings.getBOOL("KeywordsOn");
-	mKeywordsList               = gSavedPerAccountSettings.getString("KeywordsList");
-	mKeywordsInChat             = gSavedPerAccountSettings.getBOOL("KeywordsInChat");
-	mKeywordsInIM               = gSavedPerAccountSettings.getBOOL("KeywordsInIM");
-	mKeywordsChangeColor        = gSavedPerAccountSettings.getBOOL("KeywordsChangeColor");
-	mKeywordsColor              = gSavedPerAccountSettings.getColor4("KeywordsColor");
-	mKeywordsPlaySound          = gSavedPerAccountSettings.getBOOL("KeywordsPlaySound");
-	mKeywordsSound              = static_cast<LLUUID>(gSavedPerAccountSettings.getString("KeywordsSound"));
+    //Privacy -----------------------------------------------------------------------------
+    mBroadcastViewerEffects		= gSavedSettings.getBOOL("BroadcastViewerEffects");
+    mDisablePointAtAndBeam		= gSavedSettings.getBOOL("DisablePointAtAndBeam");
+    mPrivateLookAt				= gSavedSettings.getBOOL("PrivateLookAt");
+    mShowLookAt					= gSavedSettings.getBOOL("ShowLookAt");
+    mRevokePermsOnStandUp		= gSavedSettings.getBOOL("RevokePermsOnStandUp");
+    mDisableClickSit			= gSavedSettings.getBOOL("DisableClickSit");
+    mDisplayScriptJumps			= gSavedSettings.getBOOL("AscentDisplayTotalScriptJumps");
 }
 
 void LLPrefsAscentSys::refresh()
-{	
-	//General -----------------------------------------------------------------------------
-	childSetValue("double_click_teleport_check",	mDoubleClickTeleport);
-		childSetValue("center_after_teleport_check",	mResetCameraAfterTP);
-		childSetEnabled("center_after_teleport_check",	mDoubleClickTeleport);
-		childSetValue("offset_teleport_check",			mOffsetTPByUserHeight);
-		childSetEnabled("offset_teleport_check",		mDoubleClickTeleport);
-	childSetValue("preview_anim_in_world_check",	mPreviewAnimInWorld);
-	childSetValue("save_scripts_as_mono_check",		mSaveScriptsAsMono);
-	childSetValue("always_rez_in_group_check",		mAlwaysRezInGroup);
-	//Disable Teleport Progress
-	//Disable Logout progress
-	//always show Build
-	childSetValue("always_fly_check",				mAlwaysShowFly);
-	//Disable camera minimum distance
-	childSetValue("power_user_check",				mPowerUser);
-	childSetValue("power_user_confirm_check",		mPowerUser);
-	childSetValue("system_folder_check",			mUseSystemFolder);
-		childSetValue("temp_in_system_check",			mUploadToSystem);
-		childSetEnabled("temp_in_system_check",			mUseSystemFolder);
-	//Chat --------------------------------------------------------------------------------
-	childSetValue("hide_notifications_in_chat_check", mHideNotificationsInChat);
-	childSetValue("play_typing_sound_check",		mPlayTypingSound);
-	childSetValue("hide_typing_check",				mHideTypingNotification);
-	childSetValue("seconds_in_chat_and_ims_check",	mSecondsInChatAndIMs);
-	childSetValue("allow_mu_pose_check",			mEnableMUPose);
-	childSetValue("close_ooc_check",				mEnableOOCAutoClose);
-	LLRadioGroup* radioLinkOptions = getChild<LLRadioGroup>("objects_link");
-	radioLinkOptions->selectNthItem(mLinksForChattingObjects);
-	//childSetValue("objects_link",					mLinksForChattingObjects);
-	std::string format = gSavedSettings.getString("ShortTimeFormat");
-	if (format.find("%p") == -1)
-	{
-		mTimeFormat = 0;
-	}
-	else
-	{
-		mTimeFormat = 1;
-	}
-
-	format = gSavedSettings.getString("ShortDateFormat");
-	if (format.find("%m/%d/%") != -1)
-	{
-		mDateFormat = 2;
-	}
-	else if (format.find("%d/%m/%") != -1)
-	{
-		mDateFormat = 1;
-	}
-	else
-	{
-		mDateFormat = 0;
-	}
-
-	// time format combobox
-	LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
-	if (combo)
-	{
-		combo->setCurrentByIndex(mTimeFormat);
-	}
-
-	// date format combobox
-	combo = getChild<LLComboBox>("date_format_combobox");
-	if (combo)
-	{
-		combo->setCurrentByIndex(mDateFormat);
-	}
-
-	childSetValue("seconds_in_chat_and_ims_check",	mSecondsInChatAndIMs);
-
-
-	LLWString auto_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("AscentInstantMessageResponse") );
-	LLWStringUtil::replaceChar(auto_response, '^', '\n');
-	LLWStringUtil::replaceChar(auto_response, '%', ' ');
-	childSetText("im_response", wstring_to_utf8str(auto_response));
-	childSetValue("AscentInstantMessageResponseFriends", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseFriends"));
-	childSetValue("AscentInstantMessageResponseMuted", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted"));
-	childSetValue("AscentInstantMessageResponseAnyone", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseAnyone"));
-	childSetValue("AscentInstantMessageShowResponded", gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowResponded"));
-	childSetValue("AscentInstantMessageShowOnTyping", gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming"));
-	childSetValue("AscentInstantMessageResponseRepeat", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat" ));
-	childSetValue("AscentInstantMessageResponseItem", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseItem"));
-
-
-	//Save Performance --------------------------------------------------------------------
-	childSetValue("fetch_inventory_on_login_check", mFetchInventoryOnLogin);
-	childSetValue("enable_wind", mEnableLLWind);
-	childSetValue("enable_clouds", mEnableClouds);
-		childSetValue("enable_classic_clouds", mEnableClassicClouds);
-	gLLWindEnabled = mEnableLLWind;
-	childSetValue("speed_rez_check", mSpeedRez);
-		childSetEnabled("speed_rez_interval", mSpeedRez);
-		childSetEnabled("speed_rez_seconds", mSpeedRez);
-	//Command Line ------------------------------------------------------------------------
-
-	//Privacy -----------------------------------------------------------------------------
-	childSetValue("broadcast_viewer_effects", mBroadcastViewerEffects);
-	childSetValue("disable_point_at_and_beams_check", mDisablePointAtAndBeam);
-	childSetValue("private_look_at_check", mPrivateLookAt);
-	childSetValue("show_look_at_check", mShowLookAt);
-	childSetValue("revoke_perms_on_stand_up_check", mRevokePermsOnStandUp);
-	childSetValue("disable_click_sit_check", mDisableClickSit);
-
-	//Text Options ------------------------------------------------------------------------
-    combo = getChild<LLComboBox>("SpellBase");
-
-    if (combo != NULL) 
-	{
-		combo->removeall();
-		std::vector<std::string> names = glggHunSpell->getDicts();
-
-		for (int i = 0; i < (int)names.size(); i++) 
-		{
-			combo->add(names[i]);
-		}
-
-		combo->setSimple(gSavedSettings.getString("SpellBase"));
-	}
-
-    combo = getChild<LLComboBox>("EmSpell_Avail");
-
-    if (combo != NULL) 
-	{
-		combo->removeall();
-
-		combo->add("");
-		std::vector<std::string> names = glggHunSpell->getAvailDicts();
-
-		for (int i = 0; i < (int)names.size(); i++) 
-		{
-			combo->add(names[i]);
-		}
-
-		combo->setSimple(std::string(""));
-	}
-
-    combo = getChild<LLComboBox>("EmSpell_Installed");
-
-    if (combo != NULL) 
-	{
-		combo->removeall();
-
-		combo->add("");
-		std::vector<std::string> names = glggHunSpell->getInstalledDicts();
-
-		for (int i = 0; i < (int)names.size(); i++) 
-		{
-			combo->add(names[i]);
-		}
-
-		combo->setSimple(std::string(""));
-	}
-
-    childSetValue("Keywords_Alert", mKeywordsOn);
-	childSetValue("Keywords_Entries", mKeywordsList);
-	childSetValue("Keywords_LocalChat", mKeywordsInChat);
-	childSetValue("Keywords_IM", mKeywordsInIM);
-	childSetValue("Keywords_Highlight", mKeywordsChangeColor);
-	childSetValue("Keywords_PlaySound", mKeywordsPlaySound);
-	childSetValue("Keywords_SoundUUID", mKeywordsSound);
-
-	LLColorSwatchCtrl* colorctrl = getChild<LLColorSwatchCtrl>("Keywords_Color");
-	colorctrl->set(LLColor4(mKeywordsColor),TRUE);
+{
+    childSetEnabled("center_after_teleport_check",	mDoubleClickTeleport);
+    childSetEnabled("offset_teleport_check",		mDoubleClickTeleport);
+    childSetValue("power_user_check",				mPowerUser);
+    childSetValue("power_user_confirm_check",		mPowerUser);
+    childSetEnabled("temp_in_system_check",			mUseSystemFolder);
+    childSetEnabled("speed_rez_interval", mSpeedRez);
+    childSetEnabled("speed_rez_seconds", mSpeedRez);
 }
 
 void LLPrefsAscentSys::cancel()
-{/*
-	//General -----------------------------------------------------------------------------
-	childSetValue("double_click_teleport_check",	mDoubleClickTeleport);
-		childSetValue("center_after_teleport_check",	mResetCameraAfterTP);
-		childSetValue("offset_teleport_check",			mOffsetTPByUserHeight);
-	childSetValue("preview_anim_in_world_check",	mPreviewAnimInWorld);
-	childSetValue("save_scripts_as_mono_check",		mSaveScriptsAsMono);
-	childSetValue("always_rez_in_group_check",		mAlwaysRezInGroup);
-	//Chat --------------------------------------------------------------------------------
-	childSetValue("hide_notifications_in_chat_check", mHideNotificationsInChat);
-	childSetValue("play_typing_sound_check",		mPlayTypingSound);
-	childSetValue("hide_typing_check",				mHideTypingNotification);
-	childSetValue("seconds_in_chat_and_ims_check",	mSecondsInChatAndIMs);
-	childSetValue("allow_mu_pose_check",			mEnableMUPose);
-	childSetValue("close_ooc_check",				mEnableOOCAutoClose);
-	//Show Links
-	//Time Format
-	//Date Format
-	childSetValue("seconds_in_chat_and_ims_check",	mEnableOOCAutoClose);
-	//Save Performance --------------------------------------------------------------------
-	childSetValue("fetch_inventory_on_login_check", mFetchInventoryOnLogin);
-	childSetValue("enable_wind", mEnableLLWind);
-	childSetValue("enable_clouds", mEnableClouds);
-		childSetValue("enable_classic_clouds", mEnableClassicClouds);
-	childSetValue("speed_rez_check", mSpeedRez);
-	if (mSpeedRez)
-	{
-		childEnable("speed_rez_interval");
-		childEnable("speed_rez_seconds");
-	}
-	else
-	{
-		childDisable("speed_rez_interval");
-		childDisable("speed_rez_seconds");
-	}
-	//Command Line ------------------------------------------------------------------------
+{
+    //General -----------------------------------------------------------------------------
+    gSavedSettings.setBOOL("DoubleClickTeleport", mDoubleClickTeleport);
+        gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP);
+        gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight);
+    gSavedSettings.setBOOL("PreviewAnimInWorld", mPreviewAnimInWorld);
+    gSavedSettings.setBOOL("SaveScriptsAsMono", mSaveScriptsAsMono);
+    gSavedSettings.setBOOL("AscentAlwaysRezInGroup", mAlwaysRezInGroup);
+    gSavedSettings.setBOOL("AscentBuildAlwaysEnabled", mBuildAlwaysEnabled);
+    gSavedSettings.setBOOL("AscentFlyAlwaysEnabled", mAlwaysShowFly);
+    gSavedSettings.setBOOL("AscentDisableMinZoomDist", mDisableMinZoom);
+//  gSavedSettings.setBOOL("AscentPowerfulWizard", mPowerUser);
+    gSavedSettings.setBOOL("AscentUseSystemFolder", mUseSystemFolder);
+        gSavedSettings.setBOOL("AscentSystemTemporary", mUploadToSystem);
+    gSavedSettings.setBOOL("FetchInventoryOnLogin", mFetchInventoryOnLogin);
+    gSavedSettings.setBOOL("WindEnabled", mEnableLLWind);
+    gSavedSettings.setBOOL("CloudsEnabled", mEnableClouds);
+        gSavedSettings.setBOOL("SkyUseClassicClouds", mEnableClassicClouds);
+    gSavedSettings.setBOOL("SpeedRez", mSpeedRez);
+        gSavedSettings.setU32("SpeedRezInterval", mSpeedRezInterval);
 
-	//Privacy -----------------------------------------------------------------------------
-	childSetValue("broadcast_viewer_effects", mBroadcastViewerEffects);
-	childSetValue("disable_point_at_and_beams_check", mDisablePointAtAndBeam);
-	childSetValue("private_look_at_check", mPrivateLookAt);
-	childSetValue("revoke_perms_on_stand_up_check", mRevokePermsOnStandUp);
-	
-	childSetValue("enable_clouds", mEnableClouds);
-	childSetValue("enable_classic_clouds", mEnableClassicClouds);
+    //Command Line ------------------------------------------------------------------------
+    gSavedSettings.setBOOL("chat_cmd_toggle",               mCmdLine);
+    gSavedSettings.setString("AscentCmdLinePos",		    mCmdLinePos);
+    gSavedSettings.setString("AscentCmdLineGround",		    mCmdLineGround);
+    gSavedSettings.setString("AscentCmdLineHeight",		    mCmdLineHeight);
+    gSavedSettings.setString("AscentCmdLineTeleportHome",	mCmdLineTeleportHome);
+    gSavedSettings.setString("AscentCmdLineRezPlatform",	mCmdLineRezPlatform);
+    gSavedSettings.setString("AscentCmdLineCalc",		    mCmdLineCalc);
+    gSavedSettings.setString("AscentCmdLineClearChat",	    mCmdLineClearChat);
+    gSavedSettings.setString("AscentCmdLineDrawDistance",	mCmdLineDrawDistance);
+    gSavedSettings.setString("AscentCmdTeleportToCam",		mCmdTeleportToCam);
+    gSavedSettings.setString("AscentCmdLineKeyToName",		mCmdLineKeyToName);
+    gSavedSettings.setString("AscentCmdLineOfferTp",		mCmdLineOfferTp);
+    gSavedSettings.setString("AscentCmdLineMapTo",			mCmdLineMapTo);
+    gSavedSettings.setString("AscentCmdLineTP2",			mCmdLineTP2);
 
-	gLLWindEnabled = mEnableLLWind;
-
-	//Text Options ------------------------------------------------------------------------
-    childSetValue("SpellDisplay", mSpellDisplay);
-
-    childSetValue("Keywords_Alert", mKeywordsOn);
-	childSetValue("Keywords_Entries", mKeywordsList);
-	childSetValue("Keywords_LocalChat", mKeywordsInChat);
-	childSetValue("Keywords_IM", mKeywordsInIM);
-	childSetValue("Keywords_Highlight", mKeywordsChangeColor);
-	childSetValue("Keywords_PlaySound", mKeywordsPlaySound);
-	childSetValue("Keywords_SoundUUID", mKeywordsSound);
-
-	LLColorSwatchCtrl* colorctrl = getChild<LLColorSwatchCtrl>("Keywords_Color");
-	colorctrl->set(LLColor4(mKeywordsColor),TRUE);
-*/}
+    //Privacy -----------------------------------------------------------------------------
+    gSavedSettings.setBOOL("BroadcastViewerEffects",        mBroadcastViewerEffects);
+    gSavedSettings.setBOOL("DisablePointAtAndBeam",         mDisablePointAtAndBeam);
+    gSavedSettings.setBOOL("PrivateLookAt",                 mPrivateLookAt);
+    gSavedSettings.setBOOL("ShowLookAt",                    mShowLookAt);
+    gSavedSettings.setBOOL("RevokePermsOnStandUp",          mRevokePermsOnStandUp);
+    gSavedSettings.setBOOL("DisableClickSit",               mDisableClickSit);
+    gSavedSettings.setBOOL("AscentDisplayTotalScriptJumps", mDisplayScriptJumps);
+}
 
 void LLPrefsAscentSys::apply()
 {
-	std::string short_date, long_date, short_time, long_time, timestamp;
-	
-	//General ------------------------------------------------------------------------------
-	gSavedSettings.setBOOL("DoubleClickTeleport",		childGetValue("double_click_teleport_check"));
-		gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP",	childGetValue("center_after_teleport_check"));
-		gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight",	childGetValue("offset_teleport_check"));
-	gSavedSettings.setBOOL("PreviewAnimInWorld",		childGetValue("preview_anim_in_world_check"));
-	gSavedSettings.setBOOL("SaveScriptsAsMono",			childGetValue("save_scripts_as_mono_check"));
-	gSavedSettings.setBOOL("AscentAlwaysRezInGroup",	childGetValue("always_rez_in_group_check"));
-	//Disable Teleport Progress
-	//Disable Logout progress
-	//always show Build
-	gSavedSettings.setBOOL("AscentFlyAlwaysEnabled",	childGetValue("always_fly_check"));
-	//Disable camera minimum distance
-	gSavedSettings.setBOOL("AscentPowerfulWizard",		(childGetValue("power_user_check") && childGetValue("power_user_confirm_check")));
-	if (gSavedSettings.getBOOL("AscentPowerfulWizard") && !mPowerUser)
-	{
-		LLVector3d lpos_global = gAgent.getPositionGlobal();
-		gAudiop->triggerSound(LLUUID("58a38e89-44c6-c52b-deb8-9f1ddc527319"), gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
-		LLChat chat;
-		chat.mSourceType = CHAT_SOURCE_SYSTEM;
-		chat.mText = llformat("You are bestowed with powers beyond mortal comprehension.\nUse your newfound abilities wisely.\nUnlocked:\n- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.\n- Right click > Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.\n- Right Click > Explode objects - Turns and object physical, temporary, and delinks it.");
-		LLFloaterChat::addChat(chat);
-	}
-		//
-	//Chat/IM ------------------------------------------------------------------------------
-	//Use Vertical IMs
-	//Script count
-	//Missing the echo/log option.
-	gSavedSettings.setBOOL("PlayTypingSound",			childGetValue("play_typing_sound_check"));
-	gSavedSettings.setBOOL("AscentHideTypingNotification",	childGetValue("hide_typing_check"));
-	gSavedPerAccountSettings.setBOOL("AscentInstantMessageAnnounceIncoming",	childGetValue("AscentInstantMessageAnnounceIncoming").asBoolean());
-	gSavedSettings.setBOOL("AscentAllowMUpose",			childGetValue("allow_mu_pose_check").asBoolean());
-	gSavedSettings.setBOOL("AscentAutoCloseOOC",		childGetValue("close_ooc_check").asBoolean());
-	//gSavedSettings.setU32("LinksForChattingObjects",	childGetValue("objects_link").   );
-	
-	LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
-	if (combo) {
-		mTimeFormat = combo->getCurrentIndex();
-	}
+    std::string short_date, long_date, short_time, long_time, timestamp;
+    
+    //General ------------------------------------------------------------------------------
+    gSavedSettings.setBOOL("AscentPowerfulWizard", (childGetValue("power_user_check") && childGetValue("power_user_confirm_check")));
 
-	combo = getChild<LLComboBox>("date_format_combobox");
-	if (combo)
-	{
-		mDateFormat = combo->getCurrentIndex();
-	}
+    if (gSavedSettings.getBOOL("AscentPowerfulWizard") && !mPowerUser)
+    {
+        LLVector3d lpos_global = gAgent.getPositionGlobal();
+        gAudiop->triggerSound(LLUUID("58a38e89-44c6-c52b-deb8-9f1ddc527319"), gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
+        LLChat chat;
+        chat.mSourceType = CHAT_SOURCE_SYSTEM;
+        chat.mText = llformat("You are bestowed with powers beyond mortal comprehension.\nUse your newfound abilities wisely.\nUnlocked:\n- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.\n- Right click > Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.\n- Right Click > Explode objects - Turns an object physical, temporary, and delinks it.");
+        LLFloaterChat::addChat(chat);
+    }
 
-	if (mTimeFormat == 0)
-	{
-		short_time = "%H:%M";
-		long_time  = "%H:%M:%S";
-		timestamp  = " %H:%M:%S";
-	}
-	else
-	{
-		short_time = "%I:%M %p";
-		long_time  = "%I:%M:%S %p";
-		timestamp  = " %I:%M %p";
-	}
+    //Commandline ----------------------------------------------------------------------------
+    gSavedSettings.setString("AscentCmdLinePos",		    childGetValue("AscentCmdLinePos"));
+    gSavedSettings.setString("AscentCmdLineGround",		    childGetValue("AscentCmdLineGround"));
+    gSavedSettings.setString("AscentCmdLineHeight",		    childGetValue("AscentCmdLineHeight"));
+    gSavedSettings.setString("AscentCmdLineTeleportHome",	childGetValue("AscentCmdLineTeleportHome"));
+    gSavedSettings.setString("AscentCmdLineRezPlatform",	childGetValue("AscentCmdLineRezPlatform"));
+    gSavedSettings.setString("AscentCmdLineCalc",		    childGetValue("AscentCmdLineCalc"));
+    gSavedSettings.setString("AscentCmdLineClearChat",	    childGetValue("AscentCmdLineClearChat"));
+    gSavedSettings.setString("AscentCmdLineDrawDistance",	childGetValue("AscentCmdLineDrawDistance"));
+    gSavedSettings.setString("AscentCmdTeleportToCam",		childGetValue("AscentCmdTeleportToCam"));
+    gSavedSettings.setString("AscentCmdLineKeyToName",		childGetValue("AscentCmdLineKeyToName"));
+    gSavedSettings.setString("AscentCmdLineOfferTp",		childGetValue("AscentCmdLineOfferTp"));
+    gSavedSettings.setString("AscentCmdLineMapTo",			childGetValue("AscentCmdLineMapTo"));
+    gSavedSettings.setString("AscentCmdLineTP2",			childGetValue("AscentCmdLineTP2"));
 
-	if (mDateFormat == 0)
-	{
-		short_date = "%Y-%m-%d";
-		long_date  = "%A %d %B %Y";
-		timestamp  = "%a %d %b %Y" + timestamp;
-	}
-	else if (mDateFormat == 1)
-	{
-		short_date = "%d/%m/%Y";
-		long_date  = "%A %d %B %Y";
-		timestamp  = "%a %d %b %Y" + timestamp;
-	}
-	else
-	{
-		short_date = "%m/%d/%Y";
-		long_date  = "%A, %B %d %Y";
-		timestamp  = "%a %b %d %Y" + timestamp;
-	}
-
-	gSavedSettings.setString("ShortDateFormat",			short_date);
-	gSavedSettings.setString("LongDateFormat",			long_date);
-	gSavedSettings.setString("ShortTimeFormat",			short_time);
-	gSavedSettings.setString("LongTimeFormat",			long_time);
-	gSavedSettings.setString("TimestampFormat",			timestamp);
-	gSavedSettings.setBOOL("SecondsInChatAndIMs",		childGetValue("seconds_in_chat_and_ims_check").asBoolean());
-
-
-	gSavedPerAccountSettings.setString("AscentInstantMessageResponse",			childGetValue("im_response").asString());
-	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted",		childGetValue("AscentInstantMessageResponseMuted").asBoolean());
-	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends",		childGetValue("AscentInstantMessageResponseFriends").asBoolean());
-	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted",		childGetValue("AscentInstantMessageResponseMuted").asBoolean());
-	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone",		childGetValue("AscentInstantMessageResponseAnyone").asBoolean());
-	gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded",		childGetValue("AscentInstantMessageShowResponded").asBoolean());
-	gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping",		childGetValue("AscentInstantMessageShowOnTyping").asBoolean());
-	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat",		childGetValue("AscentInstantMessageResponseRepeat").asBoolean());
-	gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem",		childGetValue("AscentInstantMessageResponseItem").asBoolean());
-	gSavedPerAccountSettings.setBOOL("AscentInstantMessageAnnounceIncoming",	childGetValue("AscentInstantMessageAnnounceIncoming").asBoolean());
-
-	//Performance ----------------------------------------------------------------------------
-	gSavedSettings.setBOOL("FetchInventoryOnLogin",		childGetValue("fetch_inventory_on_login_check"));
-	gSavedSettings.setBOOL("WindEnabled",				childGetValue("enable_wind"));
-	gSavedSettings.setBOOL("CloudsEnabled",				childGetValue("enable_clouds"));
-	gSavedSettings.setBOOL("SkyUseClassicClouds",		childGetValue("enable_classic_clouds"));
-	gSavedSettings.setBOOL("SpeedRez",					childGetValue("speed_rez_check"));
-	gSavedSettings.setU32("SpeedRezInterval",			childGetValue("speed_rez_interval").asReal());
-	
-	//Commandline ----------------------------------------------------------------------------
-	//Missing "Use Command Line"
-	gSavedSettings.setString("AscentCmdLinePos",		childGetValue("AscentCmdLinePos"));
-	gSavedSettings.setString("AscentCmdLineGround",		childGetValue("AscentCmdLineGround"));
-	gSavedSettings.setString("AscentCmdLineHeight",		childGetValue("AscentCmdLineHeight"));
-	gSavedSettings.setString("AscentCmdLineTeleportHome",	childGetValue("AscentCmdLineTeleportHome"));
-	gSavedSettings.setString("AscentCmdLineRezPlatform",	childGetValue("AscentCmdLineRezPlatform"));
-	//Platform Size
-	gSavedSettings.setString("AscentCmdLineCalc",		childGetValue("AscentCmdLineCalc"));
-	gSavedSettings.setString("AscentCmdLineClearChat",	childGetValue("AscentCmdLineClearChat"));
-		//-------------------------------------------------------------------------------------
-	gSavedSettings.setString("AscentCmdLineDrawDistance",	childGetValue("AscentCmdLineDrawDistance"));
-	gSavedSettings.setString("AscentCmdTeleportToCam",		childGetValue("AscentCmdTeleportToCam"));
-	gSavedSettings.setString("AscentCmdLineKeyToName",		childGetValue("AscentCmdLineKeyToName"));
-	gSavedSettings.setString("AscentCmdLineOfferTp",		childGetValue("AscentCmdLineOfferTp"));
-	gSavedSettings.setString("AscentCmdLineMapTo",			childGetValue("AscentCmdLineMapTo"));
-	gSavedSettings.setBOOL("AscentMapToKeepPos",			childGetValue("AscentMapToKeepPos"));
-	gSavedSettings.setString("AscentCmdLineTP2",			childGetValue("AscentCmdLineTP2"));
-	
-
-	//Privacy --------------------------------------------------------------------------------
-	gSavedSettings.setBOOL("BroadcastViewerEffects",	childGetValue("broadcast_viewer_effects"));
-	gSavedSettings.setBOOL("DisablePointAtAndBeam",		childGetValue("disable_point_at_and_beams_check"));
-	gSavedSettings.setBOOL("PrivateLookAt",				childGetValue("private_look_at_check"));
-	LLHUDEffectLookAt::sDebugLookAt						= childGetValue("show_look_at_check");
-	gSavedSettings.setBOOL("RevokePermsOnStandUp",		childGetValue("revoke_perms_on_stand_up_check"));
-	gSavedSettings.setBOOL("DisableClickSit",			childGetValue("disable_click_sit_check"));
-
-
-	//Text Options ---------------------------------------------------------------------------
-    gSavedPerAccountSettings.setBOOL("KeywordsOn", childGetValue("Keywords_Alert"));
-    gSavedPerAccountSettings.setString("KeywordsList", childGetValue("Keywords_Entries"));
-    gSavedPerAccountSettings.setBOOL("KeywordsInChat", childGetValue("Keywords_LocalChat"));
-    gSavedPerAccountSettings.setBOOL("KeywordsInIM", childGetValue("Keywords_IM"));
-    gSavedPerAccountSettings.setBOOL("KeywordsChangeColor", childGetValue("Keywords_Highlight"));
-    gSavedPerAccountSettings.setColor4("KeywordsColor", childGetValue("Keywords_Color"));
-    gSavedPerAccountSettings.setBOOL("KeywordsPlaySound", childGetValue("Keywords_PlaySound"));
-    gSavedPerAccountSettings.setString("KeywordsSound", childGetValue("Keywords_SoundUUID"));
-
-	refreshValues();
-	refresh();
+    refreshValues();
+    refresh();
 }
diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h
index 06984f03a..3698686ad 100644
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -45,67 +45,55 @@ public:
 	void apply();
 	void cancel();
     void refresh();
-
-	LLPanel* getPanel();
+	void refreshValues();
 
 protected:
 	static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
-    static void onSpellAdd(void* data);
-    static void onSpellRemove(void* data);
-    static void onSpellGetMore(void* data);
-    static void onSpellEditCustom(void* data);
-    static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
-	void refreshValues();
-	//General -----------------------------------------------------------------------------
+
+    //General -----------------------------------------------------------------------------
 	BOOL mDoubleClickTeleport;
 		BOOL mResetCameraAfterTP;
 		BOOL mOffsetTPByUserHeight;
 	BOOL mPreviewAnimInWorld;
 	BOOL mSaveScriptsAsMono;
 	BOOL mAlwaysRezInGroup;
-	//Disable Teleport Progress
-	//Disable Logout progress
-	//always show Build
+	BOOL mBuildAlwaysEnabled;
 	BOOL mAlwaysShowFly;
-	//Disable camera minimum distance
+	BOOL mDisableMinZoom;
 	BOOL mPowerUser;
 	BOOL mUseSystemFolder;
-	BOOL mUploadToSystem;
-	//Chat/IM -----------------------------------------------------------------------------
-	BOOL mHideNotificationsInChat;
-	BOOL mPlayTypingSound;
-	BOOL mHideTypingNotification;
-	BOOL mEnableMUPose;
-	BOOL mEnableOOCAutoClose;
-	U32 mLinksForChattingObjects;
-	U32 mTimeFormat;
-	U32 mDateFormat;
-	BOOL mSecondsInChatAndIMs;
-	//Performance -------------------------------------------------------------------------
+	    BOOL mUploadToSystem;
 	BOOL mFetchInventoryOnLogin;
 	BOOL mEnableLLWind;
 	BOOL mEnableClouds;
-	BOOL mEnableClassicClouds;
+	    BOOL mEnableClassicClouds;
 	BOOL mSpeedRez;
-	U32 mSpeedRezInterval;
-	//Command Line ------------------------------------------------------------------------
-	//Privacy -----------------------------------------------------------------------------
+	    U32 mSpeedRezInterval;
+
+    //Command Line ------------------------------------------------------------------------
+    BOOL mCmdLine;
+	std::string mCmdLinePos;
+	std::string mCmdLineGround;
+	std::string mCmdLineHeight;
+	std::string mCmdLineTeleportHome;
+	std::string mCmdLineRezPlatform;
+	std::string mCmdLineCalc;
+	std::string mCmdLineClearChat;
+	std::string mCmdLineDrawDistance;
+	std::string mCmdTeleportToCam;
+	std::string mCmdLineKeyToName;
+	std::string mCmdLineOfferTp;
+	std::string mCmdLineMapTo;
+	std::string mCmdLineTP2;
+
+    //Privacy -----------------------------------------------------------------------------
 	BOOL mBroadcastViewerEffects;
 	BOOL mDisablePointAtAndBeam;
 	BOOL mPrivateLookAt;
 	BOOL mShowLookAt;
 	BOOL mRevokePermsOnStandUp;
 	BOOL mDisableClickSit;
-	//Text Options ------------------------------------------------------------------------
-    BOOL mSpellDisplay;
-    BOOL mKeywordsOn;
-	std::string mKeywordsList;
-	BOOL mKeywordsInIM;
-	BOOL mKeywordsInChat;
-	BOOL mKeywordsChangeColor;
-	BOOL mKeywordsPlaySound;
-	LLUUID mKeywordsSound;
-	LLColor4 mKeywordsColor;
+    BOOL mDisplayScriptJumps;
 };
 
 #endif
diff --git a/indra/newview/lggdicdownload.cpp b/indra/newview/lggdicdownload.cpp
index 734a42814..03a83aff0 100644
--- a/indra/newview/lggdicdownload.cpp
+++ b/indra/newview/lggdicdownload.cpp
@@ -43,7 +43,7 @@
 #include "llcolorswatch.h"
 #include "llcombobox.h"
 #include "llview.h"
-#include "ascentprefssys.h"
+#include "ascentprefschat.h"
 #include "llviewercontrol.h"
 #include "llhttpclient.h"
 #include "llbufferstream.h"
@@ -76,7 +76,7 @@ public:
 	static void onClickDownload(void* data);
 	std::vector<std::string> sNames;
 	std::vector<std::string> lNames;
-	LLPrefsAscentSys * empanel;
+	LLPrefsAscentChat * empanel;
 };
 
 lggDicDownloadFloater::~lggDicDownloadFloater()
@@ -104,7 +104,7 @@ void lggDicDownloadFloater::setData(std::vector<std::string> shortNames, std::ve
 {
 	sNames = shortNames;
 	lNames = longNames;
-	empanel = (LLPrefsAscentSys*)data;
+	empanel = (LLPrefsAscentChat*)data;
 
 	LLComboBox* comboBox = getChild<LLComboBox>("Emerald_combo_dics");
 	if (comboBox != NULL) 
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 420a9ae67..62f8260e3 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -630,7 +630,6 @@ bool LLAppViewer::init()
 	gSavedSettings.setS32("NumSessions", mNumSessions);
 
 	gSavedSettings.setString("HelpLastVisitedURL",gSavedSettings.getString("HelpHomeURL"));
-	LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("AscentShowLookAt");
 
 	if (gSavedSettings.getBOOL("VerboseLogs"))
 	{
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 82955afea..c0b57211b 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -66,6 +66,7 @@
 #include "llprefschat.h"
 #include "llprefsvoice.h"
 #include "llprefsim.h"
+#include "ascentprefschat.h"
 #include "ascentprefssys.h"
 #include "ascentprefsvan.h"
 #include "llresizehandle.h"
@@ -138,6 +139,7 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
 	mSkinsPanel(NULL),
 	mGridsPanel(NULL),
 	mLCDPanel(NULL),
+	mPrefsAscentChat(NULL),
 	mPrefsAscentSys(NULL),
 	mPrefsAscentVan(NULL)
 {
@@ -203,6 +205,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
 	mTabContainer->addTabPanel(mGridsPanel, mGridsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
 	mGridsPanel->setDefaultBtn(default_btn);
 
+	mPrefsAscentChat = new LLPrefsAscentChat();
+	mTabContainer->addTabPanel(mPrefsAscentChat, mPrefsAscentChat->getLabel(), FALSE, onTabChanged, mTabContainer);
+	mPrefsAscentChat->setDefaultBtn(default_btn);
+
 	mPrefsAscentSys = new LLPrefsAscentSys();
 	mTabContainer->addTabPanel(mPrefsAscentSys, mPrefsAscentSys->getLabel(), FALSE, onTabChanged, mTabContainer);
 	mPrefsAscentSys->setDefaultBtn(default_btn);
@@ -275,6 +281,11 @@ LLPreferenceCore::~LLPreferenceCore()
 		delete mGridsPanel;
 		mGridsPanel = NULL;
 	}
+	if (mPrefsAscentChat)
+	{
+		delete mPrefsAscentChat;
+		mPrefsAscentChat = NULL;
+	}
 	if (mPrefsAscentSys)
 	{
 		delete mPrefsAscentSys;
@@ -301,6 +312,7 @@ void LLPreferenceCore::apply()
 	mMsgPanel->apply();
 	mSkinsPanel->apply();
 	mGridsPanel->apply();
+	mPrefsAscentChat->apply();
 	mPrefsAscentSys->apply();
 	mPrefsAscentVan->apply();
 
@@ -332,6 +344,7 @@ void LLPreferenceCore::cancel()
 	mMsgPanel->cancel();
 	mSkinsPanel->cancel();
 	mGridsPanel->cancel();
+	mPrefsAscentChat->cancel();
 	mPrefsAscentSys->cancel();
 	mPrefsAscentVan->cancel();
 
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 9346c5419..c849ac6ea 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -58,6 +58,7 @@ class LLPrefsIM;
 class LLPanelMsgs;
 class LLPanelSkins;
 class LLScrollListCtrl;
+class LLPrefsAscentChat;
 class LLPrefsAscentSys;
 class LLPrefsAscentVan;
 
@@ -98,6 +99,7 @@ private:
 	LLPanelWeb				*mWebPanel;
 	LLPanelMsgs				*mMsgPanel;
 	LLPanelLCD				*mLCDPanel;
+	LLPrefsAscentChat		*mPrefsAscentChat;
 	LLPrefsAscentSys		*mPrefsAscentSys;
 	LLPrefsAscentVan		*mPrefsAscentVan;
 };
diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
index 98814e882..9be53c026 100644
--- a/indra/newview/llhudeffectlookat.cpp
+++ b/indra/newview/llhudeffectlookat.cpp
@@ -55,8 +55,6 @@
 // </edit>
 
 
-BOOL LLHUDEffectLookAt::sDebugLookAt = FALSE;
-
 // packet layout
 const S32 SOURCE_AVATAR = 0;
 const S32 TARGET_OBJECT = 16;
@@ -505,9 +503,12 @@ void LLHUDEffectLookAt::setSourceObject(LLViewerObject* objectp)
 void LLHUDEffectLookAt::render()
 {
 	static const LLCachedControl<bool> private_look_at("PrivateLookAt",false);
-    if (private_look_at &&
-        (gAgent.getAvatarObject() == ((LLVOAvatar*)(LLViewerObject*)mSourceObject))) return;
-	if (sDebugLookAt && mSourceObject.notNull())
+	static const LLCachedControl<bool> show_look_at("ShowLookAt",false);
+
+    if (private_look_at && (gAgent.getAvatarObject() == ((LLVOAvatar*)(LLViewerObject*)mSourceObject)))
+        return;
+
+	if (show_look_at && mSourceObject.notNull())
 	{
 		LLGLDepthTest gls_depth(GL_TRUE,GL_FALSE);
 
@@ -568,7 +569,9 @@ void LLHUDEffectLookAt::render()
 //-----------------------------------------------------------------------------
 void LLHUDEffectLookAt::update()
 {
-	// If the target object is dead, set the target object to NULL
+	static const LLCachedControl<bool> show_look_at("ShowLookAt",false);
+
+    // If the target object is dead, set the target object to NULL
 	if (!mTargetObject.isNull() && mTargetObject->isDead())
 	{
 		clearLookAtTarget();
@@ -613,7 +616,7 @@ void LLHUDEffectLookAt::update()
 		}
 	}
 
-	if (sDebugLookAt)
+	if (show_look_at)
 	{
 		((LLVOAvatar*)(LLViewerObject*)mSourceObject)->addDebugText((*mAttentions)[mTargetType].mName);
 	}
diff --git a/indra/newview/llhudeffectlookat.h b/indra/newview/llhudeffectlookat.h
index 922c718f6..6efbdd7fa 100644
--- a/indra/newview/llhudeffectlookat.h
+++ b/indra/newview/llhudeffectlookat.h
@@ -85,7 +85,6 @@ protected:
 	void setTargetPosGlobal(const LLVector3d &target_pos_global);
 
 public:
-	static BOOL sDebugLookAt;
 
 private:
 	ELookAtType					mTargetType;
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index cef6f9daa..e2c4bb676 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -2388,7 +2388,7 @@ void LLFloaterIMPanel::setTyping(BOOL typing)
 
 void LLFloaterIMPanel::sendTypingState(BOOL typing)
 {
-	if(gSavedSettings.getBOOL("AscentHideTypingNotification"))
+	if(gSavedSettings.getBOOL("HideTypingNotification"))
 		return;
 	// Don't want to send typing indicators to multiple people, potentially too
 	// much network traffic.  Only send in person-to-person IMs.
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index e08bc301a..cb216c2ea 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -236,7 +236,6 @@ std::string SCREEN_LAST_FILENAME = "screen_last.bmp";
 //
 extern S32 gStartImageWidth;
 extern S32 gStartImageHeight;
-extern bool gLLWindEnabled;
 
 //
 // local globals
@@ -1886,9 +1885,6 @@ bool idle_startup()
 	//---------------------------------------------------------------------
 	if (STATE_WORLD_INIT == LLStartUp::getStartupState())
 	{
-		//first of all, let's check if wind should be used
-		gLLWindEnabled = gSavedSettings.getBOOL("WindEnabled");
-		
 		set_startup_status(0.40f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);
 
 		// Initialize the rest of the world.
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 873e6d1ae..e02982f23 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1596,7 +1596,11 @@ void init_debug_avatar_menu(LLMenuGL* menu)
 	menu->append(new LLMenuItemCallGL("Reload Vertex Shader", &reload_vertex_shader, NULL));
 	menu->append(new LLMenuItemToggleGL("Animation Info", &LLVOAvatar::sShowAnimationDebug));
 	menu->append(new LLMenuItemCallGL("Slow Motion Animations", &slow_mo_animations, NULL));
-	menu->append(new LLMenuItemToggleGL("Show Look At", &LLHUDEffectLookAt::sDebugLookAt));
+
+	LLMenuItemCheckGL* item;
+	item = new LLMenuItemCheckGL("Show Look At", menu_toggle_control, NULL, menu_check_control, (void*)"ShowLookAt");
+	menu->append(item);
+
 	menu->append(new LLMenuItemToggleGL("Show Point At", &LLHUDEffectPointAt::sDebugPointAt));
 	menu->append(new LLMenuItemToggleGL("Debug Joint Updates", &LLVOAvatar::sJointDebug));
 	menu->append(new LLMenuItemToggleGL("Disable LOD", &LLViewerJoint::sDisableLOD));
diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp
index 8e0d09f2a..ff59a39a7 100644
--- a/indra/newview/llvotree.cpp
+++ b/indra/newview/llvotree.cpp
@@ -357,8 +357,9 @@ BOOL LLVOTree::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 	}
 	
 	//it's cheaper to check if wind is enabled first
+	static const LLCachedControl<bool> enable_wind("WindEnabled",false); 
 	static const LLCachedControl<bool> render_animate_trees("RenderAnimateTrees",false); 
-	if (gLLWindEnabled && render_animate_trees)
+	if (enable_wind && render_animate_trees)
 	{
 		F32 mass_inv; 
 
@@ -401,7 +402,7 @@ BOOL LLVOTree::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 		}
 	} 
 
-	if (!gLLWindEnabled || !render_animate_trees)
+	if (!enable_wind || !render_animate_trees)
 	{
 		if (mReferenceBuffer.isNull())
 		{
diff --git a/indra/newview/llwind.cpp b/indra/newview/llwind.cpp
index 267fcbc8f..2b0f0d969 100644
--- a/indra/newview/llwind.cpp
+++ b/indra/newview/llwind.cpp
@@ -52,7 +52,6 @@
 #include "llagent.h"
 #include "llworld.h"
 
-bool gLLWindEnabled = true;
 const F32 CLOUD_DIVERGENCE_COEF = 0.5f; 
 
 
@@ -105,7 +104,8 @@ void LLWind::init()
 
 void LLWind::decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp)
 {
-	if (!mCloudDensityp || !gLLWindEnabled)
+	static const LLCachedControl<bool> wind_enabled("WindEnabled",false); 
+	if (!mCloudDensityp || !wind_enabled)
 	{
 		return;
 	}
@@ -182,7 +182,8 @@ void LLWind::decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp)
 
 LLVector3 LLWind::getAverage()
 {
-	if(!gLLWindEnabled)
+	static const LLCachedControl<bool> wind_enabled("WindEnabled",false); 
+	if(!wind_enabled)
 	{
 		return LLVector3(0.f, 0.f, 0.f);
 	}
@@ -203,7 +204,8 @@ LLVector3 LLWind::getAverage()
 
 LLVector3 LLWind::getVelocityNoisy(const LLVector3 &pos_region, const F32 dim)
 {
-	if(!gLLWindEnabled)
+	static const LLCachedControl<bool> wind_enabled("WindEnabled",false); 
+	if(!wind_enabled)
 	{
 		return LLVector3(0.f, 0.f, 0.f);
 	}
@@ -237,7 +239,8 @@ LLVector3 LLWind::getVelocityNoisy(const LLVector3 &pos_region, const F32 dim)
 
 LLVector3 LLWind::getVelocity(const LLVector3 &pos_region)
 {
-	if(!gLLWindEnabled)
+	static const LLCachedControl<bool> wind_enabled("WindEnabled",false); 
+	if(!wind_enabled)
 	{
 		return LLVector3(0.f, 0.f, 0.f);
 	}
@@ -303,7 +306,8 @@ LLVector3 LLWind::getVelocity(const LLVector3 &pos_region)
 
 LLVector3 LLWind::getCloudVelocity(const LLVector3 &pos_region)
 {
-	if(!gLLWindEnabled)
+	static const LLCachedControl<bool> wind_enabled("WindEnabled",false); 
+	if(!wind_enabled)
 	{
 		return LLVector3(0.f, 0.f, 0.f);
 	}
diff --git a/indra/newview/llwind.h b/indra/newview/llwind.h
index fb887a1fc..7a4582d9d 100644
--- a/indra/newview/llwind.h
+++ b/indra/newview/llwind.h
@@ -42,8 +42,6 @@ class LLVector3;
 class LLBitPack;
 class LLGroupHeader;
 
-extern bool gLLWindEnabled;
-
 
 class LLWind  
 {
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
new file mode 100644
index 000000000..0b0fc9196
--- /dev/null
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
+  border="true" label="SG Chat" name="ascsys" enabled="true" mouse_opaque="true">
+  <tab_container label="SG Chat" bottom="0" height="440" width="497" left="0"
+    name="Ascent Chat" tab_min_width="70" tab_position="top">
+
+    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
+      follows="left|top|right|bottom" label="Chat/IM" name="Chat/IM">
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+          left="15" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
+          width="300">
+IMs:
+      </text>
+      <check_box bottom_delta="-25" control_name="WoLfVerticalIMTabs" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Use Vertical IMs (Requires a restart)" left="10"
+        mouse_opaque="true" name="use_vertical_ims_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Announce incoming instant messages" left="10" mouse_opaque="true"
+        control_name="AscentInstantMessageAnnounceIncoming" radio_style="false" width="270"
+        name="quickstart_im_check"
+        tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter. "/>
+      <check_box bottom_delta="-20" control_name="HideTypingNotification" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Don't send '[name] is typing...' in IMs" left="10"
+        tool_tip="IM partners will not see '______ is typing...' when you're responding."
+        mouse_opaque="true" name="hide_typing_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="OptionShowGroupNameInChatIM" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Show group name in chat" left="10"
+        tool_tip="The name of the group will also be displayed if the IM is from group chat."
+        mouse_opaque="true" name="append_group_name_check" radio_style="false"
+        width="400" />
+      <!-- Left/Right Column split -->
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
+        left="235" name="CmdDivisor" width="0"/>
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+        left="250" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
+        width="300">
+Chat:
+      </text>
+      <check_box bottom_delta="-25" control_name="PlayTypingSound" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Play the typing sound for local chat" left_delta="-5"
+        tool_tip="Silences the chatting type sound, making it quieter for things like performances."
+        mouse_opaque="true" name="play_typing_sound_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="HideNotificationsInChat" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Do not echo/log notifications in chat" left_delta="00"
+        mouse_opaque="true" name="hide_notifications_in_chat_check" radio_style="false"
+        width="400" />
+      <check_box bottom="-120" control_name="AscentAllowMUpose" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Allow MU pose method." left="10"
+        tool_tip="Allows the use of both /me and : to perform emotes."
+        mouse_opaque="true" name="allow_mu_pose_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentAutoCloseOOC" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Auto-close OOC comments." left="10"
+        tool_tip="Will automatically append '))' to any message starting with '((', or visa versa."
+        mouse_opaque="true" name="close_ooc_check" radio_style="false"
+        width="400" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+        left_delta="0" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
+        width="300">
+Show links on chatting object names in chat history for:
+      </text>
+      <radio_group bottom_delta="-26" control_name="LinksForChattingObjects" draw_border="true" enabled="true"
+        tool_tip="Enables a link to show you the owner of the speaking object."
+        follows="left|top" height="20" left="20" mouse_opaque="true" name="objects_link" width="350">
+        <radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
+          left_delta="5" mouse_opaque="true" name="no_object" width="48">
+No object
+        </radio_item>
+        <radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
+          left_delta="45" mouse_opaque="true" name="others_objects" width="48">
+Others' objects
+        </radio_item>
+        <radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
+          left_delta="60" mouse_opaque="true" name="anyones_objects" width="48">
+Anyone's objects
+        </radio_item>
+      </radio_group>
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+        left="10" mouse_opaque="true" name="time_format_text_box" v_pad="0"
+        width="80">
+Time format:
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
+        height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
+        tool_tip="Show hours in either 12-23 or 12PM-11PM format."
+        name="time_format_combobox" width="130">
+        <combo_item type="string" length="1" enabled="true" name="24hours" value="default">
+24-hour clock
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="12hours" value="default">
+12-hour clock
+        </combo_item>
+      </combo_box>
+      <check_box bottom_delta="0" control_name="SecondsInChatAndIMs" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Seconds in chat/IMs timestamps" left="240"
+        mouse_opaque="true" name="seconds_in_chat_and_ims_check" radio_style="false"
+        width="260" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+        left="10" mouse_opaque="true" name="date_format_text_box" v_pad="0"
+        width="80">
+Date format:
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
+        height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
+        name="date_format_combobox" width="130">
+        <combo_item type="string" length="1" enabled="true" name="year_first" value="default">
+YYYY-MM-DD
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="day_first" value="default">
+DD/MM/YYYY
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="month_first" value="default">
+MM/DD/YYYY
+        </combo_item>
+      </combo_box>
+      <!-- Auto-responder -->
+      <view_border bevel_style="none" border_thickness="1" bottom="-420" follows="top|left"
+        height="190" left="5" name="GraphicsBorder" width="485" />
+      <check_box bottom_delta="168" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Enable Autoresponse" left="10" mouse_opaque="true"
+        name="AscentInstantMessageResponseAnyone" radio_style="false" width="270"
+        tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Autorespond to non-friends" left_delta="0" mouse_opaque="true"
+        name="AscentInstantMessageResponseFriends" radio_style="false" width="270"
+        tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Autorespond to people you have muted" left_delta="0"
+        mouse_opaque="true" name="AscentInstantMessageResponseMuted" radio_style="false"
+        width="270" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Send as soon as they start typing" left_delta="0" mouse_opaque="true"
+        name="AscentInstantMessageShowOnTyping" radio_style="false" width="270"/>
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="26"
+        initial_value="false" label="Don't show IMs you auto-responsed to" left_delta="0"
+        mouse_opaque="true" name="AscentInstantMessageShowResponded" radio_style="false"
+        width="170"/>
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Autorespond to every message" left_delta="0" mouse_opaque="true"
+        name="AscentInstantMessageResponseRepeat" radio_style="false" width="270"/>
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Send an item along with the response" left_delta="0"
+        mouse_opaque="true" name="AscentInstantMessageResponseItem" radio_style="false"
+        width="270" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom_delta="120" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
+        h_pad="0" halign="left" height="18" left_delta="245" mouse_opaque="false"
+        name="text_box1" v_pad="0" width="430">
+Response Text:
+      </text>
+      <text_editor type="string" length="1" bottom_delta="-110" embedded_items="false" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="110" left_delta="0" max_length="1100"
+        mouse_opaque="true" name="im_response" width="230" word_wrap="true" spell_check="true"/>
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
+        h_pad="0" halign="left" height="18" left_delta="0" mouse_opaque="false"
+        name="text_box1" v_pad="0" width="430">
+Use #f for user's first name, #l for last name,
+#t for timestamp, #r for SLURL to you,
+#i for your idle time. (e.g. "5 mins")
+      </text>
+    </panel>
+
+    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
+      follows="left|top|right|bottom" label="Spam" name="Spam">
+      <check_box left="10" bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
+        label="Enable chat spam blocking" tool_tip="Enable automatic chat spam blocking"
+        height="18" width="100" radio_style="false" mouse_opaque="true"
+        name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
+      <spinner left_delta="20" height="18" width="120" enabled="true" follows="left|top"
+        decimal_digits="0" increment="1" initial_val="10" min_val="2" max_val="100"
+        label="Chat count" label_width="70" name="AscChatSpamCount" control_name="SGChatSpamCount"
+        tool_tip="Number of items spammed per time set. (Default: 10)"/>
+      <spinner left_delta="0" height="18" width="120" enabled="true" follows="left|top"
+        decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
+        label="Chat time" label_width="70" name="AscChatSpamTime" control_name="SGChatSpamTime"
+        tool_tip="Time of evalulating spam in seconds. (Default: 1.0)"/>
+      <text type="string" length="1" bottom_delta="0" left_delta="130" bg_visible="false"
+        border_visible="false" border_drop_shadow_visible="false"
+        drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="16"
+        mouse_opaque="true" name="" v_pad="0" width="100">
+seconds
+      </text>
+      <check_box left_delta="-150" enabled="true" follows="left|top" font="SansSerifSmall"
+        label="Enable dialog spam blocking" tool_tip="Enable automatic dialog spam blocking"
+        height="16" width="100" radio_style="false" mouse_opaque="true"
+        name="AscDialogSpamBlock" control_name="SGBlockDialogSpam"/>
+      <check_box left_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
+        label="Enable calling card spam blocking" tool_tip="Enable automatic calling card spam blocking"
+        height="16" width="100" radio_style="false" mouse_opaque="true"
+        name="AscCardSpamBlock" control_name="SGBlockCardSpam"/>
+      <spinner left_delta="20" height="18" width="120" enabled="true" follows="left|top"
+        decimal_digits="0" increment="1" initial_val="4" min_val="2" max_val="100"
+        label="Spam count" label_width="70" name="AscSpamCount" control_name="SGSpamCount"
+        tool_tip="This setting applies to both Dialog and Card spam (Default: 4)"/>
+      <spinner left_delta="0" height="18" width="120" enabled="true" follows="left|top"
+        decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
+        label="Spam time" label_width="70" name="AscSpamTime" control_name="SGSpamTime"
+        tool_tip="This setting applies to both Dialog and Card spam (Default: 1.0)"/>
+      <text type="string" length="1" bottom_delta="0" left_delta="130" bg_visible="false"
+        border_visible="false" border_drop_shadow_visible="false"
+        drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="16"
+        mouse_opaque="true" name="" v_pad="0" width="100">
+seconds
+      </text>
+    </panel>
+
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Text Options"
+      left="1" mouse_opaque="true" name="TextOptions" width="418">
+      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        label="Show misspelled words in red" left="12" mouse_opaque="true" name="SpellDisplay"
+        control_name="SpellDisplay" width="126"/>
+      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16" left="12"
+        name="EmSpell_txt1" width="512">
+Current language (dictionary):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
+        max_chars="200" mouse_opaque="true" name="SpellBase" width="250"
+        control_name="SpellBase" tool_tip=""/>
+      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
+        name="EmSpell_txt3" width="512">
+Downloaded languages (dictionaries):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
+        max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
+        control_name="EmSpell_Avail" tool_tip=""/>
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
+        name="EmSpell_Add" tool_tip="" left_delta="255" width="80"/>
+      <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
+        name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="12" width="250"/>
+      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
+        name="EmSpell_txt2" width="512">
+Additional custom languages (dictionaries):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
+        max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
+        control_name="EmSpell_Installed" tool_tip=""/>
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
+        name="EmSpell_Remove" tool_tip="" left_delta="255" width="80"/>
+      <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" label="Edit Custom dictionary"
+        name="EmSpell_EditCustom" tool_tip="" left="12" width="250"/>
+      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
+        name="EmSpell_txt4" width="512">
+To use spellcheck, right-click a misspelled word
+(red or otherwise) and select its replacement
+      </text>
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-16" follows="top|left" height="0"
+        left="5" name="CmdDivisor" width="356"/>
+
+      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        label="Highlight messages if any of they contain the terms" left="5" mouse_opaque="true"
+        name="Keywords_Alert" radio_style="false" width="270"/>
+      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left="12"
+        name="keyword_txt1" width="512">
+(separated by commas)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="5" max_length="500" mouse_opaque="true" name="Keywords_Entries" width="300" />
+      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left_delta="15" name="EmKeyw"
+        width="100">Is found within:</text>
+      <check_box bottom_delta="3" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        label="Local Chat Floater" left_delta="100" mouse_opaque="true" name="Keywords_LocalChat" radio_style="false" width="270"/>
+      <check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        label="Instant Message Floater" left_delta="0" mouse_opaque="true" name="Keywords_IM" radio_style="false" width="270"/>
+      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        label="Highlight the message in this color:" left_delta="-110" mouse_opaque="true" name="Keywords_Highlight"
+        radio_style="false" width="270"/>
+      <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-16" can_apply_immediately="true"
+        color="1, 1, 1, 1" follows="left|top" height="35" label="" left_delta="210"
+        mouse_opaque="true" name="Keywords_Color" tool_tip="Click to open Color Picker" width="50"/>
+      <check_box bottom_delta="-10" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        label="Play this sound alert: (UUID)" left_delta="-210" mouse_opaque="true" name="Keywords_PlaySound"
+        radio_style="false" width="270"/>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="-5" max_length="36" mouse_opaque="true" name="Keywords_SoundUUID" width="300" />
+    </panel>
+
+  </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index a3aa83a16..970ffb5f4 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -1,646 +1,325 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
-	border="true" label="Singularity" name="ascsys" enabled="true" mouse_opaque="true">
-	<tab_container label="Singularity System" bottom="0" height="440" width="497" left="0"
-		name="Ascent System" tab_min_width="70" tab_position="top">
-		<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-			follows="left|top|right|bottom" label="General" name="User Interface">
-			<check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Enable teleporting via double-click in-world" left="10"
-				tool_tip="Double-clicking on an object/person will teleport you to that location."
-			    mouse_opaque="true" name="double_click_teleport_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="OptionRotateCamAfterLocalTP" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Reset camera after teleporting" left="20"
-				tool_tip="Centers the camera behind you after a local teleport."
-			    mouse_opaque="true" name="center_after_teleport_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Offset TP target by half agent height" left="20"
-				tool_tip="Tries to aim the TP so that your feet land at the point you're aiming for."
-			    mouse_opaque="true" name="offset_teleport_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="PreviewAnimInWorld" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Preview animations on the avatar instead on a dummy before uploading" left="10"
-				tool_tip="The Animation upload window will play animations on your avatar when previewing them."
-			    mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	    		label="Save scripts in inventory as Mono scripts instead of LSL2" left="10"
-				tool_tip="Scripts will automatically be compiled in Mono when saving - Usually only possible when placed in an object."
-		    	mouse_opaque="true" name="save_scripts_as_mono_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Always rez objects as land group when available" left="10"
-				tool_tip="Rez objects with the same group that the object is being rezzed on has, regardless of your active tag."
-				mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentBuildAlwaysEnabled" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Always show Build as enabled" left="10"
-				tool_tip="Allows you to use the Build menu without having to be tricky about it. May not mean you can actually build there."
-				mouse_opaque="true" name="always_build_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentFlyAlwaysEnabled" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Always allow Fly" left="10"
-				tool_tip="Lets you fly in locations you shouldn't be allowed to. Use at your own risk - Just because you can doesn't mean you should."
-				mouse_opaque="true" name="always_fly_check" radio_style="false"
-				width="400" />	
-			<check_box bottom_delta="-20" control_name="AscentDisableMinZoomDist" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Disable camera minimum distance" left="10"
-				tool_tip="Allows the camera to get reeeaaally close to things."
-				mouse_opaque="true" name="disable_camera_zoom_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck1" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Enable Power User functionality" left="10"
-				tool_tip="Adds features deemed too dangerous for normal use. These features can wreak havoc or do bad things if misused - Mostly to yourself or your belongings. If you're sure, activate the checkbox below as well."
-				mouse_opaque="true" name="power_user_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck2" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Confirm Power User functionality" left="10"
-				tool_tip="Confirms Power User activation. Turn this on at your own risk, and use any features it enables responsibly. Ascent devs will not replace anything you break if you ruin something important. Unlike most checkboxes, you must apply/ok changes before this will activate."
-				mouse_opaque="true" name="power_user_confirm_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentUseSystemFolder" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Enable Ascent System Inventory (Requires Restart)" left="10"
-				tool_tip="Creates a new folder in the inventory for storing settings files and non-permanent assets."
-				mouse_opaque="true" name="system_folder_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentSystemTemporary" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Temporary uploads go in the System Asset folder." left="20"
-				tool_tip="Puts temporary uploads in the Asset folder which separates them from actual uploads, making them easier to find."
-			    mouse_opaque="true" name="temp_in_system_check" radio_style="false"
-			    width="400" />
-		</panel>
-    	<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-			follows="left|top|right|bottom" label="Chat/IM" name="Chat/IM">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-		    	left="15" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
-			    width="300">
-				IMs:
-			</text>
-			<check_box bottom_delta="-25" control_name="WoLfVerticalIMTabs" enabled="true"
-		    	follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-		    	label="Use Vertical IMs (Requires a restart)" left="10"
-			    mouse_opaque="true" name="use_vertical_ims_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Announce incoming instant messages" left="10" mouse_opaque="true"
-				control_name="AscentInstantMessageAnnounceIncoming" radio_style="false" width="270"
-				name="quickstart_im_check"
-				tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter. "/>
-			<check_box bottom_delta="-20" control_name="HideTypingNotification" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-				label="Don't send '[name] is typing...' in IMs" left="10"
-				tool_tip="IM partners will not see '______ is typing...' when you're responding."
-				mouse_opaque="true" name="hide_typing_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="OptionShowGroupNameInChatIM" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-				label="Show group name in chat" left="10"
-				tool_tip="The name of the group will also be displayed if the IM is from group chat."
-				mouse_opaque="true" name="append_group_name_check" radio_style="false"
-				width="400" />
-			<!-- Left/Right Column split -->
-			<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
-						 left="235" name="CmdDivisor" width="0"/>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-		    	left="250" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
-			    width="300">
-				Chat:
-			</text>
-			<check_box bottom_delta="-25" control_name="PlayTypingSound" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	    		label="Play the typing sound for local chat" left_delta="-5"
-				tool_tip="Silences the chatting type sound, making it quieter for things like performances."
-		    	mouse_opaque="true" name="play_typing_sound_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="HideNotificationsInChat" enabled="true"
-		    	follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-		    	label="Do not echo/log notifications in chat" left_delta="00"
-			    mouse_opaque="true" name="hide_notifications_in_chat_check" radio_style="false"
-			    width="400" />
-			<check_box bottom="-120" control_name="AscentAllowMUpose" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-				label="Allow MU pose method." left="10"
-				tool_tip="Allows the use of both /me and : to perform emotes."
-				mouse_opaque="true" name="allow_mu_pose_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentAutoCloseOOC" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-				label="Auto-close OOC comments." left="10"
-				tool_tip="Will automatically append '))' to any message starting with '((', or visa versa."
-				mouse_opaque="true" name="close_ooc_check" radio_style="false"
-				width="400" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-		    	left_delta="0" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
-			    width="300">
-				Show links on chatting object names in chat history for:
-			</text>
-			<radio_group bottom_delta="-26" control_name="LinksForChattingObjects" draw_border="true" enabled="true"
-				tool_tip="Enables a link to show you the owner of the speaking object."
-			    follows="left|top" height="20" left="20" mouse_opaque="true" name="objects_link" width="350">
-				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
-					left_delta="5" mouse_opaque="true" name="no_object" width="48">
-					No object
-				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18" 
-					left_delta="45" mouse_opaque="true" name="others_objects" width="48">
-					Others' objects
-				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18" 
-					left_delta="60" mouse_opaque="true" name="anyones_objects" width="48">
-					Anyone's objects
-				</radio_item>
-			</radio_group>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		    	bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-		    	left="10" mouse_opaque="true" name="time_format_text_box" v_pad="0"
-			    width="80">
-				Time format:
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
-		    	height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
-				tool_tip="Show hours in either 12-23 or 12PM-11PM format."
-		    	name="time_format_combobox" width="130">
-				<combo_item type="string" length="1" enabled="true" name="24hours" value="default">
-					24-hour clock
-				</combo_item>
-				<combo_item type="string" length="1" enabled="true" name="12hours" value="default">
-					12-hour clock
-				</combo_item>
-			</combo_box>
-			<check_box bottom_delta="0" control_name="SecondsInChatAndIMs" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-		    	label="Seconds in chat/IMs timestamps" left="240"
-			    mouse_opaque="true" name="seconds_in_chat_and_ims_check" radio_style="false"
-		    	width="260" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-		    	left="10" mouse_opaque="true" name="date_format_text_box" v_pad="0"
-			    width="80">
-					Date format:
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
-	    		height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
-			    name="date_format_combobox" width="130">
-				<combo_item type="string" length="1" enabled="true" name="year_first" value="default">
-					YYYY-MM-DD
-				</combo_item>
-				<combo_item type="string" length="1" enabled="true" name="day_first" value="default">
-					DD/MM/YYYY
-				</combo_item>
-				<combo_item type="string" length="1" enabled="true" name="month_first" value="default">
-					MM/DD/YYYY
-				</combo_item>
-			</combo_box>
-			<!-- Auto-responder -->
-			<view_border bevel_style="none" border_thickness="1" bottom="-420" follows="top|left"
-				height="190" left="5" name="GraphicsBorder" width="485" />
-			<check_box bottom_delta="168" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Enable Autoresponse" left="10" mouse_opaque="true"
-				name="AscentInstantMessageResponseAnyone" radio_style="false" width="270"
-                tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
-			<!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-				h_pad="0" halign="left" height="18" left_delta="10" mouse_opaque="false"
-				name="text_box1" v_pad="0" width="430">
-				Response:
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="2" enabled="true" follows="left|top"
-		    	height="18" hidden="false" left_delta="67" max_chars="20" mouse_opaque="true"
-				tool_tip="Saved response to use."
-		    	name="autoresponse_combobox" width="90">
-				<combo_item type="string" length="1" enabled="true" name="default" value="default">
-					Default
-				</combo_item>
-			</combo_box>
-			<button bottom_delta="0" control_name="addResponse" name="add_current" follows="left|top" 
-				label="+" height="18" left_delta="90" width="20"/>
-			<button bottom_delta="0" control_name="removeResponse" name="remove_current" follows="left|top" 
-				label="-" height="18" left_delta="20" width="20"/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Autorespond to non-friends" left_delta="-187" mouse_opaque="true"-->
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Autorespond to non-friends" left_delta="0" mouse_opaque="true"
-				name="AscentInstantMessageResponseFriends" radio_style="false" width="270"
-				tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Autorespond to people you have muted" left_delta="0"
-				mouse_opaque="true" name="AscentInstantMessageResponseMuted" radio_style="false"
-				width="270" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Send as soon as they start typing" left_delta="0" mouse_opaque="true"
-				name="AscentInstantMessageShowOnTyping" radio_style="false" width="270"/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="26"
-				initial_value="false" label="Don't show IMs you auto-responsed to" left_delta="0"
-				mouse_opaque="true" name="AscentInstantMessageShowResponded" radio_style="false"
-				width="170"/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Autorespond to every message" left_delta="0" mouse_opaque="true"
-				name="AscentInstantMessageResponseRepeat" radio_style="false" width="270"/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Send an item along with the response" left_delta="0"
-				mouse_opaque="true" name="AscentInstantMessageResponseItem" radio_style="false"
-				width="270" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
-			<!--<view_border blevel_style="in" bottom_delta="-20" follows="left|top" height="18" left_delta="5"
-				mouse_opaque="false" name="im_give_drop_target_rect" width="220"/>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom_delta="0"
-				drop_shadow_visible="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="center"
-				height="16" left_delta="0" mouse_opaque="true" name="Give inventory" tool_tip="Drop an inventory item here to have it given along with the auto-response."
-				v_pad="2" width="230">
-				Drop item here (Currently: NONE)
-			</text>-->
-			<!-- Right Column -->
-			<!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="160" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-				h_pad="0" halign="left" height="18" left_delta="245" mouse_opaque="false"-->
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="120" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-				h_pad="0" halign="left" height="18" left_delta="245" mouse_opaque="false"
-				name="text_box1" v_pad="0" width="430">
-				Response Text:
-			</text>
-			<text_editor type="string" length="1" bottom_delta="-110" embedded_items="false" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="110" left_delta="0" max_length="1100"
-				mouse_opaque="true" name="im_response" width="230" word_wrap="true" spell_check="true"/>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-				h_pad="0" halign="left" height="18" left_delta="0" mouse_opaque="false"
-				name="text_box1" v_pad="0" width="430">
-Use #f for user's first name, #l for last name, 
-#t for timestamp, #r for SLURL to you, 
-#i for your idle time. (e.g. "5 mins")
-			</text>
-		</panel>
+  border="true" label="SG System" name="ascsys" enabled="true" mouse_opaque="true">
+  <tab_container label="SG System" bottom="0" height="440" width="497" left="0"
+    name="Ascent System" tab_min_width="70" tab_position="top">
 
     <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-			follows="left|top|right|bottom" label="Spam" name="Spam">
-      <check_box left="10" bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-				label="Enable chat spam blocking" tool_tip="Enable automatic chat spam blocking"
-        height="18" width="100" radio_style="false" mouse_opaque="true"
-				name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
-      <spinner left_delta="20" height="18" width="120" enabled="true" follows="left|top"
-        decimal_digits="0" increment="1" initial_val="10" min_val="2" max_val="100"
-        label="Chat count" label_width="70" name="AscChatSpamCount" control_name="SGChatSpamCount"
-        tool_tip="Number of items spammed per time set. (Default: 10)"/>
-      <spinner left_delta="0" height="18" width="120" enabled="true" follows="left|top"
-        decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
-        label="Chat time" label_width="70" name="AscChatSpamTime" control_name="SGChatSpamTime"
-        tool_tip="Time of evalulating spam in seconds. (Default: 1.0)"/>
-      <text type="string" length="1" bottom_delta="0" left_delta="130" bg_visible="false"
-				border_visible="false" border_drop_shadow_visible="false"
-				drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="16"
-	     		mouse_opaque="true" name="" v_pad="0" width="100">
-        seconds
-      </text>
-      <check_box left_delta="-150" enabled="true" follows="left|top" font="SansSerifSmall"
-				label="Enable dialog spam blocking" tool_tip="Enable automatic dialog spam blocking"
-        height="16" width="100" radio_style="false" mouse_opaque="true"
-				name="AscDialogSpamBlock" control_name="SGBlockDialogSpam"/>
-      <check_box left_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-				label="Enable calling card spam blocking" tool_tip="Enable automatic calling card spam blocking"
-        height="16" width="100" radio_style="false" mouse_opaque="true"
-				name="AscCardSpamBlock" control_name="SGBlockCardSpam"/>
-      <spinner left_delta="20" height="18" width="120" enabled="true" follows="left|top"
-        decimal_digits="0" increment="1" initial_val="4" min_val="2" max_val="100"
-        label="Spam count" label_width="70" name="AscSpamCount" control_name="SGSpamCount"
-        tool_tip="This setting applies to both Dialog and Card spam (Default: 4)"/>
-      <spinner left_delta="0" height="18" width="120" enabled="true" follows="left|top"
-        decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
-        label="Spam time" label_width="70" name="AscSpamTime" control_name="SGSpamTime"
-        tool_tip="This setting applies to both Dialog and Card spam (Default: 1.0)"/>
-      <text type="string" length="1" bottom_delta="0" left_delta="130" bg_visible="false"
-				border_visible="false" border_drop_shadow_visible="false"
-				drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="16"
-	     		mouse_opaque="true" name="" v_pad="0" width="100">
-        seconds
+      follows="left|top|right|bottom" label="General" name="User Interface">
+      <check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Enable teleporting via double-click in-world" left="10"
+        tool_tip="Double-clicking on an object/person will teleport you to that location."
+        mouse_opaque="true" name="double_click_teleport_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="OptionRotateCamAfterLocalTP" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Reset camera after teleporting" left="20"
+        tool_tip="Centers the camera behind you after a local teleport."
+        mouse_opaque="true" name="center_after_teleport_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Offset TP target by half agent height" left="20"
+        tool_tip="Tries to aim the TP so that your feet land at the point you're aiming for."
+        mouse_opaque="true" name="offset_teleport_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="PreviewAnimInWorld" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Preview animations on the avatar instead on a dummy before uploading" left="10"
+        tool_tip="The Animation upload window will play animations on your avatar when previewing them."
+        mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Save scripts in inventory as Mono scripts instead of LSL2" left="10"
+        tool_tip="Scripts will automatically be compiled in Mono when saving - Usually only possible when placed in an object."
+        mouse_opaque="true" name="save_scripts_as_mono_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Always rez objects as land group when available" left="10"
+        tool_tip="Rez objects with the same group that the object is being rezzed on has, regardless of your active tag."
+        mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentBuildAlwaysEnabled" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Always show Build as enabled" left="10"
+        tool_tip="Allows you to use the Build menu without having to be tricky about it. May not mean you can actually build there."
+        mouse_opaque="true" name="always_build_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentFlyAlwaysEnabled" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Always allow Fly" left="10"
+        tool_tip="Lets you fly in locations you shouldn't be allowed to. Use at your own risk - Just because you can doesn't mean you should."
+        mouse_opaque="true" name="always_fly_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentDisableMinZoomDist" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Disable camera minimum distance" left="10"
+        tool_tip="Allows the camera to get reeeaaally close to things."
+        mouse_opaque="true" name="disable_camera_zoom_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck1" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Enable Power User functionality" left="10"
+        tool_tip="Adds features deemed too dangerous for normal use. These features can wreak havoc or do bad things if misused - Mostly to yourself or your belongings. If you're sure, activate the checkbox below as well."
+        mouse_opaque="true" name="power_user_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck2" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Confirm Power User functionality" left="10"
+        tool_tip="Confirms Power User activation. Turn this on at your own risk, and use any features it enables responsibly. Ascent devs will not replace anything you break if you ruin something important. Unlike most checkboxes, you must apply/ok changes before this will activate."
+        mouse_opaque="true" name="power_user_confirm_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentUseSystemFolder" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Enable Ascent System Inventory (Requires Restart)" left="10"
+        tool_tip="Creates a new folder in the inventory for storing settings files and non-permanent assets."
+        mouse_opaque="true" name="system_folder_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentSystemTemporary" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Temporary uploads go in the System Asset folder." left="20"
+        tool_tip="Puts temporary uploads in the Asset folder which separates them from actual uploads, making them easier to find."
+        mouse_opaque="true" name="temp_in_system_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="FetchInventoryOnLogin" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Automatically fetch the inventory in the background after login" left="10"
+        tool_tip="Inventory will preload when you log in, so you don't have to wait for it to load when doing an initial search."
+        mouse_opaque="true" name="fetch_inventory_on_login_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="WindEnabled" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Enable Wind Effects" left="10"
+        mouse_opaque="true" name="enable_wind" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="CloudsEnabled" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Enable Clouds" left="10"
+        mouse_opaque="true" name="enable_clouds" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" left_delta="10"  control_name="SkyUseClassicClouds" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Enable Classic Clouds" left="10"
+        mouse_opaque="true" name="enable_classic_clouds" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" left_delta="-10" control_name="SpeedRez" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Enable speed-rezzing via draw distance stepping" left="10"
+        mouse_opaque="true" name="speed_rez_check" radio_style="false"
+        tool_tip="When active, this will progressively increase your draw distance, which allows closer objects/people to rez first."
+        width="400" />
+      <spinner bottom_delta="-20" control_name="SpeedRezInterval" enabled="true" decimal_digits="0"
+        follows="left|top" font="SansSerifSmall" height="16" left="30" width="230"
+        label="Draw distance stepping interval:" label_width="180"
+        max_val="60" min_val="5" initial_val="20" increment="5"
+        mouse_opaque="true" name="speed_rez_interval" />
+      <text type="string" length="1" bottom_delta="0" left_delta="235" bg_visible="false"
+        border_visible="false" border_drop_shadow_visible="false"
+        drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="16"
+        mouse_opaque="true" name="speed_rez_seconds" v_pad="0" width="100">
+seconds
       </text>
     </panel>
 
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-			 follows="left|top|right|bottom" label="Performance" name="Performance">
-			 <check_box bottom_delta="-25" control_name="FetchInventoryOnLogin" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-		    	label="Automatically fetch the inventory in the background after login" left="10"
-				tool_tip="Inventory will preload when you log in, so you don't have to wait for it to load when doing an initial search."
-			    mouse_opaque="true" name="fetch_inventory_on_login_check" radio_style="false"
-		    	width="400" />
-			 <check_box bottom_delta="-20" control_name="WindEnabled" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-		    	label="Enable Wind Effects" left="10"
-			    mouse_opaque="true" name="enable_wind" radio_style="false"
-		    	width="400" />
-		    <check_box bottom_delta="-20" control_name="CloudsEnabled" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-		    	label="Enable Clouds" left="10"
-			    mouse_opaque="true" name="enable_clouds" radio_style="false"
-		    	width="400" />
-      <check_box bottom_delta="-20" left_delta="10"  control_name="SkyUseClassicClouds" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-		    	label="Enable Classic Clouds" left="10"
-			    mouse_opaque="true" name="enable_classic_clouds" radio_style="false"
-		    	width="400" />
-      <check_box bottom_delta="-20" left_delta="-10" control_name="SpeedRez" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Enable speed-rezzing via draw distance stepping" left="10"
-		    	mouse_opaque="true" name="speed_rez_check" radio_style="false"
-				tool_tip="When active, this will progressively increase your draw distance, which allows closer objects/people to rez first."
-			    width="400" />
-			<spinner bottom_delta="-20" control_name="SpeedRezInterval" enabled="true" decimal_digits="0"
-				follows="left|top" font="SansSerifSmall" height="16" left="30" width="230"
-				label="Draw distance stepping interval:" label_width="180"
-				max_val="60" min_val="5" initial_val="20" increment="5"
-				mouse_opaque="true" name="speed_rez_interval" />
-			<text type="string" length="1" bottom_delta="0" left_delta="235" bg_visible="false"
-				border_visible="false" border_drop_shadow_visible="false"
-				drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="16"
-	     		mouse_opaque="true" name="speed_rez_seconds" v_pad="0" width="100">
-				seconds
-			</text>
-		</panel>
-		<panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Command Line"
-				 left="1" mouse_opaque="true" name="Command Line" width="418">
-			<check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-						 initial_value="false" label="Enable usage of chat bar as a command line" left="10"
-						 mouse_opaque="true" name="chat_cmd_toggle" radio_style="false" width="270" 
-						 control_name="AscentCmdLine"/>
-			<text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
-						 name="cmd_line_text_2" width="512">
-				Teleport within sim (usage: cmd x y z)
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="" name="AscentCmdLinePos" control_name="AscentCmdLinePos" width="200"/>
-			<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-						 name="cmd_line_text_3" width="512">
-				Teleport to ground (usage: cmd)
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="" name="AscentCmdLineGround" control_name="AscentCmdLineGround" width="200"/>
-			<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-						 name="cmd_line_text_4" width="512">
-				Teleport to altitude (usage: cmd z)
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="" name="AscentCmdLineHeight" control_name="AscentCmdLineHeight" width="200"/>
-			<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-						 name="cmd_line_text_5" width="512">
-				Teleport home (usage: cmd)
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="" name="AscentCmdLineTeleportHome" control_name="AscentCmdLineTeleportHome"
-						 width="200"/>
-			<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-						 name="cmd_line_text_6" width="512">
-				Rez a platform (usage: cmd 0 - 30)
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="" name="AscentCmdLineRezPlatform" control_name="AscentCmdLineRezPlatform"
-						 width="200"/>
-			<slider bottom_delta="-22" left_delta="0" name="AscentPlatformSize" control_name="AscentPlatformSize"
-						 decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
-						 initial_val="5" label="Default width:" label_width="75" max_val="30" min_val="5"
-						 mouse_opaque="true" show_text="true" width="205" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
-			<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-						 name="cmd_line_text_8" width="512">
-				Calc. expressions (usage: cmd 2 + 2)
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="" name="AscentCmdLineCalc" control_name="AscentCmdLineCalc" width="200"/>
-			<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-						 name="cmd_line_text_15" width="512">
-				Clear the chat history (usage: cmd)</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="Clears the Chat History to prevent lag effects from chat spammers." 
-						 name="AscentCmdLineClearChat" control_name="AscentCmdLineClearChat" width="200"/>
-			<!-- Column Split -->
-			<view_border bevel_style="none" border_thickness="1" bottom_delta="-5" follows="top|left" height="295"
-						 left="230" name="CmdDivisor" width="0"/>
-			<text bottom_delta="277" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
-						 name="cmd_line_text_9" width="512">
-				Change Draw Distance (usage: cmd meters)
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="" name="AscentCmdLineDrawDistance" control_name="AscentCmdLineDrawDistance"
-						 width="200"/>
-			<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-						 name="cmd_line_text_10" width="512">
-				Teleport to cam position (usage: cmd)</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="" name="AscentCmdTeleportToCam" control_name="AscentCmdTeleportToCam"
-						 width="200"/>
-			<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-						 name="cmd_line_text_11" width="512">
-				Get avatar name from key (usage: cmd key)</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="" name="AscentCmdLineKeyToName" control_name="AscentCmdLineKeyToName"
-						 width="200"/>
-			<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-						 name="cmd_line_text_12" width="512">
-				Offer teleport to avatar (usage: cmd key)</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="" name="AscentCmdLineOfferTp" control_name="AscentCmdLineOfferTp" width="200"/>
-			<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-						 name="cmd_line_text_7" width="512">
-				Teleport to sim x (usage: cmd simname)
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="" name="AscentCmdLineMapTo" control_name="AscentCmdLineMapTo" width="200"/>
-			<check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-						 initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true"
-						 name="AscentMapToKeepPos" radio_style="false" width="270" 
-						 control_name="AscentMapToKeepPos"/>
-			<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-						 name="cmd_line_text_13" width="512">
-				Teleport to avatar (usage: cmd name)</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-						 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-						 tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
-						 name="AscentCmdLineTP2" control_name="AscentCmdLineTP2" width="200"/>
-		</panel>
-		<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-			 follows="left|top|right|bottom" label="Security" name="Security">
-			 <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-		    	label="Broadcast Viewer Effects (Does not include beams)" left="10"
-			    mouse_opaque="true" name="broadcast_viewer_effects" radio_style="false"
-		    	width="400" />
-			<check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-		    	label="Disable Point At And Beam" left="10"
-				tool_tip="Don't point at or show your edit beam when selecting an object."
-			    mouse_opaque="true" name="disable_point_at_and_beams_check" radio_style="false"
-		    	width="400" />
-			<check_box bottom_delta="-20" control_name="PrivateLookAt" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Do not Look At objects (defeats ShowLookAt)" left="10"
-				tool_tip="Turns off broadcasting headturns and lookat beacons for yourself."
-			    mouse_opaque="true" name="private_look_at_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="ShowLookAt" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Show others' LookAt beacons" left="10"
-				tool_tip="Shows you where others are looking."
-			    mouse_opaque="true" name="show_look_at_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-				label="On standing up, revoke perms for the object your avatar was sitting on" left="10"
-				tool_tip="Objects generally retain Take Control and Trigger Animation permissions until reset or given permission by another user. Enabling this will make sure you revoke these permissions immediately."
-				mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="DisableClickSit" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Disable click-to-sit objects" left="10"
-				tool_tip="Some griefer tools rely on forcing or tricking you to click on an object that will make you sit, giving the object automatic permissions to trigger animations amongst other things. This will disable llSitTarget - It does mean that you will need to select 'Sit' on poseballs and furniture."
-			    mouse_opaque="true" name="disable_click_sit_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Display Total Script Count changes:" left_delta="0"
-				mouse_opaque="true" name="totalscriptjumps" radio_style="false" width="270" 
-				control_name="AscentDisplayTotalScriptJumps" 
-				tool_tip="Displays script count changes in your region, dependant on the threshold you choose to the right."/>
-			<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16" increment="1"
-				label="" label_width="0" digits="4" left_delta="210" max_val="9999"
-				min_val="1" mouse_opaque="true" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff"
-				tool_tip="Threshold for the script jump message [Default: 100]"/>
-		</panel>
-		<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-			follows="left|top|right|bottom" label="Building" name="Building">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="-19" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-				h_pad="0" halign="left" height="10" left_delta="30" mouse_opaque="false"
-				name="text_box6" v_pad="0" width="150">
-				Pivot Point
-			</text>
-			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-				label="X pos" label_width="40" left="10" mouse_opaque="true" max_val="256"
-				min_val="-256" name="X pos" width="120" control_name="AscentBuildPrefs_PivotX"/>
-			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-				label="Y pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
-				min_val="-256" name="Y pos" width="120" control_name="AscentBuildPrefs_PivotY"/>
-			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-				label="Z pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
-				min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				label="Values are percent" left_delta="-5" mouse_opaque="true" 
-				tool_tip="Default settings are Percentages and every axis set at 50"
-				name="EmPivotPercToggle" radio_style="false" width="100" control_name="AscentBuildPrefs_PivotIsPercent"/>
-		  <check_box bottom_delta="60" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="true" label="Enable highlighting of selected prims" left_delta="140"
-				mouse_opaque="true" name="EmBuildPrefsRenderHighlight_toggle" control_name="AscentRenderHighlightSelections"
-				radio_style="false" width="270"/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Show axis arrow on root prim position" left_delta="0"
-				mouse_opaque="true" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead."
-				name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"
-				radio_style="false" width="270"/>
-		</panel>
-
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Text Options"
-       left="1" mouse_opaque="true" name="TextOptions" width="418">
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Command Line"
+      left="1" mouse_opaque="true" name="Command Line" width="418">
       <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-         label="Show misspelled words in red" left="12" mouse_opaque="true" name="SpellDisplay"
-         control_name="SpellDisplay" width="126"/>
-      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16" left="12"
-         name="EmSpell_txt1" width="512">
-        Current language (dictionary):
+        initial_value="false" label="Enable usage of chat bar as a command line" left="10"
+        mouse_opaque="true" name="chat_cmd_toggle" radio_style="false" width="270"
+        control_name="AscentCmdLine"/>
+      <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
+        name="cmd_line_text_2" width="512">
+Teleport within sim (usage: cmd x y z)
       </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
-         max_chars="200" mouse_opaque="true" name="SpellBase" width="250"
-         control_name="SpellBase" tool_tip=""/>
-      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
-         name="EmSpell_txt3" width="512">
-        Downloaded languages (dictionaries):
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLinePos" control_name="AscentCmdLinePos" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_3" width="512">
+Teleport to ground (usage: cmd)
       </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
-         max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
-         control_name="EmSpell_Avail" tool_tip=""/>
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
-         name="EmSpell_Add" tool_tip="" left_delta="255" width="80"/>
-      <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
-         name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="12" width="250"/>
-      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
-         name="EmSpell_txt2" width="512">
-        Additional custom languages (dictionaries):
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineGround" control_name="AscentCmdLineGround" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_4" width="512">
+Teleport to altitude (usage: cmd z)
       </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
-         max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
-         control_name="EmSpell_Installed" tool_tip=""/>
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
-         name="EmSpell_Remove" tool_tip="" left_delta="255" width="80"/>
-      <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" label="Edit Custom dictionary"
-         name="EmSpell_EditCustom" tool_tip="" left="12" width="250"/>
-      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
-         name="EmSpell_txt4" width="512">
-To use spellcheck, right-click a misspelled word
-(red or otherwise) and select its replacement
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineHeight" control_name="AscentCmdLineHeight" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_5" width="512">
+Teleport home (usage: cmd)
       </text>
-      
-      <view_border bevel_style="none" border_thickness="1" bottom_delta="-16" follows="top|left" height="0"
-						 left="5" name="CmdDivisor" width="356"/>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineTeleportHome" control_name="AscentCmdLineTeleportHome"
+        width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_6" width="512">
+Rez a platform (usage: cmd 0 - 30)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineRezPlatform" control_name="AscentCmdLineRezPlatform"
+        width="200"/>
+      <slider bottom_delta="-22" left_delta="0" name="AscentPlatformSize" control_name="AscentPlatformSize"
+        decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
+        initial_val="5" label="Default width:" label_width="75" max_val="30" min_val="5"
+        mouse_opaque="true" show_text="true" width="205" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
+      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_8" width="512">
+Calc. expressions (usage: cmd 2 + 2)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineCalc" control_name="AscentCmdLineCalc" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_15" width="512">
+Clear the chat history (usage: cmd)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="Clears the Chat History to prevent lag effects from chat spammers."
+        name="AscentCmdLineClearChat" control_name="AscentCmdLineClearChat" width="200"/>
+      <!-- Column Split -->
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-5" follows="top|left" height="295"
+        left="230" name="CmdDivisor" width="0"/>
+      <text bottom_delta="277" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
+        name="cmd_line_text_9" width="512">
+Change Draw Distance (usage: cmd meters)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineDrawDistance" control_name="AscentCmdLineDrawDistance"
+        width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_10" width="512">
+Teleport to cam position (usage: cmd)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdTeleportToCam" control_name="AscentCmdTeleportToCam"
+        width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_11" width="512">
+Get avatar name from key (usage: cmd key)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineKeyToName" control_name="AscentCmdLineKeyToName"
+        width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_12" width="512">
+Offer teleport to avatar (usage: cmd key)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineOfferTp" control_name="AscentCmdLineOfferTp" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_7" width="512">
+Teleport to sim x (usage: cmd simname)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineMapTo" control_name="AscentCmdLineMapTo" width="200"/>
+      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true"
+        name="map_to_keep_pos" radio_style="false" width="270"
+        control_name="AscentMapToKeepPos"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_13" width="512">
+Teleport to avatar (usage: cmd name)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
+        name="AscentCmdLineTP2" control_name="AscentCmdLineTP2" width="200"/>
+    </panel>
 
-      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-          label="Highlight messages if any of they contain the terms" left="5" mouse_opaque="true"
-          name="Keywords_Alert" radio_style="false" width="270"/>
-      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left="12"
-         name="keyword_txt1" width="512">
-        (separated by commas)
+    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
+      follows="left|top|right|bottom" label="Security" name="Security">
+      <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Broadcast Viewer Effects (Does not include beams)" left="10"
+        mouse_opaque="true" name="broadcast_viewer_effects" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Disable Point At And Beam" left="10"
+        tool_tip="Don't point at or show your edit beam when selecting an object."
+        mouse_opaque="true" name="disable_point_at_and_beams_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="PrivateLookAt" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Do not Look At objects (defeats ShowLookAt)" left="10"
+        tool_tip="Turns off broadcasting headturns and lookat beacons for yourself."
+        mouse_opaque="true" name="private_look_at_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="ShowLookAt" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Show others' LookAt beacons" left="10"
+        tool_tip="Shows you where others are looking."
+        mouse_opaque="true" name="show_look_at_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="On standing up, revoke perms for the object your avatar was sitting on" left="10"
+        tool_tip="Objects generally retain Take Control and Trigger Animation permissions until reset or given permission by another user. Enabling this will make sure you revoke these permissions immediately."
+        mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="DisableClickSit" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Disable click-to-sit objects" left="10"
+        tool_tip="Some griefer tools rely on forcing or tricking you to click on an object that will make you sit, giving the object automatic permissions to trigger animations amongst other things. This will disable llSitTarget - It does mean that you will need to select 'Sit' on poseballs and furniture."
+        mouse_opaque="true" name="disable_click_sit_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Display Total Script Count changes:" left_delta="0"
+        mouse_opaque="true" name="totalscriptjumps" radio_style="false" width="270"
+        control_name="AscentDisplayTotalScriptJumps"
+        tool_tip="Displays script count changes in your region, dependant on the threshold you choose to the right."/>
+      <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16" increment="1"
+        label="" label_width="0" digits="4" left_delta="210" max_val="9999"
+        min_val="1" mouse_opaque="true" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff"
+        tool_tip="Threshold for the script jump message [Default: 100]"/>
+    </panel>
+
+    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
+      follows="left|top|right|bottom" label="Building" name="Building">
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom_delta="-19" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
+        h_pad="0" halign="left" height="10" left_delta="30" mouse_opaque="false"
+        name="text_box6" v_pad="0" width="150">
+Pivot Point
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-          font="SansSerifSmall" height="20" left_delta="5" max_length="500" mouse_opaque="true" name="Keywords_Entries" width="300" />
-      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left_delta="15" name="EmKeyw"
-          width="100">Is found within:</text>
-      <check_box bottom_delta="3" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-          label="Local Chat Floater" left_delta="100" mouse_opaque="true" name="Keywords_LocalChat" radio_style="false" width="270"/>
-      <check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-          label="Instant Message Floater" left_delta="0" mouse_opaque="true" name="Keywords_IM" radio_style="false" width="270"/>
-      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-          label="Highlight the message in this color:" left_delta="-110" mouse_opaque="true" name="Keywords_Highlight"
-          radio_style="false" width="270"/>
-      <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-16" can_apply_immediately="true"
-          color="1, 1, 1, 1" follows="left|top" height="35" label="" left_delta="210"
-          mouse_opaque="true" name="Keywords_Color" tool_tip="Click to open Color Picker" width="50"/>
-      <check_box bottom_delta="-10" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-          label="Play this sound alert: (UUID)" left_delta="-210" mouse_opaque="true" name="Keywords_PlaySound"
-          radio_style="false" width="270"/>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-          font="SansSerifSmall" height="20" left_delta="-5" max_length="36" mouse_opaque="true" name="Keywords_SoundUUID" width="300" />
+      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
+        label="X pos" label_width="40" left="10" mouse_opaque="true" max_val="256"
+        min_val="-256" name="X pos" width="120" control_name="AscentBuildPrefs_PivotX"/>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
+        label="Y pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
+        min_val="-256" name="Y pos" width="120" control_name="AscentBuildPrefs_PivotY"/>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
+        label="Z pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
+        min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        label="Values are percent" left_delta="-5" mouse_opaque="true"
+        tool_tip="Default settings are Percentages and every axis set at 50"
+        name="EmPivotPercToggle" radio_style="false" width="100" control_name="AscentBuildPrefs_PivotIsPercent"/>
+      <check_box bottom_delta="60" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="true" label="Enable highlighting of selected prims" left_delta="140"
+        mouse_opaque="true" name="EmBuildPrefsRenderHighlight_toggle" control_name="AscentRenderHighlightSelections"
+        radio_style="false" width="270"/>
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Show axis arrow on root prim position" left_delta="0"
+        mouse_opaque="true" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead."
+        name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"
+        radio_style="false" width="270"/>
     </panel>
 
   </tab_container>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
index 3e441be8d..496845b2a 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel top="20" left="10" height="400" width="512" follows="left|top|right|bottom"
-	border="true" label="Vanity Settings" name="ascvan" enabled="true" mouse_opaque="true">
-	<tab_container label="Singularity" bottom="0" height="440" width="497" left="0"
+	border="true" label="SG Vanity" name="ascvan" enabled="true" mouse_opaque="true">
+	<tab_container label="SG Vanity" bottom="0" height="440" width="497" left="0"
 		name="Ascent Vanity" tab_min_width="90" tab_position="top">
 		<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
 				follows="left|top|right|bottom" label="General" name="General">

From c3a38c17049c318916db0c704122d0ae7d8fddd8 Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Tue, 17 May 2011 12:58:05 -0400
Subject: [PATCH 07/22] Settings names unbotch.

---
 indra/newview/ascentprefschat.cpp                |  4 ++--
 indra/newview/ascentprefssys.cpp                 |  4 ++--
 indra/newview/llhudeffectlookat.cpp              |  4 ++--
 indra/newview/llimpanel.cpp                      |  2 +-
 indra/newview/llviewermenu.cpp                   | 16 ++++++++--------
 .../xui/en-us/panel_preferences_ascent_chat.xml  |  2 +-
 .../en-us/panel_preferences_ascent_system.xml    |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp
index 58502b83f..cdc07611a 100644
--- a/indra/newview/ascentprefschat.cpp
+++ b/indra/newview/ascentprefschat.cpp
@@ -130,7 +130,7 @@ void LLPrefsAscentChat::refreshValues()
     //Chat/IM -----------------------------------------------------------------------------
     mWoLfVerticalIMTabs             = gSavedSettings.getBOOL("WoLfVerticalIMTabs");
     mIMAnnounceIncoming             = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming");
-	mHideTypingNotification         = gSavedSettings.getBOOL("HideTypingNotification");
+	mHideTypingNotification         = gSavedSettings.getBOOL("AscentHideTypingNotification");
     mShowGroupNameInChatIM          = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM");
 	mPlayTypingSound                = gSavedSettings.getBOOL("PlayTypingSound");
     mHideNotificationsInChat        = gSavedSettings.getBOOL("HideNotificationsInChat");
@@ -304,7 +304,7 @@ void LLPrefsAscentChat::cancel()
     //Chat/IM -----------------------------------------------------------------------------
     gSavedSettings.setBOOL("WoLfVerticalIMTabs",                   mWoLfVerticalIMTabs);
     gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming);
-	gSavedSettings.setBOOL("HideTypingNotification",               mHideTypingNotification);
+	gSavedSettings.setBOOL("AscentHideTypingNotification",         mHideTypingNotification);
     gSavedSettings.setBOOL("OptionShowGroupNameInChatIM",          mShowGroupNameInChatIM);
 	gSavedSettings.setBOOL("PlayTypingSound",                      mPlayTypingSound);
     gSavedSettings.setBOOL("HideNotificationsInChat",              mHideNotificationsInChat);
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index 9ddb1d6e0..726508558 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -136,7 +136,7 @@ void LLPrefsAscentSys::refreshValues()
     mBroadcastViewerEffects		= gSavedSettings.getBOOL("BroadcastViewerEffects");
     mDisablePointAtAndBeam		= gSavedSettings.getBOOL("DisablePointAtAndBeam");
     mPrivateLookAt				= gSavedSettings.getBOOL("PrivateLookAt");
-    mShowLookAt					= gSavedSettings.getBOOL("ShowLookAt");
+    mShowLookAt					= gSavedSettings.getBOOL("AscentShowLookAt");
     mRevokePermsOnStandUp		= gSavedSettings.getBOOL("RevokePermsOnStandUp");
     mDisableClickSit			= gSavedSettings.getBOOL("DisableClickSit");
     mDisplayScriptJumps			= gSavedSettings.getBOOL("AscentDisplayTotalScriptJumps");
@@ -195,7 +195,7 @@ void LLPrefsAscentSys::cancel()
     gSavedSettings.setBOOL("BroadcastViewerEffects",        mBroadcastViewerEffects);
     gSavedSettings.setBOOL("DisablePointAtAndBeam",         mDisablePointAtAndBeam);
     gSavedSettings.setBOOL("PrivateLookAt",                 mPrivateLookAt);
-    gSavedSettings.setBOOL("ShowLookAt",                    mShowLookAt);
+    gSavedSettings.setBOOL("AscentShowLookAt",              mShowLookAt);
     gSavedSettings.setBOOL("RevokePermsOnStandUp",          mRevokePermsOnStandUp);
     gSavedSettings.setBOOL("DisableClickSit",               mDisableClickSit);
     gSavedSettings.setBOOL("AscentDisplayTotalScriptJumps", mDisplayScriptJumps);
diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
index 9be53c026..82adf1bca 100644
--- a/indra/newview/llhudeffectlookat.cpp
+++ b/indra/newview/llhudeffectlookat.cpp
@@ -503,7 +503,7 @@ void LLHUDEffectLookAt::setSourceObject(LLViewerObject* objectp)
 void LLHUDEffectLookAt::render()
 {
 	static const LLCachedControl<bool> private_look_at("PrivateLookAt",false);
-	static const LLCachedControl<bool> show_look_at("ShowLookAt",false);
+	static const LLCachedControl<bool> show_look_at("AscentShowLookAt", false);
 
     if (private_look_at && (gAgent.getAvatarObject() == ((LLVOAvatar*)(LLViewerObject*)mSourceObject)))
         return;
@@ -569,7 +569,7 @@ void LLHUDEffectLookAt::render()
 //-----------------------------------------------------------------------------
 void LLHUDEffectLookAt::update()
 {
-	static const LLCachedControl<bool> show_look_at("ShowLookAt",false);
+	static const LLCachedControl<bool> show_look_at("AscentShowLookAt", false);
 
     // If the target object is dead, set the target object to NULL
 	if (!mTargetObject.isNull() && mTargetObject->isDead())
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index e2c4bb676..cef6f9daa 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -2388,7 +2388,7 @@ void LLFloaterIMPanel::setTyping(BOOL typing)
 
 void LLFloaterIMPanel::sendTypingState(BOOL typing)
 {
-	if(gSavedSettings.getBOOL("HideTypingNotification"))
+	if(gSavedSettings.getBOOL("AscentHideTypingNotification"))
 		return;
 	// Don't want to send typing indicators to multiple people, potentially too
 	// much network traffic.  Only send in person-to-person IMs.
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index e02982f23..1ca128d19 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1598,7 +1598,7 @@ void init_debug_avatar_menu(LLMenuGL* menu)
 	menu->append(new LLMenuItemCallGL("Slow Motion Animations", &slow_mo_animations, NULL));
 
 	LLMenuItemCheckGL* item;
-	item = new LLMenuItemCheckGL("Show Look At", menu_toggle_control, NULL, menu_check_control, (void*)"ShowLookAt");
+	item = new LLMenuItemCheckGL("Show Look At", menu_toggle_control, NULL, menu_check_control, (void*)"AscentShowLookAt");
 	menu->append(item);
 
 	menu->append(new LLMenuItemToggleGL("Show Point At", &LLHUDEffectPointAt::sDebugPointAt));
@@ -3736,19 +3736,19 @@ void handle_fake_away_status(void*)
 
 void handle_hide_typing_notification(void*)
 {
-	if (!gSavedSettings.controlExists("HideTypingNotification")) 
-		gSavedSettings.declareBOOL("HideTypingNotification", FALSE, "Hide your 'Name is typing...' message when Instant Messaging.");
+	if (!gSavedSettings.controlExists("AscentHideTypingNotification")) 
+		gSavedSettings.declareBOOL("AscentHideTypingNotification", FALSE, "Hide your 'Name is typing...' message when Instant Messaging.");
 
-	BOOL hide = gSavedSettings.getBOOL("HideTypingNotification");
+	BOOL hide = gSavedSettings.getBOOL("AscentHideTypingNotification");
 	if (hide)
 	{
-		gSavedSettings.declareBOOL("HideTypingNotification", FALSE, "Hide your 'Name is typing...' message when Instant Messaging.");
-		gSavedSettings.setBOOL("HideTypingNotification", FALSE);
+		gSavedSettings.declareBOOL("AscentHideTypingNotification", FALSE, "Hide your 'Name is typing...' message when Instant Messaging.");
+		gSavedSettings.setBOOL("AscentHideTypingNotification", FALSE);
 	}
 	else
 	{
-		gSavedSettings.declareBOOL("HideTypingNotification", TRUE, "Hide your 'Name is typing...' message when Instant Messaging.");
-		gSavedSettings.setBOOL("HideTypingNotification", TRUE);
+		gSavedSettings.declareBOOL("AscentHideTypingNotification", TRUE, "Hide your 'Name is typing...' message when Instant Messaging.");
+		gSavedSettings.setBOOL("AscentHideTypingNotification", TRUE);
 	}
 
 	LLChat chat;
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index 0b0fc9196..f75a79267 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -23,7 +23,7 @@ IMs:
         control_name="AscentInstantMessageAnnounceIncoming" radio_style="false" width="270"
         name="quickstart_im_check"
         tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter. "/>
-      <check_box bottom_delta="-20" control_name="HideTypingNotification" enabled="true"
+      <check_box bottom_delta="-20" control_name="AscentHideTypingNotification" enabled="true"
         follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         label="Don't send '[name] is typing...' in IMs" left="10"
         tool_tip="IM partners will not see '______ is typing...' when you're responding."
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index 970ffb5f4..4ec36f23e 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -261,7 +261,7 @@ Teleport to avatar (usage: cmd name)
         tool_tip="Turns off broadcasting headturns and lookat beacons for yourself."
         mouse_opaque="true" name="private_look_at_check" radio_style="false"
         width="400" />
-      <check_box bottom_delta="-20" control_name="ShowLookAt" enabled="true"
+      <check_box bottom_delta="-20" control_name="AscentShowLookAt" enabled="true"
         follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         label="Show others' LookAt beacons" left="10"
         tool_tip="Shows you where others are looking."

From 3dff6922c27d887530d1ad92b3237ba75e4d3270 Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Tue, 17 May 2011 13:07:32 -0400
Subject: [PATCH 08/22] Added missing settings*.xml files to CMakeLists.txt.

---
 indra/newview/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4ee02c06e..aab0ae410 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1229,9 +1229,13 @@ set(viewer_APPSETTINGS_FILES
     app_settings/low_graphics.xml
     app_settings/mid_graphics.xml
     app_settings/settings.xml
+    app_settings/settings_ascent.xml
+    app_settings/settings_ascent_coa.xml
     app_settings/settings_crash_behavior.xml
     app_settings/settings_files.xml
     app_settings/settings_per_account.xml
+    app_settings/settings_sh.xml
+    app_settings/settings_rlv.xml
     app_settings/std_bump.ini
     app_settings/trees.xml
     app_settings/ultra_graphics.xml

From 139a3d35bbdfe6527b8ecd6eeb9618ab8ca6132c Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Thu, 26 May 2011 00:20:45 -0400
Subject: [PATCH 09/22] Further updates to preferences for bug fixes and user
 friendliness.

---
 .../newview/app_settings/settings_ascent.xml  | 147 +------
 indra/newview/ascentprefschat.cpp             | 135 ++++---
 indra/newview/ascentprefschat.h               |   3 +-
 indra/newview/ascentprefssys.cpp              | 185 +++++++--
 indra/newview/ascentprefssys.h                |  90 +++--
 indra/newview/ascentprefsvan.cpp              | 369 +++++++++---------
 indra/newview/ascentprefsvan.h                |  53 ++-
 indra/newview/llfloaterpreference.cpp         |   4 +-
 indra/newview/llviewermessage.cpp             |   4 +-
 .../en-us/panel_preferences_ascent_chat.xml   |  20 +-
 .../en-us/panel_preferences_ascent_system.xml |  41 +-
 .../en-us/panel_preferences_ascent_vanity.xml |  74 ++--
 12 files changed, 580 insertions(+), 545 deletions(-)

diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml
index 86811ae6d..14fa6475f 100644
--- a/indra/newview/app_settings/settings_ascent.xml
+++ b/indra/newview/app_settings/settings_ascent.xml
@@ -130,7 +130,7 @@
 			<key>Comment</key>
 			<string>Keep those jerks guessing by hiding your "____ is typing..." message.</string>
 			<key>Persist</key>
-			<integer>0</integer>
+			<integer>1</integer>
 			<key>Type</key>
 			<string>Boolean</string>
 			<key>Value</key>
@@ -620,150 +620,5 @@
 			<key>Value</key>
 			<string>tp2</string>
 		</map>
-    <key>AscentInstantMessageAnnounceIncoming</key>
-    <map>
-      <key>Comment</key>
-      <string>Start IM window as soon as the person starts typing</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>AscentShowLookAt</key>
-    <map>
-      <key>Comment</key>
-      <string>Show Others' Lookat points</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <real>0</real>
-    </map>
-    <key>AscentUseStatusColors</key>
-    <map>
-      <key>Comment</key>
-      <string>Show special colors for statuses like Friend, Linden, so on</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <real>0</real>
-    </map>
-    <key>AscentAvatarXModifier</key>
-    <map>
-      <key>Comment</key>
-      <string>Avatar position modifier (X)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>0.0</real>
-    </map>
-    <key>AscentAvatarYModifier</key>
-    <map>
-      <key>Comment</key>
-      <string>Avatar position modifier (Y)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>0.0</real>
-    </map>
-    <key>AscentAvatarZModifier</key>
-    <map>
-      <key>Comment</key>
-      <string>Avatar position modifier (Z)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>0.0</real>
-    </map>
-    <key>AscentUseSystemFolder</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables the System folder for setting and non-permanent asset storage.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>AscentSystemTemporary</key>
-    <map>
-      <key>Comment</key>
-      <string>When enabled, temporary uploads are put in the System Asset folder (if System Folder exists).</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>AscentShowFriendsTag</key>
-    <map>
-      <key>Comment</key>
-      <string>Show friends client tags as (Friend), and colorize them specially.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>AscentUseTag</key>
-    <map>
-      <key>Comment</key>
-      <string>Broadcast client tag</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>AscentShowIdleTime</key>
-    <map>
-      <key>Comment</key>
-      <string>Show client tags for others.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>AscentShowOthersTag</key>
-    <map>
-      <key>Comment</key>
-      <string>Show client tags for others.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>AscentShowOthersTagColor</key>
-    <map>
-      <key>Comment</key>
-      <string>Show avatar names in the color of their client.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-	</map>
-
-
     </map>
 </llsd>
diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp
index cdc07611a..05e53ce02 100644
--- a/indra/newview/ascentprefschat.cpp
+++ b/indra/newview/ascentprefschat.cpp
@@ -53,7 +53,23 @@ LLPrefsAscentChat::LLPrefsAscentChat()
     childSetAction("EmSpell_Add", onSpellAdd, this);
     childSetAction("EmSpell_Remove", onSpellRemove, this);
 
-    childSetCommitCallback("Keywords_Alert", onCommitCheckBox, this);
+    childSetCommitCallback("AscentInstantMessageResponseAnyone", onCommitAutoResponse, this);
+	childSetCommitCallback("AscentInstantMessageResponseFriends", onCommitAutoResponse, this);
+	childSetCommitCallback("AscentInstantMessageResponseMuted", onCommitAutoResponse, this);
+    childSetCommitCallback("AscentInstantMessageShowOnTyping", onCommitAutoResponse, this);
+	childSetCommitCallback("AscentInstantMessageShowResponded", onCommitAutoResponse, this);
+	childSetCommitCallback("AscentInstantMessageResponseRepeat", onCommitAutoResponse, this);
+	childSetCommitCallback("AscentInstantMessageResponseItem", onCommitAutoResponse, this);
+	childSetCommitCallback("im_response", onCommitAutoResponse, this);
+
+    childSetCommitCallback("KeywordsOn", onCommitKeywords, this);
+	childSetCommitCallback("KeywordsList", onCommitKeywords, this);
+	childSetCommitCallback("KeywordsSound", onCommitKeywords, this);
+    childSetCommitCallback("KeywordsInChat", onCommitKeywords, this);
+	childSetCommitCallback("KeywordsInIM", onCommitKeywords, this);
+	childSetCommitCallback("KeywordsChangeColor", onCommitKeywords, this);
+	childSetCommitCallback("KeywordsColor", onCommitKeywords, this);
+	childSetCommitCallback("KeywordsPlaySound", onCommitKeywords, this);
 
     refreshValues();
     refresh();
@@ -64,23 +80,6 @@ LLPrefsAscentChat::~LLPrefsAscentChat()
 }
 
 //static
-void LLPrefsAscentChat::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
-{
-    LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;	
-
-    if (ctrl->getName() == "Keywords_Alert")
-    {
-        bool enabled = self->childGetValue("Keywords_Alert").asBoolean();
-        self->childSetEnabled("Keywords_Entries", enabled);
-        self->childSetEnabled("Keywords_LocalChat", enabled);
-        self->childSetEnabled("Keywords_IM", enabled);
-        self->childSetEnabled("Keywords_Highlight", enabled);
-        self->childSetEnabled("Keywords_Color", enabled);
-        self->childSetEnabled("Keywords_PlaySound", enabled);
-        self->childSetEnabled("Keywords_SoundUUID", enabled);
-    }
-}
-
 void LLPrefsAscentChat::onSpellAdd(void* data)
 {
     LLPrefsAscentChat* self = (LLPrefsAscentChat*)data;
@@ -93,6 +92,7 @@ void LLPrefsAscentChat::onSpellAdd(void* data)
     self->refresh();
 }
 
+//static
 void LLPrefsAscentChat::onSpellRemove(void* data)
 {
     LLPrefsAscentChat* self = (LLPrefsAscentChat*)data;
@@ -105,16 +105,19 @@ void LLPrefsAscentChat::onSpellRemove(void* data)
     self->refresh();
 }
 
+//static
 void LLPrefsAscentChat::onSpellGetMore(void* data)
 {
     glggHunSpell->getMoreButton(data);
 }
 
+//static
 void LLPrefsAscentChat::onSpellEditCustom(void* data)
 {
     glggHunSpell->editCustomButton();
 }
 
+//static
 void LLPrefsAscentChat::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
 {
     LLComboBox* box = (LLComboBox*)ctrl;
@@ -125,6 +128,49 @@ void LLPrefsAscentChat::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata
     }
 }
 
+//static
+void LLPrefsAscentChat::onCommitAutoResponse(LLUICtrl* ctrl, void* user_data)
+{
+    LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;	
+
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone",  self->childGetValue("AscentInstantMessageResponseAnyone"));
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", self->childGetValue("AscentInstantMessageResponseFriends"));
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted",   self->childGetValue("AscentInstantMessageResponseMuted"));
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping",    self->childGetValue("AscentInstantMessageShowOnTyping"));
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded",   self->childGetValue("AscentInstantMessageShowResponded"));
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat",  self->childGetValue("AscentInstantMessageResponseRepeat"));
+    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem",    self->childGetValue("AscentInstantMessageResponseItem"));
+    gSavedPerAccountSettings.setString("AscentInstantMessageResponse",      self->childGetValue("im_response"));
+}
+
+//static
+void LLPrefsAscentChat::onCommitKeywords(LLUICtrl* ctrl, void* user_data)
+{
+    LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;	
+
+    if (ctrl->getName() == "KeywordsOn")
+    {
+        bool enabled = self->childGetValue("KeywordsOn").asBoolean();
+        self->childSetEnabled("KeywordsList",        enabled);
+        self->childSetEnabled("KeywordsInChat",      enabled);
+        self->childSetEnabled("KeywordsInIM",        enabled);
+        self->childSetEnabled("KeywordsChangeColor", enabled);
+        self->childSetEnabled("KeywordsColor",       enabled);
+        self->childSetEnabled("KeywordsPlaySound",   enabled);
+        self->childSetEnabled("KeywordsSound",       enabled);
+    }
+
+    gSavedPerAccountSettings.setBOOL("KeywordsOn",          self->childGetValue("KeywordsOn"));
+    gSavedPerAccountSettings.setString("KeywordsList",      self->childGetValue("KeywordsList"));
+    gSavedPerAccountSettings.setBOOL("KeywordsInChat",      self->childGetValue("KeywordsInChat"));
+    gSavedPerAccountSettings.setBOOL("KeywordsInIM",        self->childGetValue("KeywordsInIM"));
+    gSavedPerAccountSettings.setBOOL("KeywordsChangeColor", self->childGetValue("KeywordsChangeColor"));
+    gSavedPerAccountSettings.setColor4("KeywordsColor",     self->childGetValue("KeywordsColor"));
+    gSavedPerAccountSettings.setBOOL("KeywordsPlaySound",   self->childGetValue("KeywordsPlaySound"));
+    gSavedPerAccountSettings.setString("KeywordsSound",     self->childGetValue("KeywordsSound"));
+}
+
+// Store current settings for cancel
 void LLPrefsAscentChat::refreshValues()
 {
     //Chat/IM -----------------------------------------------------------------------------
@@ -193,6 +239,7 @@ void LLPrefsAscentChat::refreshValues()
     mKeywordsSound                  = static_cast<LLUUID>(gSavedPerAccountSettings.getString("KeywordsSound"));
 }
 
+// Update controls based on current settings
 void LLPrefsAscentChat::refresh()
 {
     //Chat --------------------------------------------------------------------------------
@@ -277,28 +324,28 @@ void LLPrefsAscentChat::refresh()
         combo->setSimple(std::string(""));
     }
 
-    bool enabled = childGetValue("Keywords_Alert").asBoolean();
-    childSetEnabled("Keywords_Entries",   enabled);
-    childSetEnabled("Keywords_LocalChat", enabled);
-    childSetEnabled("Keywords_IM",        enabled);
-    childSetEnabled("Keywords_Highlight", enabled);
-    childSetEnabled("Keywords_Color",     enabled);
-    childSetEnabled("Keywords_PlaySound", enabled);
-    childSetEnabled("Keywords_SoundUUID", enabled);
+    childSetEnabled("KeywordsList",        mKeywordsOn);
+    childSetEnabled("KeywordsInChat",      mKeywordsOn);
+    childSetEnabled("KeywordsInIM",        mKeywordsOn);
+    childSetEnabled("KeywordsChangeColor", mKeywordsOn);
+    childSetEnabled("KeywordsColor",       mKeywordsOn);
+    childSetEnabled("KeywordsPlaySound",   mKeywordsOn);
+    childSetEnabled("KeywordsSound",       mKeywordsOn);
 
-    childSetValue("Keywords_Alert",     mKeywordsOn);
-    childSetValue("Keywords_Entries",   mKeywordsList);
-    childSetValue("Keywords_LocalChat", mKeywordsInChat);
-    childSetValue("Keywords_IM",        mKeywordsInIM);
-    childSetValue("Keywords_Highlight", mKeywordsChangeColor);
+    childSetValue("KeywordsOn",          mKeywordsOn);
+    childSetValue("KeywordsList",        mKeywordsList);
+    childSetValue("KeywordsInChat",      mKeywordsInChat);
+    childSetValue("KeywordsInIM",        mKeywordsInIM);
+    childSetValue("KeywordsChangeColor", mKeywordsChangeColor);
 
-    LLColorSwatchCtrl* colorctrl = getChild<LLColorSwatchCtrl>("Keywords_Color");
+    LLColorSwatchCtrl* colorctrl = getChild<LLColorSwatchCtrl>("KeywordsColor");
     colorctrl->set(LLColor4(mKeywordsColor),TRUE);
 
-    childSetValue("Keywords_PlaySound", mKeywordsPlaySound);
-    childSetValue("Keywords_SoundUUID", mKeywordsSound);
+    childSetValue("KeywordsPlaySound",   mKeywordsPlaySound);
+    childSetValue("KeywordsSound",       mKeywordsSound);
 }
 
+// Reset settings to local copy
 void LLPrefsAscentChat::cancel()
 {
     //Chat/IM -----------------------------------------------------------------------------
@@ -383,6 +430,7 @@ void LLPrefsAscentChat::cancel()
     gSavedPerAccountSettings.setString("KeywordsSound",     mKeywordsSound.asString());
 }
 
+// Update local copy so cancel has no effect
 void LLPrefsAscentChat::apply()
 {
     //Chat/IM -----------------------------------------------------------------------------
@@ -438,25 +486,6 @@ void LLPrefsAscentChat::apply()
     gSavedSettings.setString("LongTimeFormat",  long_time);
     gSavedSettings.setString("TimestampFormat", timestamp);
 
-    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone",  mIMResponseAnyone);
-    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", mIMResponseFriends);
-    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted",   mIMResponseMuted);
-    gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping",    mIMShowOnTyping);
-    gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded",   mIMShowResponded);
-    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat",  mIMResponseRepeat);
-    gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem",    mIMResponseItem);
-    gSavedPerAccountSettings.setString("AscentInstantMessageResponse",      mIMResponseText);
-
-    //Text Options ------------------------------------------------------------------------
-    gSavedPerAccountSettings.setBOOL("KeywordsOn",          mKeywordsOn);
-    gSavedPerAccountSettings.setString("KeywordsList",      mKeywordsList);
-    gSavedPerAccountSettings.setBOOL("KeywordsInChat",      mKeywordsInChat);
-    gSavedPerAccountSettings.setBOOL("KeywordsInIM",        mKeywordsInIM);
-    gSavedPerAccountSettings.setBOOL("KeywordsChangeColor", mKeywordsChangeColor);
-    gSavedPerAccountSettings.setColor4("KeywordsColor",     mKeywordsColor);
-    gSavedPerAccountSettings.setBOOL("KeywordsPlaySound",   mKeywordsPlaySound);
-    gSavedPerAccountSettings.setString("KeywordsSound",     mKeywordsSound.asString());
-
     refreshValues();
     refresh();
 }
diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h
index ddf26b7b9..8b7b1f436 100644
--- a/indra/newview/ascentprefschat.h
+++ b/indra/newview/ascentprefschat.h
@@ -48,12 +48,13 @@ public:
 	void refreshValues();
 
 protected:
-	static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
     static void onSpellAdd(void* data);
     static void onSpellRemove(void* data);
     static void onSpellGetMore(void* data);
     static void onSpellEditCustom(void* data);
     static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
+	static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data);
+	static void onCommitKeywords(LLUICtrl* ctrl, void* user_data);
 
     //Chat/IM -----------------------------------------------------------------------------
     BOOL mWoLfVerticalIMTabs;
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index 726508558..7aa94bed5 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -54,6 +54,23 @@ LLPrefsAscentSys::LLPrefsAscentSys()
     childSetCommitCallback("system_folder_check", onCommitCheckBox, this);
     childSetCommitCallback("show_look_at_check", onCommitCheckBox, this);
     childSetCommitCallback("enable_clouds", onCommitCheckBox, this);
+    childSetCommitCallback("power_user_check", onCommitCheckBox, this);
+    childSetCommitCallback("power_user_confirm_check", onCommitCheckBox, this);
+
+    childSetCommitCallback("chat_cmd_toggle", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLinePos", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLineGround", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLineHeight", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLineTeleportHome", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLineRezPlatform", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLineCalc", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLineClearChat", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLineDrawDistance", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdTeleportToCam", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLineKeyToName", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLineOfferTp", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLineMapTo", onCommitCmdLine, this);
+    childSetCommitCallback("AscentCmdLineTP2", onCommitCmdLine, this);
 
     refreshValues();
     refresh();
@@ -68,7 +85,7 @@ void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
 {
     LLPrefsAscentSys* self = (LLPrefsAscentSys*)user_data;	
     
-    llinfos << "Change to " << ctrl->getControlName()  << " aka " << ctrl->getName() << llendl;
+//    llinfos << "Change to " << ctrl->getControlName()  << " aka " << ctrl->getName() << llendl;
     
     if (ctrl->getName() == "speed_rez_check")   // Why is this one getControlName() and the rest are getName()?
     {
@@ -92,6 +109,81 @@ void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
         bool enabled = self->childGetValue("enable_clouds").asBoolean();
         self->childSetEnabled("enable_classic_clouds", enabled);
     }
+    else if (ctrl->getName() == "power_user_check")
+    {
+        bool enabled = self->childGetValue("power_user_check").asBoolean();
+        self->childSetEnabled("power_user_confirm_check", enabled);
+        self->childSetValue("power_user_confirm_check", false);
+    }
+    else if (ctrl->getName() == "power_user_confirm_check")
+    {
+        bool enabled = self->childGetValue("power_user_confirm_check").asBoolean();
+
+        gSavedSettings.setBOOL("AscentPowerfulWizard", enabled);
+
+        if (enabled)
+        {
+            LLVector3d lpos_global = gAgent.getPositionGlobal();
+            gAudiop->triggerSound(LLUUID("58a38e89-44c6-c52b-deb8-9f1ddc527319"), gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
+            LLChat chat;
+            chat.mSourceType = CHAT_SOURCE_SYSTEM;
+            chat.mText = llformat("You are bestowed with powers beyond mortal comprehension.\nUse your newfound abilities wisely.\nUnlocked:\n- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.\n- Right click > Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.\n- Right Click > Explode objects - Turns an object physical, temporary, and delinks it.");
+            LLFloaterChat::addChat(chat);
+        }
+    }
+}
+
+//static
+void LLPrefsAscentSys::onCommitCmdLine(LLUICtrl* ctrl, void* user_data)
+{
+    LLPrefsAscentSys* self = (LLPrefsAscentSys*)user_data;
+
+    if (ctrl->getName() == "chat_cmd_toggle")
+    {
+        bool enabled = self->childGetValue("chat_cmd_toggle").asBoolean();
+        self->childSetEnabled("cmd_line_text_2",           enabled);
+        self->childSetEnabled("cmd_line_text_3",           enabled);
+        self->childSetEnabled("cmd_line_text_4",           enabled);
+        self->childSetEnabled("cmd_line_text_5",           enabled);
+        self->childSetEnabled("cmd_line_text_6",           enabled);
+        self->childSetEnabled("cmd_line_text_7",           enabled);
+        self->childSetEnabled("cmd_line_text_8",           enabled);
+        self->childSetEnabled("cmd_line_text_9",           enabled);
+        self->childSetEnabled("cmd_line_text_10",          enabled);
+        self->childSetEnabled("cmd_line_text_11",          enabled);
+        self->childSetEnabled("cmd_line_text_12",          enabled);
+        self->childSetEnabled("cmd_line_text_13",          enabled);
+        self->childSetEnabled("cmd_line_text_15",          enabled);
+        self->childSetEnabled("AscentCmdLinePos",          enabled);
+        self->childSetEnabled("AscentCmdLineGround",       enabled);
+        self->childSetEnabled("AscentCmdLineHeight",       enabled);
+        self->childSetEnabled("AscentCmdLineTeleportHome", enabled);
+        self->childSetEnabled("AscentCmdLineRezPlatform",  enabled);
+        self->childSetEnabled("AscentPlatformSize",        enabled);
+        self->childSetEnabled("AscentCmdLineCalc",         enabled);
+        self->childSetEnabled("AscentCmdLineClearChat",    enabled);
+        self->childSetEnabled("AscentCmdLineDrawDistance", enabled);
+        self->childSetEnabled("AscentCmdTeleportToCam",    enabled);
+        self->childSetEnabled("AscentCmdLineKeyToName",    enabled);
+        self->childSetEnabled("AscentCmdLineOfferTp",      enabled);
+        self->childSetEnabled("AscentCmdLineMapTo",        enabled);
+        self->childSetEnabled("map_to_keep_pos",           enabled);
+        self->childSetEnabled("AscentCmdLineTP2",          enabled);
+    }
+
+    gSavedSettings.setString("AscentCmdLinePos",          self->childGetValue("AscentCmdLinePos"));
+    gSavedSettings.setString("AscentCmdLineGround",       self->childGetValue("AscentCmdLineGround"));
+    gSavedSettings.setString("AscentCmdLineHeight",       self->childGetValue("AscentCmdLineHeight"));
+    gSavedSettings.setString("AscentCmdLineTeleportHome", self->childGetValue("AscentCmdLineTeleportHome"));
+    gSavedSettings.setString("AscentCmdLineRezPlatform",  self->childGetValue("AscentCmdLineRezPlatform"));
+    gSavedSettings.setString("AscentCmdLineCalc",         self->childGetValue("AscentCmdLineCalc"));
+    gSavedSettings.setString("AscentCmdLineClearChat",    self->childGetValue("AscentCmdLineClearChat"));
+    gSavedSettings.setString("AscentCmdLineDrawDistance", self->childGetValue("AscentCmdLineDrawDistance"));
+    gSavedSettings.setString("AscentCmdTeleportToCam",    self->childGetValue("AscentCmdTeleportToCam"));
+    gSavedSettings.setString("AscentCmdLineKeyToName",    self->childGetValue("AscentCmdLineKeyToName"));
+    gSavedSettings.setString("AscentCmdLineOfferTp",      self->childGetValue("AscentCmdLineOfferTp"));
+    gSavedSettings.setString("AscentCmdLineMapTo",        self->childGetValue("AscentCmdLineMapTo"));
+    gSavedSettings.setString("AscentCmdLineTP2",          self->childGetValue("AscentCmdLineTP2"));
 }
 
 void LLPrefsAscentSys::refreshValues()
@@ -101,7 +193,7 @@ void LLPrefsAscentSys::refreshValues()
         mResetCameraAfterTP		= gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
         mOffsetTPByUserHeight	= gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
     mPreviewAnimInWorld			= gSavedSettings.getBOOL("PreviewAnimInWorld");
-    mSaveScriptsAsMono			= gSavedSettings.getBOOL("SaveScriptsAsMono");
+//    mSaveScriptsAsMono			= gSavedSettings.getBOOL("SaveScriptsAsMono");
     mAlwaysRezInGroup			= gSavedSettings.getBOOL("AscentAlwaysRezInGroup");
     mBuildAlwaysEnabled			= gSavedSettings.getBOOL("AscentBuildAlwaysEnabled");
     mAlwaysShowFly				= gSavedSettings.getBOOL("AscentFlyAlwaysEnabled");
@@ -117,12 +209,13 @@ void LLPrefsAscentSys::refreshValues()
         mSpeedRezInterval			= gSavedSettings.getU32("SpeedRezInterval");
 
     //Command Line ------------------------------------------------------------------------
-    mCmdLine                    = gSavedSettings.getBOOL("chat_cmd_toggle");
+    mCmdLine                    = gSavedSettings.getBOOL("AscentCmdLine");
     mCmdLinePos                 = gSavedSettings.getString("AscentCmdLinePos");
     mCmdLineGround              = gSavedSettings.getString("AscentCmdLineGround");
     mCmdLineHeight              = gSavedSettings.getString("AscentCmdLineHeight");
     mCmdLineTeleportHome        = gSavedSettings.getString("AscentCmdLineTeleportHome");
     mCmdLineRezPlatform         = gSavedSettings.getString("AscentCmdLineRezPlatform");
+    mCmdPlatformSize            = gSavedSettings.getF32("AscentPlatformSize");
     mCmdLineCalc                = gSavedSettings.getString("AscentCmdLineCalc");
     mCmdLineClearChat           = gSavedSettings.getString("AscentCmdLineClearChat");
     mCmdLineDrawDistance        = gSavedSettings.getString("AscentCmdLineDrawDistance");
@@ -130,6 +223,7 @@ void LLPrefsAscentSys::refreshValues()
     mCmdLineKeyToName           = gSavedSettings.getString("AscentCmdLineKeyToName");
     mCmdLineOfferTp             = gSavedSettings.getString("AscentCmdLineOfferTp");
     mCmdLineMapTo               = gSavedSettings.getString("AscentCmdLineMapTo");
+    mCmdMapToKeepPos            = gSavedSettings.getBOOL("AscentMapToKeepPos");
     mCmdLineTP2                 = gSavedSettings.getString("AscentCmdLineTP2");
 
     //Privacy -----------------------------------------------------------------------------
@@ -140,6 +234,7 @@ void LLPrefsAscentSys::refreshValues()
     mRevokePermsOnStandUp		= gSavedSettings.getBOOL("RevokePermsOnStandUp");
     mDisableClickSit			= gSavedSettings.getBOOL("DisableClickSit");
     mDisplayScriptJumps			= gSavedSettings.getBOOL("AscentDisplayTotalScriptJumps");
+    mNumScriptDiff              = gSavedSettings.getF32("Ascentnumscriptdiff");
 }
 
 void LLPrefsAscentSys::refresh()
@@ -149,8 +244,51 @@ void LLPrefsAscentSys::refresh()
     childSetValue("power_user_check",				mPowerUser);
     childSetValue("power_user_confirm_check",		mPowerUser);
     childSetEnabled("temp_in_system_check",			mUseSystemFolder);
-    childSetEnabled("speed_rez_interval", mSpeedRez);
-    childSetEnabled("speed_rez_seconds", mSpeedRez);
+    childSetEnabled("speed_rez_interval",           mSpeedRez);
+    childSetEnabled("speed_rez_seconds",            mSpeedRez);
+
+    childSetEnabled("cmd_line_text_2",            mCmdLine);
+    childSetEnabled("cmd_line_text_3",            mCmdLine);
+    childSetEnabled("cmd_line_text_4",            mCmdLine);
+    childSetEnabled("cmd_line_text_5",            mCmdLine);
+    childSetEnabled("cmd_line_text_6",            mCmdLine);
+    childSetEnabled("cmd_line_text_7",            mCmdLine);
+    childSetEnabled("cmd_line_text_8",            mCmdLine);
+    childSetEnabled("cmd_line_text_9",            mCmdLine);
+    childSetEnabled("cmd_line_text_10",           mCmdLine);
+    childSetEnabled("cmd_line_text_11",           mCmdLine);
+    childSetEnabled("cmd_line_text_12",           mCmdLine);
+    childSetEnabled("cmd_line_text_13",           mCmdLine);
+    childSetEnabled("cmd_line_text_15",           mCmdLine);
+    childSetEnabled("AscentCmdLinePos",           mCmdLine);
+    childSetEnabled("AscentCmdLineGround",        mCmdLine);
+    childSetEnabled("AscentCmdLineHeight",        mCmdLine);
+    childSetEnabled("AscentCmdLineTeleportHome",  mCmdLine);
+    childSetEnabled("AscentCmdLineRezPlatform",   mCmdLine);
+    childSetEnabled("AscentPlatformSize",         mCmdLine);
+    childSetEnabled("AscentCmdLineCalc",          mCmdLine);
+    childSetEnabled("AscentCmdLineClearChat",     mCmdLine);
+    childSetEnabled("AscentCmdLineDrawDistance",  mCmdLine);
+    childSetEnabled("AscentCmdTeleportToCam",     mCmdLine);
+    childSetEnabled("AscentCmdLineKeyToName",     mCmdLine);
+    childSetEnabled("AscentCmdLineOfferTp",       mCmdLine);
+    childSetEnabled("AscentCmdLineMapTo",         mCmdLine);
+    childSetEnabled("map_to_keep_pos",            mCmdLine);
+    childSetEnabled("AscentCmdLineTP2",           mCmdLine);
+
+    childSetValue("AscentCmdLinePos",           mCmdLinePos);
+    childSetValue("AscentCmdLineGround",        mCmdLineGround);
+    childSetValue("AscentCmdLineHeight",        mCmdLineHeight);
+    childSetValue("AscentCmdLineTeleportHome",  mCmdLineTeleportHome);
+    childSetValue("AscentCmdLineRezPlatform",   mCmdLineRezPlatform);
+    childSetValue("AscentCmdLineCalc",          mCmdLineCalc);
+    childSetValue("AscentCmdLineClearChat",     mCmdLineClearChat);
+    childSetValue("AscentCmdLineDrawDistance",  mCmdLineDrawDistance);
+    childSetValue("AscentCmdTeleportToCam",     mCmdTeleportToCam);
+    childSetValue("AscentCmdLineKeyToName",     mCmdLineKeyToName);
+    childSetValue("AscentCmdLineOfferTp",       mCmdLineOfferTp);
+    childSetValue("AscentCmdLineMapTo",         mCmdLineMapTo);
+    childSetValue("AscentCmdLineTP2",           mCmdLineTP2);
 }
 
 void LLPrefsAscentSys::cancel()
@@ -160,7 +298,7 @@ void LLPrefsAscentSys::cancel()
         gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP);
         gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight);
     gSavedSettings.setBOOL("PreviewAnimInWorld", mPreviewAnimInWorld);
-    gSavedSettings.setBOOL("SaveScriptsAsMono", mSaveScriptsAsMono);
+//    gSavedSettings.setBOOL("SaveScriptsAsMono", mSaveScriptsAsMono);
     gSavedSettings.setBOOL("AscentAlwaysRezInGroup", mAlwaysRezInGroup);
     gSavedSettings.setBOOL("AscentBuildAlwaysEnabled", mBuildAlwaysEnabled);
     gSavedSettings.setBOOL("AscentFlyAlwaysEnabled", mAlwaysShowFly);
@@ -176,12 +314,13 @@ void LLPrefsAscentSys::cancel()
         gSavedSettings.setU32("SpeedRezInterval", mSpeedRezInterval);
 
     //Command Line ------------------------------------------------------------------------
-    gSavedSettings.setBOOL("chat_cmd_toggle",               mCmdLine);
+    gSavedSettings.setBOOL("AscentCmdLine",                 mCmdLine);
     gSavedSettings.setString("AscentCmdLinePos",		    mCmdLinePos);
     gSavedSettings.setString("AscentCmdLineGround",		    mCmdLineGround);
     gSavedSettings.setString("AscentCmdLineHeight",		    mCmdLineHeight);
     gSavedSettings.setString("AscentCmdLineTeleportHome",	mCmdLineTeleportHome);
     gSavedSettings.setString("AscentCmdLineRezPlatform",	mCmdLineRezPlatform);
+    gSavedSettings.setF32("AscentPlatformSize",             mCmdPlatformSize);
     gSavedSettings.setString("AscentCmdLineCalc",		    mCmdLineCalc);
     gSavedSettings.setString("AscentCmdLineClearChat",	    mCmdLineClearChat);
     gSavedSettings.setString("AscentCmdLineDrawDistance",	mCmdLineDrawDistance);
@@ -189,6 +328,7 @@ void LLPrefsAscentSys::cancel()
     gSavedSettings.setString("AscentCmdLineKeyToName",		mCmdLineKeyToName);
     gSavedSettings.setString("AscentCmdLineOfferTp",		mCmdLineOfferTp);
     gSavedSettings.setString("AscentCmdLineMapTo",			mCmdLineMapTo);
+    gSavedSettings.setBOOL("AscentMapToKeepPos",            mCmdMapToKeepPos);
     gSavedSettings.setString("AscentCmdLineTP2",			mCmdLineTP2);
 
     //Privacy -----------------------------------------------------------------------------
@@ -199,40 +339,11 @@ void LLPrefsAscentSys::cancel()
     gSavedSettings.setBOOL("RevokePermsOnStandUp",          mRevokePermsOnStandUp);
     gSavedSettings.setBOOL("DisableClickSit",               mDisableClickSit);
     gSavedSettings.setBOOL("AscentDisplayTotalScriptJumps", mDisplayScriptJumps);
+    gSavedSettings.setF32("Ascentnumscriptdiff",            mNumScriptDiff);
 }
 
 void LLPrefsAscentSys::apply()
 {
-    std::string short_date, long_date, short_time, long_time, timestamp;
-    
-    //General ------------------------------------------------------------------------------
-    gSavedSettings.setBOOL("AscentPowerfulWizard", (childGetValue("power_user_check") && childGetValue("power_user_confirm_check")));
-
-    if (gSavedSettings.getBOOL("AscentPowerfulWizard") && !mPowerUser)
-    {
-        LLVector3d lpos_global = gAgent.getPositionGlobal();
-        gAudiop->triggerSound(LLUUID("58a38e89-44c6-c52b-deb8-9f1ddc527319"), gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
-        LLChat chat;
-        chat.mSourceType = CHAT_SOURCE_SYSTEM;
-        chat.mText = llformat("You are bestowed with powers beyond mortal comprehension.\nUse your newfound abilities wisely.\nUnlocked:\n- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.\n- Right click > Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.\n- Right Click > Explode objects - Turns an object physical, temporary, and delinks it.");
-        LLFloaterChat::addChat(chat);
-    }
-
-    //Commandline ----------------------------------------------------------------------------
-    gSavedSettings.setString("AscentCmdLinePos",		    childGetValue("AscentCmdLinePos"));
-    gSavedSettings.setString("AscentCmdLineGround",		    childGetValue("AscentCmdLineGround"));
-    gSavedSettings.setString("AscentCmdLineHeight",		    childGetValue("AscentCmdLineHeight"));
-    gSavedSettings.setString("AscentCmdLineTeleportHome",	childGetValue("AscentCmdLineTeleportHome"));
-    gSavedSettings.setString("AscentCmdLineRezPlatform",	childGetValue("AscentCmdLineRezPlatform"));
-    gSavedSettings.setString("AscentCmdLineCalc",		    childGetValue("AscentCmdLineCalc"));
-    gSavedSettings.setString("AscentCmdLineClearChat",	    childGetValue("AscentCmdLineClearChat"));
-    gSavedSettings.setString("AscentCmdLineDrawDistance",	childGetValue("AscentCmdLineDrawDistance"));
-    gSavedSettings.setString("AscentCmdTeleportToCam",		childGetValue("AscentCmdTeleportToCam"));
-    gSavedSettings.setString("AscentCmdLineKeyToName",		childGetValue("AscentCmdLineKeyToName"));
-    gSavedSettings.setString("AscentCmdLineOfferTp",		childGetValue("AscentCmdLineOfferTp"));
-    gSavedSettings.setString("AscentCmdLineMapTo",			childGetValue("AscentCmdLineMapTo"));
-    gSavedSettings.setString("AscentCmdLineTP2",			childGetValue("AscentCmdLineTP2"));
-
     refreshValues();
     refresh();
 }
diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h
index 3698686ad..0137ddd29 100644
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -39,61 +39,65 @@
 class LLPrefsAscentSys : public LLPanel
 {
 public:
-	LLPrefsAscentSys();
-	~LLPrefsAscentSys();
+    LLPrefsAscentSys();
+    ~LLPrefsAscentSys();
 
-	void apply();
-	void cancel();
+    void apply();
+    void cancel();
     void refresh();
-	void refreshValues();
+    void refreshValues();
 
 protected:
-	static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
+    static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
+    static void onCommitCmdLine(LLUICtrl* ctrl, void* user_data);
 
     //General -----------------------------------------------------------------------------
-	BOOL mDoubleClickTeleport;
-		BOOL mResetCameraAfterTP;
-		BOOL mOffsetTPByUserHeight;
-	BOOL mPreviewAnimInWorld;
-	BOOL mSaveScriptsAsMono;
-	BOOL mAlwaysRezInGroup;
-	BOOL mBuildAlwaysEnabled;
-	BOOL mAlwaysShowFly;
-	BOOL mDisableMinZoom;
-	BOOL mPowerUser;
-	BOOL mUseSystemFolder;
-	    BOOL mUploadToSystem;
-	BOOL mFetchInventoryOnLogin;
-	BOOL mEnableLLWind;
-	BOOL mEnableClouds;
-	    BOOL mEnableClassicClouds;
-	BOOL mSpeedRez;
-	    U32 mSpeedRezInterval;
+    BOOL mDoubleClickTeleport;
+        BOOL mResetCameraAfterTP;
+        BOOL mOffsetTPByUserHeight;
+    BOOL mPreviewAnimInWorld;
+//    BOOL mSaveScriptsAsMono;
+    BOOL mAlwaysRezInGroup;
+    BOOL mBuildAlwaysEnabled;
+    BOOL mAlwaysShowFly;
+    BOOL mDisableMinZoom;
+    BOOL mPowerUser;
+    BOOL mUseSystemFolder;
+        BOOL mUploadToSystem;
+    BOOL mFetchInventoryOnLogin;
+    BOOL mEnableLLWind;
+    BOOL mEnableClouds;
+        BOOL mEnableClassicClouds;
+    BOOL mSpeedRez;
+        U32 mSpeedRezInterval;
 
     //Command Line ------------------------------------------------------------------------
     BOOL mCmdLine;
-	std::string mCmdLinePos;
-	std::string mCmdLineGround;
-	std::string mCmdLineHeight;
-	std::string mCmdLineTeleportHome;
-	std::string mCmdLineRezPlatform;
-	std::string mCmdLineCalc;
-	std::string mCmdLineClearChat;
-	std::string mCmdLineDrawDistance;
-	std::string mCmdTeleportToCam;
-	std::string mCmdLineKeyToName;
-	std::string mCmdLineOfferTp;
-	std::string mCmdLineMapTo;
-	std::string mCmdLineTP2;
+    std::string mCmdLinePos;
+    std::string mCmdLineGround;
+    std::string mCmdLineHeight;
+    std::string mCmdLineTeleportHome;
+    std::string mCmdLineRezPlatform;
+    F32 mCmdPlatformSize;
+    std::string mCmdLineCalc;
+    std::string mCmdLineClearChat;
+    std::string mCmdLineDrawDistance;
+    std::string mCmdTeleportToCam;
+    std::string mCmdLineKeyToName;
+    std::string mCmdLineOfferTp;
+    std::string mCmdLineMapTo;
+    BOOL mCmdMapToKeepPos;
+    std::string mCmdLineTP2;
 
     //Privacy -----------------------------------------------------------------------------
-	BOOL mBroadcastViewerEffects;
-	BOOL mDisablePointAtAndBeam;
-	BOOL mPrivateLookAt;
-	BOOL mShowLookAt;
-	BOOL mRevokePermsOnStandUp;
-	BOOL mDisableClickSit;
+    BOOL mBroadcastViewerEffects;
+    BOOL mDisablePointAtAndBeam;
+    BOOL mPrivateLookAt;
+    BOOL mShowLookAt;
+    BOOL mRevokePermsOnStandUp;
+    BOOL mDisableClickSit;
     BOOL mDisplayScriptJumps;
+    F32 mNumScriptDiff;
 };
 
 #endif
diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp
index 7996fb106..a6e66f77e 100644
--- a/indra/newview/ascentprefsvan.cpp
+++ b/indra/newview/ascentprefsvan.cpp
@@ -49,87 +49,78 @@
 #include "llviewernetwork.h"
 #include "pipeline.h"
 
-class LLPrefsAscentVanImpl : public LLPanel
-{
-public:
-	LLPrefsAscentVanImpl();
-	/*virtual*/ ~LLPrefsAscentVanImpl() { };
 
-	virtual void refresh();
-
-	void apply();
-	void cancel();
-
-private:
-	static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
-	static void onCommitColor(LLUICtrl* ctrl, void* user_data);
-	static void onManualClientUpdate(void* data);
-	void refreshValues();
-	//General
-	BOOL mUseAccountSettings;
-	BOOL mShowTPScreen;
-	BOOL mPlayTPSound;
-	BOOL mShowLogScreens;
-	//Colors
-	BOOL mShowSelfClientTag;
-	BOOL mShowSelfClientTagColor;
-	BOOL mCustomTagOn;
-	std::string mCustomTagLabel;
-	LLColor4 mCustomTagColor;
-	LLColor4 mEffectColor;
-	LLColor4 mFriendColor;
-	LLColor4 mLindenColor;
-	LLColor4 mMutedColor;
-	LLColor4 mEMColor;
-	U32 mSelectedClient;
-};
-
-
-LLPrefsAscentVanImpl::LLPrefsAscentVanImpl()
- : LLPanel(std::string("Ascent"))
+LLPrefsAscentVan::LLPrefsAscentVan()
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml");
-	childSetCommitCallback("use_account_settings_check", onCommitCheckBox, this);
+
+	childSetCommitCallback("show_my_tag_check", onCommitCheckBox, this);
+	childSetCommitCallback("show_self_tag_check", onCommitCheckBox, this);
+	childSetCommitCallback("show_self_tag_color_check", onCommitCheckBox, this);
 	childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this);
 	childSetCommitCallback("show_friend_tag_check", onCommitCheckBox, this);
 	childSetCommitCallback("use_status_check", onCommitCheckBox, this);
 
-	childSetCommitCallback("custom_tag_color_swatch", onCommitColor, this);
-	childSetCommitCallback("effect_color_swatch", onCommitColor, this);
+	childSetCommitCallback("custom_tag_label_box", onCommitTextModified, this);
+//	childSetCommitCallback("custom_tag_color_swatch", onCommitColor, this);
+
+	childSetCommitCallback("X Modifier", onCommitUpdateAvatarOffsets);
+	childSetCommitCallback("Y Modifier", onCommitUpdateAvatarOffsets);
+	childSetCommitCallback("Z Modifier", onCommitUpdateAvatarOffsets);
 
-	childSetCommitCallback("X Modifier", LLPrefsAscentVan::onCommitUpdateAvatarOffsets);
-	childSetCommitCallback("Y Modifier", LLPrefsAscentVan::onCommitUpdateAvatarOffsets);
-	childSetCommitCallback("Z Modifier", LLPrefsAscentVan::onCommitUpdateAvatarOffsets);
-	
 	childSetAction("update_clientdefs", onManualClientUpdate, this);
+
+    refreshValues();
 	refresh();
-	
 }
 
+LLPrefsAscentVan::~LLPrefsAscentVan()
+{
+}
+
+//static
 void LLPrefsAscentVan::onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata)
 {
-	gAgent.sendAgentSetAppearance();
-	//llinfos << llformat("%d,%d,%d",gSavedSettings.getF32("EmeraldAvatarXModifier"),gSavedSettings.getF32("EmeraldAvatarYModifier"),gSavedSettings.getF32("EmeraldAvatarZModifier")) << llendl;
+    if (!gAgent.getID().isNull())
+    {
+    	gAgent.sendAgentSetAppearance();
+    }
 }
 
-void LLPrefsAscentVanImpl::onCommitColor(LLUICtrl* ctrl, void* user_data)
+//static
+void LLPrefsAscentVan::onCommitTextModified(LLUICtrl* ctrl, void* userdata)
 {
-	LLPrefsAscentVanImpl* self = (LLPrefsAscentVanImpl*)user_data;
+	LLPrefsAscentVan* self = (LLPrefsAscentVan*)userdata;
+
+    if (ctrl->getName() == "custom_tag_label_box")
+    {
+        gSavedSettings.setString("AscentCustomTagLabel", self->childGetValue("custom_tag_label_box"));
+    }
+}
+/*
+//static
+void LLPrefsAscentVan::onCommitColor(LLUICtrl* ctrl, void* user_data)
+{
+	LLPrefsAscentVan* self = (LLPrefsAscentVan*)user_data;
 
 	llinfos << "Control named " << ctrl->getControlName() << " aka " << ctrl->getName() << llendl;
 
 	if (ctrl->getName() == "custom_tag_color_swatch")
 	{
-		
 		llinfos << "Recreating color message for tag update." << llendl;
 		gSavedSettings.setString("AscentCustomTagLabel",		self->childGetValue("custom_tag_label_box"));
-		gSavedSettings.setColor4("AscentCustomTagColor",		self->childGetValue("custom_tag_color_swatch"));
-		gAgent.sendAgentSetAppearance();
-		gAgent.resetClientTag();
+//		gSavedSettings.setColor4("AscentCustomTagColor",		self->childGetValue("custom_tag_color_swatch"));
+
+        if (!gAgent.getID().isNull())
+        {
+		    gAgent.sendAgentSetAppearance();
+		    gAgent.resetClientTag();
+        }
 	}
 }
-
-void LLPrefsAscentVanImpl::onManualClientUpdate(void* data)
+*/
+//static
+void LLPrefsAscentVan::onManualClientUpdate(void* data)
 {
 	LLChat chat;
 	chat.mSourceType = CHAT_SOURCE_SYSTEM;
@@ -150,22 +141,21 @@ void LLPrefsAscentVanImpl::onManualClientUpdate(void* data)
 		}
 	}
 	LLFloaterChat::addChat(chat);
-	
 }
 
 //static
-void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
+void LLPrefsAscentVan::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
 {
-	
-	LLPrefsAscentVanImpl* self = (LLPrefsAscentVanImpl*)user_data;
+	LLPrefsAscentVan* self = (LLPrefsAscentVan*)user_data;
 
-	llinfos << "Control named " << ctrl->getControlName() << llendl;
-	if (ctrl->getControlName() == "AscentStoreSettingsPerAccount")
+//	llinfos << "Control named " << ctrl->getControlName() << llendl;
+/*
+    if (ctrl->getControlName() == "AscentStoreSettingsPerAccount")
 	{
 		self->refresh();
 	}
-
-	if ((ctrl->getName() == "show_friend_tag_check")||(ctrl->getName() == "use_status_check"))
+*/
+	if (ctrl->getName() == "show_friend_tag_check")
 	{
 		for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
 		iter != LLCharacter::sInstances.end(); ++iter)
@@ -178,125 +168,176 @@ void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
 			}
 		}
 	}
+    else if (ctrl->getName() == "use_status_check")
+    {
+		for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+		iter != LLCharacter::sInstances.end(); ++iter)
+		{
+			LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
+			if(avatarp)
+			{
+				LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition();
+				avatarp->mClientTag = "";
+			}
+		}
 
-	BOOL showCustomOptions;
-	showCustomOptions = gSavedSettings.getBOOL("AscentUseCustomTag");
-	self->childSetValue("customize_own_tag_check", showCustomOptions);
-	self->childSetEnabled("custom_tag_label_text", showCustomOptions);
-	self->childSetEnabled("custom_tag_label_box", showCustomOptions);
-	self->childSetEnabled("custom_tag_color_text", showCustomOptions);
-	self->childSetEnabled("custom_tag_color_swatch", showCustomOptions);
-	if (!gAgent.getID().isNull())
+        BOOL showCustomColors = gSavedSettings.getBOOL("AscentUseStatusColors");
+	    self->childSetEnabled("friends_color_textbox", showCustomColors);
+	    self->childSetEnabled("friend_color_swatch", showCustomColors);
+	    self->childSetEnabled("estate_owner_color_swatch", showCustomColors);
+	    self->childSetEnabled("linden_color_swatch", showCustomColors);
+	    self->childSetEnabled("muted_color_swatch", showCustomColors);
+    }
+    else if (ctrl->getName() == "customize_own_tag_check")
+    {
+	    BOOL showCustomOptions = gSavedSettings.getBOOL("AscentUseCustomTag");
+	    self->childSetEnabled("custom_tag_label_text", showCustomOptions);
+	    self->childSetEnabled("custom_tag_label_box", showCustomOptions);
+	    self->childSetEnabled("custom_tag_color_text", showCustomOptions);
+	    self->childSetEnabled("custom_tag_color_swatch", showCustomOptions);
+    }
+
+    if (!gAgent.getID().isNull())
+    {
+		gAgent.sendAgentSetAppearance();
 		gAgent.resetClientTag();
+    }
 }
 
-void LLPrefsAscentVanImpl::refreshValues()
+// Store current settings for cancel
+void LLPrefsAscentVan::refreshValues()
 {
-	//General
-	mUseAccountSettings			= gSavedSettings.getBOOL("AscentStoreSettingsPerAccount");
-	mShowTPScreen				= !gSavedSettings.getBOOL("AscentDisableTeleportScreens");
-	mPlayTPSound				= gSavedSettings.getBOOL("OptionPlayTpSound");
-	mShowLogScreens				= !gSavedSettings.getBOOL("AscentDisableLogoutScreens");
-	
-	//Colors
-	mShowSelfClientTag			= gSavedSettings.getBOOL("AscentShowSelfTag");
-	mShowSelfClientTagColor		= gSavedSettings.getBOOL("AscentShowSelfTagColor");	
-	mCustomTagOn				= gSavedSettings.getBOOL("AscentUseCustomTag");
+	//General --------------------------------------------------------------------------------
+	mUseAccountSettings		= gSavedSettings.getBOOL("AscentStoreSettingsPerAccount");
+	mShowTPScreen			= !gSavedSettings.getBOOL("AscentDisableTeleportScreens");
+	mPlayTPSound			= gSavedSettings.getBOOL("OptionPlayTpSound");
+	mShowLogScreens			= !gSavedSettings.getBOOL("AscentDisableLogoutScreens");
 
+	//Tags\Colors ----------------------------------------------------------------------------
+    mAscentUseTag           = gSavedSettings.getBOOL("AscentUseTag");
+    mReportClientUUID       = gSavedSettings.getString("AscentReportClientUUID");
 	mSelectedClient			= gSavedSettings.getU32("AscentReportClientIndex");
-	mEffectColor			= gSavedSettings.getColor4("EffectColor");	
-	
-	childSetEnabled("custom_tag_label_text", mCustomTagOn);
-	childSetEnabled("custom_tag_label_box", mCustomTagOn);
-	childSetEnabled("custom_tag_color_text", mCustomTagOn);
-	childSetEnabled("custom_tag_color_swatch", mCustomTagOn);
-
+    mShowSelfClientTag		= gSavedSettings.getBOOL("AscentShowSelfTag");
+	mShowSelfClientTagColor = gSavedSettings.getBOOL("AscentShowSelfTagColor");
+    mShowFriendsTag         = gSavedSettings.getBOOL("AscentShowFriendsTag");
+	mCustomTagOn			= gSavedSettings.getBOOL("AscentUseCustomTag");
 	mCustomTagLabel			= gSavedSettings.getString("AscentCustomTagLabel");
 	mCustomTagColor			= gSavedSettings.getColor4("AscentCustomTagColor");
+    mShowOthersTag          = gSavedSettings.getBOOL("AscentShowOthersTag");
+    mShowOthersTagColor     = gSavedSettings.getBOOL("AscentShowOthersTagColor");
+    mShowIdleTime           = gSavedSettings.getBOOL("AscentShowIdleTime");
+    mUseStatusColors        = gSavedSettings.getBOOL("AscentUseStatusColors");
+    mUpdateTagsOnLoad       = gSavedSettings.getBOOL("AscentUpdateTagsOnLoad");
+	mEffectColor			= gSavedSettings.getColor4("EffectColor");
 	mFriendColor			= gSavedSettings.getColor4("AscentFriendColor");
+	mEstateOwnerColor		= gSavedSettings.getColor4("AscentEstateOwnerColor");
 	mLindenColor			= gSavedSettings.getColor4("AscentLindenColor");
 	mMutedColor				= gSavedSettings.getColor4("AscentMutedColor");
-	mEMColor				= gSavedSettings.getColor4("AscentEstateOwnerColor");
 	//mCustomColor			= gSavedSettings.getColor4("MoyMiniMapCustomColor");
+
+    //Body Dynamics --------------------------------------------------------------------------
+    mBreastPhysicsToggle    = gSavedSettings.getBOOL("EmeraldBreastPhysicsToggle");
+    mBoobMass               = gSavedSettings.getF32("EmeraldBoobMass");
+    mBoobHardness           = gSavedSettings.getF32("EmeraldBoobHardness");
+    mBoobVelMax             = gSavedSettings.getF32("EmeraldBoobVelMax");
+    mBoobFriction           = gSavedSettings.getF32("EmeraldBoobFriction");
+    mBoobVelMin             = gSavedSettings.getF32("EmeraldBoobVelMin");
+
+    mAvatarXModifier        = gSavedSettings.getF32("AscentAvatarXModifier");
+    mAvatarYModifier        = gSavedSettings.getF32("AscentAvatarYModifier");
+    mAvatarZModifier        = gSavedSettings.getF32("AscentAvatarZModifier");
 }
 
-void LLPrefsAscentVanImpl::refresh()
+// Update controls based on current settings
+void LLPrefsAscentVan::refresh()
 {
-	refreshValues();
 	//General --------------------------------------------------------------------------------
-	childSetValue("use_account_settings_check", mUseAccountSettings);
-	childSetValue("disable_tp_screen_check",	mShowTPScreen);
-	childSetValue("tp_sound_check",				mPlayTPSound);
-	childSetValue("disable_logout_screen_check", mShowLogScreens);
 
-	//Colors ---------------------------------------------------------------------------------
+	//Tags\Colors ----------------------------------------------------------------------------
 	LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");
 	combo->setCurrentByIndex(mSelectedClient);
-
-	childSetValue("show_self_tag_check", mShowSelfClientTag);
-	childSetValue("show_self_tag_color_check", mShowSelfClientTagColor);
-	childSetValue("customize_own_tag_check", mCustomTagOn);
-	childSetValue("custom_tag_label_box", mCustomTagLabel);
-	
+/*	
 	getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
 	getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
 	getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor);
 	getChild<LLColorSwatchCtrl>("linden_color_swatch")->set(mLindenColor);
 	getChild<LLColorSwatchCtrl>("muted_color_swatch")->set(mMutedColor);
-	getChild<LLColorSwatchCtrl>("em_color_swatch")->set(mEMColor);
+	getChild<LLColorSwatchCtrl>("estate_owner_color_swatch")->set(mEstateOwnerColor);
 	//getChild<LLColorSwatchCtrl>("custom_color_swatch")->set(mCustomColor);
-	gSavedSettings.setColor4("EffectColor", LLColor4::white);
-	gSavedSettings.setColor4("EffectColor", mEffectColor);
-	
-	gSavedSettings.setColor4("AscentFriendColor", LLColor4::white);
-	gSavedSettings.setColor4("AscentFriendColor", mFriendColor);
+*/
+	childSetEnabled("friends_color_textbox",     mUseStatusColors);
+	childSetEnabled("friend_color_swatch",       mUseStatusColors);
+	childSetEnabled("estate_owner_color_swatch", mUseStatusColors);
+	childSetEnabled("linden_color_swatch",       mUseStatusColors);
+	childSetEnabled("muted_color_swatch",        mUseStatusColors);
 
-	gSavedSettings.setColor4("AscentLindenColor", LLColor4::white);
-	gSavedSettings.setColor4("AscentLindenColor", mLindenColor);
+    childSetEnabled("custom_tag_label_text",   mCustomTagOn);
+	childSetEnabled("custom_tag_label_box",    mCustomTagOn);
+	childSetValue("custom_tag_label_box", gSavedSettings.getString("AscentCustomTagLabel"));
+	childSetEnabled("custom_tag_color_text",   mCustomTagOn);
+	childSetEnabled("custom_tag_color_swatch", mCustomTagOn);
 
-	gSavedSettings.setColor4("AscentMutedColor", LLColor4::white);
-	gSavedSettings.setColor4("AscentMutedColor", mMutedColor);
-
-	gSavedSettings.setColor4("AscentEstateOwnerColor", LLColor4::white);
-	gSavedSettings.setColor4("AscentEstateOwnerColor", mEMColor);
-
-	//gSavedSettings.setColor4("MoyMiniMapCustomColor", LLColor4::white);
-	//gSavedSettings.setColor4("MoyMiniMapCustomColor", mCustomColor);
-	gAgent.resetClientTag();
+    //Body Dynamics --------------------------------------------------------------------------
+    childSetEnabled("EmeraldBoobMass",     mBreastPhysicsToggle);
+    childSetEnabled("EmeraldBoobHardness", mBreastPhysicsToggle);
+    childSetEnabled("EmeraldBoobVelMax",   mBreastPhysicsToggle);
+    childSetEnabled("EmeraldBoobFriction", mBreastPhysicsToggle);
+    childSetEnabled("EmeraldBoobVelMin",   mBreastPhysicsToggle);
 }
 
-void LLPrefsAscentVanImpl::cancel()
+// Reset settings to local copy
+void LLPrefsAscentVan::cancel()
 {
 	//General --------------------------------------------------------------------------------
-	childSetValue("use_account_settings_check", mUseAccountSettings);
-	childSetValue("disable_tp_screen_check",	mShowTPScreen);
-	childSetValue("tp_sound_check",				mPlayTPSound);
-	childSetValue("disable_logout_screen_check", mShowLogScreens);
+	gSavedSettings.setBOOL("AscentStoreSettingsPerAccount", mUseAccountSettings);
+	gSavedSettings.setBOOL("AscentDisableTeleportScreens", !mShowTPScreen);
+	gSavedSettings.setBOOL("OptionPlayTpSound",             mPlayTPSound);
+	gSavedSettings.setBOOL("AscentDisableLogoutScreens",   !mShowLogScreens);
 
-	gSavedSettings.setColor4("EffectColor", LLColor4::white);
-	gSavedSettings.setColor4("EffectColor", mEffectColor);
-	gSavedSettings.setColor4("AscentFriendColor", LLColor4::yellow);
-	gSavedSettings.setColor4("AscentFriendColor", mFriendColor);
-	gSavedSettings.setColor4("AscentLindenColor", LLColor4::yellow);
-	gSavedSettings.setColor4("AscentLindenColor", mLindenColor);
-	gSavedSettings.setColor4("AscentMutedColor", LLColor4::yellow);
-	gSavedSettings.setColor4("AscentMutedColor", mMutedColor);
-	gSavedSettings.setColor4("AscentEstateOwnerColor", LLColor4::yellow);
-	gSavedSettings.setColor4("AscentEstateOwnerColor", mEMColor);
-	//gSavedSettings.setColor4("MoyMiniMapCustomColor", LLColor4::yellow);
-	//gSavedSettings.setColor4("MoyMiniMapCustomColor", mCustomColor);
+	//Tags\Colors ----------------------------------------------------------------------------
+    gSavedSettings.setBOOL("AscentUseTag",               mAscentUseTag);
+    gSavedSettings.setString("AscentReportClientUUID",   mReportClientUUID);
+	gSavedSettings.setU32("AscentReportClientIndex",     mSelectedClient);
+    gSavedSettings.setBOOL("AscentShowSelfTag",          mShowSelfClientTag);
+	gSavedSettings.setBOOL("AscentShowSelfTagColor",     mShowSelfClientTagColor);
+    gSavedSettings.setBOOL("AscentShowFriendsTag",       mShowFriendsTag);
+	gSavedSettings.setBOOL("AscentUseCustomTag",         mCustomTagOn);
+	gSavedSettings.setString("AscentCustomTagLabel",     mCustomTagLabel);
+	gSavedSettings.setColor4("AscentCustomTagColor",     mCustomTagColor);
+    gSavedSettings.setBOOL("AscentShowOthersTag",        mShowOthersTag);
+    gSavedSettings.setBOOL("AscentShowOthersTagColor",   mShowOthersTagColor);
+    gSavedSettings.setBOOL("AscentShowIdleTime",         mShowIdleTime);
+    gSavedSettings.setBOOL("AscentUseStatusColors",      mUseStatusColors);
+    gSavedSettings.setBOOL("AscentUpdateTagsOnLoad",     mUpdateTagsOnLoad);
+	gSavedSettings.setColor4("EffectColor",              mEffectColor);
+	gSavedSettings.setColor4("AscentFriendColor",        mFriendColor);
+	gSavedSettings.setColor4("AscentEstateOwnerColor",   mEstateOwnerColor);
+	gSavedSettings.setColor4("AscentLindenColor",        mLindenColor);
+	gSavedSettings.setColor4("AscentMutedColor",         mMutedColor);
+//    gSavedSettings.setColor4("MoyMiniMapCustomColor",    mCustomColor);
+
+    //Body Dynamics --------------------------------------------------------------------------
+    gSavedSettings.setBOOL("EmeraldBreastPhysicsToggle", mBreastPhysicsToggle);
+    gSavedSettings.setF32("EmeraldBoobMass",             mBoobMass);
+    gSavedSettings.setF32("EmeraldBoobHardness",         mBoobHardness);
+    gSavedSettings.setF32("EmeraldBoobVelMax",           mBoobVelMax);
+    gSavedSettings.setF32("EmeraldBoobFriction",         mBoobFriction);
+    gSavedSettings.setF32("EmeraldBoobVelMin",           mBoobVelMin);
+
+    gSavedSettings.setF32("AscentAvatarXModifier",       mAvatarXModifier);
+    gSavedSettings.setF32("AscentAvatarYModifier",       mAvatarYModifier);
+    gSavedSettings.setF32("AscentAvatarZModifier",       mAvatarZModifier);
 }
 
-void LLPrefsAscentVanImpl::apply()
+// Update local copy so cancel has no effect
+void LLPrefsAscentVan::apply()
 {
 	std::string client_uuid;
 	U32 client_index;
-	//General -----------------------------------------------------------------------------
-	gSavedSettings.setBOOL("AscentDisableTeleportScreens",	!childGetValue("disable_tp_screen_check"));
-	gSavedSettings.setBOOL("OptionPlayTpSound",				childGetValue("tp_sound_check"));
-	gSavedSettings.setBOOL("AscentDisableLogoutScreens",	!childGetValue("disable_logout_screen_check"));
 
-	//Colors ------------------------------------------------------------------------------
+	//General -----------------------------------------------------------------------------
+
+	//Tags\Colors -------------------------------------------------------------------------
 	LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");
 	if (combo)
 	{
@@ -315,45 +356,9 @@ void LLPrefsAscentVanImpl::apply()
 			avatar->forceBakeAllTextures(slam_for_debug);
 		}
 	}
-	gSavedSettings.setBOOL("AscentShowSelfTag",			childGetValue("show_self_tag_check"));
-	gSavedSettings.setBOOL("AscentShowSelfTagColor",	childGetValue("show_self_tag_color_check"));
 
-	gSavedSettings.setColor4("EffectColor",				childGetValue("effect_color_swatch"));
-	gSavedSettings.setColor4("AscentFriendColor",			childGetValue("friend_color_swatch"));
-	gSavedSettings.setColor4("AscentLindenColor",			childGetValue("linden_color_swatch"));
-	gSavedSettings.setColor4("AscentMutedColor",			childGetValue("muted_color_swatch"));
-	gSavedSettings.setColor4("AscentEstateOwnerColor",		childGetValue("em_color_swatch"));
-	gSavedSettings.setColor4("MoyMiniMapCustomColor",		childGetValue("custom_color_swatch"));
-	gSavedSettings.setBOOL("AscentUseCustomTag",			childGetValue("customize_own_tag_check"));
-	gSavedSettings.setString("AscentCustomTagLabel",		childGetValue("custom_tag_label_box"));
-	gSavedSettings.setColor4("AscentCustomTagColor",		childGetValue("custom_tag_color_swatch"));
-	
+    //Body Dynamics -----------------------------------------------------------------------
+
 	refreshValues();
-}
-
-//---------------------------------------------------------------------------
-
-LLPrefsAscentVan::LLPrefsAscentVan()
-:	impl(* new LLPrefsAscentVanImpl())
-{
-}
-
-LLPrefsAscentVan::~LLPrefsAscentVan()
-{
-	delete &impl;
-}
-
-void LLPrefsAscentVan::apply()
-{
-	impl.apply();
-}
-
-void LLPrefsAscentVan::cancel()
-{
-	impl.cancel();
-}
-
-LLPanel* LLPrefsAscentVan::getPanel()
-{
-	return &impl;
+    refresh();
 }
diff --git a/indra/newview/ascentprefsvan.h b/indra/newview/ascentprefsvan.h
index 0cd18d98f..a743a0c88 100644
--- a/indra/newview/ascentprefsvan.h
+++ b/indra/newview/ascentprefsvan.h
@@ -34,10 +34,8 @@
 
 #include "llpanel.h"
 
-class LLPanel;
-class LLPrefsAscentVanImpl;
 
-class LLPrefsAscentVan
+class LLPrefsAscentVan : public LLPanel
 {
 public:
 	LLPrefsAscentVan();
@@ -45,16 +43,55 @@ public:
 
 	void apply();
 	void cancel();
+	void refresh();
+	void refreshValues();
 
-	LLPanel* getPanel();
-
-	static void onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata);	
+//	LLPanel* getPanel();
 
 protected:
-	LLPrefsAscentVanImpl& impl;
+	static void onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata);	
+	static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
+    static void onCommitTextModified(LLUICtrl* ctrl, void* userdata);
+//	static void onCommitColor(LLUICtrl* ctrl, void* user_data);
+	static void onManualClientUpdate(void* data);
+	//General
+	BOOL mUseAccountSettings;
+	BOOL mShowTPScreen;
+	BOOL mPlayTPSound;
+	BOOL mShowLogScreens;
+	//Tags\Colors
+    BOOL mAscentUseTag;
+    std::string mReportClientUUID;
+	U32 mSelectedClient;
+	BOOL mShowSelfClientTag;
+	BOOL mShowSelfClientTagColor;
+    BOOL mShowFriendsTag;
+	BOOL mCustomTagOn;
+    std::string mCustomTagLabel;
+	LLColor4 mCustomTagColor;
+    BOOL mShowOthersTag;
+    BOOL mShowOthersTagColor;
+    BOOL mShowIdleTime;
+    BOOL mUseStatusColors;
+    BOOL mUpdateTagsOnLoad;
+    LLColor4 mEffectColor;
+	LLColor4 mFriendColor;
+	LLColor4 mEstateOwnerColor;
+	LLColor4 mLindenColor;
+	LLColor4 mMutedColor;
+    //Body Dynamics
+    BOOL mBreastPhysicsToggle;
+    F32 mBoobMass;
+    F32 mBoobHardness;
+    F32 mBoobVelMax;
+    F32 mBoobFriction;
+    F32 mBoobVelMin;
+    F32 mAvatarXModifier;
+    F32 mAvatarYModifier;
+    F32 mAvatarZModifier;
 
 private:
-	
+
 };
 
 #endif
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index c0b57211b..231d680a0 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -214,8 +214,8 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
 	mPrefsAscentSys->setDefaultBtn(default_btn);
 
 	mPrefsAscentVan = new LLPrefsAscentVan();
-	mTabContainer->addTabPanel(mPrefsAscentVan->getPanel(), mPrefsAscentVan->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
-	mPrefsAscentVan->getPanel()->setDefaultBtn(default_btn);
+	mTabContainer->addTabPanel(mPrefsAscentVan, mPrefsAscentVan->getLabel(), FALSE, onTabChanged, mTabContainer);
+	mPrefsAscentVan->setDefaultBtn(default_btn);
 
 	if (!mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
 	{
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8115bca09..037e1b323 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1746,7 +1746,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	bool typing_init = false;
 	if( dialog == IM_TYPING_START && !is_muted )
 	{
-		if(!gIMMgr->hasSession(computed_session_id) && gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
+		if(!gIMMgr->hasSession(computed_session_id) && gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
 		{
 			typing_init = true;
 			gIMMgr->addMessage(
@@ -1800,7 +1800,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 // [/RLVa:KB]
 	{
 		if((dialog == IM_NOTHING_SPECIAL && !is_auto_response) ||
-			(dialog == IM_TYPING_START && gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
+			(dialog == IM_TYPING_START && gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
 			)
 		{
 			BOOL has = gIMMgr->hasSession(computed_session_id);
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index f75a79267..15436edfe 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -159,7 +159,7 @@ MM/DD/YYYY
       <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
         initial_value="false" label="Autorespond to every message" left_delta="0" mouse_opaque="true"
         name="AscentInstantMessageResponseRepeat" radio_style="false" width="270"/>
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall" height="16"
         initial_value="false" label="Send an item along with the response" left_delta="0"
         mouse_opaque="true" name="AscentInstantMessageResponseItem" radio_style="false"
         width="270" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
@@ -273,30 +273,30 @@ To use spellcheck, right-click a misspelled word
 
       <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
         label="Highlight messages if any of they contain the terms" left="5" mouse_opaque="true"
-        name="Keywords_Alert" radio_style="false" width="270"/>
+        name="KeywordsOn" radio_style="false" width="270"/>
       <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left="12"
         name="keyword_txt1" width="512">
 (separated by commas)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="5" max_length="500" mouse_opaque="true" name="Keywords_Entries" width="300" />
+        font="SansSerifSmall" height="20" left_delta="5" max_length="500" mouse_opaque="true" name="KeywordsList" width="300" />
       <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left_delta="15" name="EmKeyw"
         width="100">Is found within:</text>
       <check_box bottom_delta="3" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Local Chat Floater" left_delta="100" mouse_opaque="true" name="Keywords_LocalChat" radio_style="false" width="270"/>
+        label="Local Chat Floater" left_delta="100" mouse_opaque="true" name="KeywordsInChat" radio_style="false" width="270"/>
       <check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Instant Message Floater" left_delta="0" mouse_opaque="true" name="Keywords_IM" radio_style="false" width="270"/>
+        label="Instant Message Floater" left_delta="0" mouse_opaque="true" name="KeywordsInIM" radio_style="false" width="270"/>
       <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Highlight the message in this color:" left_delta="-110" mouse_opaque="true" name="Keywords_Highlight"
+        label="Highlight the message in this color:" left_delta="-110" mouse_opaque="true" name="KeywordsChangeColor"
         radio_style="false" width="270"/>
       <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-16" can_apply_immediately="true"
-        color="1, 1, 1, 1" follows="left|top" height="35" label="" left_delta="210"
-        mouse_opaque="true" name="Keywords_Color" tool_tip="Click to open Color Picker" width="50"/>
+        color="1, 1, 1, 1" follows="left|top" height="35" label="" left_delta="210" mouse_opaque="true"
+        name="KeywordsColor" tool_tip="Click to open Color Picker" width="50"/>
       <check_box bottom_delta="-10" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Play this sound alert: (UUID)" left_delta="-210" mouse_opaque="true" name="Keywords_PlaySound"
+        label="Play this sound alert: (UUID)" left_delta="-210" mouse_opaque="true" name="KeywordsPlaySound"
         radio_style="false" width="270"/>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="-5" max_length="36" mouse_opaque="true" name="Keywords_SoundUUID" width="300" />
+        font="SansSerifSmall" height="20" left_delta="-5" max_length="36" mouse_opaque="true" name="KeywordsSound" width="300" />
     </panel>
 
   </tab_container>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index 4ec36f23e..b2027fbed 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -30,7 +30,7 @@
         tool_tip="The Animation upload window will play animations on your avatar when previewing them."
         mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
         width="400" />
-      <check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="true"
+      <check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="false"
         follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         label="Save scripts in inventory as Mono scripts instead of LSL2" left="10"
         tool_tip="Scripts will automatically be compiled in Mono when saving - Usually only possible when placed in an object."
@@ -60,15 +60,15 @@
         tool_tip="Allows the camera to get reeeaaally close to things."
         mouse_opaque="true" name="disable_camera_zoom_check" radio_style="false"
         width="400" />
-      <check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck1" enabled="true"
+      <check_box bottom_delta="-20" enabled="true"
         follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         label="Enable Power User functionality" left="10"
         tool_tip="Adds features deemed too dangerous for normal use. These features can wreak havoc or do bad things if misused - Mostly to yourself or your belongings. If you're sure, activate the checkbox below as well."
         mouse_opaque="true" name="power_user_check" radio_style="false"
         width="400" />
-      <check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck2" enabled="true"
+      <check_box bottom_delta="-20" enabled="true"
         follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Confirm Power User functionality" left="10"
+        label="Confirm Power User functionality" left="20"
         tool_tip="Confirms Power User activation. Turn this on at your own risk, and use any features it enables responsibly. Ascent devs will not replace anything you break if you ruin something important. Unlike most checkboxes, you must apply/ok changes before this will activate."
         mouse_opaque="true" name="power_user_confirm_check" radio_style="false"
         width="400" />
@@ -137,37 +137,35 @@ Teleport within sim (usage: cmd x y z)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLinePos" control_name="AscentCmdLinePos" width="200"/>
+        tool_tip="" name="AscentCmdLinePos" width="200"/>
       <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
         name="cmd_line_text_3" width="512">
 Teleport to ground (usage: cmd)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineGround" control_name="AscentCmdLineGround" width="200"/>
+        tool_tip="" name="AscentCmdLineGround" width="200"/>
       <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
         name="cmd_line_text_4" width="512">
 Teleport to altitude (usage: cmd z)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineHeight" control_name="AscentCmdLineHeight" width="200"/>
+        tool_tip="" name="AscentCmdLineHeight" width="200"/>
       <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
         name="cmd_line_text_5" width="512">
 Teleport home (usage: cmd)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineTeleportHome" control_name="AscentCmdLineTeleportHome"
-        width="200"/>
+        tool_tip="" name="AscentCmdLineTeleportHome" width="200"/>
       <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
         name="cmd_line_text_6" width="512">
 Rez a platform (usage: cmd 0 - 30)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineRezPlatform" control_name="AscentCmdLineRezPlatform"
-        width="200"/>
+        tool_tip="" name="AscentCmdLineRezPlatform" width="200"/>
       <slider bottom_delta="-22" left_delta="0" name="AscentPlatformSize" control_name="AscentPlatformSize"
         decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
         initial_val="5" label="Default width:" label_width="75" max_val="30" min_val="5"
@@ -178,7 +176,7 @@ Calc. expressions (usage: cmd 2 + 2)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineCalc" control_name="AscentCmdLineCalc" width="200"/>
+        tool_tip="" name="AscentCmdLineCalc" width="200"/>
       <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
         name="cmd_line_text_15" width="512">
 Clear the chat history (usage: cmd)
@@ -186,7 +184,7 @@ Clear the chat history (usage: cmd)
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
         tool_tip="Clears the Chat History to prevent lag effects from chat spammers."
-        name="AscentCmdLineClearChat" control_name="AscentCmdLineClearChat" width="200"/>
+        name="AscentCmdLineClearChat" width="200"/>
       <!-- Column Split -->
       <view_border bevel_style="none" border_thickness="1" bottom_delta="-5" follows="top|left" height="295"
         left="230" name="CmdDivisor" width="0"/>
@@ -196,38 +194,35 @@ Change Draw Distance (usage: cmd meters)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineDrawDistance" control_name="AscentCmdLineDrawDistance"
-        width="200"/>
+        tool_tip="" name="AscentCmdLineDrawDistance" width="200"/>
       <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
         name="cmd_line_text_10" width="512">
 Teleport to cam position (usage: cmd)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdTeleportToCam" control_name="AscentCmdTeleportToCam"
-        width="200"/>
+        tool_tip="" name="AscentCmdTeleportToCam" width="200"/>
       <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
         name="cmd_line_text_11" width="512">
 Get avatar name from key (usage: cmd key)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineKeyToName" control_name="AscentCmdLineKeyToName"
-        width="200"/>
+        tool_tip="" name="AscentCmdLineKeyToName" width="200"/>
       <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
         name="cmd_line_text_12" width="512">
 Offer teleport to avatar (usage: cmd key)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineOfferTp" control_name="AscentCmdLineOfferTp" width="200"/>
+        tool_tip="" name="AscentCmdLineOfferTp" width="200"/>
       <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
         name="cmd_line_text_7" width="512">
 Teleport to sim x (usage: cmd simname)
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineMapTo" control_name="AscentCmdLineMapTo" width="200"/>
+        tool_tip="" name="AscentCmdLineMapTo" width="200"/>
       <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
         initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true"
         name="map_to_keep_pos" radio_style="false" width="270"
@@ -239,7 +234,7 @@ Teleport to avatar (usage: cmd name)
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
         tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
-        name="AscentCmdLineTP2" control_name="AscentCmdLineTP2" width="200"/>
+        name="AscentCmdLineTP2" width="200"/>
     </panel>
 
     <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
@@ -311,7 +306,7 @@ Pivot Point
         label="Values are percent" left_delta="-5" mouse_opaque="true"
         tool_tip="Default settings are Percentages and every axis set at 50"
         name="EmPivotPercToggle" radio_style="false" width="100" control_name="AscentBuildPrefs_PivotIsPercent"/>
-      <check_box bottom_delta="60" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="60" enabled="false" follows="left|top" font="SansSerifSmall" height="16"
         initial_value="true" label="Enable highlighting of selected prims" left_delta="140"
         mouse_opaque="true" name="EmBuildPrefsRenderHighlight_toggle" control_name="AscentRenderHighlightSelections"
         radio_style="false" width="270"/>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
index 496845b2a..f2ff019e8 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
@@ -31,15 +31,13 @@
 				width="400" />
 		</panel>
 		<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
-			follows="left|top|right|bottom" label="Colors" name="Colors">
+			follows="left|top|right|bottom" label="Tags\Colors" name="Tags\Colors">
 			<!-- Client tag options -->
-			<view_border bevel_style="none" border_thickness="1" bottom="-155" follows="top|left"
-				height="150" left="5" name="GraphicsBorder" width="485" />
-			<check_box bottom_delta="130" control_name="AscentUseTag" enabled="true"
+			<check_box bottom_delta="-25" control_name="AscentUseTag" enabled="true"
 				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Use Client Tag:" left_delta="0"
+				label="Use Client Tag:" left="10"
 				tool_tip="Enabling this will show your client tag on your avatar name locally."
-				mouse_opaque="true" name="show_client_tag_check" radio_style="false"
+				mouse_opaque="true" name="show_my_tag_check" radio_style="false"
 				width="400" />
 			<combo_box allow_text_entry="false" enabled="true" follows="left|top"
 		    	  bottom_delta="-24" height="18" hidden="false" left_delta="24" max_chars="20" mouse_opaque="true"
@@ -47,7 +45,7 @@
 		    	  name="tag_spoofing_combobox" width="130">
 				<combo_item type="string" length="1" enabled="true" name="Ascent" 
 					value="f25263b7-6167-4f34-a4ef-af65213b2e39">
-					Singularity
+Singularity
 				</combo_item>
 			</combo_box>
 			<check_box bottom_delta="-23" control_name="AscentShowSelfTag" enabled="true"
@@ -79,7 +77,7 @@
 				bottom_delta="-17" left_delta="25" drop_shadow_visible="true" enabled="true" follows="left|top"
 				font="SansSerifSmall" h_pad="0" halign="left" height="10" 
 				mouse_opaque="true" name="custom_tag_label_text" v_pad="0" width="394">
-				Label:
+Label:
 			</text>
 			<line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
 				height="18" left_delta="35" name="custom_tag_label_box"
@@ -89,18 +87,18 @@
 				bottom_delta="6" left_delta="110" drop_shadow_visible="true" enabled="true" follows="left|top"
 				font="SansSerifSmall" h_pad="0" halign="left" height="10" 
 				mouse_opaque="true" name="custom_tag_color_text" v_pad="0" width="394">
-				Color:
+Color:
 			</text>
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-22"
 				can_apply_immediately="false" color="1 1 1 1"
 				enabled="true" follows="left|top" height="34" label="" left_delta="35"
-				mouse_opaque="true" name="custom_tag_color_swatch"
+				mouse_opaque="true" name="custom_tag_color_swatch" control_name="AscentCustomTagColor"
 				tool_tip="The custom color you would like to replace your client color with (Local only)" width="30" />
 			<check_box bottom_delta="-8" control_name="AscentShowOthersTag" enabled="true"
 				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
 				label="Display client tag for others" left_delta="-205"
 				tool_tip="Enabling this will show client tag names on others' avatar names."
-				mouse_opaque="true" name="show_client_tag_check" radio_style="false"
+				mouse_opaque="true" name="show_other_tag_check" radio_style="false"
 				width="400" />
 			<check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" enabled="true"
 				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
@@ -114,54 +112,54 @@
 				tool_tip="Enabling this will show the amount of time an avatar has been idle."
 				mouse_opaque="true" name="show_idle_time_check" radio_style="false"
 				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentUseStatusColors" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Use user status colors (Friend, Linden, etcetera below)" left_delta="-230"
-				tool_tip="Enabling this will show people who match specific criteria (Lindens, Estate owners, friends, muted people) with the color you've set below."
-				mouse_opaque="true" name="use_status_check" radio_style="false"
-				width="400" />
 			<check_box bottom_delta="-20" control_name="AscentUpdateTagsOnLoad" enabled="true"
 				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Automatically check website for updates to client definitions" left_delta="0"
-				tool_tip="Enabling this will allow ascent to download fresh definitions when needed."
+				label="Automatically check website for updates to client definitions" left_delta="-230"
+				tool_tip="Enabling this will allow Singularity to download fresh definitions when needed."
 				mouse_opaque="true" name="update_tags_check" radio_style="false"
 				width="400" />
 			<button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="left|top" 
 				label="Manual Update" height="18" left_delta="340" width="110"/>
 			<!-- End of Client Tag settings -->
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom="-178" drop_shadow_visible="true" enabled="true" follows="left|top"
-				font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+				bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+				font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
 				mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
-				Color For My Effects:
+Color For My Effects:
 			</text>
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34"
 				 can_apply_immediately="true" color="1 1 1 1" control_name="EffectColor"
-				 enabled="true" follows="left|top" height="47" label="Effects" left="148"
+				 enabled="true" follows="left|top" height="47" label="Effects" left_delta="138"
 				 mouse_opaque="true" name="effect_color_swatch" width="44" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom="-225" drop_shadow_visible="true" enabled="true" follows="left|top"
-				font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+      <check_box bottom_delta="-20" control_name="AscentUseStatusColors" enabled="true"
+				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+				label="Use user status colors (Friend, Linden, etcetera below)" left="10"
+				tool_tip="Enabling this will show people who match specific criteria (Lindens, Estate owners, friends, muted people) with the color you've set below."
+				mouse_opaque="true" name="use_status_check" radio_style="false"
+				width="400" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+				font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="10"
 				mouse_opaque="true" name="friends_color_textbox" v_pad="0" width="394">
-				Color For:
+Color For:
 (Radar, Tag, Minimap)
 			</text>
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34"
-				 can_apply_immediately="true" color="1 1 1 1" control_name="FriendColor"
-				 enabled="true" follows="left|top" height="47" label="Friends" left="148"
-				 mouse_opaque="true" name="friend_color_swatch" width="44" />
+				 can_apply_immediately="true" color="1 1 1 1" control_name="AscentFriendColor"
+				 enabled="true" follows="left|top" height="47" label="Friends" left_delta="138"
+				 mouse_opaque="true" name="friend_color_swatch" width="44" tool_tip="Color of Friends" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
-				 can_apply_immediately="true" color="1 1 1 1" control_name="EMColor"
-				 enabled="true" follows="left|top" height="47" label="EMs" left_delta="54"
-				 mouse_opaque="true" name="em_color_swatch" width="44" />
+				 can_apply_immediately="true" color="1 1 1 1" control_name="AscentEstateOwnerColor"
+				 enabled="true" follows="left|top" height="47" label="Estate" left_delta="54"
+				 mouse_opaque="true" name="estate_owner_color_swatch" width="44" tool_tip="Color of Estate Managers" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
-				 can_apply_immediately="true" color="0.6 0.6 1 1"
+				 can_apply_immediately="true" color="0.6 0.6 1 1" control_name="AscentLindenColor"
 				 enabled="true" follows="left|top" height="47" label="Lindens" left_delta="54"
-				 mouse_opaque="true" name="linden_color_swatch" width="44" />
+				 mouse_opaque="true" name="linden_color_swatch" width="44" tool_tip="Color of Lindens" />
 			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
-				 can_apply_immediately="true" color="0.8 1 1 1" mouse_opaque="true"
+				 can_apply_immediately="true" color="0.8 1 1 1" control_name="AscentMutedColor"
 				 enabled="true" follows="left|top" height="47"  label="Muted" left_delta="54"
-				 name="muted_color_swatch" width="44" />
+				 mouse_opaque="true" name="muted_color_swatch" width="44" tool_tip="Color of Muted" />
 		</panel>
 		<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
 			follows="left|top|right|bottom" label="Body Dynamics" name="Body Dynamics">
@@ -192,7 +190,7 @@
 				bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 				font="SansSerifSmall" h_pad="0" halign="left" height="15" left="10"
 				mouse_opaque="true" name="av_mod_textbox" v_pad="0" width="394">
-        Avatar Offset Modifiers
+Avatar Offset Modifiers
       </text>
       <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
 					 label="X Modifier" label_width="65" left_delta="5" max_val="0.15" min_val="-0.15"

From da23cd1f42e52a7a4e4cb0b9a05177231de56f9a Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Sat, 28 May 2011 21:31:35 -0400
Subject: [PATCH 10/22] More updates to preferences UI and bug fixes.

---
 indra/newview/ascentprefschat.cpp             | 117 +++---
 indra/newview/ascentprefschat.h               |   3 +
 indra/newview/ascentprefssys.cpp              |   2 +-
 indra/newview/ascentprefsvan.cpp              |  61 +--
 indra/newview/ascentprefsvan.h                |   3 +-
 .../en-us/panel_preferences_ascent_vanity.xml | 380 +++++++++---------
 6 files changed, 292 insertions(+), 274 deletions(-)

diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp
index 05e53ce02..46dfa2756 100644
--- a/indra/newview/ascentprefschat.cpp
+++ b/indra/newview/ascentprefschat.cpp
@@ -53,6 +53,9 @@ LLPrefsAscentChat::LLPrefsAscentChat()
     childSetAction("EmSpell_Add", onSpellAdd, this);
     childSetAction("EmSpell_Remove", onSpellRemove, this);
 
+    childSetCommitCallback("time_format_combobox", onCommitTimeDate, this);
+    childSetCommitCallback("date_format_combobox", onCommitTimeDate, this);
+
     childSetCommitCallback("AscentInstantMessageResponseAnyone", onCommitAutoResponse, this);
 	childSetCommitCallback("AscentInstantMessageResponseFriends", onCommitAutoResponse, this);
 	childSetCommitCallback("AscentInstantMessageResponseMuted", onCommitAutoResponse, this);
@@ -128,6 +131,62 @@ void LLPrefsAscentChat::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata
     }
 }
 
+//static
+void LLPrefsAscentChat::onCommitTimeDate(LLUICtrl* ctrl, void* userdata)
+{
+    LLPrefsAscentChat* self = (LLPrefsAscentChat*)userdata;
+
+    LLComboBox* combo = (LLComboBox*)ctrl;
+    if (ctrl->getName() == "time_format_combobox")
+    {
+        self->tempTimeFormat = combo->getCurrentIndex();
+    }
+    else if (ctrl->getName() == "date_format_combobox")
+    {
+        self->tempDateFormat = combo->getCurrentIndex();
+    }
+
+    std::string short_date, long_date, short_time, long_time, timestamp;
+
+    if (self->tempTimeFormat == 0)
+    {
+        short_time = "%H:%M";
+        long_time  = "%H:%M:%S";
+        timestamp  = " %H:%M:%S";
+    }
+    else
+    {
+        short_time = "%I:%M %p";
+        long_time  = "%I:%M:%S %p";
+        timestamp  = " %I:%M %p";
+    }
+
+    if (self->tempDateFormat == 0)
+    {
+        short_date = "%Y-%m-%d";
+        long_date  = "%A %d %B %Y";
+        timestamp  = "%a %d %b %Y" + timestamp;
+    }
+    else if (self->tempDateFormat == 1)
+    {
+        short_date = "%d/%m/%Y";
+        long_date  = "%A %d %B %Y";
+        timestamp  = "%a %d %b %Y" + timestamp;
+    }
+    else
+    {
+        short_date = "%m/%d/%Y";
+        long_date  = "%A, %B %d %Y";
+        timestamp  = "%a %b %d %Y" + timestamp;
+    }
+
+    gSavedSettings.setString("ShortDateFormat", short_date);
+    gSavedSettings.setString("LongDateFormat",  long_date);
+    gSavedSettings.setString("ShortTimeFormat", short_time);
+    gSavedSettings.setString("LongTimeFormat",  long_time);
+    gSavedSettings.setString("TimestampFormat", timestamp);
+}
+
 //static
 void LLPrefsAscentChat::onCommitAutoResponse(LLUICtrl* ctrl, void* user_data)
 {
@@ -146,7 +205,7 @@ void LLPrefsAscentChat::onCommitAutoResponse(LLUICtrl* ctrl, void* user_data)
 //static
 void LLPrefsAscentChat::onCommitKeywords(LLUICtrl* ctrl, void* user_data)
 {
-    LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;	
+    LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;
 
     if (ctrl->getName() == "KeywordsOn")
     {
@@ -209,6 +268,9 @@ void LLPrefsAscentChat::refreshValues()
         mDateFormat = 0;
     }
 
+    tempTimeFormat = mTimeFormat;
+    tempDateFormat = mDateFormat;
+
     mIMResponseAnyone               = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseAnyone");
     mIMResponseFriends              = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseFriends");
     mIMResponseMuted                = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted");
@@ -433,59 +495,6 @@ void LLPrefsAscentChat::cancel()
 // Update local copy so cancel has no effect
 void LLPrefsAscentChat::apply()
 {
-    //Chat/IM -----------------------------------------------------------------------------
-    LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
-    if (combo)
-    {
-        mTimeFormat = combo->getCurrentIndex();
-    }
-
-    combo = getChild<LLComboBox>("date_format_combobox");
-    if (combo)
-    {
-        mDateFormat = combo->getCurrentIndex();
-    }
-
-    std::string short_date, long_date, short_time, long_time, timestamp;
-
-    if (mTimeFormat == 0)
-    {
-        short_time = "%H:%M";
-        long_time  = "%H:%M:%S";
-        timestamp  = " %H:%M:%S";
-    }
-    else
-    {
-        short_time = "%I:%M %p";
-        long_time  = "%I:%M:%S %p";
-        timestamp  = " %I:%M %p";
-    }
-
-    if (mDateFormat == 0)
-    {
-        short_date = "%Y-%m-%d";
-        long_date  = "%A %d %B %Y";
-        timestamp  = "%a %d %b %Y" + timestamp;
-    }
-    else if (mDateFormat == 1)
-    {
-        short_date = "%d/%m/%Y";
-        long_date  = "%A %d %B %Y";
-        timestamp  = "%a %d %b %Y" + timestamp;
-    }
-    else
-    {
-        short_date = "%m/%d/%Y";
-        long_date  = "%A, %B %d %Y";
-        timestamp  = "%a %b %d %Y" + timestamp;
-    }
-
-    gSavedSettings.setString("ShortDateFormat", short_date);
-    gSavedSettings.setString("LongDateFormat",  long_date);
-    gSavedSettings.setString("ShortTimeFormat", short_time);
-    gSavedSettings.setString("LongTimeFormat",  long_time);
-    gSavedSettings.setString("TimestampFormat", timestamp);
-
     refreshValues();
     refresh();
 }
diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h
index 8b7b1f436..3bc641bb2 100644
--- a/indra/newview/ascentprefschat.h
+++ b/indra/newview/ascentprefschat.h
@@ -53,6 +53,7 @@ protected:
     static void onSpellGetMore(void* data);
     static void onSpellEditCustom(void* data);
     static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
+    static void onCommitTimeDate(LLUICtrl* ctrl, void *userdata);
 	static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data);
 	static void onCommitKeywords(LLUICtrl* ctrl, void* user_data);
 
@@ -68,6 +69,8 @@ protected:
     U32 mLinksForChattingObjects;
     U32 mTimeFormat;
 	U32 mDateFormat;
+        U32 tempTimeFormat;
+        U32 tempDateFormat;
     BOOL mSecondsInChatAndIMs;
 
     BOOL mIMResponseAnyone;
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index 7aa94bed5..f42c1a504 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -87,7 +87,7 @@ void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
     
 //    llinfos << "Change to " << ctrl->getControlName()  << " aka " << ctrl->getName() << llendl;
     
-    if (ctrl->getName() == "speed_rez_check")   // Why is this one getControlName() and the rest are getName()?
+    if (ctrl->getName() == "speed_rez_check")
     {
         bool enabled = self->childGetValue("speed_rez_check").asBoolean();
         self->childSetEnabled("speed_rez_interval", enabled);
diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp
index a6e66f77e..a4ebab6c0 100644
--- a/indra/newview/ascentprefsvan.cpp
+++ b/indra/newview/ascentprefsvan.cpp
@@ -54,6 +54,8 @@ LLPrefsAscentVan::LLPrefsAscentVan()
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml");
 
+	childSetCommitCallback("tag_spoofing_combobox", onCommitClientTag, this);
+
 	childSetCommitCallback("show_my_tag_check", onCommitCheckBox, this);
 	childSetCommitCallback("show_self_tag_check", onCommitCheckBox, this);
 	childSetCommitCallback("show_self_tag_color_check", onCommitCheckBox, this);
@@ -62,7 +64,6 @@ LLPrefsAscentVan::LLPrefsAscentVan()
 	childSetCommitCallback("use_status_check", onCommitCheckBox, this);
 
 	childSetCommitCallback("custom_tag_label_box", onCommitTextModified, this);
-//	childSetCommitCallback("custom_tag_color_swatch", onCommitColor, this);
 
 	childSetCommitCallback("X Modifier", onCommitUpdateAvatarOffsets);
 	childSetCommitCallback("Y Modifier", onCommitUpdateAvatarOffsets);
@@ -78,6 +79,37 @@ LLPrefsAscentVan::~LLPrefsAscentVan()
 {
 }
 
+//static
+void LLPrefsAscentVan::onCommitClientTag(LLUICtrl* ctrl, void* userdata)
+{
+	std::string client_uuid;
+	U32 client_index;
+
+	LLPrefsAscentVan* self = (LLPrefsAscentVan*)userdata;
+	LLComboBox* combo = (LLComboBox*)ctrl;
+
+    if (combo)
+	{
+		client_index = combo->getCurrentIndex();
+		//Don't rebake if it's not neccesary.
+		if (client_index != self->mSelectedClient)
+		{
+			client_uuid = combo->getSelectedValue().asString();
+			gSavedSettings.setString("AscentReportClientUUID",  client_uuid);
+			gSavedSettings.setU32("AscentReportClientIndex",  client_index);
+
+			LLVOAvatar* avatar = gAgent.getAvatarObject();
+
+            if (avatar)
+            {
+			    // Slam pending upload count to "unstick" things
+			    bool slam_for_debug = true;
+			    avatar->forceBakeAllTextures(slam_for_debug);
+            }
+		}
+	}
+}
+
 //static
 void LLPrefsAscentVan::onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata)
 {
@@ -332,33 +364,6 @@ void LLPrefsAscentVan::cancel()
 // Update local copy so cancel has no effect
 void LLPrefsAscentVan::apply()
 {
-	std::string client_uuid;
-	U32 client_index;
-
-	//General -----------------------------------------------------------------------------
-
-	//Tags\Colors -------------------------------------------------------------------------
-	LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");
-	if (combo)
-	{
-		client_index = combo->getCurrentIndex();
-		//Don't rebake if it's not neccesary.
-		if (client_index != mSelectedClient)
-		{
-			client_uuid = combo->getSelectedValue().asString();
-			gSavedSettings.setString("AscentReportClientUUID",  client_uuid);
-			gSavedSettings.setU32("AscentReportClientIndex",  client_index);
-			LLVOAvatar* avatar = gAgent.getAvatarObject();
-			if (!avatar) return;
-
-			// Slam pending upload count to "unstick" things
-			bool slam_for_debug = true;
-			avatar->forceBakeAllTextures(slam_for_debug);
-		}
-	}
-
-    //Body Dynamics -----------------------------------------------------------------------
-
 	refreshValues();
     refresh();
 }
diff --git a/indra/newview/ascentprefsvan.h b/indra/newview/ascentprefsvan.h
index a743a0c88..1ebb31fea 100644
--- a/indra/newview/ascentprefsvan.h
+++ b/indra/newview/ascentprefsvan.h
@@ -49,7 +49,8 @@ public:
 //	LLPanel* getPanel();
 
 protected:
-	static void onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata);	
+	static void onCommitClientTag(LLUICtrl* ctrl, void* userdata);
+	static void onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata);
 	static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
     static void onCommitTextModified(LLUICtrl* ctrl, void* userdata);
 //	static void onCommitColor(LLUICtrl* ctrl, void* user_data);
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
index f2ff019e8..ecdda34bd 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
@@ -1,201 +1,201 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel top="20" left="10" height="400" width="512" follows="left|top|right|bottom"
-	border="true" label="SG Vanity" name="ascvan" enabled="true" mouse_opaque="true">
-	<tab_container label="SG Vanity" bottom="0" height="440" width="497" left="0"
-		name="Ascent Vanity" tab_min_width="90" tab_position="top">
-		<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
-				follows="left|top|right|bottom" label="General" name="General">
-			<check_box bottom_delta="-25" control_name="AscentStoreSettingsPerAccount" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Where applicable, save Vanity settings per-account." left="10"
-				tool_tip="Saves settings per-account, allowing easier customization for alts."
-				mouse_opaque="true" name="use_account_settings_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Show the Teleport progress screens" left="10"
-				tool_tip="If turned off, the viewer will not hide your UI while teleporting, allowing you to continue to read IMs."
-				mouse_opaque="true" name="disable_tp_screen_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="OptionPlayTpSound" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Play the Teleport sound when moving between sims" left="10"
-				tool_tip="Viewer will play the wooshing TP noise on teleport."
-				mouse_opaque="true" name="tp_sound_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Show the Login/Logout progress screens" left="10"
-				tool_tip="If turned off, the viewer does not hide the UI when logging in or out."
-				mouse_opaque="true" name="disable_logout_screen_check" radio_style="false"
-				width="400" />
-		</panel>
-		<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
-			follows="left|top|right|bottom" label="Tags\Colors" name="Tags\Colors">
-			<!-- Client tag options -->
-			<check_box bottom_delta="-25" control_name="AscentUseTag" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Use Client Tag:" left="10"
-				tool_tip="Enabling this will show your client tag on your avatar name locally."
-				mouse_opaque="true" name="show_my_tag_check" radio_style="false"
-				width="400" />
-			<combo_box allow_text_entry="false" enabled="true" follows="left|top"
-		    	  bottom_delta="-24" height="18" hidden="false" left_delta="24" max_chars="20" mouse_opaque="true"
-				  tool_tip="The client tag (And subsequent color) to broadcast. Overridden locally by Custom Tag/Color."
-		    	  name="tag_spoofing_combobox" width="130">
-				<combo_item type="string" length="1" enabled="true" name="Ascent" 
-					value="f25263b7-6167-4f34-a4ef-af65213b2e39">
+  border="true" label="SG Vanity" name="ascvan" enabled="true" mouse_opaque="true">
+  <tab_container label="SG Vanity" bottom="0" height="440" width="497" left="0"
+    name="Ascent Vanity" tab_min_width="90" tab_position="top">
+    <panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
+        follows="left|top|right|bottom" label="General" name="General">
+      <check_box bottom_delta="-25" control_name="AscentStoreSettingsPerAccount" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Where applicable, save Vanity settings per-account." left="10"
+        tool_tip="Saves settings per-account, allowing easier customization for alts."
+        mouse_opaque="true" name="use_account_settings_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Show the Teleport progress screens" left="10"
+        tool_tip="If turned off, the viewer will not hide your UI while teleporting, allowing you to continue to read IMs."
+        mouse_opaque="true" name="disable_tp_screen_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="OptionPlayTpSound" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Play the Teleport sound when moving between sims" left="10"
+        tool_tip="Viewer will play the wooshing TP noise on teleport."
+        mouse_opaque="true" name="tp_sound_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Show the Login/Logout progress screens" left="10"
+        tool_tip="If turned off, the viewer does not hide the UI when logging in or out."
+        mouse_opaque="true" name="disable_logout_screen_check" radio_style="false"
+        width="400" />
+    </panel>
+    <panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
+      follows="left|top|right|bottom" label="Tags\Colors" name="Tags\Colors">
+      <!-- Client tag options -->
+      <check_box bottom_delta="-25" control_name="AscentUseTag" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Use Client Tag:" left="10"
+        tool_tip="Enabling this will show your client tag on your avatar name locally."
+        mouse_opaque="true" name="show_my_tag_check" radio_style="false"
+        width="400" />
+      <combo_box allow_text_entry="false" enabled="true" follows="left|top"
+        bottom_delta="-24" height="18" hidden="false" left_delta="24" max_chars="20" mouse_opaque="true"
+        tool_tip="The client tag (And subsequent color) to broadcast. Overridden locally by Custom Tag/Color."
+        name="tag_spoofing_combobox" width="130">
+        <combo_item type="string" length="1" enabled="true" name="Ascent" 
+          value="f25263b7-6167-4f34-a4ef-af65213b2e39">
 Singularity
-				</combo_item>
-			</combo_box>
-			<check_box bottom_delta="-23" control_name="AscentShowSelfTag" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Display client tag to self" left_delta="-24"
-				tool_tip="Choose whether others see that you enjoy Singularity."
-				mouse_opaque="true" name="show_self_tag_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentShowSelfTagColor" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Display client tag color to self" left_delta="0"
-				tool_tip="Enabling this set your avatar name color to your client tag color or custom set color."
-				mouse_opaque="true" name="show_self_tag_color_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentShowFriendsTag" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Display friend client tags as (Friend)" left_delta="0"
-				tool_tip="Enabling this changes your friends' client tags to (Friend)."
-				mouse_opaque="true" name="show_friend_tag_check" radio_style="false"
-				width="400" />
-			<!-- End of Left Side -->
-			<check_box bottom_delta="87" control_name="AscentUseCustomTag" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Use a custom color and label (Local only)" left_delta="230"
-				tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself."
-				mouse_opaque="true" name="customize_own_tag_check" radio_style="false"
-				width="400" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="-17" left_delta="25" drop_shadow_visible="true" enabled="true" follows="left|top"
-				font="SansSerifSmall" h_pad="0" halign="left" height="10" 
-				mouse_opaque="true" name="custom_tag_label_text" v_pad="0" width="394">
-Label:
-			</text>
-			<line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
-				height="18" left_delta="35" name="custom_tag_label_box"
-				tool_tip="The custom string you would like to replace your client tag with (Local only)"
-				width="100" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="6" left_delta="110" drop_shadow_visible="true" enabled="true" follows="left|top"
-				font="SansSerifSmall" h_pad="0" halign="left" height="10" 
-				mouse_opaque="true" name="custom_tag_color_text" v_pad="0" width="394">
-Color:
-			</text>
-			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-22"
-				can_apply_immediately="false" color="1 1 1 1"
-				enabled="true" follows="left|top" height="34" label="" left_delta="35"
-				mouse_opaque="true" name="custom_tag_color_swatch" control_name="AscentCustomTagColor"
-				tool_tip="The custom color you would like to replace your client color with (Local only)" width="30" />
-			<check_box bottom_delta="-8" control_name="AscentShowOthersTag" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Display client tag for others" left_delta="-205"
-				tool_tip="Enabling this will show client tag names on others' avatar names."
-				mouse_opaque="true" name="show_other_tag_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Display client tag color for others" left_delta="0"
-				tool_tip="Enabling this sets others' avatar name color to their client's color."
-				mouse_opaque="true" name="show_client_tag_color_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentShowIdleTime" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Show Idle Time" left_delta="0"
-				tool_tip="Enabling this will show the amount of time an avatar has been idle."
-				mouse_opaque="true" name="show_idle_time_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentUpdateTagsOnLoad" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Automatically check website for updates to client definitions" left_delta="-230"
-				tool_tip="Enabling this will allow Singularity to download fresh definitions when needed."
-				mouse_opaque="true" name="update_tags_check" radio_style="false"
-				width="400" />
-			<button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="left|top" 
-				label="Manual Update" height="18" left_delta="340" width="110"/>
-			<!-- End of Client Tag settings -->
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-				font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-				mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
-Color For My Effects:
-			</text>
-			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34"
-				 can_apply_immediately="true" color="1 1 1 1" control_name="EffectColor"
-				 enabled="true" follows="left|top" height="47" label="Effects" left_delta="138"
-				 mouse_opaque="true" name="effect_color_swatch" width="44" />
-      <check_box bottom_delta="-20" control_name="AscentUseStatusColors" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Use user status colors (Friend, Linden, etcetera below)" left="10"
-				tool_tip="Enabling this will show people who match specific criteria (Lindens, Estate owners, friends, muted people) with the color you've set below."
-				mouse_opaque="true" name="use_status_check" radio_style="false"
-				width="400" />
+        </combo_item>
+      </combo_box>
+      <check_box bottom_delta="-23" control_name="AscentShowSelfTag" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Display client tag to self" left_delta="-24"
+        tool_tip="Choose whether others see that you enjoy Singularity."
+        mouse_opaque="true" name="show_self_tag_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentShowSelfTagColor" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Display client tag color to self" left_delta="0"
+        tool_tip="Enabling this set your avatar name color to your client tag color or custom set color."
+        mouse_opaque="true" name="show_self_tag_color_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentShowFriendsTag" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Display friend client tags as (Friend)" left_delta="0"
+        tool_tip="Enabling this changes your friends' client tags to (Friend)."
+        mouse_opaque="true" name="show_friend_tag_check" radio_style="false"
+        width="400" />
+      <!-- End of Left Side -->
+      <check_box bottom_delta="87" control_name="AscentUseCustomTag" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Use a custom color and label (Local only)" left_delta="230"
+        tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself."
+        mouse_opaque="true" name="customize_own_tag_check" radio_style="false"
+        width="400" />
       <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-				font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="10"
-				mouse_opaque="true" name="friends_color_textbox" v_pad="0" width="394">
+        bottom_delta="-17" left_delta="25" drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" 
+        mouse_opaque="true" name="custom_tag_label_text" v_pad="0" width="394">
+Label:
+      </text>
+      <line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
+        height="18" left_delta="35" name="custom_tag_label_box"
+        tool_tip="The custom string you would like to replace your client tag with (Local only)"
+        width="100" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom_delta="6" left_delta="110" drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" 
+        mouse_opaque="true" name="custom_tag_color_text" v_pad="0" width="394">
+Color:
+      </text>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-22"
+        can_apply_immediately="false" color="1 1 1 1"
+        enabled="true" follows="left|top" height="34" label="" left_delta="35"
+        mouse_opaque="true" name="custom_tag_color_swatch" control_name="AscentCustomTagColor"
+        tool_tip="The custom color you would like to replace your client color with (Local only)" width="30" />
+      <check_box bottom_delta="-8" control_name="AscentShowOthersTag" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Display client tag for others" left_delta="-205"
+        tool_tip="Enabling this will show client tag names on others' avatar names."
+        mouse_opaque="true" name="show_other_tag_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Display client tag color for others" left_delta="0"
+        tool_tip="Enabling this sets others' avatar name color to their client's color."
+        mouse_opaque="true" name="show_client_tag_color_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentShowIdleTime" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Show Idle Time" left_delta="0"
+        tool_tip="Enabling this will show the amount of time an avatar has been idle."
+        mouse_opaque="true" name="show_idle_time_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentUpdateTagsOnLoad" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Automatically check website for updates to client definitions" left_delta="-230"
+        tool_tip="Enabling this will allow Singularity to download fresh definitions when needed."
+        mouse_opaque="true" name="update_tags_check" radio_style="false"
+        width="400" />
+      <button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="left|top" 
+        label="Manual Update" height="18" left_delta="340" width="110"/>
+      <!-- End of Client Tag settings -->
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+        mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
+Color For My Effects:
+      </text>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34"
+         can_apply_immediately="true" color="1 1 1 1" control_name="EffectColor"
+         enabled="true" follows="left|top" height="47" label="Effects" left_delta="138"
+         mouse_opaque="true" name="effect_color_swatch" width="44" />
+      <check_box bottom_delta="-20" control_name="AscentUseStatusColors" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Use user status colors (Friend, Linden, etcetera below)" left="10"
+        tool_tip="Enabling this will show people who match specific criteria (Lindens, Estate owners, friends, muted people) with the color you've set below."
+        mouse_opaque="true" name="use_status_check" radio_style="false"
+        width="400" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="10"
+        mouse_opaque="true" name="friends_color_textbox" v_pad="0" width="394">
 Color For:
 (Radar, Tag, Minimap)
-			</text>
-			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34"
-				 can_apply_immediately="true" color="1 1 1 1" control_name="AscentFriendColor"
-				 enabled="true" follows="left|top" height="47" label="Friends" left_delta="138"
-				 mouse_opaque="true" name="friend_color_swatch" width="44" tool_tip="Color of Friends" />
-			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
-				 can_apply_immediately="true" color="1 1 1 1" control_name="AscentEstateOwnerColor"
-				 enabled="true" follows="left|top" height="47" label="Estate" left_delta="54"
-				 mouse_opaque="true" name="estate_owner_color_swatch" width="44" tool_tip="Color of Estate Managers" />
-			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
-				 can_apply_immediately="true" color="0.6 0.6 1 1" control_name="AscentLindenColor"
-				 enabled="true" follows="left|top" height="47" label="Lindens" left_delta="54"
-				 mouse_opaque="true" name="linden_color_swatch" width="44" tool_tip="Color of Lindens" />
-			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
-				 can_apply_immediately="true" color="0.8 1 1 1" control_name="AscentMutedColor"
-				 enabled="true" follows="left|top" height="47"  label="Muted" left_delta="54"
-				 mouse_opaque="true" name="muted_color_swatch" width="44" tool_tip="Color of Muted" />
-		</panel>
-		<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
-			follows="left|top|right|bottom" label="Body Dynamics" name="Body Dynamics">
-			<check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				label="Enable enhanced physics on avatar breasts" left="10" mouse_opaque="true" name="EmBreastsToggle"
-				control_name="EmeraldBreastPhysicsToggle" width="126"/>
-			<slider bottom_delta="-20" left="10" name="EmeraldBoobMass" control_name="EmeraldBoobMass"
-				decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
-				label="Breast mass:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
-				show_text="true" width="250" auto_resize="false" tool_tip=""/>
-			<slider bottom_delta="-20" left_delta="0" name="EmeraldBoobHardness" control_name="EmeraldBoobHardness"
-				decimal_di:wqgits="0" enabled="true" follows="left|top" height="18" increment="1"
-				label="Breast rebound:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
-				show_text="true" width="250" auto_resize="false" tool_tip=""/>
-			<slider bottom_delta="-20" left_delta="0" name="EmeraldBoobVelMax" control_name="EmeraldBoobVelMax"
-				decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
-				label="Breast max vel:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
-				show_text="true" width="250" auto_resize="false" tool_tip=""/>
-			<slider bottom_delta="-20" left_delta="0" name="EmeraldBoobFriction" control_name="EmeraldBoobFriction"
-				decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
-				label="Breast friction:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
-				show_text="true" width="250" auto_resize="false" tool_tip=""/>
-			<slider bottom_delta="-20" left_delta="0" name="EmeraldBoobVelMin" control_name="EmeraldBoobVelMin"
-				decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
-				label="Breast min vel:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
-				show_text="true" width="250" auto_resize="false" tool_tip=""/>
+      </text>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34"
+         can_apply_immediately="true" color="1 1 1 1" control_name="AscentFriendColor"
+         enabled="true" follows="left|top" height="47" label="Friends" left_delta="138"
+         mouse_opaque="true" name="friend_color_swatch" width="44" tool_tip="Color of Friends" />
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
+         can_apply_immediately="true" color="1 1 1 1" control_name="AscentEstateOwnerColor"
+         enabled="true" follows="left|top" height="47" label="Estate" left_delta="54"
+         mouse_opaque="true" name="estate_owner_color_swatch" width="44" tool_tip="Color of Estate Managers" />
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
+         can_apply_immediately="true" color="0.6 0.6 1 1" control_name="AscentLindenColor"
+         enabled="true" follows="left|top" height="47" label="Lindens" left_delta="54"
+         mouse_opaque="true" name="linden_color_swatch" width="44" tool_tip="Color of Lindens" />
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
+         can_apply_immediately="true" color="0.8 1 1 1" control_name="AscentMutedColor"
+         enabled="true" follows="left|top" height="47"  label="Muted" left_delta="54"
+         mouse_opaque="true" name="muted_color_swatch" width="44" tool_tip="Color of Muted" />
+    </panel>
+    <panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
+      follows="left|top|right|bottom" label="Body Dynamics" name="Body Dynamics">
+      <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        label="Enable enhanced physics on avatar breasts" left="10" mouse_opaque="true" name="EmBreastsToggle"
+        control_name="EmeraldBreastPhysicsToggle" width="126"/>
+      <slider bottom_delta="-20" left="10" name="EmeraldBoobMass" control_name="EmeraldBoobMass"
+        decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
+        label="Breast mass:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
+        show_text="true" width="250" auto_resize="false" tool_tip=""/>
+      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobHardness" control_name="EmeraldBoobHardness"
+        decimal_di:wqgits="0" enabled="true" follows="left|top" height="18" increment="1"
+        label="Breast rebound:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
+        show_text="true" width="250" auto_resize="false" tool_tip=""/>
+      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobVelMax" control_name="EmeraldBoobVelMax"
+        decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
+        label="Breast max vel:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
+        show_text="true" width="250" auto_resize="false" tool_tip=""/>
+      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobFriction" control_name="EmeraldBoobFriction"
+        decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
+        label="Breast friction:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
+        show_text="true" width="250" auto_resize="false" tool_tip=""/>
+      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobVelMin" control_name="EmeraldBoobVelMin"
+        decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
+        label="Breast min vel:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
+        show_text="true" width="250" auto_resize="false" tool_tip=""/>
       <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-				font="SansSerifSmall" h_pad="0" halign="left" height="15" left="10"
-				mouse_opaque="true" name="av_mod_textbox" v_pad="0" width="394">
+        bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="15" left="10"
+        mouse_opaque="true" name="av_mod_textbox" v_pad="0" width="394">
 Avatar Offset Modifiers
       </text>
       <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-					 label="X Modifier" label_width="65" left_delta="5" max_val="0.15" min_val="-0.15"
-					 mouse_opaque="true" name="X Modifier" width="128" control_name="AscentAvatarXModifier"
-					 tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
+           label="X Modifier" label_width="65" left_delta="5" max_val="0.15" min_val="-0.15"
+           mouse_opaque="true" name="X Modifier" width="128" control_name="AscentAvatarXModifier"
+           tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
       <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
          label="Y Modifier" label_width="65" left_delta="0" max_val="0.20" min_val="-0.20"
          mouse_opaque="true" name="Y Modifier" width="128" control_name="AscentAvatarYModifier"
@@ -204,6 +204,6 @@ Avatar Offset Modifiers
          label="Z Modifier" label_width="65" left_delta="0" max_val="5.0" min_val="-5.0"
          mouse_opaque="true" name="Z Modifier" width="128" control_name="AscentAvatarZModifier"
          tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
-		</panel>
-	</tab_container>
+    </panel>
+  </tab_container>
 </panel>

From aede4d80e892a439f6b3cbc57c6f5a3160b5463f Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Sat, 28 May 2011 21:45:05 -0400
Subject: [PATCH 11/22] Fix for people setting object name to nothing so that
 you can still click in chat to find out who and where.

---
 indra/newview/llviewermessage.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8115bca09..55a9bbb54 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3024,6 +3024,10 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 	LLViewerObject*	chatter;
 
 	msg->getString("ChatData", "FromName", from_name);
+    if (from_name.empty())
+    {
+        from_name = "(no name)";
+    }
 	chat.mFromName = from_name;
 	
 	msg->getUUID("ChatData", "SourceID", from_id);

From 3813ccb15a05c59ae86592c447645f2efdb71b45 Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Sun, 29 May 2011 20:18:44 -0400
Subject: [PATCH 12/22] Removed commented out code.

---
 indra/newview/ascentprefschat.cpp |  36 ++--
 indra/newview/ascentprefschat.h   |  30 +--
 indra/newview/ascentprefssys.cpp  |   1 -
 indra/newview/ascentprefsvan.cpp  | 310 +++++++++++++-----------------
 indra/newview/ascentprefsvan.h    |  53 +++--
 5 files changed, 194 insertions(+), 236 deletions(-)

diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp
index 46dfa2756..bd52eb5f0 100644
--- a/indra/newview/ascentprefschat.cpp
+++ b/indra/newview/ascentprefschat.cpp
@@ -57,22 +57,22 @@ LLPrefsAscentChat::LLPrefsAscentChat()
     childSetCommitCallback("date_format_combobox", onCommitTimeDate, this);
 
     childSetCommitCallback("AscentInstantMessageResponseAnyone", onCommitAutoResponse, this);
-	childSetCommitCallback("AscentInstantMessageResponseFriends", onCommitAutoResponse, this);
-	childSetCommitCallback("AscentInstantMessageResponseMuted", onCommitAutoResponse, this);
+    childSetCommitCallback("AscentInstantMessageResponseFriends", onCommitAutoResponse, this);
+    childSetCommitCallback("AscentInstantMessageResponseMuted", onCommitAutoResponse, this);
     childSetCommitCallback("AscentInstantMessageShowOnTyping", onCommitAutoResponse, this);
-	childSetCommitCallback("AscentInstantMessageShowResponded", onCommitAutoResponse, this);
-	childSetCommitCallback("AscentInstantMessageResponseRepeat", onCommitAutoResponse, this);
-	childSetCommitCallback("AscentInstantMessageResponseItem", onCommitAutoResponse, this);
-	childSetCommitCallback("im_response", onCommitAutoResponse, this);
+    childSetCommitCallback("AscentInstantMessageShowResponded", onCommitAutoResponse, this);
+    childSetCommitCallback("AscentInstantMessageResponseRepeat", onCommitAutoResponse, this);
+    childSetCommitCallback("AscentInstantMessageResponseItem", onCommitAutoResponse, this);
+    childSetCommitCallback("im_response", onCommitAutoResponse, this);
 
     childSetCommitCallback("KeywordsOn", onCommitKeywords, this);
-	childSetCommitCallback("KeywordsList", onCommitKeywords, this);
-	childSetCommitCallback("KeywordsSound", onCommitKeywords, this);
+    childSetCommitCallback("KeywordsList", onCommitKeywords, this);
+    childSetCommitCallback("KeywordsSound", onCommitKeywords, this);
     childSetCommitCallback("KeywordsInChat", onCommitKeywords, this);
-	childSetCommitCallback("KeywordsInIM", onCommitKeywords, this);
-	childSetCommitCallback("KeywordsChangeColor", onCommitKeywords, this);
-	childSetCommitCallback("KeywordsColor", onCommitKeywords, this);
-	childSetCommitCallback("KeywordsPlaySound", onCommitKeywords, this);
+    childSetCommitCallback("KeywordsInIM", onCommitKeywords, this);
+    childSetCommitCallback("KeywordsChangeColor", onCommitKeywords, this);
+    childSetCommitCallback("KeywordsColor", onCommitKeywords, this);
+    childSetCommitCallback("KeywordsPlaySound", onCommitKeywords, this);
 
     refreshValues();
     refresh();
@@ -235,9 +235,9 @@ void LLPrefsAscentChat::refreshValues()
     //Chat/IM -----------------------------------------------------------------------------
     mWoLfVerticalIMTabs             = gSavedSettings.getBOOL("WoLfVerticalIMTabs");
     mIMAnnounceIncoming             = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming");
-	mHideTypingNotification         = gSavedSettings.getBOOL("AscentHideTypingNotification");
+    mHideTypingNotification         = gSavedSettings.getBOOL("AscentHideTypingNotification");
     mShowGroupNameInChatIM          = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM");
-	mPlayTypingSound                = gSavedSettings.getBOOL("PlayTypingSound");
+    mPlayTypingSound                = gSavedSettings.getBOOL("PlayTypingSound");
     mHideNotificationsInChat        = gSavedSettings.getBOOL("HideNotificationsInChat");
     mEnableMUPose                   = gSavedSettings.getBOOL("AscentAllowMUpose");
     mEnableOOCAutoClose             = gSavedSettings.getBOOL("AscentAutoCloseOOC");
@@ -305,10 +305,6 @@ void LLPrefsAscentChat::refreshValues()
 void LLPrefsAscentChat::refresh()
 {
     //Chat --------------------------------------------------------------------------------
-/*
-    LLRadioGroup* radioLinkOptions = getChild<LLRadioGroup>("objects_link");
-    radioLinkOptions->selectNthItem(mLinksForChattingObjects);
-*/
     // time format combobox
     LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
     if (combo)
@@ -413,9 +409,9 @@ void LLPrefsAscentChat::cancel()
     //Chat/IM -----------------------------------------------------------------------------
     gSavedSettings.setBOOL("WoLfVerticalIMTabs",                   mWoLfVerticalIMTabs);
     gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming);
-	gSavedSettings.setBOOL("AscentHideTypingNotification",         mHideTypingNotification);
+    gSavedSettings.setBOOL("AscentHideTypingNotification",         mHideTypingNotification);
     gSavedSettings.setBOOL("OptionShowGroupNameInChatIM",          mShowGroupNameInChatIM);
-	gSavedSettings.setBOOL("PlayTypingSound",                      mPlayTypingSound);
+    gSavedSettings.setBOOL("PlayTypingSound",                      mPlayTypingSound);
     gSavedSettings.setBOOL("HideNotificationsInChat",              mHideNotificationsInChat);
     gSavedSettings.setBOOL("AscentAllowMUpose",                    mEnableMUPose);
     gSavedSettings.setBOOL("AscentAutoCloseOOC",                   mEnableOOCAutoClose);
diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h
index 3bc641bb2..85b8d45d6 100644
--- a/indra/newview/ascentprefschat.h
+++ b/indra/newview/ascentprefschat.h
@@ -39,13 +39,13 @@
 class LLPrefsAscentChat : public LLPanel
 {
 public:
-	LLPrefsAscentChat();
-	~LLPrefsAscentChat();
+    LLPrefsAscentChat();
+    ~LLPrefsAscentChat();
 
-	void apply();
-	void cancel();
+    void apply();
+    void cancel();
     void refresh();
-	void refreshValues();
+    void refreshValues();
 
 protected:
     static void onSpellAdd(void* data);
@@ -54,21 +54,21 @@ protected:
     static void onSpellEditCustom(void* data);
     static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
     static void onCommitTimeDate(LLUICtrl* ctrl, void *userdata);
-	static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data);
-	static void onCommitKeywords(LLUICtrl* ctrl, void* user_data);
+    static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data);
+    static void onCommitKeywords(LLUICtrl* ctrl, void* user_data);
 
     //Chat/IM -----------------------------------------------------------------------------
     BOOL mWoLfVerticalIMTabs;
     BOOL mIMAnnounceIncoming;
-	BOOL mHideTypingNotification;
+    BOOL mHideTypingNotification;
     BOOL mShowGroupNameInChatIM;
-	BOOL mPlayTypingSound;
+    BOOL mPlayTypingSound;
     BOOL mHideNotificationsInChat;
     BOOL mEnableMUPose;
     BOOL mEnableOOCAutoClose;
     U32 mLinksForChattingObjects;
     U32 mTimeFormat;
-	U32 mDateFormat;
+    U32 mDateFormat;
         U32 tempTimeFormat;
         U32 tempDateFormat;
     BOOL mSecondsInChatAndIMs;
@@ -94,13 +94,13 @@ protected:
     //Text Options ------------------------------------------------------------------------
     BOOL mSpellDisplay;
     BOOL mKeywordsOn;
-	std::string mKeywordsList;
-	BOOL mKeywordsInChat;
+    std::string mKeywordsList;
+    BOOL mKeywordsInChat;
     BOOL mKeywordsInIM;
-	BOOL mKeywordsChangeColor;
-	LLColor4 mKeywordsColor;
+    BOOL mKeywordsChangeColor;
+    LLColor4 mKeywordsColor;
     BOOL mKeywordsPlaySound;
-	LLUUID mKeywordsSound;
+    LLUUID mKeywordsSound;
 };
 
 #endif
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index f42c1a504..66a8d7e72 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -303,7 +303,6 @@ void LLPrefsAscentSys::cancel()
     gSavedSettings.setBOOL("AscentBuildAlwaysEnabled", mBuildAlwaysEnabled);
     gSavedSettings.setBOOL("AscentFlyAlwaysEnabled", mAlwaysShowFly);
     gSavedSettings.setBOOL("AscentDisableMinZoomDist", mDisableMinZoom);
-//  gSavedSettings.setBOOL("AscentPowerfulWizard", mPowerUser);
     gSavedSettings.setBOOL("AscentUseSystemFolder", mUseSystemFolder);
         gSavedSettings.setBOOL("AscentSystemTemporary", mUploadToSystem);
     gSavedSettings.setBOOL("FetchInventoryOnLogin", mFetchInventoryOnLogin);
diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp
index a4ebab6c0..4ff96a614 100644
--- a/indra/newview/ascentprefsvan.cpp
+++ b/indra/newview/ascentprefsvan.cpp
@@ -52,27 +52,27 @@
 
 LLPrefsAscentVan::LLPrefsAscentVan()
 {
-	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml");
+    LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml");
 
-	childSetCommitCallback("tag_spoofing_combobox", onCommitClientTag, this);
+    childSetCommitCallback("tag_spoofing_combobox", onCommitClientTag, this);
 
-	childSetCommitCallback("show_my_tag_check", onCommitCheckBox, this);
-	childSetCommitCallback("show_self_tag_check", onCommitCheckBox, this);
-	childSetCommitCallback("show_self_tag_color_check", onCommitCheckBox, this);
-	childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this);
-	childSetCommitCallback("show_friend_tag_check", onCommitCheckBox, this);
-	childSetCommitCallback("use_status_check", onCommitCheckBox, this);
+    childSetCommitCallback("show_my_tag_check", onCommitCheckBox, this);
+    childSetCommitCallback("show_self_tag_check", onCommitCheckBox, this);
+    childSetCommitCallback("show_self_tag_color_check", onCommitCheckBox, this);
+    childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this);
+    childSetCommitCallback("show_friend_tag_check", onCommitCheckBox, this);
+    childSetCommitCallback("use_status_check", onCommitCheckBox, this);
 
-	childSetCommitCallback("custom_tag_label_box", onCommitTextModified, this);
+    childSetCommitCallback("custom_tag_label_box", onCommitTextModified, this);
 
-	childSetCommitCallback("X Modifier", onCommitUpdateAvatarOffsets);
-	childSetCommitCallback("Y Modifier", onCommitUpdateAvatarOffsets);
-	childSetCommitCallback("Z Modifier", onCommitUpdateAvatarOffsets);
+    childSetCommitCallback("X Modifier", onCommitUpdateAvatarOffsets);
+    childSetCommitCallback("Y Modifier", onCommitUpdateAvatarOffsets);
+    childSetCommitCallback("Z Modifier", onCommitUpdateAvatarOffsets);
 
-	childSetAction("update_clientdefs", onManualClientUpdate, this);
+    childSetAction("update_clientdefs", onManualClientUpdate, this);
 
     refreshValues();
-	refresh();
+    refresh();
 }
 
 LLPrefsAscentVan::~LLPrefsAscentVan()
@@ -82,32 +82,32 @@ LLPrefsAscentVan::~LLPrefsAscentVan()
 //static
 void LLPrefsAscentVan::onCommitClientTag(LLUICtrl* ctrl, void* userdata)
 {
-	std::string client_uuid;
-	U32 client_index;
+    std::string client_uuid;
+    U32 client_index;
 
-	LLPrefsAscentVan* self = (LLPrefsAscentVan*)userdata;
-	LLComboBox* combo = (LLComboBox*)ctrl;
+    LLPrefsAscentVan* self = (LLPrefsAscentVan*)userdata;
+    LLComboBox* combo = (LLComboBox*)ctrl;
 
     if (combo)
-	{
-		client_index = combo->getCurrentIndex();
-		//Don't rebake if it's not neccesary.
-		if (client_index != self->mSelectedClient)
-		{
-			client_uuid = combo->getSelectedValue().asString();
-			gSavedSettings.setString("AscentReportClientUUID",  client_uuid);
-			gSavedSettings.setU32("AscentReportClientIndex",  client_index);
+    {
+        client_index = combo->getCurrentIndex();
+        //Don't rebake if it's not neccesary.
+        if (client_index != self->mSelectedClient)
+        {
+            client_uuid = combo->getSelectedValue().asString();
+            gSavedSettings.setString("AscentReportClientUUID",  client_uuid);
+            gSavedSettings.setU32("AscentReportClientIndex",  client_index);
 
-			LLVOAvatar* avatar = gAgent.getAvatarObject();
+            LLVOAvatar* avatar = gAgent.getAvatarObject();
 
             if (avatar)
             {
-			    // Slam pending upload count to "unstick" things
-			    bool slam_for_debug = true;
-			    avatar->forceBakeAllTextures(slam_for_debug);
+                // Slam pending upload count to "unstick" things
+                bool slam_for_debug = true;
+                avatar->forceBakeAllTextures(slam_for_debug);
             }
-		}
-	}
+        }
+    }
 }
 
 //static
@@ -115,157 +115,131 @@ void LLPrefsAscentVan::onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdat
 {
     if (!gAgent.getID().isNull())
     {
-    	gAgent.sendAgentSetAppearance();
+        gAgent.sendAgentSetAppearance();
     }
 }
 
 //static
 void LLPrefsAscentVan::onCommitTextModified(LLUICtrl* ctrl, void* userdata)
 {
-	LLPrefsAscentVan* self = (LLPrefsAscentVan*)userdata;
+    LLPrefsAscentVan* self = (LLPrefsAscentVan*)userdata;
 
     if (ctrl->getName() == "custom_tag_label_box")
     {
         gSavedSettings.setString("AscentCustomTagLabel", self->childGetValue("custom_tag_label_box"));
     }
 }
-/*
-//static
-void LLPrefsAscentVan::onCommitColor(LLUICtrl* ctrl, void* user_data)
-{
-	LLPrefsAscentVan* self = (LLPrefsAscentVan*)user_data;
 
-	llinfos << "Control named " << ctrl->getControlName() << " aka " << ctrl->getName() << llendl;
-
-	if (ctrl->getName() == "custom_tag_color_swatch")
-	{
-		llinfos << "Recreating color message for tag update." << llendl;
-		gSavedSettings.setString("AscentCustomTagLabel",		self->childGetValue("custom_tag_label_box"));
-//		gSavedSettings.setColor4("AscentCustomTagColor",		self->childGetValue("custom_tag_color_swatch"));
-
-        if (!gAgent.getID().isNull())
-        {
-		    gAgent.sendAgentSetAppearance();
-		    gAgent.resetClientTag();
-        }
-	}
-}
-*/
 //static
 void LLPrefsAscentVan::onManualClientUpdate(void* data)
 {
-	LLChat chat;
-	chat.mSourceType = CHAT_SOURCE_SYSTEM;
-	chat.mText = llformat("Definitions already up-to-date.");
-	if (LLVOAvatar::updateClientTags())
-	{
-		chat.mText = llformat("Client definitions updated.");
-		LLVOAvatar::loadClientTags();
-		for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
-		iter != LLCharacter::sInstances.end(); ++iter)
-		{
-			LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
-			if(avatarp)
-			{
-				LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition();
-				avatarp->mClientTag = "";
-			}
-		}
-	}
-	LLFloaterChat::addChat(chat);
+    LLChat chat;
+    chat.mSourceType = CHAT_SOURCE_SYSTEM;
+    chat.mText = llformat("Definitions already up-to-date.");
+    if (LLVOAvatar::updateClientTags())
+    {
+        chat.mText = llformat("Client definitions updated.");
+        LLVOAvatar::loadClientTags();
+        for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+        iter != LLCharacter::sInstances.end(); ++iter)
+        {
+            LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
+            if(avatarp)
+            {
+                LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition();
+                avatarp->mClientTag = "";
+            }
+        }
+    }
+    LLFloaterChat::addChat(chat);
 }
 
 //static
 void LLPrefsAscentVan::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
 {
-	LLPrefsAscentVan* self = (LLPrefsAscentVan*)user_data;
+    LLPrefsAscentVan* self = (LLPrefsAscentVan*)user_data;
 
 //	llinfos << "Control named " << ctrl->getControlName() << llendl;
-/*
-    if (ctrl->getControlName() == "AscentStoreSettingsPerAccount")
-	{
-		self->refresh();
-	}
-*/
-	if (ctrl->getName() == "show_friend_tag_check")
-	{
-		for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
-		iter != LLCharacter::sInstances.end(); ++iter)
-		{
-			LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
-			if(avatarp)
-			{
-				LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition();
-				avatarp->mClientTag = "";
-			}
-		}
-	}
+
+    if (ctrl->getName() == "show_friend_tag_check")
+    {
+        for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+        iter != LLCharacter::sInstances.end(); ++iter)
+        {
+            LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
+            if(avatarp)
+            {
+                LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition();
+                avatarp->mClientTag = "";
+            }
+        }
+    }
     else if (ctrl->getName() == "use_status_check")
     {
-		for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
-		iter != LLCharacter::sInstances.end(); ++iter)
-		{
-			LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
-			if(avatarp)
-			{
-				LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition();
-				avatarp->mClientTag = "";
-			}
-		}
+        for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+        iter != LLCharacter::sInstances.end(); ++iter)
+        {
+            LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
+            if(avatarp)
+            {
+                LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition();
+                avatarp->mClientTag = "";
+            }
+        }
 
         BOOL showCustomColors = gSavedSettings.getBOOL("AscentUseStatusColors");
-	    self->childSetEnabled("friends_color_textbox", showCustomColors);
-	    self->childSetEnabled("friend_color_swatch", showCustomColors);
-	    self->childSetEnabled("estate_owner_color_swatch", showCustomColors);
-	    self->childSetEnabled("linden_color_swatch", showCustomColors);
-	    self->childSetEnabled("muted_color_swatch", showCustomColors);
+        self->childSetEnabled("friends_color_textbox", showCustomColors);
+        self->childSetEnabled("friend_color_swatch", showCustomColors);
+        self->childSetEnabled("estate_owner_color_swatch", showCustomColors);
+        self->childSetEnabled("linden_color_swatch", showCustomColors);
+        self->childSetEnabled("muted_color_swatch", showCustomColors);
     }
     else if (ctrl->getName() == "customize_own_tag_check")
     {
-	    BOOL showCustomOptions = gSavedSettings.getBOOL("AscentUseCustomTag");
-	    self->childSetEnabled("custom_tag_label_text", showCustomOptions);
-	    self->childSetEnabled("custom_tag_label_box", showCustomOptions);
-	    self->childSetEnabled("custom_tag_color_text", showCustomOptions);
-	    self->childSetEnabled("custom_tag_color_swatch", showCustomOptions);
+        BOOL showCustomOptions = gSavedSettings.getBOOL("AscentUseCustomTag");
+        self->childSetEnabled("custom_tag_label_text", showCustomOptions);
+        self->childSetEnabled("custom_tag_label_box", showCustomOptions);
+        self->childSetEnabled("custom_tag_color_text", showCustomOptions);
+        self->childSetEnabled("custom_tag_color_swatch", showCustomOptions);
     }
 
     if (!gAgent.getID().isNull())
     {
-		gAgent.sendAgentSetAppearance();
-		gAgent.resetClientTag();
+        gAgent.sendAgentSetAppearance();
+        gAgent.resetClientTag();
     }
 }
 
 // Store current settings for cancel
 void LLPrefsAscentVan::refreshValues()
 {
-	//General --------------------------------------------------------------------------------
-	mUseAccountSettings		= gSavedSettings.getBOOL("AscentStoreSettingsPerAccount");
-	mShowTPScreen			= !gSavedSettings.getBOOL("AscentDisableTeleportScreens");
-	mPlayTPSound			= gSavedSettings.getBOOL("OptionPlayTpSound");
-	mShowLogScreens			= !gSavedSettings.getBOOL("AscentDisableLogoutScreens");
+    //General --------------------------------------------------------------------------------
+    mUseAccountSettings		= gSavedSettings.getBOOL("AscentStoreSettingsPerAccount");
+    mShowTPScreen			= !gSavedSettings.getBOOL("AscentDisableTeleportScreens");
+    mPlayTPSound			= gSavedSettings.getBOOL("OptionPlayTpSound");
+    mShowLogScreens			= !gSavedSettings.getBOOL("AscentDisableLogoutScreens");
 
-	//Tags\Colors ----------------------------------------------------------------------------
+    //Tags\Colors ----------------------------------------------------------------------------
     mAscentUseTag           = gSavedSettings.getBOOL("AscentUseTag");
     mReportClientUUID       = gSavedSettings.getString("AscentReportClientUUID");
-	mSelectedClient			= gSavedSettings.getU32("AscentReportClientIndex");
+    mSelectedClient			= gSavedSettings.getU32("AscentReportClientIndex");
     mShowSelfClientTag		= gSavedSettings.getBOOL("AscentShowSelfTag");
-	mShowSelfClientTagColor = gSavedSettings.getBOOL("AscentShowSelfTagColor");
+    mShowSelfClientTagColor = gSavedSettings.getBOOL("AscentShowSelfTagColor");
     mShowFriendsTag         = gSavedSettings.getBOOL("AscentShowFriendsTag");
-	mCustomTagOn			= gSavedSettings.getBOOL("AscentUseCustomTag");
-	mCustomTagLabel			= gSavedSettings.getString("AscentCustomTagLabel");
-	mCustomTagColor			= gSavedSettings.getColor4("AscentCustomTagColor");
+    mCustomTagOn			= gSavedSettings.getBOOL("AscentUseCustomTag");
+    mCustomTagLabel			= gSavedSettings.getString("AscentCustomTagLabel");
+    mCustomTagColor			= gSavedSettings.getColor4("AscentCustomTagColor");
     mShowOthersTag          = gSavedSettings.getBOOL("AscentShowOthersTag");
     mShowOthersTagColor     = gSavedSettings.getBOOL("AscentShowOthersTagColor");
     mShowIdleTime           = gSavedSettings.getBOOL("AscentShowIdleTime");
     mUseStatusColors        = gSavedSettings.getBOOL("AscentUseStatusColors");
     mUpdateTagsOnLoad       = gSavedSettings.getBOOL("AscentUpdateTagsOnLoad");
-	mEffectColor			= gSavedSettings.getColor4("EffectColor");
-	mFriendColor			= gSavedSettings.getColor4("AscentFriendColor");
-	mEstateOwnerColor		= gSavedSettings.getColor4("AscentEstateOwnerColor");
-	mLindenColor			= gSavedSettings.getColor4("AscentLindenColor");
-	mMutedColor				= gSavedSettings.getColor4("AscentMutedColor");
-	//mCustomColor			= gSavedSettings.getColor4("MoyMiniMapCustomColor");
+    mEffectColor			= gSavedSettings.getColor4("EffectColor");
+    mFriendColor			= gSavedSettings.getColor4("AscentFriendColor");
+    mEstateOwnerColor		= gSavedSettings.getColor4("AscentEstateOwnerColor");
+    mLindenColor			= gSavedSettings.getColor4("AscentLindenColor");
+    mMutedColor				= gSavedSettings.getColor4("AscentMutedColor");
+    //mCustomColor			= gSavedSettings.getColor4("MoyMiniMapCustomColor");
 
     //Body Dynamics --------------------------------------------------------------------------
     mBreastPhysicsToggle    = gSavedSettings.getBOOL("EmeraldBreastPhysicsToggle");
@@ -283,31 +257,23 @@ void LLPrefsAscentVan::refreshValues()
 // Update controls based on current settings
 void LLPrefsAscentVan::refresh()
 {
-	//General --------------------------------------------------------------------------------
+    //General --------------------------------------------------------------------------------
 
-	//Tags\Colors ----------------------------------------------------------------------------
-	LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");
-	combo->setCurrentByIndex(mSelectedClient);
-/*	
-	getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
-	getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
-	getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor);
-	getChild<LLColorSwatchCtrl>("linden_color_swatch")->set(mLindenColor);
-	getChild<LLColorSwatchCtrl>("muted_color_swatch")->set(mMutedColor);
-	getChild<LLColorSwatchCtrl>("estate_owner_color_swatch")->set(mEstateOwnerColor);
-	//getChild<LLColorSwatchCtrl>("custom_color_swatch")->set(mCustomColor);
-*/
-	childSetEnabled("friends_color_textbox",     mUseStatusColors);
-	childSetEnabled("friend_color_swatch",       mUseStatusColors);
-	childSetEnabled("estate_owner_color_swatch", mUseStatusColors);
-	childSetEnabled("linden_color_swatch",       mUseStatusColors);
-	childSetEnabled("muted_color_swatch",        mUseStatusColors);
+    //Tags\Colors ----------------------------------------------------------------------------
+    LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");
+    combo->setCurrentByIndex(mSelectedClient);
+
+    childSetEnabled("friends_color_textbox",     mUseStatusColors);
+    childSetEnabled("friend_color_swatch",       mUseStatusColors);
+    childSetEnabled("estate_owner_color_swatch", mUseStatusColors);
+    childSetEnabled("linden_color_swatch",       mUseStatusColors);
+    childSetEnabled("muted_color_swatch",        mUseStatusColors);
 
     childSetEnabled("custom_tag_label_text",   mCustomTagOn);
-	childSetEnabled("custom_tag_label_box",    mCustomTagOn);
-	childSetValue("custom_tag_label_box", gSavedSettings.getString("AscentCustomTagLabel"));
-	childSetEnabled("custom_tag_color_text",   mCustomTagOn);
-	childSetEnabled("custom_tag_color_swatch", mCustomTagOn);
+    childSetEnabled("custom_tag_label_box",    mCustomTagOn);
+    childSetValue("custom_tag_label_box", gSavedSettings.getString("AscentCustomTagLabel"));
+    childSetEnabled("custom_tag_color_text",   mCustomTagOn);
+    childSetEnabled("custom_tag_color_swatch", mCustomTagOn);
 
     //Body Dynamics --------------------------------------------------------------------------
     childSetEnabled("EmeraldBoobMass",     mBreastPhysicsToggle);
@@ -320,32 +286,32 @@ void LLPrefsAscentVan::refresh()
 // Reset settings to local copy
 void LLPrefsAscentVan::cancel()
 {
-	//General --------------------------------------------------------------------------------
-	gSavedSettings.setBOOL("AscentStoreSettingsPerAccount", mUseAccountSettings);
-	gSavedSettings.setBOOL("AscentDisableTeleportScreens", !mShowTPScreen);
-	gSavedSettings.setBOOL("OptionPlayTpSound",             mPlayTPSound);
-	gSavedSettings.setBOOL("AscentDisableLogoutScreens",   !mShowLogScreens);
+    //General --------------------------------------------------------------------------------
+    gSavedSettings.setBOOL("AscentStoreSettingsPerAccount", mUseAccountSettings);
+    gSavedSettings.setBOOL("AscentDisableTeleportScreens", !mShowTPScreen);
+    gSavedSettings.setBOOL("OptionPlayTpSound",             mPlayTPSound);
+    gSavedSettings.setBOOL("AscentDisableLogoutScreens",   !mShowLogScreens);
 
-	//Tags\Colors ----------------------------------------------------------------------------
+    //Tags\Colors ----------------------------------------------------------------------------
     gSavedSettings.setBOOL("AscentUseTag",               mAscentUseTag);
     gSavedSettings.setString("AscentReportClientUUID",   mReportClientUUID);
-	gSavedSettings.setU32("AscentReportClientIndex",     mSelectedClient);
+    gSavedSettings.setU32("AscentReportClientIndex",     mSelectedClient);
     gSavedSettings.setBOOL("AscentShowSelfTag",          mShowSelfClientTag);
-	gSavedSettings.setBOOL("AscentShowSelfTagColor",     mShowSelfClientTagColor);
+    gSavedSettings.setBOOL("AscentShowSelfTagColor",     mShowSelfClientTagColor);
     gSavedSettings.setBOOL("AscentShowFriendsTag",       mShowFriendsTag);
-	gSavedSettings.setBOOL("AscentUseCustomTag",         mCustomTagOn);
-	gSavedSettings.setString("AscentCustomTagLabel",     mCustomTagLabel);
-	gSavedSettings.setColor4("AscentCustomTagColor",     mCustomTagColor);
+    gSavedSettings.setBOOL("AscentUseCustomTag",         mCustomTagOn);
+    gSavedSettings.setString("AscentCustomTagLabel",     mCustomTagLabel);
+    gSavedSettings.setColor4("AscentCustomTagColor",     mCustomTagColor);
     gSavedSettings.setBOOL("AscentShowOthersTag",        mShowOthersTag);
     gSavedSettings.setBOOL("AscentShowOthersTagColor",   mShowOthersTagColor);
     gSavedSettings.setBOOL("AscentShowIdleTime",         mShowIdleTime);
     gSavedSettings.setBOOL("AscentUseStatusColors",      mUseStatusColors);
     gSavedSettings.setBOOL("AscentUpdateTagsOnLoad",     mUpdateTagsOnLoad);
-	gSavedSettings.setColor4("EffectColor",              mEffectColor);
-	gSavedSettings.setColor4("AscentFriendColor",        mFriendColor);
-	gSavedSettings.setColor4("AscentEstateOwnerColor",   mEstateOwnerColor);
-	gSavedSettings.setColor4("AscentLindenColor",        mLindenColor);
-	gSavedSettings.setColor4("AscentMutedColor",         mMutedColor);
+    gSavedSettings.setColor4("EffectColor",              mEffectColor);
+    gSavedSettings.setColor4("AscentFriendColor",        mFriendColor);
+    gSavedSettings.setColor4("AscentEstateOwnerColor",   mEstateOwnerColor);
+    gSavedSettings.setColor4("AscentLindenColor",        mLindenColor);
+    gSavedSettings.setColor4("AscentMutedColor",         mMutedColor);
 //    gSavedSettings.setColor4("MoyMiniMapCustomColor",    mCustomColor);
 
     //Body Dynamics --------------------------------------------------------------------------
@@ -364,6 +330,6 @@ void LLPrefsAscentVan::cancel()
 // Update local copy so cancel has no effect
 void LLPrefsAscentVan::apply()
 {
-	refreshValues();
+    refreshValues();
     refresh();
 }
diff --git a/indra/newview/ascentprefsvan.h b/indra/newview/ascentprefsvan.h
index 1ebb31fea..5545c5b2f 100644
--- a/indra/newview/ascentprefsvan.h
+++ b/indra/newview/ascentprefsvan.h
@@ -38,48 +38,45 @@
 class LLPrefsAscentVan : public LLPanel
 {
 public:
-	LLPrefsAscentVan();
-	~LLPrefsAscentVan();
+    LLPrefsAscentVan();
+    ~LLPrefsAscentVan();
 
-	void apply();
-	void cancel();
-	void refresh();
-	void refreshValues();
-
-//	LLPanel* getPanel();
+    void apply();
+    void cancel();
+    void refresh();
+    void refreshValues();
 
 protected:
-	static void onCommitClientTag(LLUICtrl* ctrl, void* userdata);
-	static void onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata);
-	static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
+    static void onCommitClientTag(LLUICtrl* ctrl, void* userdata);
+    static void onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata);
+    static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
     static void onCommitTextModified(LLUICtrl* ctrl, void* userdata);
-//	static void onCommitColor(LLUICtrl* ctrl, void* user_data);
-	static void onManualClientUpdate(void* data);
-	//General
-	BOOL mUseAccountSettings;
-	BOOL mShowTPScreen;
-	BOOL mPlayTPSound;
-	BOOL mShowLogScreens;
-	//Tags\Colors
+    static void onManualClientUpdate(void* data);
+    //General
+    BOOL mUseAccountSettings;
+    BOOL mShowTPScreen;
+    BOOL mPlayTPSound;
+    BOOL mShowLogScreens;
+    //Tags\Colors
     BOOL mAscentUseTag;
     std::string mReportClientUUID;
-	U32 mSelectedClient;
-	BOOL mShowSelfClientTag;
-	BOOL mShowSelfClientTagColor;
+    U32 mSelectedClient;
+    BOOL mShowSelfClientTag;
+    BOOL mShowSelfClientTagColor;
     BOOL mShowFriendsTag;
-	BOOL mCustomTagOn;
+    BOOL mCustomTagOn;
     std::string mCustomTagLabel;
-	LLColor4 mCustomTagColor;
+    LLColor4 mCustomTagColor;
     BOOL mShowOthersTag;
     BOOL mShowOthersTagColor;
     BOOL mShowIdleTime;
     BOOL mUseStatusColors;
     BOOL mUpdateTagsOnLoad;
     LLColor4 mEffectColor;
-	LLColor4 mFriendColor;
-	LLColor4 mEstateOwnerColor;
-	LLColor4 mLindenColor;
-	LLColor4 mMutedColor;
+    LLColor4 mFriendColor;
+    LLColor4 mEstateOwnerColor;
+    LLColor4 mLindenColor;
+    LLColor4 mMutedColor;
     //Body Dynamics
     BOOL mBreastPhysicsToggle;
     F32 mBoobMass;

From abf5f09a4634d0634d387d9d0a92c6ea5e75c790 Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Sun, 29 May 2011 20:22:02 -0400
Subject: [PATCH 13/22] Removed uncalled function.

---
 indra/newview/llviewermenu.cpp | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 873e6d1ae..f78ad25bc 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3730,29 +3730,6 @@ void handle_fake_away_status(void*)
 	}
 }
 
-void handle_hide_typing_notification(void*)
-{
-	if (!gSavedSettings.controlExists("HideTypingNotification")) 
-		gSavedSettings.declareBOOL("HideTypingNotification", FALSE, "Hide your 'Name is typing...' message when Instant Messaging.");
-
-	BOOL hide = gSavedSettings.getBOOL("HideTypingNotification");
-	if (hide)
-	{
-		gSavedSettings.declareBOOL("HideTypingNotification", FALSE, "Hide your 'Name is typing...' message when Instant Messaging.");
-		gSavedSettings.setBOOL("HideTypingNotification", FALSE);
-	}
-	else
-	{
-		gSavedSettings.declareBOOL("HideTypingNotification", TRUE, "Hide your 'Name is typing...' message when Instant Messaging.");
-		gSavedSettings.setBOOL("HideTypingNotification", TRUE);
-	}
-
-	LLChat chat;
-	chat.mSourceType = CHAT_SOURCE_SYSTEM;
-	chat.mText = llformat("IM Typing Notifications: %s",(hide ? "On" : "Off"));
-	LLFloaterChat::addChat(chat);
-}
-
 void handle_force_ground_sit(void*)
 {
 	if (gAgent.getAvatarObject())

From 37f8a6e00bc4197de85aea1594cf74f17987c101 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 5 Jun 2011 19:06:54 +0200
Subject: [PATCH 14/22] Applied patch for #37 by anonymous

---
 indra/newview/app_settings/settings_ascent.xml | 15 +++++++++++++--
 indra/newview/llimpanel.cpp                    |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml
index 14fa6475f..50efda805 100644
--- a/indra/newview/app_settings/settings_ascent.xml
+++ b/indra/newview/app_settings/settings_ascent.xml
@@ -2,8 +2,19 @@
 <llsd>
 	<map>
 		<!-- Ascent-Specific Settings -->
-		
-		<key>SianaRenderOmitBlankVBO</key>
+
+    <key>SingularityBoldGroupModerator</key>
+    <map>
+      <key>Comment</key>
+      <string>Should group moderator chat be displayed in bold</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>SianaRenderOmitBlankVBO</key>
 		<map>
 			<key>Comment</key>
 			<string>Optimization: omit prefilling VBOs with zeroes. Default: OFF</string>
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index cef6f9daa..110d3a708 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -1668,7 +1668,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol
 	}
 
 	//Kadah - Bold group mods chat. Doesnt work on the first msg of the session, dont have speakers list yet?
-	if (isModerator(source))
+	if (gSavedSettings.getBOOL("SingularityBoldGroupModerator") && isModerator(source))
 	{
 		mHistoryEditor->appendColoredText(utf8msg.substr(0,1), false, prepend_newline, color);
 		LLStyleSP style(new LLStyle);

From 1473486f2378c6961c276fcb12430edd7b1af9e5 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 5 Jun 2011 19:09:43 +0200
Subject: [PATCH 15/22] Apply hollow size patch by Zauber Paracelsus

---
 indra/llmath/llvolume.cpp                            |  6 +++---
 indra/newview/llpanelobject.cpp                      | 12 ++++++------
 .../skins/default/xui/en-us/floater_tools.xml        |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index bc1a4fa9f..b3fdde257 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -56,7 +56,7 @@ const F32 CUT_MAX = 1.f;
 const F32 MIN_CUT_DELTA = 0.02f;
 
 const F32 HOLLOW_MIN = 0.f;
-const F32 HOLLOW_MAX = 0.95f;
+const F32 HOLLOW_MAX = 0.99f;
 const F32 HOLLOW_MAX_SQUARE	= 0.7f;
 
 const F32 TWIST_MIN = -1.f;
@@ -65,10 +65,10 @@ const F32 TWIST_MAX =  1.f;
 const F32 RATIO_MIN = 0.f;
 const F32 RATIO_MAX = 2.f; // Tom Y: Inverted sense here: 0 = top taper, 2 = bottom taper
 
-const F32 HOLE_X_MIN= 0.05f;
+const F32 HOLE_X_MIN= 0.01f;
 const F32 HOLE_X_MAX= 1.0f;
 
-const F32 HOLE_Y_MIN= 0.05f;
+const F32 HOLE_Y_MIN= 0.01f;
 const F32 HOLE_Y_MAX= 0.5f;
 
 const F32 SHEAR_MIN = -0.5f;
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 9f8561835..ba4909d91 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -75,7 +75,7 @@
 #include "llfirstuse.h"
 
 #include "lldrawpool.h"
-
+#include "hippolimits.h"
 
 
 
@@ -1224,9 +1224,9 @@ void LLPanelObject::getState( )
 		mSpinScaleY->set( scale_y );
 		calcp->setVar(LLCalc::X_HOLE, scale_x);
 		calcp->setVar(LLCalc::Y_HOLE, scale_y);
-		mSpinScaleX->setMinValue(OBJECT_MIN_HOLE_SIZE);
+		mSpinScaleX->setMinValue(gHippoLimits->getMinHoleSize());
 		mSpinScaleX->setMaxValue(OBJECT_MAX_HOLE_SIZE_X);
-		mSpinScaleY->setMinValue(OBJECT_MIN_HOLE_SIZE);
+		mSpinScaleY->setMinValue(gHippoLimits->getMinHoleSize());
 		mSpinScaleY->setMaxValue(OBJECT_MAX_HOLE_SIZE_Y);
 		break;
 	default:
@@ -1270,7 +1270,7 @@ void LLPanelObject::getState( )
 	*/
 	{
 		mSpinHollow->setMinValue(0.f);
-		mSpinHollow->setMaxValue(95.f); //Not that nuts. -HgB
+		mSpinHollow->setMaxValue(gHippoLimits->getMaxHollow() * 100.0f);
 	}
 
 	// Update field enablement
@@ -1987,11 +1987,11 @@ void LLPanelObject::getVolumeParams(LLVolumeParams& volume_params)
 	{
 		scale_x = llclamp(
 			scale_x,
-			OBJECT_MIN_HOLE_SIZE,
+			gHippoLimits->getMinHoleSize(),
 			OBJECT_MAX_HOLE_SIZE_X);
 		scale_y = llclamp(
 			scale_y,
-			OBJECT_MIN_HOLE_SIZE,
+			gHippoLimits->getMinHoleSize(),
 			OBJECT_MAX_HOLE_SIZE_Y);
 
 		// Limit radius offset, based on taper and hole size y.
diff --git a/indra/newview/skins/default/xui/en-us/floater_tools.xml b/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 43dabdebb..59b583855 100644
--- a/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -941,10 +941,10 @@
 				Taper
 			</text>
 			<spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="X" label_width="10" left="121"
+			     increment="0.01" initial_val="0" label="X" label_width="10" left="121"
 			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" />
 			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
+			     increment="0.01" initial_val="0" label="Y" label_width="10" left_delta="73"
 			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"

From 41a910d1b572f38c28f350b0fd46253a760373c5 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 9 Jun 2011 15:04:10 +0200
Subject: [PATCH 16/22] Boost 1.45 from V2 on Linux and OS X

---
 LICENSES/boost-coroutine-linden.patch | 62 ---------------------------
 indra/cmake/Boost.cmake               |  4 +-
 install.xml                           |  8 ++--
 3 files changed, 6 insertions(+), 68 deletions(-)
 delete mode 100644 LICENSES/boost-coroutine-linden.patch

diff --git a/LICENSES/boost-coroutine-linden.patch b/LICENSES/boost-coroutine-linden.patch
deleted file mode 100644
index 06cb3b454..000000000
--- a/LICENSES/boost-coroutine-linden.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -rc ../boost-coroutine/boost/coroutine/coroutine.hpp boost-coroutine/boost/coroutine/coroutine.hpp
-*** ../boost-coroutine/boost/coroutine/coroutine.hpp	Wed Apr 29 14:41:05 2009
---- boost-coroutine/boost/coroutine/coroutine.hpp	Wed Apr 22 09:35:22 2009
-***************
-*** 28,33 ****
---- 28,36 ----
-  
-  #ifndef BOOST_COROUTINE_COROUTINE_HPP_20060512
-  #define BOOST_COROUTINE_COROUTINE_HPP_20060512
-+ // On Linux systems, use native swapcontext() et al. rather than
-+ // Boost.Coroutine homebrew assembler
-+ #define BOOST_COROUTINE_NO_ASM
-  // default_context_impl.hpp must be first for weird Apple bug
-  #include <boost/coroutine/detail/default_context_impl.hpp>
-  #include <cstddef>
-diff -rc ../boost-coroutine/boost/coroutine/future.hpp boost-coroutine/boost/coroutine/future.hpp
-*** ../boost-coroutine/boost/coroutine/future.hpp	Wed Apr 29 14:41:05 2009
---- boost-coroutine/boost/coroutine/future.hpp	Wed Apr 22 09:35:26 2009
-***************
-*** 33,38 ****
---- 33,41 ----
-  #ifndef BOOST_COROUTINE_WAIT_MAX
-  #define BOOST_COROUTINE_WAIT_MAX 10
-  #endif
-+ // On Linux systems, use native swapcontext() et al. rather than
-+ // Boost.Coroutine homebrew assembler
-+ #define BOOST_COROUTINE_NO_ASM
-  // default_context_impl.hpp must be first for weird Apple bug
-  #include <boost/coroutine/detail/default_context_impl.hpp>
-  #include <boost/none.hpp>
-diff -u -r old/boost/coroutine/detail/coroutine_impl.hpp new/boost/coroutine/detail/coroutine_impl.hpp
---- old/boost/coroutine/detail/coroutine_impl.hpp	2009-10-20 17:10:02.000000000 +0100
-+++ new/boost/coroutine/detail/coroutine_impl.hpp	2009-10-20 19:22:11.000000000 +0100
-@@ -56,7 +56,7 @@
-     typedef ContextImpl context_impl;
-     typedef CoroutineType coroutine_type;
-     typedef coroutine_impl<coroutine_type, context_impl> type;
--    typedef context_base<context_impl> context_base;
-+    typedef context_base<context_impl> context_base_type;
-     typedef typename coroutine_type::arg_slot_type arg_slot_type;
-     typedef typename coroutine_type::result_type result_type;
-     typedef typename coroutine_type::result_slot_type result_slot_type;
-@@ -65,7 +65,7 @@
-   
-     template<typename DerivedType>
- 	coroutine_impl(DerivedType * this_, std::ptrdiff_t stack_size) :
--      context_base(*this_, stack_size),
-+      context_base_type(*this_, stack_size),
- 	m_arg(0),
- 	m_result(0){}
-                 
-diff -u -r old/boost/coroutine/detail/posix_utility.hpp new/boost/coroutine/detail/posix_utility.hpp
---- old/boost/coroutine/detail/posix_utility.hpp	2009-04-24 21:30:44.000000000 +0100
-+++ new/boost/coroutine/detail/posix_utility.hpp	2009-10-20 19:21:27.000000000 +0100
-@@ -39,6 +39,7 @@
- #include <cstddef>
- #include <cstdlib>
- #include <iostream>
-+#include <cstring>
- #include <boost/type_traits.hpp>
- #if defined(_POSIX_MAPPED_FILES) && _POSIX_MAPPED_FILES > 0
- #include <sys/mman.h>
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 5ebc7959f..418753205 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -47,13 +47,13 @@ else (STANDALONE)
     set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-mt)
-    set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
+	#    set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
     set(BOOST_SYSTEM_LIBRARY boost_system-mt)  
   elseif (LINUX)
     set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-mt)
-    set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
+	#    set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
     set(BOOST_SYSTEM_LIBRARY boost_system-mt)  
   endif (WINDOWS)
 endif (STANDALONE)
diff --git a/install.xml b/install.xml
index 0a0a9d509..b48b17842 100644
--- a/install.xml
+++ b/install.xml
@@ -193,16 +193,16 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>bb8552f22769da81593f7d47a51d83d8</string>
+            <string>2cad51575b429be4fdadb5d63da1c739</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20100226.tar.bz2</uri>
+            <uri>https:/github.com/siana/SingularityViewer/boost-1.45.0-darwin-20110604.tar.bz2</uri>
           </map>
            <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>4db3d74e40d149eeec06f4d97a609bb1</string>
+            <string>a2d2fff5cc5555ffd9865daedfcd0dd5</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100624.tar.bz2</uri>
+            <uri>https:/github.com/siana/SingularityViewer/boost-1.45.0-linux-20110604.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>

From b64bd9c74f193f3edbd50c6dec4caa28bee23c44 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 9 Jun 2011 17:37:57 +0200
Subject: [PATCH 17/22] Linux build fixes

---
 LICENSES/gstreamer.txt                 | 68 --------------------------
 indra/llcommon/CMakeLists.txt          |  1 +
 indra/llplugin/slplugin/CMakeLists.txt |  1 +
 indra/newview/CMakeLists.txt           |  1 +
 install.xml                            |  8 +--
 5 files changed, 7 insertions(+), 72 deletions(-)
 delete mode 100644 LICENSES/gstreamer.txt

diff --git a/LICENSES/gstreamer.txt b/LICENSES/gstreamer.txt
deleted file mode 100644
index 7f02d0472..000000000
--- a/LICENSES/gstreamer.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-http://www.gnu.org/copyleft/lgpl.html
-
-GNU LESSER GENERAL PUBLIC LICENSE
-
-Version 3, 29 June 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.
-0. Additional Definitions.
-
-As used herein, .this License. refers to version 3 of the GNU Lesser General Public License, and the .GNU GPL. refers to version 3 of the GNU General Public License.
-
-.The Library. refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.
-
-An .Application. is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.
-
-A .Combined Work. is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the .Linked Version..
-
-The .Minimal Corresponding Source. for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.
-
-The .Corresponding Application Code. for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.
-1. Exception to Section 3 of the GNU GPL.
-
-You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.
-2. Conveying Modified Versions.
-
-If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:
-
-    * a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
-	    * b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
-
-		3. Object Code Incorporating Material from Library Header Files.
-
-		The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:
-
-		    * a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
-			    * b) Accompany the object code with a copy of the GNU GPL and this license document.
-
-				4. Combined Works.
-
-				You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:
-
-				    * a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
-					    * b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
-						    * c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
-							    * d) Do one of the following:
-								          o 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
-										            o 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
-													    * e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
-
-														5. Combined Libraries.
-
-														You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:
-
-														    * a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
-															    * b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
-
-																6. Revised Versions of the GNU Lesser General Public License.
-
-																The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-																Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License .or any later version. applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.
-
-																If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
-
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 47cddfdba..7df7a16c7 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -5,6 +5,7 @@ project(llcommon)
 include(Cwdebug)
 include(00-Common)
 include(LLCommon)
+include(APR)
 include(Linking)
 
 include_directories(
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 5d0a57dfb..11c921ed7 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -59,6 +59,7 @@ target_link_libraries(SLPlugin
   ${LLPLUGIN_LIBRARIES}
   ${LLMESSAGE_LIBRARIES}
   ${LLCOMMON_LIBRARIES}
+  ${APRUTIL_LIBRARIES}
   ${PLUGIN_API_WINDOWS_LIBRARIES}
 )
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 90bdd9273..c6621ab1d 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1448,6 +1448,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${DBUSGLIB_LIBRARIES}
     ${OPENGL_LIBRARIES}
     ${FMODWRAPPER_LIBRARY}
+    ${APRUTIL_LIBRARIES}
     ${OPENGL_LIBRARIES}
     ${JSONCPP_LIBRARIES}
     ${SDL_LIBRARY}
diff --git a/install.xml b/install.xml
index b48b17842..bc352a5c1 100644
--- a/install.xml
+++ b/install.xml
@@ -561,16 +561,16 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>c829b638b6eef71ca63418cb9aea46a2</string>
+            <string>2cd3f6499f8444f1d119d097e4047252</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux-20080613.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux-20091125.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>befc7520fe01250f39458f65c29bc584</string>
+            <string>7e6fc4e185e8444a07b58ba7c0df255a</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux64-20080909.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux64-20091230.tar.bz2</uri>
           </map>
         </map>
       </map>

From 8bf88bd7dae3f4599d4472c4cde922f6cd67f23a Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 9 Jun 2011 20:24:39 +0200
Subject: [PATCH 18/22] Fix the fix.

---
 install.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.xml b/install.xml
index bc352a5c1..015653824 100644
--- a/install.xml
+++ b/install.xml
@@ -195,14 +195,14 @@
             <key>md5sum</key>
             <string>2cad51575b429be4fdadb5d63da1c739</string>
             <key>url</key>
-            <uri>https:/github.com/siana/SingularityViewer/boost-1.45.0-darwin-20110604.tar.bz2</uri>
+			<uri>https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-darwin-20110604.tar.bz2</uri>
           </map>
            <key>linux</key>
           <map>
             <key>md5sum</key>
             <string>a2d2fff5cc5555ffd9865daedfcd0dd5</string>
             <key>url</key>
-            <uri>https:/github.com/siana/SingularityViewer/boost-1.45.0-linux-20110604.tar.bz2</uri>
+			<uri>https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-linux-20110604.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>

From d06ea4d2114bee1f7667e5d653df390dfa126853 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 9 Jun 2011 21:41:54 +0200
Subject: [PATCH 19/22] Constant type fix

---
 indra/newview/pipeline.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index cae557a60..f67a72a7d 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6710,7 +6710,7 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, U32 light_index, LLRen
 	static const LLCachedControl<F32> render_gi_luminance("RenderGILuminance",.075f);
 	static const LLCachedControl<F32> render_gi_blur_edge_weight("RenderGIBlurEdgeWeight",.8f);
 	static const LLCachedControl<F32> render_gi_blur_brightness("RenderGIBlurBrightness",1.025f);
-	static const LLCachedControl<F32> render_gi_render_gi_noise("RenderGINoise",.7);
+	static const LLCachedControl<F32> render_gi_render_gi_noise("RenderGINoise",.7f);
 	static const LLCachedControl<F32> render_gi_attenuation("RenderGIAttenuation",.1f);
 	static const LLCachedControl<F32> render_gi_ambiance("RenderGIAmbiance",.5f);
 	static const LLCachedControl<F32> render_edge_depth_cutoff("RenderEdgeDepthCutoff",.01f);

From 977ee9d8ea1a210af9cc55d3f1a9c048812a9724 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 9 Jun 2011 21:44:38 +0200
Subject: [PATCH 20/22] Exit the window finder loop if a window is found that
 is it's own parent.

---
 indra/llui/llfloater.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 0ab07c5e4..eeb69d79f 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1358,7 +1358,7 @@ LLFloater* LLFloater::getClosableFloaterFromFocus()
 	// Find and close a parental floater that is closeable, if any.
 	LLFloater* previous_floater = NULL;		// Guard against endless loop, because getParentFloater(x) can return x!
 	for(LLFloater* floater_to_close = focused_floater; 
-		NULL != floater_to_close; 
+		NULL != floater_to_close && floater_to_close != gFloaterView->getParentFloater(floater_to_close); 
 		floater_to_close = gFloaterView->getParentFloater(floater_to_close))
 	{
 		if(floater_to_close == previous_floater)

From 96a506a1d505e5f5c7056dcc04e08b9f5bed19ff Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Fri, 10 Jun 2011 00:26:03 +0200
Subject: [PATCH 21/22] Media plugin update

---
 indra/plugins/base_basic/CMakeLists.txt       |   4 +-
 indra/plugins/webkit/CMakeLists.txt           |   2 +
 indra/plugins/webkit/dummy_volume_catcher.cpp |  37 ++--
 indra/plugins/webkit/linux_volume_catcher.cpp |  42 ++---
 indra/plugins/webkit/linux_volume_catcher.h   |  56 ------
 indra/plugins/webkit/mac_volume_catcher.cpp   |  37 ++--
 indra/plugins/webkit/media_plugin_webkit.cpp  | 173 +++++++++++++++---
 indra/plugins/webkit/volume_catcher.h         |  37 ++--
 .../plugins/webkit/windows_volume_catcher.cpp |  37 ++--
 9 files changed, 231 insertions(+), 194 deletions(-)
 delete mode 100755 indra/plugins/webkit/linux_volume_catcher.h

diff --git a/indra/plugins/base_basic/CMakeLists.txt b/indra/plugins/base_basic/CMakeLists.txt
index a9ef4593f..05b84324f 100644
--- a/indra/plugins/base_basic/CMakeLists.txt
+++ b/indra/plugins/base_basic/CMakeLists.txt
@@ -15,13 +15,13 @@ include_directories(
 
 ### basic_plugin_base
 
-if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+if(NOT WORD_SIZE EQUAL 32)
 	if(WINDOWS)
 		add_definitions(/FIXED:NO)
 	else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
 		add_definitions(-fPIC)
 	endif(WINDOWS)
-endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+endif (NOT WORD_SIZE EQUAL 32)
 
 set(basic_plugin_base_SOURCE_FILES
     basic_plugin_base.cpp
diff --git a/indra/plugins/webkit/CMakeLists.txt b/indra/plugins/webkit/CMakeLists.txt
index 49ea3e7f6..de027561e 100644
--- a/indra/plugins/webkit/CMakeLists.txt
+++ b/indra/plugins/webkit/CMakeLists.txt
@@ -53,6 +53,8 @@ set(media_plugin_webkit_LINK_LIBRARIES
 if (LINUX)
   if (PULSEAUDIO_FOUND)
     list(APPEND media_plugin_webkit_SOURCE_FILES linux_volume_catcher.cpp)
+  else (PULSEAUDIO_FOUND)
+    list(APPEND media_plugin_webkit_SOURCE_FILES dummy_volume_catcher.cpp)
   endif (PULSEAUDIO_FOUND)
   list(APPEND media_plugin_webkit_LINK_LIBRARIES
        ${UI_LIBRARIES}     # for glib/GTK
diff --git a/indra/plugins/webkit/dummy_volume_catcher.cpp b/indra/plugins/webkit/dummy_volume_catcher.cpp
index 4df988789..d54b31b2a 100644
--- a/indra/plugins/webkit/dummy_volume_catcher.cpp
+++ b/indra/plugins/webkit/dummy_volume_catcher.cpp
@@ -3,33 +3,26 @@
  * @brief A null implementation of the "VolumeCatcher" class for platforms where it's not implemented yet.
  *
  * @cond
- * $LicenseInfo:firstyear=2010&license=viewergpl$
- * 
- * Copyright (c) 2010, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlife.com/developers/opensource/flossexception
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
- * 
  * @endcond
  */
 
diff --git a/indra/plugins/webkit/linux_volume_catcher.cpp b/indra/plugins/webkit/linux_volume_catcher.cpp
index ca1b1cfa2..0fdd3be3d 100644
--- a/indra/plugins/webkit/linux_volume_catcher.cpp
+++ b/indra/plugins/webkit/linux_volume_catcher.cpp
@@ -3,33 +3,26 @@
  * @brief A Linux-specific, PulseAudio-specific hack to detect and volume-adjust new audio sources
  *
  * @cond
- * $LicenseInfo:firstyear=2010&license=viewergpl$
- * 
- * Copyright (c) 2010, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlife.com/developers/opensource/flossexception
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
- * 
  * @endcond
  */
 
@@ -139,7 +132,10 @@ void ungrab_pa_syms()
 		sSymPADSOHandleG = NULL;
 	}
 	
-	sSymPADSOMemoryPool.destroy();
+	if ( sSymPADSOMemoryPool )
+	{
+		sSymPADSOMemoryPool.destroy();
+	}
 	
 	// NULL-out all of the symbols we'd grabbed
 #define LL_PA_SYM(REQUIRED, PASYM, RTN, ...) do{ll##PASYM = NULL;}while(0)
diff --git a/indra/plugins/webkit/linux_volume_catcher.h b/indra/plugins/webkit/linux_volume_catcher.h
deleted file mode 100755
index d4a1b38f9..000000000
--- a/indra/plugins/webkit/linux_volume_catcher.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/** 
- * @file linux_volume_catcher.h
- * @brief A Linux-specific, PulseAudio-specific hack to detect and volume-adjust new audio sources
- *
- * @cond
- * $LicenseInfo:firstyear=2010&license=viewergpl$
- * 
- * Copyright (c) 2010, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlife.com/developers/opensource/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- * 
- * @endcond
- */
-
-#ifndef LINUX_VOLUME_CATCHER_H
-#define LINUX_VOLUME_CATCHER_H
-
-#include "linden_common.h"
-
-class LinuxVolumeCatcherImpl;
-
-class LinuxVolumeCatcher
-{
- public:
-	LinuxVolumeCatcher();
-	~LinuxVolumeCatcher();
-
-	void setVolume(F32 volume); // 0.0 - 1.0
-	void pump(); // call this at least a few times a second if you can - it affects how quickly we can 'catch' a new audio source and adjust its volume
-	
- private:
-	LinuxVolumeCatcherImpl *pimpl;
-};
-
-#endif // LINUX_VOLUME_CATCHER_H
diff --git a/indra/plugins/webkit/mac_volume_catcher.cpp b/indra/plugins/webkit/mac_volume_catcher.cpp
index 190823f73..8a06bb848 100644
--- a/indra/plugins/webkit/mac_volume_catcher.cpp
+++ b/indra/plugins/webkit/mac_volume_catcher.cpp
@@ -3,33 +3,26 @@
  * @brief A Mac OS X specific hack to control the volume level of all audio channels opened by a process.
  *
  * @cond
- * $LicenseInfo:firstyear=2010&license=viewergpl$
- * 
- * Copyright (c) 2010, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlife.com/developers/opensource/flossexception
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
- * 
  * @endcond
  */
 
diff --git a/indra/plugins/webkit/media_plugin_webkit.cpp b/indra/plugins/webkit/media_plugin_webkit.cpp
index 0b3ba177a..4bab56090 100755
--- a/indra/plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/plugins/webkit/media_plugin_webkit.cpp
@@ -3,33 +3,26 @@
  * @brief Webkit plugin for LLMedia API plugin system
  *
  * @cond
- * $LicenseInfo:firstyear=2008&license=viewergpl$
- * 
- * Copyright (c) 2008-2010, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlife.com/developers/opensource/flossexception
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
- * 
  * @endcond
  */
 
@@ -323,7 +316,7 @@ private:
 
 		// append details to agent string
 		LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent );
-	
+
 #if !LL_QTWEBKIT_USES_PIXMAPS
 		// don't flip bitmap
 		LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true );
@@ -416,6 +409,9 @@ private:
 		{
 			LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_begin");
 			message.setValue("uri", event.getEventUri());
+			message.setValueBoolean("history_back_available", LLQtWebKit::getInstance()->userActionIsEnabled( mBrowserWindowId, LLQtWebKit::UA_NAVIGATE_BACK));
+			message.setValueBoolean("history_forward_available", LLQtWebKit::getInstance()->userActionIsEnabled( mBrowserWindowId, LLQtWebKit::UA_NAVIGATE_FORWARD));
+
 			sendMessage(message);
 		
 			setStatus(STATUS_LOADING);
@@ -496,7 +492,16 @@ private:
 			sendMessage(message);
 		}
 	}
-
+  
+	////////////////////////////////////////////////////////////////////////////////
+	// virtual
+	void onNavigateErrorPage(const EventType& event)
+	{
+		LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_error_page");
+		message.setValueS32("status_code", event.getIntValue());
+		sendMessage(message);
+	}
+  
 	////////////////////////////////////////////////////////////////////////////////
 	// virtual
 	void onLocationChange(const EventType& event)
@@ -526,6 +531,11 @@ private:
 	{
 		LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_nofollow");
 		message.setValue("uri", event.getEventUri());
+#if LLQTWEBKIT_API_VERSION >= 7
+		message.setValue("nav_type", event.getNavigationType());
+#else
+		message.setValue("nav_type", "clicked");
+#endif
 		sendMessage(message);
 	}
 
@@ -540,7 +550,87 @@ private:
 //		message.setValueBoolean("dead", (event.getIntValue() != 0))
 		sendMessage(message);
 	}
+  
+  ////////////////////////////////////////////////////////////////////////////////
+	// virtual
+	void onWindowCloseRequested(const EventType& event)
+	{
+		LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "close_request");
+		message.setValue("uuid", event.getStringValue());
+		sendMessage(message);
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	// virtual
+	void onWindowGeometryChangeRequested(const EventType& event)
+	{
+		int x, y, width, height;
+		event.getRectValue(x, y, width, height);
+
+		// This sometimes gets called with a zero-size request.  Don't pass these along.
+		if(width > 0 && height > 0)
+		{
+			LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "geometry_change");
+			message.setValue("uuid", event.getStringValue());
+			message.setValueS32("x", x);
+			message.setValueS32("y", y);
+			message.setValueS32("width", width);
+			message.setValueS32("height", height);
+			sendMessage(message);
+		}
+	}
+  
+	std::string mAuthUsername;
+	std::string mAuthPassword;
+	bool mAuthOK;
 	
+	////////////////////////////////////////////////////////////////////////////////
+	// virtual
+	bool onAuthRequest(const std::string &in_url, const std::string &in_realm, std::string &out_username, std::string &out_password)
+	{
+		mAuthOK = false;
+
+		LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "auth_request");
+		message.setValue("url", in_url);
+		message.setValue("realm", in_realm);
+		message.setValueBoolean("blocking_request", true);
+				
+		// The "blocking_request" key in the message means this sendMessage call will block until a response is received.
+		sendMessage(message);
+		
+		if(mAuthOK)
+		{
+			out_username = mAuthUsername;
+			out_password = mAuthPassword;
+		}
+		
+		return mAuthOK;
+	}
+	
+	void authResponse(LLPluginMessage &message)
+	{
+		mAuthOK = message.getValueBoolean("ok");
+		if(mAuthOK)
+		{
+			mAuthUsername = message.getValue("username");
+			mAuthPassword = message.getValue("password");
+		}
+	}
+	
+	////////////////////////////////////////////////////////////////////////////////
+	// virtual
+	void onLinkHovered(const EventType& event)
+	{
+		if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
+		{
+			LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "link_hovered");
+			message.setValue("link", event.getEventUri());
+			message.setValue("title", event.getStringValue());
+			message.setValue("text", event.getStringValue2());
+			sendMessage(message);
+		}
+	}
+		
 	LLQtWebKit::EKeyboardModifier decodeModifiers(std::string &modifiers)
 	{
 		int result = 0;
@@ -1044,6 +1134,10 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
 				LLQtWebKit::getInstance()->userAction( mBrowserWindowId, LLQtWebKit::UA_EDIT_PASTE );
 				checkEditState();
 			}
+			if(message_name == "auth_response")
+			{
+				authResponse(message_in);
+			}      
 			else
 			{
 //				std::cerr << "MediaPluginWebKit::receiveMessage: unknown media message: " << message_string << std::endl;
@@ -1122,7 +1216,9 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
 				std::string url = message_in.getValue("url");
 				if ( 404 == code )	// browser lib only supports 404 right now
 				{
-					LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url );
+#if LLQTWEBKIT_API_VERSION < 8
+				 	LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url );
+#endif
 				};
 			}
 			else if(message_name == "set_user_agent")
@@ -1130,6 +1226,22 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
 				mUserAgent = message_in.getValue("user_agent");
 				LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent );
 			}
+			else if(message_name == "ignore_ssl_cert_errors")
+			{
+#if LLQTWEBKIT_API_VERSION >= 3
+				LLQtWebKit::getInstance()->setIgnoreSSLCertErrors( message_in.getValueBoolean("ignore") );
+#else
+				llwarns << "Ignoring ignore_ssl_cert_errors message (llqtwebkit version is too old)." << llendl;
+#endif
+			}
+			else if(message_name == "add_certificate_file_path")
+			{
+#if LLQTWEBKIT_API_VERSION >= 6
+				LLQtWebKit::getInstance()->addCAFile( message_in.getValue("path") );
+#else
+				llwarns << "Ignoring add_certificate_file_path message (llqtwebkit version is too old)." << llendl;
+#endif
+			}
 			else if(message_name == "init_history")
 			{
 				// Initialize browser history
@@ -1147,6 +1259,17 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
 					}
 				}
 			}
+			else if(message_name == "proxy_window_opened")
+			{
+				std::string target = message_in.getValue("target");
+				std::string uuid = message_in.getValue("uuid");
+				LLQtWebKit::getInstance()->proxyWindowOpened(mBrowserWindowId, target, uuid);
+			}
+			else if(message_name == "proxy_window_closed")
+			{
+				std::string uuid = message_in.getValue("uuid");
+				LLQtWebKit::getInstance()->proxyWindowClosed(mBrowserWindowId, uuid);
+			}
 			else
 			{
 //				std::cerr << "MediaPluginWebKit::receiveMessage: unknown media_browser message: " << message_string << std::endl;
diff --git a/indra/plugins/webkit/volume_catcher.h b/indra/plugins/webkit/volume_catcher.h
index 855e99fc0..337f2913d 100644
--- a/indra/plugins/webkit/volume_catcher.h
+++ b/indra/plugins/webkit/volume_catcher.h
@@ -3,33 +3,26 @@
  * @brief Interface to a class with platform-specific implementations that allows control of the audio volume of all sources in the current process.
  *
  * @cond
- * $LicenseInfo:firstyear=2010&license=viewergpl$
- * 
- * Copyright (c) 2010, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlife.com/developers/opensource/flossexception
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
- * 
  * @endcond
  */
 
diff --git a/indra/plugins/webkit/windows_volume_catcher.cpp b/indra/plugins/webkit/windows_volume_catcher.cpp
index 64f70c419..ed2285d3d 100644
--- a/indra/plugins/webkit/windows_volume_catcher.cpp
+++ b/indra/plugins/webkit/windows_volume_catcher.cpp
@@ -3,33 +3,26 @@
  * @brief A Windows implementation of volume level control of all audio channels opened by a process.
  *
  * @cond
- * $LicenseInfo:firstyear=2010&license=viewergpl$
- * 
- * Copyright (c) 2010, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlife.com/developers/opensource/flossexception
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
- * 
  * @endcond
  */
 

From 42f60042eb26e88b0a78457271b88b4675aef427 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 14 Jun 2011 14:13:43 +0200
Subject: [PATCH 22/22] Idle timer tag update fix, by phr0z3nt04st

---
 indra/newview/llvoavatar.cpp | 13 ++++++++++---
 indra/newview/llvoavatar.h   |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 4f2b44210..ac4462875 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3801,6 +3801,12 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 			{
 				is_muted = LLMuteList::getInstance()->isMuted(getID());
 			}
+			//idle text
+			std::string idle_string;
+			if(!mIsSelf && mIdleTimer.getElapsedTimeF32() > 120 && gSavedSettings.getBOOL("AscentShowIdleTime"))
+			{
+				idle_string = getIdleTime();
+			}
 
 			if ((mNameString.empty() && !(mNameFromChatOverride && mNameFromChatText.empty())) ||
 				new_name ||
@@ -3809,7 +3815,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 				(!title && !mTitle.empty()) ||
 				(title && mTitle != title->getString()) ||
 				(is_away != mNameAway || is_busy != mNameBusy || is_muted != mNameMute) ||
-				is_appearance != mNameAppearance || client != mClientName ||
+				is_appearance != mNameAppearance || client != mClientName || idle_string != mIdleString ||
 				mNameFromAttachment != nameplate ||
 				mNameFromChatChanged)
 			{
@@ -3819,6 +3825,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 				mNameBusy = is_busy;
 				mNameMute = is_muted;
 				mClientName = client;
+				mIdleString = idle_string;
 				mUsedNameSystem = phoenix_name_system;
 				mNameAppearance = is_appearance;
 				mTitle = title? title->getString() : "";
@@ -3949,10 +3956,10 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 					line += "\n";
 					line += "(Editing Appearance)";
 				}
-				if(!isSelf() && mIdleTimer.getElapsedTimeF32() > 120 && gSavedSettings.getBOOL("AscentShowIdleTime"))
+				if(!mIdleString.empty())
 				{
 					line += "\n";
-					line += getIdleTime();
+					line += mIdleString;
 				}
 
 				mNameString = utf8str_to_wstring(line);
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 6ec9179c8..b50111e40 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -942,6 +942,7 @@ private:
 	bool      		mRenderGroupTitles;
 	std::string      mRenderedName;
 	std::string      mClientName;
+	std::string		 mIdleString;
 	S32		  mUsedNameSystem;
 
 	//--------------------------------------------------------------------