2 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 876ef3e..b6b9739 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2008-12-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llworld.cpp:
+        VWR-9352: Prim falls to 256m height when moved outworld.
+        Patch by Aimee Trescothick.
+
+
 2008-12-13  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/scripts/build_version.py:
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 66c4068..4dee103 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -365,9 +365,14 @@ LLVector3d	LLWorld::clipToVisibleRegions(const LLVector3d &start_pos, const LLVe
                 clip_factor = (region_coord.mV[VY] - region_width) / delta_pos_abs.mdV[VY];
         }
 
-        // clamp to < 256 to stay in sim
+        // clamp to within region dimensions
         LLVector3d final_region_pos = LLVector3d(region_coord) - (delta_pos * clip_factor);
-        final_region_pos.clamp(0.0, 255.999);
+        final_region_pos.mdV[VX] = llclamp(final_region_pos.mdV[VX], 0.0,
+                                                                           (F64)(region_width - F_ALMOST_ZERO));
+        final_region_pos.mdV[VY] = llclamp(final_region_pos.mdV[VY], 0.0,
+                                                                           (F64)(region_width - F_ALMOST_ZERO));
+        final_region_pos.mdV[VZ] = llclamp(final_region_pos.mdV[VZ], 0.0,
+                                                                           (F64)(LLWorld::getInstance()->getRegionMaxHeight()));
         return regionp->getPosGlobalFromRegion(LLVector3(final_region_pos));
 }