From 9b1840c1c95a1a4adad913e0c162048fb78c537d Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 6 Jun 2013 16:34:24 -0400
Subject: [PATCH] STORM-1838 Added teleport request to conversation log. Added
xml to have message appear in IM window, if open. Code cleanup.
---
indra/newview/llavataractions.cpp | 1 -
indra/newview/llconversationloglist.cpp | 5 ++++-
indra/newview/llpanelpeoplemenus.cpp | 2 --
.../newview/skins/default/xui/en/menu_conversation.xml | 2 --
.../default/xui/en/menu_conversation_log_gear.xml | 10 ++++++++++
indra/newview/skins/default/xui/en/notifications.xml | 1 +
6 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 285e70c8ea6..45992b8c839 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -443,7 +443,6 @@ void LLAvatarActions::teleport_request_callback(const LLSD& notification, const
// static
void LLAvatarActions::teleportRequest(const LLUUID& id)
{
-llwarns << "DBG " << llendl;
std::string name;
gCacheName->getFullName(id, name);
gCacheName->cleanFullName(name);
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp
index cf9c9b34150..44212298cf5 100644
--- a/indra/newview/llconversationloglist.cpp
+++ b/indra/newview/llconversationloglist.cpp
@@ -311,9 +311,12 @@ void LLConversationLogList::onCustomAction(const LLSD& userdata)
}
else if ("offer_teleport" == command_name)
{
-llwarns << "DBG " << llendl;
LLAvatarActions::offerTeleport(selected_conversation_participant_id);
}
+ else if ("request_teleport" == command_name)
+ {
+ LLAvatarActions::teleportRequest(selected_conversation_participant_id);
+ }
else if("add_friend" == command_name)
{
if (!LLAvatarActions::isFriend(selected_conversation_participant_id))
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
index ddc92f439b0..0b2bf1d2c8d 100644
--- a/indra/newview/llpanelpeoplemenus.cpp
+++ b/indra/newview/llpanelpeoplemenus.cpp
@@ -261,7 +261,6 @@ void PeopleContextMenu::requestTeleport()
{
// boost::bind cannot recognize overloaded method LLAvatarActions::teleportRequest(),
// so we have to use a wrapper.
-llwarns << "DBG " << llendl;
LLAvatarActions::teleportRequest(mUUIDs.front());
}
@@ -269,7 +268,6 @@ void PeopleContextMenu::offerTeleport()
{
// boost::bind cannot recognize overloaded method LLAvatarActions::offerTeleport(),
// so we have to use a wrapper.
-llwarns << "DBG " << llendl;
LLAvatarActions::offerTeleport(mUUIDs);
}
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index c2c15023c58..d8eb2f0ffd8 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -46,7 +46,6 @@
<on_click function="Avatar.DoToSelected" parameter="offer_teleport"/>
<on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/>
</menu_item_call>
-
<menu_item_call
label="Request teleport"
layout="topleft"
@@ -54,7 +53,6 @@
<on_click function="Avatar.DoToSelected" parameter="request_teleport"/>
<on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/>
</menu_item_call>
-
<menu_item_call
label="Voice call"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
index 8796b87955f..a1a3afbf682 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
@@ -56,6 +56,16 @@
function="Calllog.Enable"
parameter="can_offer_teleport"/>
</menu_item_call>
+ <menu_item_call
+ label="Request Teleport"
+ name="request_teleport">
+ <on_click
+ function="Calllog.Action"
+ parameter="request_teleport"/>
+ <on_enable
+ function="Calllog.Enable"
+ parameter="can_offer_teleport"/>
+ </menu_item_call>
<menu_item_separator />
<menu_item_call
label="Add Friend"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 31e3e7fc30c..3a01084b9a1 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6630,6 +6630,7 @@ However, this region contains content accessible to adults only.
<notification
icon="notify.tga"
name="TeleportRequest"
+ log_to_im="true"
type="offer">
[NAME_SLURL] is requesting to be teleported to your location.
[MESSAGE]
--
GitLab