Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lirusaito/master'

Browse Source
This commit is contained in:
Latif Khalifa
2013-06-14 18:31:35 +02:00
parent 4552c5f878 9ffd531ce6
commit a6a5983fbe
68 changed files with 14348 additions and 10776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llviewermessage.cpp
View File

@@ -87,7 +87,7 @@
#include "llstatenums.h"
#include "llstatusbar.h"
#include "llimview.h"
#include "llfloateractivespeakers.h"
#include "llspeakers.h"
#include "lltrans.h"
#include "llviewerfoldertype.h"
#include "llviewergenericmessage.h"
@@ -1320,6 +1320,14 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
gNotifyBoxView->purgeMessagesMatching(OfferMatcher(blocked_id));
}
LLOfferInfo::LLOfferInfo()
: mFromGroup(FALSE)
, mFromObject(FALSE)
, mIM(IM_NOTHING_SPECIAL)
, mType(LLAssetType::AT_NONE)
{
}
LLOfferInfo::LLOfferInfo(const LLSD& sd)
{
mIM = (EInstantMessage)sd["im_type"].asInteger();
@@ -1335,6 +1343,21 @@ LLOfferInfo::LLOfferInfo(const LLSD& sd)
mHost = LLHost(sd["sender"].asString());
}
LLOfferInfo::LLOfferInfo(const LLOfferInfo& info)
{
mIM = info.mIM;
mFromID = info.mFromID;
mFromGroup = info.mFromGroup;
mFromObject = info.mFromObject;
mTransactionID = info.mTransactionID;
mFolderID = info.mFolderID;
mObjectID = info.mObjectID;
mType = info.mType;
mFromName = info.mFromName;
mDesc = info.mDesc;
mHost = info.mHost;
}
LLSD LLOfferInfo::asLLSD()
{
LLSD sd;