Second Life viewer sources 1.21.0-RC

1 files changed, 5 insertions, 9 deletions

diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 2c2440c..66c4068 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -88,10 +88,6 @@ LLWorld::LLWorld() :
         mLastPacketsIn(0),
         mLastPacketsOut(0),
         mLastPacketsLost(0),
-        mMinRegionX(0),
-        mMaxRegionX(0),
-        mMinRegionY(0),
-        mMaxRegionY(0),
         mSpaceTimeUSec(0)
 {
         for (S32 i = 0; i < 8; i++)
@@ -139,7 +135,7 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
         {
                 LLHost old_host = regionp->getHost();
                 // region already exists!
-                if (host == old_host && regionp->mAlive)
+                if (host == old_host && regionp->isAlive())
                 {
                         // This is a duplicate for the same host and it's alive, don't bother.
                         return regionp;
@@ -150,7 +146,7 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
                         llwarns << "LLWorld::addRegion exists, but old host " << old_host
                                         << " does not match new host " << host << llendl;
                 }
-                if (!regionp->mAlive)
+                if (!regionp->isAlive())
                 {
                         llwarns << "LLWorld::addRegion exists, but isn't alive" << llendl;
                 }
@@ -422,7 +418,7 @@ BOOL LLWorld::positionRegionValidGlobal(const LLVector3d &pos_global)
 F32 LLWorld::getMinAllowedZ(LLViewerObject* object)
 {
         F32 land_height = resolveLandHeightGlobal(object->getPositionGlobal());
-        F32 radius = 0.5f * object->getScale().magVec();
+        F32 radius = 0.5f * object->getScale().length();
         return land_height - radius;
 }
 
@@ -501,7 +497,7 @@ F32 LLWorld::resolveStepHeightGlobal(const LLVOAvatar* avatarp, const LLVector3d
         }
         
         // calculate the length of the segment
-        F32 segment_length = (F32)((point_a - point_b).magVec());
+        F32 segment_length = (F32)((point_a - point_b).length());
         if (0.0f == segment_length)
         {
                 intersection = point_a;
@@ -779,7 +775,7 @@ void LLWorld::printPacketsLost()
                 {
                         LLVector3d range = regionp->getCenterGlobal() - gAgent.getPositionGlobal();
                                 
-                        llinfos << regionp->getHost() << ", range: " << range.magVec()
+                        llinfos << regionp->getHost() << ", range: " << range.length()
                                         << " packets lost: " << cdp->getPacketsLost() << llendl;
                 }
         }