diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-04 18:34:32 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-04 18:34:32 +0200 |
| commit | 63096e40de74b6540a87773cc0449a8a12bafb5b (patch) | |
| tree | 91f1113af0ef82041d11a39b404ed2560a31498f /indra/newview/llnotificationhandlerutil.cpp | |
| parent | 69cd9ac98bde4d602a8bdb785ac576df958ea1f5 (diff) | |
| parent | 28a1ee9da8d58955590e3596409d2f49b130e1fc (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llnotificationhandlerutil.cpp')
| -rw-r--r-- | indra/newview/llnotificationhandlerutil.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index 857b7e9796..0fbc6575e8 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -43,7 +43,10 @@ using namespace LLNotificationsUI; const static std::string GRANTED_MODIFY_RIGHTS("GrantedModifyRights"), REVOKED_MODIFY_RIGHTS("RevokedModifyRights"), OBJECT_GIVE_ITEM( "ObjectGiveItem"), OBJECT_GIVE_ITEM_UNKNOWN_USER( - "ObjectGiveItemUnknownUser"), PAYMENT_RECIVED("PaymentRecived"); + "ObjectGiveItemUnknownUser"), PAYMENT_RECIVED("PaymentRecived"), + ADD_FRIEND_WITH_MESSAGE("AddFriendWithMessage"), + USER_GIVE_ITEM("UserGiveItem"), OFFER_FRIENDSHIP("OfferFriendship"), + FRIENDSHIP_ACCEPTED("FriendshipAccepted"); // static bool LLHandlerUtil::canLogToIM(const LLNotificationPtr& notification) @@ -54,6 +57,14 @@ bool LLHandlerUtil::canLogToIM(const LLNotificationPtr& notification) } // static +bool LLHandlerUtil::canSpawnIMSession(const LLNotificationPtr& notification) +{ + return ADD_FRIEND_WITH_MESSAGE == notification->getName() + || OFFER_FRIENDSHIP == notification->getName() + || FRIENDSHIP_ACCEPTED == notification->getName(); +} + +// static void LLHandlerUtil::logToIM(const EInstantMessage& session_type, const std::string& session_name, const std::string& from_name, const std::string& message, const LLUUID& session_owner_id, |