summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationhandlerutil.cpp
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-03-05 17:53:32 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-03-05 17:53:32 +0200
commit2f9cc80c2e0a6ca648871ed74cc10b813d2c4940 (patch)
treefa1ae5d5e973caba2f28ee7d3d37a194d20aaf2f /indra/newview/llnotificationhandlerutil.cpp
parent27283c1de73282590e614b3d5e9bdabe922c0a94 (diff)
fixed EXT-5910 “Offers logging”,
fixed IM message counter when received interactive notification(offer); corrected logging to file of offer notification; enabled logging for FRIENDSHIP_ACCEPTED notification; --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llnotificationhandlerutil.cpp')
-rw-r--r--indra/newview/llnotificationhandlerutil.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 8d1c244a7e..7b61b200cd 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -139,6 +139,7 @@ bool LLHandlerUtil::canLogToIM(const LLNotificationPtr& notification)
|| PAYMENT_RECIVED == notification->getName()
|| OFFER_FRIENDSHIP == notification->getName()
|| FRIENDSHIP_OFFERED == notification->getName()
+ || FRIENDSHIP_ACCEPTED == notification->getName()
|| FRIENDSHIP_ACCEPTED_BYME == notification->getName()
|| FRIENDSHIP_DECLINED_BYME == notification->getName()
|| SERVER_OBJECT_MESSAGE == notification->getName()
@@ -274,12 +275,12 @@ void LLHandlerUtil::logToIMP2P(const LLNotificationPtr& notification, bool to_fi
if(to_file_only)
{
- logToIM(IM_NOTHING_SPECIAL, session_name, name, notification->getMessage(),
- LLUUID(), LLUUID());
+ logToIM(IM_NOTHING_SPECIAL, session_name, "", notification->getMessage(),
+ from_id, LLUUID());
}
else
{
- logToIM(IM_NOTHING_SPECIAL, session_name, "", notification->getMessage(),
+ logToIM(IM_NOTHING_SPECIAL, session_name, INTERACTIVE_SYSTEM_FROM, notification->getMessage(),
from_id, LLUUID());
}
}