Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch the IM and teleport callbacks of right-clicked inventory calling cards to LLAvatarActions

Browse Source 
This is partially in attempt to reduce possible suspects for Issue 936: Talking to users with the lastname Resident sometimes creates logs without the delimiting space stripped out
This commit is contained in:
Lirusaito
2013-07-19 20:34:39 -04:00
parent b2522a06b4
commit ed1dbfaa81
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llinventorybridge.cpp
View File

@@ -4584,8 +4584,7 @@ void LLCallingCardBridge::performAction(LLInventoryModel* model, std::string act
if (item && (item->getCreatorUUID() != gAgent.getID()) && if (item && (item->getCreatorUUID() != gAgent.getID()) &&
(!item->getCreatorUUID().isNull())) (!item->getCreatorUUID().isNull()))
{ {
gIMMgr->setFloaterOpen(TRUE); LLAvatarActions::startIM(item->getCreatorUUID());
gIMMgr->addSession(item->getName(), IM_NOTHING_SPECIAL, item->getCreatorUUID());
} }
} }
else if ("lure" == action) else if ("lure" == action)
@@ -4594,7 +4593,7 @@ void LLCallingCardBridge::performAction(LLInventoryModel* model, std::string act
if (item && (item->getCreatorUUID() != gAgent.getID()) && if (item && (item->getCreatorUUID() != gAgent.getID()) &&
(!item->getCreatorUUID().isNull())) (!item->getCreatorUUID().isNull()))
{ {
handle_lure(item->getCreatorUUID()); LLAvatarActions::offerTeleport(item->getCreatorUUID());
} }
} }
else LLItemBridge::performAction(model, action); else LLItemBridge::performAction(model, action);