From 4cdac61634cc7b4962dfdf02f27156ec10749263 Mon Sep 17 00:00:00 2001 From: Liny Date: Fri, 6 Mar 2015 14:08:29 -0800 Subject: [PATCH 1/2] Change placeholder that is shown while display name is still being fetched to proper placeholder. --- indra/llui/llurlentry.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 4285900149..eb185b6686 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -502,7 +502,7 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa if (!gCacheName) { // probably at the login screen, use short string for layout - return LLTrans::getString("LoadingData"); + return LLTrans::getString("AvatarNameWaiting"); } std::string agent_id_string = getIDStringFromUrl(url); @@ -535,7 +535,7 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa } mAvatarNameCacheConnection = LLAvatarNameCache::get(agent_id, boost::bind(&LLUrlEntryAgent::onAvatarNameCache, this, _1, _2)); addObserver(agent_id_string, url, cb); - return LLTrans::getString("LoadingData"); + return LLTrans::getString("AvatarNameWaiting"); } } @@ -613,7 +613,7 @@ std::string LLUrlEntryAgentName::getLabel(const std::string &url, const LLUrlLab if (!gCacheName) { // probably at the login screen, use short string for layout - return LLTrans::getString("LoadingData"); + return LLTrans::getString("AvatarNameWaiting"); } std::string agent_id_string = getIDStringFromUrl(url); @@ -642,7 +642,7 @@ std::string LLUrlEntryAgentName::getLabel(const std::string &url, const LLUrlLab } mAvatarNameCacheConnection = LLAvatarNameCache::get(agent_id, boost::bind(&LLUrlEntryAgentName::onAvatarNameCache, this, _1, _2)); addObserver(agent_id_string, url, cb); - return LLTrans::getString("LoadingData"); + return LLTrans::getString("AvatarNameWaiting"); } } @@ -757,7 +757,7 @@ std::string LLUrlEntryGroup::getLabel(const std::string &url, const LLUrlLabelCa if (!gCacheName) { // probably at login screen, give something short for layout - return LLTrans::getString("LoadingData"); + return LLTrans::getString("AvatarNameWaiting"); } std::string group_id_string = getIDStringFromUrl(url); @@ -783,7 +783,7 @@ std::string LLUrlEntryGroup::getLabel(const std::string &url, const LLUrlLabelCa boost::bind(&LLUrlEntryGroup::onGroupNameReceived, this, _1, _2, _3)); addObserver(group_id_string, url, cb); - return LLTrans::getString("LoadingData"); + return LLTrans::getString("AvatarNameWaiting"); } } From b3fceda4f99e32e513925057394ce676b2ea80d8 Mon Sep 17 00:00:00 2001 From: Liny Date: Fri, 6 Mar 2015 14:14:36 -0800 Subject: [PATCH 2/2] Add debug setting to force showing the TP cancel button regardless if it is able to be canceled. If the TP can't be canceled, clicking will do nothing as the region will ignore the request. Does not bypass RLV restrictions however, force TPs will not show the button. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llviewermessage.cpp | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f3edbd2166..51985ce380 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -20015,6 +20015,17 @@ Change of this parameter will affect the layout of buttons in notification toast Value 0 + FSAlwaysShowTPCancel + + Comment + Always show the TP cancel button even if the sim says it cant be canceled. The sim will always know if it can and will ignore cancel requests on death/god TPs anyways. Ignores RLVa (i.e. RLV restrictions can still disable it). + Persist + 1 + Type + Boolean + Value + 0 + FSTagShowDistanceColors Comment diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 59921a3e61..9e575c241e 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4838,7 +4838,7 @@ void process_teleport_start(LLMessageSystem *msg, void**) // if (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL) // [RLVa:KB] - Checked: 2010-04-07 (RLVa-1.2.0d) | Added: RLVa-0.2.0b - if ( (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL) || (!gRlvHandler.getCanCancelTp()) ) + if ( ((teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL) && !gSavedSettings.getBOOL("FSAlwaysShowTPCancel")) || (!gRlvHandler.getCanCancelTp()) ) // [/RLVa:KB] { gViewerWindow->setProgressCancelButtonVisible(FALSE); @@ -4883,7 +4883,7 @@ void process_teleport_progress(LLMessageSystem* msg, void**) msg->getU32("Info", "TeleportFlags", teleport_flags); // if (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL) // [RLVa:KB] - Checked: 2010-04-07 (RLVa-1.2.0d) | Added: RLVa-0.2.0b - if ( (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL) || (!gRlvHandler.getCanCancelTp()) ) + if ( ((teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL) && !gSavedSettings.getBOOL("FSAlwaysShowTPCancel")) || (!gRlvHandler.getCanCancelTp()) ) // [/RLVa:KB] { gViewerWindow->setProgressCancelButtonVisible(FALSE);