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

Merge remote-tracking branch 'shyotl/sunshine'

Browse Source
This commit is contained in:
Latif Khalifa
2013-01-21 11:25:10 +01:00
parent 4cd2de0fff dc106c5442
commit 18816ae146
415 changed files with 20229 additions and 16924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewerobjectlist.cpp
View File

@@ -335,9 +335,12 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
// have to transform to absolute coordinates.
num_objects = mesgsys->getNumberOfBlocksFast(_PREHASH_ObjectData);
// I don't think this case is ever hit. TODO* Test this.
if (!cached && !compressed && update_type != OUT_FULL)
{
//llinfos << "TEST: !cached && !compressed && update_type != OUT_FULL" << llendl;
gTerseObjectUpdates += num_objects;
/*
S32 size;
if (mesgsys->getReceiveCompressedSize())
{
@@ -347,10 +350,12 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
{
size = mesgsys->getReceiveSize();
}
// llinfos << "Received terse " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl;
llinfos << "Received terse " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl;
*/
}
else
{
/*
S32 size;
if (mesgsys->getReceiveCompressedSize())
{
@@ -361,7 +366,8 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
size = mesgsys->getReceiveSize();
}
// llinfos << "Received " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl;
llinfos << "Received " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl;
*/
gFullObjectUpdates += num_objects;
}