diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 05648d111..3cdb88757 100644 --- a/indra/newview/CMakeLists.txt +++ b/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) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1bb9649b3..b8391fe91 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -35,6 +35,17 @@ Value 0.0 + AscentShowFriendsTag + + Comment + Show friends client tags as (Friend), and colorize them specially. + Persist + 1 + Type + Boolean + Value + 1 + AscentBuildAlwaysEnabled Comment diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp index e50a2c4a7..643d043b5 100644 --- a/indra/newview/ascentprefsvan.cpp +++ b/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("effect_color_swatch")->set(mEffectColor); getChild("custom_tag_color_swatch")->set(mCustomTagColor); + getChild("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("effect_color_swatch")->set(mEffectColor); getChild("custom_tag_color_swatch")->set(mCustomTagColor); + getChild("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("effect_color_swatch")->set(mEffectColor); getChild("custom_tag_color_swatch")->set(mCustomTagColor); + getChild("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("effect_color_swatch")->set(mEffectColor); getChild("custom_tag_color_swatch")->set(mCustomTagColor); + getChild("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")); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 362912b66..0e87a8900 100644 --- a/indra/newview/llvoavatar.cpp +++ b/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() || 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 885cdde38..1c15489dd 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 @@ -15,10 +15,10 @@ - + diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 44fab8a81..2392f4b0e 100755 --- a/indra/newview/viewer_manifest.py +++ b/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")