From 47044de069c2c1442a33d719846cdbf1e3450124 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Mon, 4 Jun 2012 11:23:38 -0400 Subject: STORM-1838 Add "Request Teleport" option to the menu when right-clicking on avatars in the Nearby list --- indra/newview/llviewermessage.cpp | 48 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 854e2bea52..f4f7148340 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1992,6 +1992,54 @@ bool lure_callback(const LLSD& notification, const LLSD& response) } static LLNotificationFunctorRegistration lure_callback_reg("TeleportOffered", lure_callback); +bool teleport_requested_callback(const LLSD& notification, const LLSD& response) +{ + LLUUID from_id = notification["payload"]["from_id"].asUUID(); + std::string from_name; + gCacheName->getFullName(from_id, from_name); + + if(from_id.isNull() || (LLMuteList::getInstance()->isMuted(from_id) && !LLMuteList::getInstance()->isLinden(from_name))) + { + return false; + } + + S32 option = 0; + if (response.isInteger()) + { + option = response.asInteger(); + } + else + { + option = LLNotificationsUtil::getSelectedOption(notification, response); + } + + switch(option) + { + // Yes + case 0: + { + LLAvatarActions::offerTeleport(from_id); + } + break; + + // No + case 1: + default: + break; + + // Block + case 2: + { + LLMute mute(from_id, from_name, LLMute::AGENT); + LLPanelBlockedList::showPanelAndSelect(mute.mID); + } + break; + } + return false; +} + +static LLNotificationFunctorRegistration teleport_requested_callback_reg("TeleportRequested", teleport_requested_callback); + bool goto_url_callback(const LLSD& notification, const LLSD& response) { std::string url = notification["payload"]["url"].asString(); -- cgit v1.2.3 From e386aa73b7af5ca326f66fa3fb0482e42b3af33f Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 11 Jan 2013 11:13:44 -0500 Subject: STORM-1838 --- indra/newview/llviewermessage.cpp | 48 +++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 7 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index f4f7148340..25b3563807 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1992,13 +1992,20 @@ bool lure_callback(const LLSD& notification, const LLSD& response) } static LLNotificationFunctorRegistration lure_callback_reg("TeleportOffered", lure_callback); -bool teleport_requested_callback(const LLSD& notification, const LLSD& response) +bool teleport_request_callback(const LLSD& notification, const LLSD& response) { LLUUID from_id = notification["payload"]["from_id"].asUUID(); + if(from_id.isNull()) + { + llwarns << "from_id is NULL" << llendl; + return false; + } + std::string from_name; gCacheName->getFullName(from_id, from_name); +llwarns << "DBG " << from_name << " " << from_id << llendl; - if(from_id.isNull() || (LLMuteList::getInstance()->isMuted(from_id) && !LLMuteList::getInstance()->isLinden(from_name))) + if(LLMuteList::getInstance()->isMuted(from_id) && !LLMuteList::getInstance()->isLinden(from_name)) { return false; } @@ -2027,18 +2034,27 @@ bool teleport_requested_callback(const LLSD& notification, const LLSD& response) default: break; - // Block + // IM case 2: { +llwarns << "DBG start IM" << llendl; + LLAvatarActions::startIM(from_id); + } + break; + +/* // Block + case 3: + { LLMute mute(from_id, from_name, LLMute::AGENT); + LLMuteList::getInstance()->add(mute); LLPanelBlockedList::showPanelAndSelect(mute.mID); } - break; + break; */ } return false; } -static LLNotificationFunctorRegistration teleport_requested_callback_reg("TeleportRequested", teleport_requested_callback); +static LLNotificationFunctorRegistration teleport_request_callback_reg("TeleportRequest", teleport_request_callback); bool goto_url_callback(const LLSD& notification, const LLSD& response) { @@ -2163,7 +2179,7 @@ static std::string clean_name_from_im(const std::string& name, EInstantMessage t case IM_LURE_ACCEPTED: case IM_LURE_DECLINED: case IM_GODLIKE_LURE_USER: - case IM_YET_TO_BE_USED: + case IM_TELEPORT_REQUEST: case IM_GROUP_ELECTION_DEPRECATED: //IM_GOTO_URL //IM_FROM_TASK_AS_ALERT @@ -2914,7 +2930,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) break; case IM_LURE_USER: + case IM_TELEPORT_REQUEST: { +llwarns << "DBG teleport processing" << llendl; if (is_muted) { return; @@ -2949,7 +2967,23 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) payload["lure_id"] = session_id; payload["godlike"] = FALSE; - LLNotification::Params params("TeleportOffered"); + LLNotification::Params params; + if (IM_LURE_USER == dialog) + { +llwarns << "DBG LURE_USER received (treating as TELPORT_REQUEST" << llendl; +// params.name = "TeleportOffered"; +// params.functor.name = "TeleportOffered"; + params.name = "TeleportRequest"; + params.functor.name = "TeleportRequest"; + } + + if (IM_TELEPORT_REQUEST == dialog) + { +llwarns << "DBG TELEPORT_REQUEST received" << llendl; + params.name = "TeleportRequest"; + params.functor.name = "TeleportRequest"; + } + params.substitutions = args; params.payload = payload; LLPostponedNotification::add( params, from_id, false); -- cgit v1.2.3 From 184f07fbc8acbc9bb509588ff532fe587fa24a22 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 18 Jan 2013 05:14:01 -0500 Subject: STORM-1838 Remove some debugging code --- indra/newview/llviewermessage.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 25b3563807..1d6139a732 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2970,11 +2970,8 @@ llwarns << "DBG teleport processing" << llendl; LLNotification::Params params; if (IM_LURE_USER == dialog) { -llwarns << "DBG LURE_USER received (treating as TELPORT_REQUEST" << llendl; -// params.name = "TeleportOffered"; -// params.functor.name = "TeleportOffered"; - params.name = "TeleportRequest"; - params.functor.name = "TeleportRequest"; + params.name = "TeleportOffered"; + params.functor.name = "TeleportOffered"; } if (IM_TELEPORT_REQUEST == dialog) -- cgit v1.2.3 From 146f3e639c3576a0113857b7c5f2c51644683851 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 23 Jan 2013 11:59:46 -0500 Subject: STORM-1838 Do not display unwanted notification. --- indra/newview/llviewermessage.cpp | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index a2a9b13eb5..69d53e74ab 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2068,7 +2068,40 @@ llwarns << "DBG " << from_name << " " << from_id << llendl; // Yes case 0: { - LLAvatarActions::offerTeleport(from_id); + std::string text = "Join me in "; + LLSLURL slurl; + LLAgentUI::buildSLURL(slurl); + text.append("\r\n").append(slurl.getSLURLString()); + + LLMessageSystem* msg = gMessageSystem; + msg->newMessageFast(_PREHASH_StartLure); + msg->nextBlockFast(_PREHASH_AgentData); + msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); + msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); + msg->nextBlockFast(_PREHASH_Info); + msg->addU8Fast(_PREHASH_LureType, (U8)0); // sim will fill this in. + msg->addStringFast(_PREHASH_Message, text); + + msg->nextBlockFast(_PREHASH_TargetData); + msg->addUUIDFast(_PREHASH_TargetID, from_id); + + // Record the offer. + std::string target_name; + gCacheName->getFullName(from_id, target_name); // for im log filenames + LLSD args; + args["TO_NAME"] = LLSLURL("agent", from_id, "displayname").getSLURLString();; + + LLSD payload; + + //*TODO please rewrite all keys to the same case, lower or upper + payload["from_id"] = from_id; + payload["SUPPRESS_TOAST"] = true; + LLNotificationsUtil::add("TeleportOfferSent", args, payload); + + // Add the recepient to the recent people list. + LLRecentPeople::instance().add(from_id); + + gAgent.sendReliableMessage(); } break; -- cgit v1.2.3 From d66c0ee8e9dc21b1887be496b484f1529ee23764 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 23 Jan 2013 13:17:51 -0500 Subject: STORM-1838 First pass at calling handle_lure_callback from within teleport_request_callback --- indra/newview/llviewermessage.cpp | 176 +++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 99 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 69d53e74ab..8a955377da 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2035,103 +2035,6 @@ bool mature_lure_callback(const LLSD& notification, const LLSD& response) } static LLNotificationFunctorRegistration mature_lure_callback_reg("TeleportOffered_MaturityExceeded", mature_lure_callback); -bool teleport_request_callback(const LLSD& notification, const LLSD& response) -{ - LLUUID from_id = notification["payload"]["from_id"].asUUID(); - if(from_id.isNull()) - { - llwarns << "from_id is NULL" << llendl; - return false; - } - - std::string from_name; - gCacheName->getFullName(from_id, from_name); -llwarns << "DBG " << from_name << " " << from_id << llendl; - - if(LLMuteList::getInstance()->isMuted(from_id) && !LLMuteList::getInstance()->isLinden(from_name)) - { - return false; - } - - S32 option = 0; - if (response.isInteger()) - { - option = response.asInteger(); - } - else - { - option = LLNotificationsUtil::getSelectedOption(notification, response); - } - - switch(option) - { - // Yes - case 0: - { - std::string text = "Join me in "; - LLSLURL slurl; - LLAgentUI::buildSLURL(slurl); - text.append("\r\n").append(slurl.getSLURLString()); - - LLMessageSystem* msg = gMessageSystem; - msg->newMessageFast(_PREHASH_StartLure); - msg->nextBlockFast(_PREHASH_AgentData); - msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); - msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); - msg->nextBlockFast(_PREHASH_Info); - msg->addU8Fast(_PREHASH_LureType, (U8)0); // sim will fill this in. - msg->addStringFast(_PREHASH_Message, text); - - msg->nextBlockFast(_PREHASH_TargetData); - msg->addUUIDFast(_PREHASH_TargetID, from_id); - - // Record the offer. - std::string target_name; - gCacheName->getFullName(from_id, target_name); // for im log filenames - LLSD args; - args["TO_NAME"] = LLSLURL("agent", from_id, "displayname").getSLURLString();; - - LLSD payload; - - //*TODO please rewrite all keys to the same case, lower or upper - payload["from_id"] = from_id; - payload["SUPPRESS_TOAST"] = true; - LLNotificationsUtil::add("TeleportOfferSent", args, payload); - - // Add the recepient to the recent people list. - LLRecentPeople::instance().add(from_id); - - gAgent.sendReliableMessage(); - } - break; - - // No - case 1: - default: - break; - - // IM - case 2: - { -llwarns << "DBG start IM" << llendl; - LLAvatarActions::startIM(from_id); - } - break; - -/* // Block - case 3: - { - LLMute mute(from_id, from_name, LLMute::AGENT); - LLMuteList::getInstance()->add(mute); - LLPanelBlockedList::showPanelAndSelect(mute.mID); - } - break; */ - } - return false; -} - -static LLNotificationFunctorRegistration teleport_request_callback_reg("TeleportRequest", teleport_request_callback); - bool goto_url_callback(const LLSD& notification, const LLSD& response) { std::string url = notification["payload"]["url"].asString(); @@ -3012,7 +2915,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) case IM_LURE_USER: case IM_TELEPORT_REQUEST: { -llwarns << "DBG teleport processing" << llendl; if (is_muted) { return; @@ -3114,7 +3016,7 @@ llwarns << "DBG teleport processing" << llendl; } else if (IM_TELEPORT_REQUEST == dialog) { - llwarns << "DBG TELEPORT_REQUEST received" << llendl; +llwarns << "DBG TELEPORT_REQUEST received" << llendl; params.name = "TeleportRequest"; params.functor.name = "TeleportRequest"; } @@ -6860,6 +6762,10 @@ void send_group_notice(const LLUUID& group_id, bool handle_lure_callback(const LLSD& notification, const LLSD& response) { +// Caution: this function is also called directly by teleport_request_callback using dummied-up parameters. +// If you make a change here that uses additional fields in notification or response +// make sure to add appropriate dummy values in teleport_request_callback. + static const unsigned OFFER_RECIPIENT_LIMIT = 250; if(notification["payload"]["ids"].size() > OFFER_RECIPIENT_LIMIT) { @@ -6955,6 +6861,78 @@ void handle_lure(const uuid_vec_t& ids) } } +bool teleport_request_callback(const LLSD& notification, const LLSD& response) +{ + LLUUID from_id = notification["payload"]["from_id"].asUUID(); + if(from_id.isNull()) + { + llwarns << "from_id is NULL" << llendl; + return false; + } + + std::string from_name; + gCacheName->getFullName(from_id, from_name); + + if(LLMuteList::getInstance()->isMuted(from_id) && !LLMuteList::getInstance()->isLinden(from_name)) + { + return false; + } + + S32 option = 0; + if (response.isInteger()) + { + option = response.asInteger(); + } + else + { + option = LLNotificationsUtil::getSelectedOption(notification, response); + } + + switch(option) + { + // Yes + case 0: + { + LLSD notification; + notification["payload"]["ids"] = from_id; + notification["form"][0]["type"] = "button"; + notification["form"][0]["index"] = 0; + + LLSD response; + response["message"] = "Join me in "; + response["name"][0] = 1; + + // Calling handle_lure_callback directly is a bit of a hack to avoid having to copy most of + // the code from this routine. + handle_lure_callback(notification, response); + } + break; + + // No + case 1: + default: + break; + + // IM + case 2: + { + LLAvatarActions::startIM(from_id); + } + break; + +/* // Block + case 3: + { + LLMute mute(from_id, from_name, LLMute::AGENT); + LLMuteList::getInstance()->add(mute); + LLPanelBlockedList::showPanelAndSelect(mute.mID); + } + break; */ + } + return false; +} + +static LLNotificationFunctorRegistration teleport_request_callback_reg("TeleportRequest", teleport_request_callback); void send_improved_im(const LLUUID& to_id, const std::string& name, -- cgit v1.2.3 From f64e11dfe1490c1a89e00cf5dc368dd1dc25b866 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 24 Jan 2013 14:27:10 -0500 Subject: STORM-1838 Add optional message processing --- indra/newview/llviewermessage.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 8a955377da..7247dfcd65 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6765,7 +6765,8 @@ bool handle_lure_callback(const LLSD& notification, const LLSD& response) // Caution: this function is also called directly by teleport_request_callback using dummied-up parameters. // If you make a change here that uses additional fields in notification or response // make sure to add appropriate dummy values in teleport_request_callback. - +llwarns << "DBB notification=" << notification << llendl; +llwarns << "DBG response=" << response << llendl; static const unsigned OFFER_RECIPIENT_LIMIT = 250; if(notification["payload"]["ids"].size() > OFFER_RECIPIENT_LIMIT) { @@ -6893,18 +6894,20 @@ bool teleport_request_callback(const LLSD& notification, const LLSD& response) // Yes case 0: { - LLSD notification; - notification["payload"]["ids"] = from_id; - notification["form"][0]["type"] = "button"; - notification["form"][0]["index"] = 0; + LLSD dummy_notification; + dummy_notification["payload"]["ids"][0] = from_id; + dummy_notification["form"]["name"][0] = "OK"; + dummy_notification["form"]["text"][0] = "OK"; + dummy_notification["form"]["type"][0] = "button"; - LLSD response; - response["message"] = "Join me in "; - response["name"][0] = 1; + + LLSD dummy_response; + dummy_response["message"] = response["message"]; + dummy_response["OK"] = 1; // Calling handle_lure_callback directly is a bit of a hack to avoid having to copy most of // the code from this routine. - handle_lure_callback(notification, response); + handle_lure_callback(dummy_notification, dummy_response); } break; -- cgit v1.2.3 From 12182d7cc3fbc3462e7dbacd09c975dc76b8f75f Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 24 Jan 2013 15:29:36 -0500 Subject: STORM-1838 Break out a large block of code from handle_lure_callback so it can be called directly by teleport_request_callback. --- indra/newview/llviewermessage.cpp | 103 ++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 55 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 7247dfcd65..2dc5fcff85 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3016,7 +3016,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) } else if (IM_TELEPORT_REQUEST == dialog) { -llwarns << "DBG TELEPORT_REQUEST received" << llendl; params.name = "TeleportRequest"; params.functor.name = "TeleportRequest"; } @@ -6760,13 +6759,53 @@ void send_group_notice(const LLUUID& group_id, bin_bucket_size); } +void send_lures(const LLSD& notification, const LLSD& response) +{ + std::string text = response["message"].asString(); + LLSLURL slurl; + LLAgentUI::buildSLURL(slurl); + text.append("\r\n").append(slurl.getSLURLString()); + + LLMessageSystem* msg = gMessageSystem; + msg->newMessageFast(_PREHASH_StartLure); + msg->nextBlockFast(_PREHASH_AgentData); + msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); + msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); + msg->nextBlockFast(_PREHASH_Info); + msg->addU8Fast(_PREHASH_LureType, (U8)0); // sim will fill this in. + msg->addStringFast(_PREHASH_Message, text); + for(LLSD::array_const_iterator it = notification["payload"]["ids"].beginArray(); + it != notification["payload"]["ids"].endArray(); + ++it) + { + LLUUID target_id = it->asUUID(); + + msg->nextBlockFast(_PREHASH_TargetData); + msg->addUUIDFast(_PREHASH_TargetID, target_id); + + // Record the offer. + { + std::string target_name; + gCacheName->getFullName(target_id, target_name); // for im log filenames + LLSD args; + args["TO_NAME"] = LLSLURL("agent", target_id, "displayname").getSLURLString();; + + LLSD payload; + + //*TODO please rewrite all keys to the same case, lower or upper + payload["from_id"] = target_id; + payload["SUPPRESS_TOAST"] = true; + LLNotificationsUtil::add("TeleportOfferSent", args, payload); + + // Add the recepient to the recent people list. + LLRecentPeople::instance().add(target_id); + } + } + gAgent.sendReliableMessage(); +} + bool handle_lure_callback(const LLSD& notification, const LLSD& response) { -// Caution: this function is also called directly by teleport_request_callback using dummied-up parameters. -// If you make a change here that uses additional fields in notification or response -// make sure to add appropriate dummy values in teleport_request_callback. -llwarns << "DBB notification=" << notification << llendl; -llwarns << "DBG response=" << response << llendl; static const unsigned OFFER_RECIPIENT_LIMIT = 250; if(notification["payload"]["ids"].size() > OFFER_RECIPIENT_LIMIT) { @@ -6778,51 +6817,12 @@ llwarns << "DBG response=" << response << llendl; LLNotificationsUtil::add("TooManyTeleportOffers", args); return false; } - - std::string text = response["message"].asString(); - LLSLURL slurl; - LLAgentUI::buildSLURL(slurl); - text.append("\r\n").append(slurl.getSLURLString()); + S32 option = LLNotificationsUtil::getSelectedOption(notification, response); if(0 == option) { - LLMessageSystem* msg = gMessageSystem; - msg->newMessageFast(_PREHASH_StartLure); - msg->nextBlockFast(_PREHASH_AgentData); - msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); - msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); - msg->nextBlockFast(_PREHASH_Info); - msg->addU8Fast(_PREHASH_LureType, (U8)0); // sim will fill this in. - msg->addStringFast(_PREHASH_Message, text); - for(LLSD::array_const_iterator it = notification["payload"]["ids"].beginArray(); - it != notification["payload"]["ids"].endArray(); - ++it) - { - LLUUID target_id = it->asUUID(); - - msg->nextBlockFast(_PREHASH_TargetData); - msg->addUUIDFast(_PREHASH_TargetID, target_id); - - // Record the offer. - { - std::string target_name; - gCacheName->getFullName(target_id, target_name); // for im log filenames - LLSD args; - args["TO_NAME"] = LLSLURL("agent", target_id, "displayname").getSLURLString();; - - LLSD payload; - - //*TODO please rewrite all keys to the same case, lower or upper - payload["from_id"] = target_id; - payload["SUPPRESS_TOAST"] = true; - LLNotificationsUtil::add("TeleportOfferSent", args, payload); - - // Add the recepient to the recent people list. - LLRecentPeople::instance().add(target_id); - } - } - gAgent.sendReliableMessage(); + send_lures(notification, response); } return false; @@ -6896,18 +6896,11 @@ bool teleport_request_callback(const LLSD& notification, const LLSD& response) { LLSD dummy_notification; dummy_notification["payload"]["ids"][0] = from_id; - dummy_notification["form"]["name"][0] = "OK"; - dummy_notification["form"]["text"][0] = "OK"; - dummy_notification["form"]["type"][0] = "button"; - LLSD dummy_response; dummy_response["message"] = response["message"]; - dummy_response["OK"] = 1; - // Calling handle_lure_callback directly is a bit of a hack to avoid having to copy most of - // the code from this routine. - handle_lure_callback(dummy_notification, dummy_response); + send_lures(dummy_notification, dummy_response); } break; -- cgit v1.2.3 From 0afbc85efadfb3e3e825a5cade9f76876fbdf1a4 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 25 Jan 2013 06:23:56 -0500 Subject: STORM-1838 Minor UI improvements and code changes --- indra/newview/llviewermessage.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 2dc5fcff85..8d4fab4e9f 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2936,7 +2936,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) bool canUserAccessDstRegion = true; bool doesUserRequireMaturityIncrease = false; - if (parse_lure_bucket(region_info, region_handle, pos, look_at, region_access)) + // Do not parse the (empty) lure bucket for TELEPORT_REQUEST + if (IM_TELEPORT_REQUEST != dialog && parse_lure_bucket(region_info, region_handle, pos, look_at, region_access)) { region_access_str = LLViewerRegion::accessToString(region_access); region_access_icn = LLViewerRegion::getAccessIcon(region_access); @@ -6915,15 +6916,6 @@ bool teleport_request_callback(const LLSD& notification, const LLSD& response) LLAvatarActions::startIM(from_id); } break; - -/* // Block - case 3: - { - LLMute mute(from_id, from_name, LLMute::AGENT); - LLMuteList::getInstance()->add(mute); - LLPanelBlockedList::showPanelAndSelect(mute.mID); - } - break; */ } return false; } -- cgit v1.2.3 From 71f4f5e4a1534fcf88deae07a7021b02f2ca14f7 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Sat, 26 Jan 2013 10:36:05 -0500 Subject: STORM-1838 Added SUPPRESS_TOAST to notification payload --- indra/newview/llviewermessage.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 8d4fab4e9f..05b68b7323 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3017,6 +3017,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) } else if (IM_TELEPORT_REQUEST == dialog) { + payload["SUPPRESS_TOAST"] = true; params.name = "TeleportRequest"; params.functor.name = "TeleportRequest"; } -- cgit v1.2.3 From 9de2371f157fa7f62b1c91949fb05b45f18c9812 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 1 Feb 2013 17:04:53 -0500 Subject: make teleport requests appear correctly with respect to open im sessions --- indra/newview/llviewermessage.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 05b68b7323..8d4fab4e9f 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3017,7 +3017,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) } else if (IM_TELEPORT_REQUEST == dialog) { - payload["SUPPRESS_TOAST"] = true; params.name = "TeleportRequest"; params.functor.name = "TeleportRequest"; } -- cgit v1.2.3 From c8533650b4779040c5e196f9ff156e3454edc9c8 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 1 Feb 2013 17:30:37 -0500 Subject: STORM-1838 Remove IM button --- indra/newview/llviewermessage.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 8d4fab4e9f..69b278ee8d 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6909,14 +6909,8 @@ bool teleport_request_callback(const LLSD& notification, const LLSD& response) case 1: default: break; - - // IM - case 2: - { - LLAvatarActions::startIM(from_id); - } - break; } + return false; } -- cgit v1.2.3