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

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer

Browse Source 
# Conflicts:
#	indra/newview/llvoavatar.cpp
Also Reverted reversion of removal of before() wrapper in llstl.h
This commit is contained in:
Lirusaito
2016-05-02 15:15:06 -04:00
parent cd66c61214 9e354801d8
commit 39b3f58e13
1477 changed files with 12486 additions and 16529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llviewermessage.cpp
View File

@@ -2812,7 +2812,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
LLSD args;
args["SUBJECT"] = subj;
args["MESSAGE"] = mes;
LLNotifications::instance().add(LLNotification::Params("GroupNotice").substitutions(args).payload(payload).timestamp(timestamp));
LLDate notice_date = LLDate(timestamp).notNull() ? LLDate(timestamp) : LLDate::now();
LLNotifications::instance().add(LLNotification::Params("GroupNotice").substitutions(args).payload(payload).timestamp(notice_date));
}
// Also send down the old path for now.
@@ -5165,18 +5166,18 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
// *TODO: Remove this dependency, or figure out a better way to handle
// this hack.
extern U32 gObjectBits;
extern U32Bits gObjectData;
void process_object_update(LLMessageSystem *mesgsys, void **user_data)
{
// Update the data counters
if (mesgsys->getReceiveCompressedSize())
{
gObjectBits += mesgsys->getReceiveCompressedSize() * 8;
gObjectData += (U32Bytes)mesgsys->getReceiveCompressedSize();
}
else
{
gObjectBits += mesgsys->getReceiveSize() * 8;
gObjectData += (U32Bytes)mesgsys->getReceiveSize();
}
// Update the object...
@@ -5188,11 +5189,11 @@ void process_compressed_object_update(LLMessageSystem *mesgsys, void **user_data
// Update the data counters
if (mesgsys->getReceiveCompressedSize())
{
gObjectBits += mesgsys->getReceiveCompressedSize() * 8;
gObjectData += (U32Bytes)mesgsys->getReceiveCompressedSize();
}
else
{
gObjectBits += mesgsys->getReceiveSize() * 8;
gObjectData += (U32Bytes)mesgsys->getReceiveSize();
}
// Update the object...
@@ -5204,11 +5205,11 @@ void process_cached_object_update(LLMessageSystem *mesgsys, void **user_data)
// Update the data counters
if (mesgsys->getReceiveCompressedSize())
{
gObjectBits += mesgsys->getReceiveCompressedSize() * 8;
gObjectData += (U32Bytes)mesgsys->getReceiveCompressedSize();
}
else
{
gObjectBits += mesgsys->getReceiveSize() * 8;
gObjectData += (U32Bytes)mesgsys->getReceiveSize();
}
// Update the object...
@@ -5220,11 +5221,11 @@ void process_terse_object_update_improved(LLMessageSystem *mesgsys, void **user_
{
if (mesgsys->getReceiveCompressedSize())
{
gObjectBits += mesgsys->getReceiveCompressedSize() * 8;
gObjectData += (U32Bytes)mesgsys->getReceiveCompressedSize();
}
else
{
gObjectBits += mesgsys->getReceiveSize() * 8;
gObjectData += (U32Bytes)mesgsys->getReceiveSize();
}
gObjectList.processCompressedObjectUpdate(mesgsys, user_data, OUT_TERSE_IMPROVED);