summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llnotificationhandlerutil.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 11f210be93..8d1c244a7e 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -279,8 +279,8 @@ void LLHandlerUtil::logToIMP2P(const LLNotificationPtr& notification, bool to_fi
}
else
{
- logToIM(IM_NOTHING_SPECIAL, session_name, name, notification->getMessage(),
- from_id, from_id);
+ logToIM(IM_NOTHING_SPECIAL, session_name, "", notification->getMessage(),
+ from_id, LLUUID());
}
}
}
@@ -348,7 +348,10 @@ std::string LLHandlerUtil::getSubstitutionName(const LLNotificationPtr& notifica
if (res.empty())
{
LLUUID from_id = notification->getPayload()["FROM_ID"];
- gCacheName->getFullName(from_id, res);
+ if(!gCacheName->getFullName(from_id, res))
+ {
+ res = "";
+ }
}
return res;
}