diff options
Diffstat (limited to 'indra/llui/llnotifications.cpp')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 1773a1e86a..75b92e47da 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -35,6 +35,7 @@ #include "llnotifications.h" #include "llavatarnamecache.h" +#include "llinstantmessage.h" #include "llcachename.h" #include "llxmlnode.h" #include "lluictrl.h" @@ -43,6 +44,7 @@ #include "llsdserialize.h" #include "lltrans.h" #include "llnotificationslistener.h" +#include "llstring.h" #include <algorithm> #include <boost/regex.hpp> @@ -1516,6 +1518,14 @@ void LLPostponedNotification::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name) { std::string name = av_name.getCompleteName(); + + // from PE merge - we should figure out if this is the right thing to do + if (name.empty()) + { + llwarns << "Empty name received for Id: " << agent_id << llendl; + name = SYSTEM_FROM; + } + finalizeName(name); } |