diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 16:59:43 -0800 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 16:59:43 -0800 |
| commit | 5cbbb565f1bba870ec6db0b266e8768ecbdb7826 (patch) | |
| tree | fd00c91dc7a90fe4de3b52ce07548e1e4ef1e960 /indra/newview/llworld.h | |
| parent | 4839e79b20679560f697af96c11db4aef7e1d740 (diff) | |
| parent | 187b21e6d22204e8989b1c7d5e75f8b7880dd79f (diff) | |
Merge simon_linden/viewer-dev to get avatar motion prediction code.
Diffstat (limited to 'indra/newview/llworld.h')
| -rw-r--r-- | indra/newview/llworld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index c60dc8dc29..d8ab4bc508 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -89,7 +89,7 @@ public: // Return the lowest allowed Z point to prevent objects from being moved // underground. - F32 getMinAllowedZ(LLViewerObject* object); + F32 getMinAllowedZ(LLViewerObject* object, const LLVector3d &global_pos); // takes a line segment defined by point_a and point_b, then // determines the closest (to point_a) point of intersection that is |