From 68590624652963510e1d5b03107daf7f68348374 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 19 Sep 2009 08:34:11 -0700 Subject: Fixed inventory offers not avatar name (another RLVa bug) --- ChangeLog.txt | 5 +++++ linden/indra/newview/llviewermessage.cpp | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 6a70f77..fea7edc 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -9,6 +9,11 @@ modified: linden/indra/newview/llpanelobject.cpp modified: linden/indra/newview/llviewermessage.cpp modified: linden/indra/newview/skins/default/xui/en-us/floater_tools.xml + + + * Fixed inventory offers not avatar name (another RLVa bug). + + modified: linden/indra/newview/llviewermessage.cpp 2009-09-18 McCabe Maxsted diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp index c9a3cb7..d5d9324 100644 --- a/linden/indra/newview/llviewermessage.cpp +++ b/linden/indra/newview/llviewermessage.cpp @@ -1266,7 +1266,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task) if (gCacheName->getName(info->mFromID, first_name, last_name)) { // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e) - if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) ) + if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) ) { first_name = gRlvHandler.getAnonym(first_name.append(" ").append(last_name)); last_name.clear(); @@ -1287,12 +1287,15 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task) { // *TODO:translate -> [FIRST] [LAST] // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e) - if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) ) + if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) ) { args["[NAME]"] = gRlvHandler.getAnonym(info->mFromName); } // [/RLVa:KB] - //args["[NAME]"] = info->mFromName; + else + { + args["[NAME]"] = info->mFromName; + } LLNotifyBox::showXml("UserGiveItem", args, &inventory_offer_callback, (void*)info); } -- cgit v1.1