diff --git a/indra/newview/Info-Inertia.plist b/indra/newview/Info-Inertia.plist
deleted file mode 100644
index 78ea01e01..000000000
--- a/indra/newview/Info-Inertia.plist
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>Inertia</string>
-	<key>CFBundleIconFile</key>
-	<string>inertia.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.inertia.indra.viewer</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Inertia</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>Second Life URL</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>secondlife</string>
-			</array>
-			<key>LSIsAppleDefaultForScheme</key>
-			<true/>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.0.0.0</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-</dict>
-</plist>
diff --git a/indra/newview/app_settings/client_definitions.xml b/indra/newview/app_settings/client_definitions.xml
index a7ff12c22..f50258ed4 100644
--- a/indra/newview/app_settings/client_definitions.xml
+++ b/indra/newview/app_settings/client_definitions.xml
@@ -98,6 +98,20 @@
         <key>name</key>
             <string>Day Oh proxy</string>
         </map>
+	<key>28b4da3f-5f9b-f44e-1387-6a115ab482c5</key>
+    <map>
+        <key>color</key>
+		<array>
+			<real>0.64314000000000004</real>
+			<real>0.89803999999999995</real>
+			<real>0.99607999999999997</real>
+			<real>1</real>
+		</array>
+		<key>multiple</key>
+		<real>1</real>
+        <key>name</key>
+        <string>Diamond</string>
+    </map>
 	<key>072343d0-1ce9-0952-4106-5312af4a789a</key>
         <map>
         <key>color</key>
@@ -406,20 +420,6 @@
         <key>name</key>
             <string>NeilLife</string>
         </map>
-    <key>e6f9c019-8783-dc3e-b265-41f1510333fc</key>
-        <map>
-        <key>color</key>
-            <array>
-                <real>2</real>
-                <real>2</real>
-                <real>0</real>
-                <real>1</real>
-            </array>
-        <key>multiple</key>
-            <real>0</real>
-        <key>name</key>
-            <string>NeilLife</string>
-        </map>
     <key>f5a48821-9a98-d09e-8d6a-50cc08ba9a47</key>
         <map>
         <key>color</key>
@@ -448,6 +448,34 @@
         <key>name</key>
             <string>NeilLife</string>
         </map>
+	<key>e6f9c019-8783-dc3e-b265-41f1510333fc</key>
+        <map>
+        <key>color</key>
+            <array>
+                <real>2</real>
+                <real>2</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        <key>multiple</key>
+            <real>0</real>
+        <key>name</key>
+            <string>Onyx</string>
+        </map>
+	<key>ed63fbd0-589e-fe1d-a3d0-16905efaa96b</key>
+        <map>
+        <key>color</key>
+            <array>
+                <real>1</real>
+                <real>0</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        <key>multiple</key>
+            <real>2</real>
+        <key>name</key>
+            <string>Phoenix</string>
+        </map>
 	<key>f3fd74a6-fee7-4b2f-93ae-ddcb5991da04</key>
         <map>
         <key>color</key>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 047b09f15..a49e5a8f1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2,6 +2,17 @@
 <llsd>
 <map>
 	<!--Expanded settings from Vanilla SL -->
+	<key>AscentShowLookAt</key>
+	<map>
+		<key>Comment</key>
+		<string>Avatar position modifier (X)</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>
@@ -35,17 +46,17 @@
 		<key>Value</key>
 		<real>0.0</real>
 	</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>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>AscentBuildAlwaysEnabled</key>
     <map>
       <key>Comment</key>
@@ -379,11 +390,11 @@
 	<key>InventorySortOrder</key>
         <map>
         <key>Comment</key>
-            <string>Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
+        <string>Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
         <key>Type</key>
-            <string>U32</string>
+        <string>U32</string>
         <key>Value</key>
-            <integer>3</integer>
+        <integer>3</integer>
         </map>
 	<key>AO.Enabled</key>
 	<map>
@@ -647,6 +658,17 @@
 		<key>Value</key>
 		<integer>0</integer>
 	</map>
+	<key>AscentUploadFolder</key>
+	<map>
+		<key>Comment</key>
+		<string>Active folder for the Uploader</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>String</string>
+		<key>Value</key>
+		<string>None</string>
+	</map>
 	<key>AscentUseCustomTag</key>
 	<map>
 		<key>Comment</key>
@@ -13073,7 +13095,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>Second Life Release</string>
+      <string>Ascent Viewer Release</string>
     </map>
     <key>VertexShaderEnable</key>
     <map>
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index c16af50a9..632939f26 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -137,7 +137,9 @@ void LLPrefsAscentSysImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
 	}
 	else if (ctrl->getName() == "show_look_at_check")
 	{
-		LLHUDEffectLookAt::sDebugLookAt = self->childGetValue("show_look_at_check").asBoolean();
+		BOOL lookAt = self->childGetValue("show_look_at_check").asBoolean();
+		LLHUDEffectLookAt::sDebugLookAt = lookAt;
+		gSavedSettings.setBOOL("AscentShowLookAt", lookAt);
 	}
 }
 
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 96c17b686..3b9034f75 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -74,7 +74,7 @@
 
 #include "llweb.h"
 #include "llsecondlifeurls.h"
-
+	
 #include <boost/bind.hpp>
 
 #if LL_WINDOWS
@@ -133,6 +133,7 @@
 
 #include "llworld.h"
 #include "llhudeffecttrail.h"
+#include "llhudeffectlookat.h"
 #include "llvectorperfoptions.h"
 #include "llurlsimstring.h"
 #include "llwatchdog.h"
@@ -666,6 +667,7 @@ 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/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
index c8460cf60..1dbbe8922 100644
--- a/indra/newview/llhudeffectlookat.cpp
+++ b/indra/newview/llhudeffectlookat.cpp
@@ -55,7 +55,7 @@
 // </edit>
 
 
-BOOL LLHUDEffectLookAt::sDebugLookAt = TRUE;
+BOOL LLHUDEffectLookAt::sDebugLookAt = FALSE;
 
 // packet layout
 const S32 SOURCE_AVATAR = 0;
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 ec2beffbd..6f494fd82 100644
--- a/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -3,76 +3,79 @@
 	<string name="Multiple">
 		Multiple friends...
 	</string>
-  <text bottom_delta="-30" follows="left|top" font="SansSerif" height="16" left_delta="10" name="friends" width="110">
-    Contact Group:
-  </text>
-  <text bottom_delta="-20" follows="left|top" font="SansSerif" height="16" left_delta="0" name="friends" width="110">
-    Contact Search:
-  </text>
-  <combo_box allow_text_entry="false" enabled="true" follows="right|top"
-		    	  bottom_delta="20" height="18" hidden="false" left="-235" max_chars="20" mouse_opaque="true"
-				  tool_tip="Buddy group"
-		    	  name="buddy_group_combobox" width="130">
-    <combo_item type="string" length="1" enabled="true" name="All" 
-      value="All">
-      All
-    </combo_item>
-  </combo_box>
-  <line_editor bottom_delta="-20" enabled="true" follows="right|top" font="SansSerif"
-				height="18" left="-235" name="buddy_search_lineedit"
-				tool_tip="The friend name you want to search for"
-				width="130" />
+	<text bottom_delta="-30" follows="left|top" font="SansSerif" height="16" left_delta="10" name="friends" width="110">
+		Contact Group:
+	</text>
+	<text bottom_delta="-25" follows="left|top" font="SansSerif" height="16" left_delta="0" name="friends" width="110">
+		Contact Search:
+	</text>
+	<combo_box allow_text_entry="false" enabled="true" follows="right|top"
+		bottom_delta="22" height="18" hidden="false" left="-235" max_chars="20" mouse_opaque="true"
+		tool_tip="Buddy group" name="buddy_group_combobox" width="130">
+		<combo_item type="string" length="1" enabled="true" name="All" value="All">
+			All
+		</combo_item>
+	</combo_box>
+	<line_editor bottom_delta="-21" enabled="true" follows="right|top" font="SansSerif"
+		height="18" left="-235" name="buddy_search_lineedit" width="130" 
+		tool_tip="The friend name you want to search for"/>
 	<scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true"
-	     follows="left|top|bottom|right" left="10" multi_select="true"
-	     name="friend_list" right="-100" search_column="1"
-	     tool_tip="Hold shift or control while clicking to select multiple friends"
-	     top="-60">
+	    follows="left|top|bottom|right" left="10" multi_select="true" name="friend_list" 
+		right="-100" search_column="1" top="-61"
+	    tool_tip="Hold shift or control while clicking to select multiple friends">
 		<column image="ff_online_status_button.tga" name="icon_online_status"
-		     tool_tip="Online status" width="20" />
+		    tool_tip="Online status" width="20" />
 		<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" />
 		<column image="ff_visible_online_button.tga" name="icon_visible_online"
-		     tool_tip="Friend can see when you&apos;re online" width="20" />
+		    tool_tip="Friend can see when you&apos;re online" width="20" />
 		<column image="ff_visible_map_button.tga" name="icon_visible_map"
-		     tool_tip="Friend can locate you on the map" width="20" />
+		    tool_tip="Friend can locate you on the map" width="20" />
 		<column image="ff_edit_mine_button.tga" name="icon_edit_mine"
-		     tool_tip="Friend can edit, delete or take objects" width="20" />
+		    tool_tip="Friend can edit, delete or take objects" width="20" />
     	<column image="ff_visible_online_button.tga" name="icon_visible_online_theirs"
-		     tool_tip="You can see when they are online (only updates on login)" width="20" />
+		    tool_tip="You can see when they are online (only updates on login)" width="20" />
    		<column image="ff_visible_map_button.tga" name="icon_visible_map_theirs"
-		     tool_tip="You can locate them on the map" width="20" />
+		    tool_tip="You can locate them on the map" width="20" />
 		<column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
-		     tool_tip="You can edit this friend&apos;s objects" width="20" />
+		    tool_tip="You can edit this friend&apos;s objects" width="20" />
 		<column name="friend_last_update_generation" width="0" />
 	</scroll_list>
 	<pad bottom="-7" height="0" left="-90" width="1" />
-  <button bottom_delta="-25" follows="top|right" height="22" label="Set Contact"
-     left_delta="0" name="assign_btn" tool_tip="Asign a friend to a Contact Group"
-     width="80" />
+	<button bottom_delta="-25" follows="top|right" height="22" label="Set Contact"
+		left_delta="0" name="assign_btn" tool_tip="Asign a friend to a Contact Group"
+		width="80" />
 	<button bottom_delta="-25" follows="top|right" height="22" label="IM/Call"
-	     left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
-	     width="80" />
+	    left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
+	    width="80" />
 	<button bottom_delta="-25" follows="top|right" height="22" label="Profile"
-	     left_delta="0" name="profile_btn"
-	     tool_tip="Show picture, groups, and other information" width="80" />
+	    left_delta="0" name="profile_btn" width="80" 
+	    tool_tip="Show picture, groups, and other information"/>
 	<button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
-	     left_delta="0" name="offer_teleport_btn"
-	     tool_tip="Offer this friend a teleport to your current location" width="80" />
+	    left_delta="0" name="offer_teleport_btn"
+	    tool_tip="Offer this friend a teleport to your current location" width="80" />
 	<button bottom_delta="-25" follows="top|right" height="22" label="Pay..."
-	     left_delta="0" name="pay_btn"
-	     tool_tip="Give Linden dollars (L$) to this friend" width="80" />
+	    left_delta="0" name="pay_btn"
+	    tool_tip="Give Linden dollars (L$) to this friend" width="80" />
 	<button bottom_delta="-25" follows="top|right" height="22" label="Remove..."
-	     left_delta="0" name="remove_btn"
-	     tool_tip="Remove this person from your friends list" width="80" />
+	    left_delta="0" name="remove_btn"
+	    tool_tip="Remove this person from your friends list" width="80" />
 	<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">
-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">
-Selected:
-    </text>	<text bottom_delta="-15" follows="right|top" font="SansSerif" height="32" left_delta="0" name="s_num" width="95">
-0000
+	    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">
+		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">
+		Selected:
+    </text>
+	<text bottom_delta="-15" follows="right|top" font="SansSerif" height="32" 
+		left_delta="0" name="s_num" width="95">
+		0000
     </text>		 
 </panel>