diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
| commit | 026b528b86a853a923ec87dd3897fe2079cbd539 (patch) | |
| tree | b31ec200f751a5c0817a6e628ae6e6c4f394bf77 /indra/newview/llfloaterimcontainer.cpp | |
| parent | ee74eb1a9ee8e2aba49613cf434f1272a4526417 (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
| -rwxr-xr-x | indra/newview/llfloaterimcontainer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 21bc747648..90b4490e1d 100755 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -1080,6 +1080,10 @@ void LLFloaterIMContainer::doToParticipants(const std::string& command, uuid_vec { LLAvatarActions::offerTeleport(selectedIDS); } + else if ("request_teleport" == command) + { + LLAvatarActions::teleportRequest(selectedIDS.front()); + } else if ("voice_call" == command) { LLAvatarActions::startCall(userID); |