Merge branch 'master' of github.com:Beeks/Ascent

Conflicts:
	indra/newview/llvoavatar.cpp

indra/newview/CMakeLists.txt

@@ -494,7 +494,7 @@ set(viewer_SOURCE_FILES
     )
 
 # This gets renamed in the packaging step
-set(VIEWER_BINARY_NAME "secondlife-bin" CACHE STRING
+set(VIEWER_BINARY_NAME "Ascent" CACHE STRING
     "The name of the viewer executable to create.")
 
 if (LINUX)

indra/newview/app_settings/settings.xml

@@ -35,6 +35,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>AscentBuildAlwaysEnabled</key>
     <map>
       <key>Comment</key>

indra/newview/ascentprefsvan.cpp

@@ -71,6 +71,7 @@ private:
 	std::string mCustomTagLabel;
 	LLColor4 mCustomTagColor;
 	LLColor4 mEffectColor;
+	LLColor4 mFriendColor;
 	U32 mSelectedClient;
 };
 
@@ -155,6 +156,7 @@ void LLPrefsAscentVanImpl::refreshValues()
 		}
 		mCustomTagLabel			= gSavedSettings.getString("AscentCustomTagLabel");
 		mCustomTagColor			= gSavedSettings.getColor4("AscentCustomTagColor");
+		mFriendColor			= gSavedSettings.getColor4("AscentFriendColor");
 	}
 	else
 	{
@@ -176,6 +178,7 @@ void LLPrefsAscentVanImpl::refreshValues()
 		}
 		mCustomTagLabel			= gSavedPerAccountSettings.getString("AscentCustomTagLabel");
 		mCustomTagColor			= gSavedPerAccountSettings.getColor4("AscentCustomTagColor");
+		mFriendColor			= gSavedPerAccountSettings.getColor4("AscentFriendColor");
 	}
 	
 	
@@ -201,16 +204,22 @@ void LLPrefsAscentVanImpl::refresh()
 		llinfos << "Retrieving color from client" << llendl;
 		getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
 		getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
+		getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor);
 		gSavedSettings.setColor4("EffectColor", LLColor4::white);
 		gSavedSettings.setColor4("EffectColor", mEffectColor);
+		gSavedSettings.setColor4("AscentFriendColor", LLColor4::yellow);
+		gSavedSettings.setColor4("AscentFriendColor", mFriendColor);
 	}
 	else
 	{
 		llinfos << "Retrieving color from account" << llendl;
 		getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
 		getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
+		getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor);
 		gSavedPerAccountSettings.setColor4("EffectColor", LLColor4::white);
 		gSavedPerAccountSettings.setColor4("EffectColor", mEffectColor);
+		gSavedPerAccountSettings.setColor4("AscentFriendColor", LLColor4::yellow);
+		gSavedPerAccountSettings.setColor4("AscentFriendColor", mFriendColor);
 	}
 }
 
@@ -233,16 +242,22 @@ void LLPrefsAscentVanImpl::cancel()
 		llinfos << "Retrieving color from client" << llendl;
 		getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
 		getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
+		getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor);
 		gSavedSettings.setColor4("EffectColor", LLColor4::white);
 		gSavedSettings.setColor4("EffectColor", mEffectColor);
+		gSavedSettings.setColor4("AscentFriendColor", LLColor4::yellow);
+		gSavedSettings.setColor4("AscentFriendColor", mFriendColor);
 	}
 	else
 	{
 		llinfos << "Retrieving color from account" << llendl;
 		getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
 		getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
+		getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor);
 		gSavedPerAccountSettings.setColor4("EffectColor", LLColor4::white);
 		gSavedPerAccountSettings.setColor4("EffectColor", mEffectColor);
+		gSavedPerAccountSettings.setColor4("AscentFriendColor", LLColor4::yellow);
+		gSavedPerAccountSettings.setColor4("AscentFriendColor", mFriendColor);
 	}
 }
 
@@ -289,6 +304,7 @@ void LLPrefsAscentVanImpl::apply()
 	{
 		llinfos << "Storing color in client" << llendl;
 		gSavedSettings.setColor4("EffectColor",				childGetValue("effect_color_swatch"));
+		gSavedSettings.setColor4("AscentFriendColor",		childGetValue("friend_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"));
@@ -297,6 +313,7 @@ void LLPrefsAscentVanImpl::apply()
 	{
 		llinfos << "Storing color in account" << llendl;
 		gSavedPerAccountSettings.setColor4("EffectColor",			childGetValue("effect_color_swatch"));
+		gSavedPerAccountSettings.setColor4("AscentFriendColor",		childGetValue("friend_color_swatch"));
 		gSavedPerAccountSettings.setBOOL("AscentUseCustomTag",		childGetValue("customize_own_tag_check"));
 		gSavedPerAccountSettings.setString("AscentCustomTagLabel",	childGetValue("custom_tag_label_box"));
 		gSavedPerAccountSettings.setColor4("AscentCustomTagColor",	childGetValue("custom_tag_color_swatch"));

indra/newview/llvoavatar.cpp

@@ -3613,6 +3613,16 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 					LLColor4 tag_color = texentry->getColor();
 					tag_color.setAlpha(alpha);
 					mNameText->setColor(tag_color);
+
+					// you probably had e-sex with this person
+					if (LLAvatarTracker::instance().getBuddyInfo(this->getID()) != NULL)
+					{
+						if (gSavedSettings.getBOOL("AscentShowFriendsTag"))
+						{
+							client = "Friend"; // "fuckable";
+							avatar_name_color = gSavedSettings.getColor4("AscentFriendColor");
+						}
+					}
 				}
 				else
 				{
@@ -3682,6 +3692,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 			else
 			{
 				is_muted = LLMuteList::getInstance()->isMuted(getID());
+				
 			}
 
 			if (mNameString.empty() ||

indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml

@@ -15,10 +15,10 @@
 		<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
 			follows="left|top|right|bottom" label="Colors" name="Colors">
 			<!-- Client tag options -->
-			<view_border bevel_style="none" border_thickness="1" bottom="-95" follows="top|left"
+			<view_border bevel_style="none" border_thickness="1" bottom="-115" follows="top|left"
-				height="90" left="5" name="GraphicsBorder" width="485" />
+				height="110" left="5" name="GraphicsBorder" width="485" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			      bottom_delta="74" drop_shadow_visible="true" enabled="true" follows="left|top"
+			      bottom_delta="94" drop_shadow_visible="true" enabled="true" follows="left|top"
 	    		  font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
 		    	  left_delta="9" mouse_opaque="true" name="client_tag_text_box" v_pad="0"
 			      width="90">
@@ -53,6 +53,12 @@
 				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_self_tag_color_check" radio_style="false"
+				width="400" />
 			<check_box bottom_delta="65" 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"
@@ -82,16 +88,27 @@
 				tool_tip="The custom color you would like to replace your client color with (Local only)" width="32" />
 			<!-- End of Client Tag settings -->
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom="-123" drop_shadow_visible="true" enabled="true" follows="left|top"
+				bottom="-143" drop_shadow_visible="true" enabled="true" follows="left|top"
 				font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
 				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="-149"
+			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-169"
 				can_apply_immediately="false" color="1 1 1 1"
 				enabled="true" follows="left|top" height="48" label="" left="153"
 				mouse_opaque="true" name="effect_color_swatch"
 				tool_tip="Click to open Color Picker" width="32" />
+      <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"
+				mouse_opaque="true" name="friends_color_textbox" v_pad="0" width="394">
+        Color For My Friends:
+      </text>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-204"
+				can_apply_immediately="false" color="1 1 1 1"
+				enabled="true" follows="left|top" height="48" label="" left="153"
+				mouse_opaque="true" name="friend_color_swatch"
+				tool_tip="Click to open Color Picker" width="32" />
 		</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">

indra/newview/viewer_manifest.py

@@ -176,7 +176,7 @@ class WindowsManifest(ViewerManifest):
         super(WindowsManifest, self).construct()
         # the final exe is complicated because we're not sure where it's coming from,
         # nor do we have a fixed name for the executable
-        self.path(self.find_existing_file('debug/secondlife-bin.exe', 'release/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe())
+        self.path(self.find_existing_file('debug/Ascent.exe', 'release/Ascent.exe', 'relwithdebinfo/Ascent.exe'), dst=self.final_exe())
 
         # Plugin host application
         self.path(os.path.join(os.pardir,
@@ -255,7 +255,7 @@ class WindowsManifest(ViewerManifest):
             self.end_prefix()
 
         # The config file name needs to match the exe's name.
-        self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
+        self.path(src="%s/Ascent.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
 
         # Vivox runtimes
         if self.prefix(src="vivox-runtime/i686-win32", dst=""):
@@ -668,7 +668,7 @@ class LinuxManifest(ViewerManifest):
             self.path("secondlife-stripped","bin/"+self.binary_name())
             self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
         else:
-            self.path("secondlife-bin","bin/"+self.binary_name())
+            self.path("Ascent","bin/"+self.binary_name())
             self.path("../linux_crash_logger/linux-crash-logger","linux-crash-logger.bin")
 
         self.path("linux_tools/launch_url.sh","launch_url.sh")