livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge in old changes ive done but forgot about commiting.

Liny 2015-03-06 14:20:18 -08:00
parent fd2773aad4 b3fceda4f9
commit 28f81d8e17
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llui/llurlentry.cpp
View File

@ -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");
}
}

11
indra/newview/app_settings/settings.xml
View File

@ -20015,6 +20015,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSAlwaysShowTPCancel</key>
<map>
<key>Comment</key>
<string>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).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FSTagShowDistanceColors</key>
<map>
<key>Comment</key>

4
indra/newview/llviewermessage.cpp
View File

@ -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);