diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
commit | 52293aa4bb7af45d2c3733f20982f4acb030c2d8 (patch) | |
tree | f963815f91b6259ea403d41807d19b69e759897e /indra/newview/llworld.cpp | |
parent | 516ec63f52245a777725d29efe3c35e4e4e72936 (diff) | |
parent | 8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff) |
automated merge
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r-- | indra/newview/llworld.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 58b9f5ce18..0b63f5efbd 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -133,11 +133,10 @@ 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) { - llinfos << "Region exists, removing it " << llendl; LLHost old_host = regionp->getHost(); // region already exists! if (host == old_host && regionp->isAlive()) |