From d36f86f6745d827165720fdae769a6518f278819 Mon Sep 17 00:00:00 2001 From: Beeks Date: Tue, 28 Sep 2010 17:44:01 -0400 Subject: [PATCH] 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 --- indra/newview/app_settings/settings.xml | 13 ++++++- indra/newview/ascentprefssys.cpp | 2 - indra/newview/ascentprefsvan.cpp | 23 +++++++++-- indra/newview/llstartup.cpp | 32 +++++++++++++--- .../en-us/panel_preferences_ascent_system.xml | 12 ------ .../en-us/panel_preferences_ascent_vanity.xml | 38 +++++++++++++++---- 6 files changed, 89 insertions(+), 31 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 89b66672e..ebeb00690 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -84,6 +84,17 @@ Value 0 + AscentUseStatusColors + + Comment + Show special colors for statuses like Friend, Linden, so on + Persist + 1 + Type + Boolean + Value + 0 + AscentAvatarXModifier Comment @@ -500,7 +511,7 @@ Type Boolean Value - 0 + 1 OptionRotateCamAfterLocalTP diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp index 965ce2181..6bef23fd7 100644 --- a/indra/newview/ascentprefssys.cpp +++ b/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 diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp index 67e14ef8a..9e97aeef4 100644 --- a/indra/newview/ascentprefsvan.cpp +++ b/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::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("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("tag_spoofing_combobox"); diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 50a5427c9..37c26a6c0 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1498,9 +1498,7 @@ bool idle_startup() } // Display the startup progress bar. - // - //gViewerWindow->setShowProgress(TRUE); - // + gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("AscentDisableLogoutScreens")); 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); - gViewerWindow->setProgressString(string); + if(gSavedSettings.getBOOL("AscentDisableLogoutScreens")) + { + 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) 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 45f936464..125a6c0b1 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 @@ -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" /> - - + + + - - + + @@ -110,7 +134,7 @@ label="Manual Update" height="18" left_delta="340" width="100"/> 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" /> Color For: @@ -144,7 +168,7 @@ name="muted_color_swatch" width="44" />