From c938e165062cbe53065dcdaa434fc1c3d9f38774 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 5 May 2016 13:53:07 -0400
Subject: various changes required to compile on new clang

---
 autobuild.xml                   | 28 ++++++++++++++--------------
 indra/llkdu/llimagej2ckdu.cpp   | 12 ++++++------
 indra/newview/llmaniprotate.cpp |  3 ---
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 6c29d5cb18..072dfa678a 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1528,11 +1528,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>468e88a527e610804c3eecf07f4ed70b</string>
+              <string>01a7cc9d0e56238a9abedd7a41ccd0a3</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298369/arch/Darwin/installer/llphysicsextensions_source-1.0.298369-darwin-298369.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions/rev/313564/arch/Darwin/installer/llphysicsextensions_source-1.0.313564-darwin-313564.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -1542,9 +1542,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>793964e49c935b414c4bdbb8a0d14ad1</string>
+              <string>c94dc7ab6efe59c0d5d04fc447257c57</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298369/arch/Linux/installer/llphysicsextensions_source-1.0.298369-linux-298369.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions/rev/313564/arch/Linux/installer/llphysicsextensions_source-1.0.313564-linux-313564.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -1554,16 +1554,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>922aad5261aac150e5ce3c094e57f373</string>
+              <string>e760be34addeb0cd6e2ec43394834bac</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298369/arch/CYGWIN/installer/llphysicsextensions_source-1.0.298369-windows-298369.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions/rev/313564/arch/CYGWIN/installer/llphysicsextensions_source-1.0.313564-windows-313564.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.0.298369</string>
+        <string>1.0.313564</string>
       </map>
       <key>llphysicsextensions_stub</key>
       <map>
@@ -1582,11 +1582,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>1175977a191ffc936fd0ccca433c8278</string>
+              <string>c8c6e5867d1ead7ad452a3359b22cf44</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298370/arch/Darwin/installer/llphysicsextensions_stub-1.0.298370-darwin-298370.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions/rev/313563/arch/Darwin/installer/llphysicsextensions_stub-1.0.313563-darwin-313563.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -1596,9 +1596,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d13d7927692eab2d6a63e36166b72a8a</string>
+              <string>e99afb25a4fd5b08c5cd3060ae9c1d59</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298370/arch/Linux/installer/llphysicsextensions_stub-1.0.298370-linux-298370.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions/rev/313563/arch/Linux/installer/llphysicsextensions_stub-1.0.313563-linux-313563.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -1608,16 +1608,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9594f6fd79ee924fe675a4a23e30516e</string>
+              <string>6f4307a35c692e44b872125d7932df8e</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298370/arch/CYGWIN/installer/llphysicsextensions_stub-1.0.298370-windows-298370.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions/rev/313563/arch/CYGWIN/installer/llphysicsextensions_stub-1.0.313563-windows-313563.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.0.298370</string>
+        <string>1.0.313563</string>
       </map>
       <key>mesa</key>
       <map>
diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp
index 6a8959517d..282c859e9e 100755
--- a/indra/llkdu/llimagej2ckdu.cpp
+++ b/indra/llkdu/llimagej2ckdu.cpp
@@ -1034,7 +1034,7 @@ all necessary level shifting, type conversion, rounding and truncation. */
 				val = (kdu_int32)(sp->fval*scale16);
 				val = (val+128)>>8; // May be faster than true rounding
 				val += 128;
-				if (val & ((-1)<<8))
+				if (val & ((0xffffffffU)<<8))
 				{
 					val = (val < 0 ? 0 : 255);
 				}
@@ -1052,7 +1052,7 @@ all necessary level shifting, type conversion, rounding and truncation. */
 				val = sp->ival;
 				val = (val+offset)>>downshift;
 				val += 128;
-				if (val & ((-1)<<8))
+				if (val & ((0xffffffffU)<<8))
 				{
 					val = (val < 0 ? 0 : 255);
 				}
@@ -1075,7 +1075,7 @@ all necessary level shifting, type conversion, rounding and truncation. */
 					val += (1<<(KDU_FIX_POINT-8))>>1;
 					val >>= (KDU_FIX_POINT-8);
 					val += 128;
-					if (val & ((-1)<<8))
+					if (val & ((0xffffffffU)<<8))
 					{
 						val = (val < 0 ? 0 : 255);
 					}
@@ -1094,7 +1094,7 @@ all necessary level shifting, type conversion, rounding and truncation. */
 					val = (val+offset)>>downshift;
 					val <<= upshift;
 					val += 128;
-					if (val & ((-1)<<8))
+					if (val & ((0xffffffffU)<<8))
 					{
 						val = (val < 0 ? 0 : 256 - (1<<upshift));
 					}
@@ -1116,7 +1116,7 @@ all necessary level shifting, type conversion, rounding and truncation. */
 					val = sp->ival;
 					val = (val+offset)>>downshift;
 					val += 128;
-					if (val & ((-1)<<8))
+					if (val & ((0xffffffffU)<<8))
 					{
 						val = (val < 0 ? 0 : 255);
 					}
@@ -1132,7 +1132,7 @@ all necessary level shifting, type conversion, rounding and truncation. */
 					val = sp->ival;
 					val <<= upshift;
 					val += 128;
-					if (val & ((-1)<<8))
+					if (val & ((0xffffffffU)<<8))
 					{
 						val = (val < 0 ? 0 : 256 - (1<<upshift));
 					}
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index ed40483029..3a0f96cd37 100755
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -67,9 +67,6 @@ const F32 RADIUS_PIXELS = 100.f;		// size in screen space
 const F32 SQ_RADIUS = RADIUS_PIXELS * RADIUS_PIXELS;
 const F32 WIDTH_PIXELS = 8;
 const S32 CIRCLE_STEPS = 100;
-const F32 DELTA = F_TWO_PI / CIRCLE_STEPS;
-const F32 SIN_DELTA = sin( DELTA );
-const F32 COS_DELTA = cos( DELTA );
 const F32 MAX_MANIP_SELECT_DISTANCE = 100.f;
 const F32 SNAP_ANGLE_INCREMENT = 5.625f;
 const F32 SNAP_ANGLE_DETENTE = SNAP_ANGLE_INCREMENT;
-- 
cgit v1.2.3