diff options
author | McCabe Maxsted | 2009-09-19 08:34:11 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-19 08:34:11 -0700 |
commit | 68590624652963510e1d5b03107daf7f68348374 (patch) | |
tree | 9152d38bb549d8e9637445c24f61cfb3a0fb1347 /linden/indra/newview/llviewermessage.cpp | |
parent | Dynamically change max prim size depending upon LL/OpenSim grid (added settin... (diff) | |
download | meta-impy-68590624652963510e1d5b03107daf7f68348374.zip meta-impy-68590624652963510e1d5b03107daf7f68348374.tar.gz meta-impy-68590624652963510e1d5b03107daf7f68348374.tar.bz2 meta-impy-68590624652963510e1d5b03107daf7f68348374.tar.xz |
Fixed inventory offers not avatar name (another RLVa bug)
Diffstat (limited to 'linden/indra/newview/llviewermessage.cpp')
-rw-r--r-- | linden/indra/newview/llviewermessage.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
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) | |||
1266 | if (gCacheName->getName(info->mFromID, first_name, last_name)) | 1266 | if (gCacheName->getName(info->mFromID, first_name, last_name)) |
1267 | { | 1267 | { |
1268 | // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e) | 1268 | // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e) |
1269 | if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) ) | 1269 | if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) ) |
1270 | { | 1270 | { |
1271 | first_name = gRlvHandler.getAnonym(first_name.append(" ").append(last_name)); | 1271 | first_name = gRlvHandler.getAnonym(first_name.append(" ").append(last_name)); |
1272 | last_name.clear(); | 1272 | last_name.clear(); |
@@ -1287,12 +1287,15 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task) | |||
1287 | { | 1287 | { |
1288 | // *TODO:translate -> [FIRST] [LAST] | 1288 | // *TODO:translate -> [FIRST] [LAST] |
1289 | // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e) | 1289 | // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e) |
1290 | if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) ) | 1290 | if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) ) |
1291 | { | 1291 | { |
1292 | args["[NAME]"] = gRlvHandler.getAnonym(info->mFromName); | 1292 | args["[NAME]"] = gRlvHandler.getAnonym(info->mFromName); |
1293 | } | 1293 | } |
1294 | // [/RLVa:KB] | 1294 | // [/RLVa:KB] |
1295 | //args["[NAME]"] = info->mFromName; | 1295 | else |
1296 | { | ||
1297 | args["[NAME]"] = info->mFromName; | ||
1298 | } | ||
1296 | LLNotifyBox::showXml("UserGiveItem", args, | 1299 | LLNotifyBox::showXml("UserGiveItem", args, |
1297 | &inventory_offer_callback, (void*)info); | 1300 | &inventory_offer_callback, (void*)info); |
1298 | } | 1301 | } |