Moved the Logout/Login and Teleport screen options to Vanity for future use, set them to "enable" instead of "disable" (This will make more sense in the future). This update also has the changes in the settings for the update to follow it (Status tags)

Signed-off-by: Beeks <HgDelirium@gmail.com>

indra/newview/app_settings/settings.xml

@@ -84,6 +84,17 @@
 		<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>
@@ -500,7 +511,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
 	<key>OptionRotateCamAfterLocalTP</key>
     <map>

indra/newview/ascentprefssys.cpp

@@ -161,8 +161,6 @@ void LLPrefsAscentSysImpl::refreshValues()
 	mPreviewAnimInWorld			= gSavedSettings.getBOOL("PreviewAnimInWorld");
 	mSaveScriptsAsMono			= gSavedSettings.getBOOL("SaveScriptsAsMono");
 	mAlwaysRezInGroup			= gSavedSettings.getBOOL("AscentAlwaysRezInGroup");
-	//Disable Teleport Progress
-	//Disable Logout progress
 	//always show Build
 	mAlwaysShowFly				= gSavedSettings.getBOOL("AscentFlyAlwaysEnabled");
 	//Disable camera minimum distance

indra/newview/ascentprefsvan.cpp

@@ -68,6 +68,9 @@ private:
 	void refreshValues();
 	//General
 	BOOL mUseAccountSettings;
+	BOOL mShowTPScreen;
+	BOOL mPlayTPSound;
+	BOOL mShowLogScreens;
 	//Colors
 	BOOL mShowSelfClientTag;
 	BOOL mShowSelfClientTagColor;
@@ -91,6 +94,7 @@ LLPrefsAscentVanImpl::LLPrefsAscentVanImpl()
 	childSetCommitCallback("use_account_settings_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);
@@ -163,7 +167,7 @@ void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
 		self->refresh();
 	}
 
-	if (ctrl->getName() == "show_friend_tag_check")
+	if ((ctrl->getName() == "show_friend_tag_check")||(ctrl->getName() == "use_status_check"))
 	{
 		for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
 		iter != LLCharacter::sInstances.end(); ++iter)
@@ -192,6 +196,9 @@ void LLPrefsAscentVanImpl::refreshValues()
 {
 	//General
 	mUseAccountSettings			= gSavedSettings.getBOOL("AscentStoreSettingsPerAccount");
+	mShowTPScreen				= !gSavedSettings.getBOOL("AscentDisableTeleportScreens");
+	mPlayTPSound				= gSavedSettings.getBOOL("OptionPlayTpSound");
+	mShowLogScreens				= !gSavedSettings.getBOOL("AscentDisableLogoutScreens");
 	
 	//Colors
 	mShowSelfClientTag			= gSavedSettings.getBOOL("AscentShowSelfTag");
@@ -203,6 +210,8 @@ void LLPrefsAscentVanImpl::refreshValues()
 	
 	BOOL use_custom = LLSavedSettingsGlue::getCOABOOL("AscentUseCustomTag");
 
+	
+
 	childSetEnabled("custom_tag_label_text", use_custom);
 	childSetEnabled("custom_tag_label_box", use_custom);
 	childSetEnabled("custom_tag_color_text", use_custom);
@@ -222,6 +231,9 @@ void LLPrefsAscentVanImpl::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 ---------------------------------------------------------------------------------
 	LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");
@@ -263,7 +275,10 @@ void LLPrefsAscentVanImpl::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);
+
 	LLSavedSettingsGlue::setCOAColor4("EffectColor", LLColor4::white);
 	LLSavedSettingsGlue::setCOAColor4("EffectColor", mEffectColor);
 	LLSavedSettingsGlue::setCOAColor4("AscentFriendColor", LLColor4::yellow);
@@ -283,7 +298,9 @@ void LLPrefsAscentVanImpl::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 ------------------------------------------------------------------------------
 	LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");

indra/newview/llstartup.cpp

@@ -1498,9 +1498,7 @@ bool idle_startup()
 		}
 
 		// Display the startup progress bar.
-		// <edit>
+		gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("AscentDisableLogoutScreens"));
-		//gViewerWindow->setShowProgress(TRUE);
-		// </edit>
 		gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Quit")); // *TODO: Translate
 
 		// Poke the VFS, which could potentially block for a while if
@@ -3787,10 +3785,32 @@ bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
 
 void set_startup_status(const F32 frac, const std::string& string, const std::string& msg)
 {
-	gViewerWindow->setProgressPercent(frac*100);
+	if(gSavedSettings.getBOOL("AscentDisableLogoutScreens"))
-	gViewerWindow->setProgressString(string);
+	{
+		static std::string last_d;
+		std::string new_d = string;
+		if(new_d != last_d)
+		{
+			last_d = new_d;
+			LLChat chat;
+			chat.mText = new_d;
+			chat.mSourceType = (EChatSourceType)(CHAT_SOURCE_OBJECT+1);
+			LLFloaterChat::addChat(chat);
+			if(new_d == LLTrans::getString("LoginWaitingForRegionHandshake"))
+			{
+				chat.mText = "MOTD: "+msg;
+				chat.mSourceType = (EChatSourceType)(CHAT_SOURCE_OBJECT+1);
+				LLFloaterChat::addChat(chat);
+			}
+		}
+	}
+	else
+	{
+		gViewerWindow->setProgressPercent(frac*100);
+		gViewerWindow->setProgressString(string);
 
-	gViewerWindow->setProgressMessage(msg);
+		gViewerWindow->setProgressMessage(msg);
+	}
 }
 
 bool login_alert_status(const LLSD& notification, const LLSD& response)

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

@@ -41,18 +41,6 @@
 				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="AscentDisableTeleportScreens" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Disable the Teleport progress screens" left="10"
-				tool_tip="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="AscentDisableLogoutScreens" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Hide the Logout progress screen" left="10"
-				tool_tip="Does not hide the UI when logging out."
-				mouse_opaque="true" name="disable_logout_screen_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"

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

@@ -11,13 +11,31 @@
 				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="Colors" name="Colors">
 			<!-- Client tag options -->
-			<view_border bevel_style="none" border_thickness="1" bottom="-135" follows="top|left"
+			<view_border bevel_style="none" border_thickness="1" bottom="-155" follows="top|left"
-				height="130" left="5" name="GraphicsBorder" width="485" />
+				height="150" left="5" name="GraphicsBorder" width="485" />
-			<check_box bottom_delta="110" control_name="AscentUseTag" enabled="true"
+			<check_box bottom_delta="130" control_name="AscentUseTag" enabled="true"
 				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
 				label="Use Client Tag:" left_delta="0"
 				tool_tip="Enabling this will show your client tag on your avatar name locally."
@@ -100,9 +118,15 @@
 				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="-230"
+				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."
 				mouse_opaque="true" name="update_tags_check" radio_style="false"
 				width="400" />
@@ -110,7 +134,7 @@
 				label="Manual Update" height="18" left_delta="340" width="100"/>
 			<!-- End of Client Tag settings -->
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom="-158" drop_shadow_visible="true" enabled="true" follows="left|top"
+				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="effects_color_textbox" v_pad="0" width="394">
 				Color For My Effects:
@@ -120,7 +144,7 @@
 				 enabled="true" follows="left|top" height="47" label="Effects" left="148"
 				 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="-205" drop_shadow_visible="true" enabled="true" follows="left|top"
+				bottom="-225" 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:
@@ -144,7 +168,7 @@
 				 name="muted_color_swatch" width="44" />
 			<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"
-				 enabled="true" follows="left|top" height="47"  label="Muted" left_delta="54"
+				 enabled="true" follows="left|top" height="47"  label="Custom" left_delta="54"
 				 name="custom_color_swatch" width="44" />
 		</panel>
 		<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"