1 files changed, 14 insertions, 6 deletions

diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index aaafe0d..5a99e66 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -303,7 +303,7 @@ void LLSurface::initTextures()
                 mWaterObjp = (LLVOWater *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_WATER, mRegionp);
                 gPipeline.createObject(mWaterObjp);
                 LLVector3d water_pos_global = from_region_handle(mRegionp->getHandle());
-                water_pos_global += LLVector3d(128.0, 128.0, DEFAULT_WATER_HEIGHT);
+                water_pos_global += LLVector3d(mRegionp->getWidth()/2, mRegionp->getWidth()/2, DEFAULT_WATER_HEIGHT);
                 mWaterObjp->setPositionGlobal(water_pos_global);
         }
 }
@@ -356,8 +356,8 @@ void LLSurface::setOriginGlobal(const LLVector3d &origin_global)
         // Hack!
         if (mWaterObjp.notNull() && mWaterObjp->mDrawable.notNull())
         {
-                const F64 x = origin_global.mdV[VX] + 128.0;
-                const F64 y = origin_global.mdV[VY] + 128.0;
+                const F64 x = origin_global.mdV[VX] + (F64)mRegionp->getWidth()/2;
+                const F64 y = origin_global.mdV[VY] + (F64)mRegionp->getWidth()/2;
                 const F64 z = mWaterObjp->getPositionGlobal().mdV[VZ];
 
                 LLVector3d water_origin_global(x, y, z);
@@ -707,14 +707,22 @@ void LLSurface::decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, BOOL
 
         while (1)
         {
-                decode_patch_header(bitpack, &ph);
+                decode_patch_header(bitpack, &ph, b_large_patch);
                 if (ph.quant_wbits == END_OF_PATCHES)
                 {
                         break;
                 }
 
-                i = ph.patchids >> 5;
-                j = ph.patchids & 0x1F;
+                if (b_large_patch)
+                {
+                        i = ph.patchids >> 16; //x
+                        j = ph.patchids & 0xFFFF; //y
+                }
+                else
+                {
+                        i = ph.patchids >> 5; //x
+                        j = ph.patchids & 0x1F; //y
+                }
 
                 if ((i >= mPatchesPerEdge) || (j >= mPatchesPerEdge))
                 {