Merge with siana/future

2011-10-13 00:03:56 -05:00
parent 4963a064f1
commit 008bebd817
169 changed files with 15033 additions and 2475 deletions
--- a/indra/newview/llsurface.cpp
+++ b/indra/newview/llsurface.cpp
@@ -699,14 +699,14 @@ void LLSurface::decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, BOOL
 		}

 		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
+		{
+            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))