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

Added "offerteleport" FS SLurl command and wired it up in agent SLurl context menu

Ansariel 2012-09-07 18:26:19 +02:00
parent 441997560c
commit 732fc8918c
5 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llui/llscrolllistctrl.cpp
View File

@ -1846,6 +1846,7 @@ BOOL LLScrollListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
// <FS:Ansariel> Additional convenience options
registrar.add("FS.ZoomIn", boost::bind(&LLUrlAction::executeSLURL, "secondlife:///app/firestorm/" + id + "/zoom"));
registrar.add("FS.TeleportToTarget", boost::bind(&LLUrlAction::executeSLURL, "secondlife:///app/firestorm/" + id + "/teleportto"));
registrar.add("FS.OfferTeleport", boost::bind(&LLUrlAction::executeSLURL, "secondlife:///app/firestorm/" + id + "/offerteleport"));
registrar.add("FS.TrackAvatar", boost::bind(&LLUrlAction::executeSLURL, "secondlife:///app/firestorm/" + id + "/track"));
// </FS:Ansariel> Additional convenience options

1
indra/llui/lltextbase.cpp
View File

@ -1926,6 +1926,7 @@ void LLTextBase::createUrlContextMenu(S32 x, S32 y, const std::string &in_url)
std::string target_id = LLUrlAction::extractUuidFromSlurl(url).asString();
registrar.add("FS.ZoomIn", boost::bind(&LLUrlAction::executeSLURL, "secondlife:///app/firestorm/" + target_id + "/zoom"));
registrar.add("FS.TeleportToTarget", boost::bind(&LLUrlAction::executeSLURL, "secondlife:///app/firestorm/" + target_id + "/teleportto"));
registrar.add("FS.OfferTeleport", boost::bind(&LLUrlAction::executeSLURL, "secondlife:///app/firestorm/" + target_id + "/offerteleport"));
registrar.add("FS.TrackAvatar", boost::bind(&LLUrlAction::executeSLURL, "secondlife:///app/firestorm/" + target_id + "/track"));
// </FS:Ansariel>

10
indra/newview/fsslurlcommand.cpp
View File

@ -80,6 +80,16 @@ public:
return true;
}
if (verb == "offerteleport")
{
if (gAgentID != target_id)
{
LLAvatarActions::offerTeleport(target_id);
}
return true;
}
if (verb == "teleportto")
{
if (gAgentID != target_id)

1
indra/newview/skins/default/xui/de/menu_url_agent.xml
View File

@ -3,6 +3,7 @@
<menu_item_call label="Einwohnerprofil anzeigen" name="show_agent"/>
<menu_item_call label="Zoome auf Einwohner" name="zoom_agent"/>
<menu_item_call label="Zu Einwohner teleportieren" name="teleportto_agent"/>
<menu_item_call label="Einwohner Teleport anbieten" name="offer_teleport"/>
<menu_item_call label="Einwohner verfolgen" name="track_agent"/>
<menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/>
<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>

9
indra/newview/skins/default/xui/en/menu_url_agent.xml
View File

@ -25,8 +25,13 @@
name="teleportto_agent">
<menu_item_call.on_click
function="FS.TeleportToTarget" />
<menu_item_call.on_enable
function="FS.VisibleTeleportToTarget" />
</menu_item_call>
<menu_item_call
label="Offer Teleport"
layout="topleft"
name="offer_teleport">
<menu_item_call.on_click
function="FS.OfferTeleport" />
</menu_item_call>
<menu_item_call
label="Track Resident"