diff options
Diffstat (limited to 'linden/indra/newview/llviewerobjectlist.cpp')
-rw-r--r-- | linden/indra/newview/llviewerobjectlist.cpp | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp index ad92fe3..c82b1ae 100644 --- a/linden/indra/newview/llviewerobjectlist.cpp +++ b/linden/indra/newview/llviewerobjectlist.cpp | |||
@@ -288,7 +288,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys, | |||
288 | { | 288 | { |
289 | LLFastTimer t(LLFastTimer::FTM_PROCESS_OBJECTS); | 289 | LLFastTimer t(LLFastTimer::FTM_PROCESS_OBJECTS); |
290 | 290 | ||
291 | LLVector3d camera_global = gAgent.getCameraPositionGlobal(); | ||
292 | LLViewerObject *objectp; | 291 | LLViewerObject *objectp; |
293 | S32 num_objects; | 292 | S32 num_objects; |
294 | U32 local_id; | 293 | U32 local_id; |
@@ -305,28 +304,28 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys, | |||
305 | if (!cached && !compressed && update_type != OUT_FULL) | 304 | if (!cached && !compressed && update_type != OUT_FULL) |
306 | { | 305 | { |
307 | gTerseObjectUpdates += num_objects; | 306 | gTerseObjectUpdates += num_objects; |
308 | S32 size; | 307 | // S32 size; |
309 | if (mesgsys->getReceiveCompressedSize()) | 308 | // if (mesgsys->getReceiveCompressedSize()) |
310 | { | 309 | // { |
311 | size = mesgsys->getReceiveCompressedSize(); | 310 | // size = mesgsys->getReceiveCompressedSize(); |
312 | } | 311 | // } |
313 | else | 312 | // else |
314 | { | 313 | // { |
315 | size = mesgsys->getReceiveSize(); | 314 | // size = mesgsys->getReceiveSize(); |
316 | } | 315 | // } |
317 | // llinfos << "Received terse " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl; | 316 | // llinfos << "Received terse " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl; |
318 | } | 317 | } |
319 | else | 318 | else |
320 | { | 319 | { |
321 | S32 size; | 320 | // S32 size; |
322 | if (mesgsys->getReceiveCompressedSize()) | 321 | // if (mesgsys->getReceiveCompressedSize()) |
323 | { | 322 | // { |
324 | size = mesgsys->getReceiveCompressedSize(); | 323 | // size = mesgsys->getReceiveCompressedSize(); |
325 | } | 324 | // } |
326 | else | 325 | // else |
327 | { | 326 | // { |
328 | size = mesgsys->getReceiveSize(); | 327 | // size = mesgsys->getReceiveSize(); |
329 | } | 328 | // } |
330 | 329 | ||
331 | // llinfos << "Received " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl; | 330 | // llinfos << "Received " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl; |
332 | gFullObjectUpdates += num_objects; | 331 | gFullObjectUpdates += num_objects; |
@@ -639,7 +638,7 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent) | |||
639 | mCurLazyUpdateIndex = 0; | 638 | mCurLazyUpdateIndex = 0; |
640 | } | 639 | } |
641 | 640 | ||
642 | mCurBin = (++mCurBin) % NUM_BINS; | 641 | mCurBin = (mCurBin + 1) % NUM_BINS; |
643 | 642 | ||
644 | LLVOAvatar::cullAvatarsByPixelArea(); | 643 | LLVOAvatar::cullAvatarsByPixelArea(); |
645 | } | 644 | } |