diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 17:03:40 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 17:03:40 -0800 |
| commit | e19ee531aedcbbe0f77a8ac11cdcda43c9c4ed84 (patch) | |
| tree | 1c297e01c91d9aa851296cf371403daa0a243988 /indra/newview/llworld.cpp | |
| parent | cd30239eda5d8969db02c2c56d95332dd5039bb0 (diff) | |
| parent | c893c55d8a1328a134c956b70e6fef7fd7053d47 (diff) | |
merge
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 8fabaaba80..399442e5c4 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -431,14 +431,15 @@ BOOL LLWorld::positionRegionValidGlobal(const LLVector3d &pos_global) // Allow objects to go up to their radius underground. -F32 LLWorld::getMinAllowedZ(LLViewerObject* object) +F32 LLWorld::getMinAllowedZ(LLViewerObject* object, const LLVector3d &global_pos) { - F32 land_height = resolveLandHeightGlobal(object->getPositionGlobal()); + F32 land_height = resolveLandHeightGlobal(global_pos); F32 radius = 0.5f * object->getScale().length(); return land_height - radius; } + LLViewerRegion* LLWorld::resolveRegionGlobal(LLVector3 &pos_region, const LLVector3d &pos_global) { LLViewerRegion *regionp = getRegionFromPosGlobal(pos_global); |