diff options
Diffstat (limited to 'linden/indra/newview/llgivemoney.cpp')
-rw-r--r-- | linden/indra/newview/llgivemoney.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp index 41b1c1e..016acd5 100644 --- a/linden/indra/newview/llgivemoney.cpp +++ b/linden/indra/newview/llgivemoney.cpp | |||
@@ -40,6 +40,8 @@ | |||
40 | #include "llresmgr.h" | 40 | #include "llresmgr.h" |
41 | #include "lltextbox.h" | 41 | #include "lltextbox.h" |
42 | #include "lllineeditor.h" | 42 | #include "lllineeditor.h" |
43 | #include "llmutelist.h" | ||
44 | #include "llfloaterreporter.h" | ||
43 | #include "llviewerobject.h" | 45 | #include "llviewerobject.h" |
44 | #include "llviewerobjectlist.h" | 46 | #include "llviewerobjectlist.h" |
45 | #include "llviewerregion.h" | 47 | #include "llviewerregion.h" |
@@ -474,6 +476,17 @@ void LLFloaterPay::give(S32 amount) | |||
474 | if(dest_object->isAvatar()) tx_type = TRANS_GIFT; | 476 | if(dest_object->isAvatar()) tx_type = TRANS_GIFT; |
475 | mCallback(mTargetUUID, region, amount, FALSE, tx_type, object_name); | 477 | mCallback(mTargetUUID, region, amount, FALSE, tx_type, object_name); |
476 | mObjectSelection = NULL; | 478 | mObjectSelection = NULL; |
479 | |||
480 | // request the object owner in order to check if the owner needs to be unmuted | ||
481 | LLMessageSystem* msg = gMessageSystem; | ||
482 | msg->newMessageFast(_PREHASH_RequestObjectPropertiesFamily); | ||
483 | msg->nextBlockFast(_PREHASH_AgentData); | ||
484 | msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); | ||
485 | msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); | ||
486 | msg->nextBlockFast(_PREHASH_ObjectData); | ||
487 | msg->addU32Fast(_PREHASH_RequestFlags, OBJECT_PAY_REQUEST ); | ||
488 | msg->addUUIDFast(_PREHASH_ObjectID, mTargetUUID); | ||
489 | msg->sendReliable( region->getHost() ); | ||
477 | } | 490 | } |
478 | } | 491 | } |
479 | } | 492 | } |
@@ -481,6 +494,9 @@ void LLFloaterPay::give(S32 amount) | |||
481 | { | 494 | { |
482 | // just transfer the L$ | 495 | // just transfer the L$ |
483 | mCallback(mTargetUUID, gAgent.getRegion(), amount, mTargetIsGroup, TRANS_GIFT, LLString::null); | 496 | mCallback(mTargetUUID, gAgent.getRegion(), amount, mTargetIsGroup, TRANS_GIFT, LLString::null); |
497 | |||
498 | // check if the payee needs to be unmuted | ||
499 | LLMuteList::getInstance()->autoRemove(mTargetUUID, LLMuteList::AR_MONEY); | ||
484 | } | 500 | } |
485 | } | 501 | } |
486 | } | 502 | } |