diff options
| author | Geenz <geenz@geenzo.com> | 2013-02-15 11:52:18 -0500 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-02-15 11:52:18 -0500 |
| commit | ec3b4e05a43fec4414924eb92a483bc164fb0ec2 (patch) | |
| tree | 01c2626f55bef0db287eeca17d00b77e3391cbfb /indra/newview/llworld.cpp | |
| parent | c2785a740eb98d28ba705c981f4b6b289501d2e5 (diff) | |
| parent | b7cd89da5f74663a9fd547af77afaed06cdb05fd (diff) | |
Merge with latest viewer-dev-materials.
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 604f7f2b56..27366b96d0 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -138,7 +138,6 @@ void LLWorld::destroyClass() LLViewerRegion* LLWorld::addRegion(const U64 ®ion_handle, const LLHost &host) { - LLMemType mt(LLMemType::MTYPE_REGIONS); llinfos << "Add region with handle: " << region_handle << " on host " << host << llendl; LLViewerRegion *regionp = getRegionFromHandle(region_handle); if (regionp) @@ -659,7 +658,6 @@ void LLWorld::updateVisibilities() void LLWorld::updateRegions(F32 max_update_time) { - LLMemType mt_ur(LLMemType::MTYPE_IDLE_UPDATE_REGIONS); LLTimer update_timer; BOOL did_one = FALSE; @@ -1209,7 +1207,7 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi { LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter; - if (!pVOAvatar->isDead() && !pVOAvatar->isSelf()) + if (!pVOAvatar->isDead() && !pVOAvatar->isSelf() && !pVOAvatar->mIsDummy) { LLVector3d pos_global = pVOAvatar->getPositionGlobal(); LLUUID uuid = pVOAvatar->getID(); |