diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-06-07 00:47:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-06-07 00:47:05 +0000 |
| commit | 290f2f05f7c2c061ba82f83594e4f7fb6a043ced (patch) | |
| tree | 648819527f93c4b398aaace5fb456afc983c2b15 /indra/newview/llworld.cpp | |
| parent | 810a0b3dcee41ec657c94ccb26003b9b4e20e141 (diff) | |
svn merge -r 88991:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release
Due to the gnarly history of the source branch and merge history of release, combine with cmake header and gcc-fu, this was an "interesting" merge.
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 7a2acbb094..08c593755b 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -418,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; } @@ -497,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; @@ -775,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; } } |