livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-8341 FIXED Avoided assertion on receiving object auto return notification. 

Details:
1 Provided passing necessary is_group parameter to LLPostponedNotification::add<LLPostponedServerObjectNotification> method call;
3 Corrected handling group name in LLPostponedNotification::onCachedNameReceived;
2 Added check on retrieved name from cache name and replacement with fallback value.

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/743/

--HG--
branch : product-engine
master
Alexei Arabadji 2010-07-13 19:42:31 +03:00
parent f790036002
commit c73dcb0a2d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llui/llnotifications.cpp
View File

@ -34,6 +34,7 @@
#include "llnotifications.h"
#include "llinstantmessage.h"
#include "llxmlnode.h"
#include "lluictrl.h"
#include "lluictrlfactory.h"
@ -41,6 +42,7 @@
#include "llsdserialize.h"
#include "lltrans.h"
#include "llnotificationslistener.h"
#include "llstring.h"
#include <algorithm>
#include <boost/regex.hpp>
@ -1487,7 +1489,14 @@ std::ostream& operator<<(std::ostream& s, const LLNotification& notification)
void LLPostponedNotification::onCachedNameReceived(const LLUUID& id, const std::string& first,
const std::string& last, bool is_group)
{
gCacheName->getFullName(id, mName);
mName = first + " " + last;
LLStringUtil::trim(mName);
if (mName.empty())
{
llwarns << "Empty name received for Id: " << id << llendl;
mName = SYSTEM_FROM;
}
modifyNotificationParams();
LLNotifications::instance().add(mParams);
cleanup();

2
indra/newview/llviewermessage.cpp
View File

@ -2585,7 +2585,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
params.substitutions = substitutions;
params.payload = payload;
LLPostponedNotification::add<LLPostponedServerObjectNotification>(params, from_id, false);
LLPostponedNotification::add<LLPostponedServerObjectNotification>(params, from_id, from_group);
}
break;
case IM_FROM_TASK_AS_ALERT: