Merge git://github.com/TighMacFanatic/SingularityViewer

indra/develop.py

@@ -518,9 +518,16 @@ class WindowsSetup(PlatformSetup):
                         self.using_express = True
                         print 'Building with ', self.gens[version]['gen'] , "Express edition"
                         break
-                    else:
+                else:
-                        print >> sys.stderr, 'Cannot find any Visual Studio installation'
+					for version in 'vc80 vc90 vc100 vc71'.split():
-                        sys.exit(1)
+						if self.find_visual_studio_express_single(version):
+							self._generator = version
+							self.using_express = True
+							print 'Building with ', self.gens[version]['gen'] , "Express edition"
+							break
+					else:
+						print >> sys.stderr, 'Cannot find any Visual Studio installation'
+						sys.exit(1)
         return self._generator
 
     def _set_generator(self, gen):
@@ -605,6 +612,28 @@ class WindowsSetup(PlatformSetup):
         except WindowsError, err:
             print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
             return ''
+        
+    def find_visual_studio_express_single(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VCEXpress\%s_Config\Setup\VC' %
+                       self.gens[gen]['ver'])
+            value_str = (r'ProductDir')
+            print ('Reading VS environment from HKEY_CURRENT_USER\%s\%s' %
+                   (key_str, value_str))
+            print key_str
+
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_CURRENT_USER)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
+            print 'Found: %s' % value
+            return value
+        except WindowsError, err:
+            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
+            return ''
 
     def get_build_cmd(self):
         if self.incredibuild:
@@ -617,13 +646,15 @@ class WindowsSetup(PlatformSetup):
         if environment == '':
             environment = self.find_visual_studio_express()
             if environment == '':
-                 print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
+				environment = self.find_visual_studio_express_single()
-            else:
+				if environment == '':
-                 build_dirs=self.build_dirs()
+					print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
-                 print >> sys.stderr, "\nSolution generation complete, it can can now be found in:", build_dirs[0]    
+				else:
-                 print >> sys.stderr, "\nAs you are using an Express Visual Studio, the build step cannot be automated"
+					build_dirs=self.build_dirs()
-		 print >> sys.stderr, "\nPlease see https://wiki.secondlife.com/wiki/Microsoft_Visual_Studio#Extra_steps_for_Visual_Studio_Express_editions for Visual Studio Express specific information"
+					print >> sys.stderr, "\nSolution generation complete, it can can now be found in:", build_dirs[0]    
-                 exit(0)
+					print >> sys.stderr, "\nAs you are using an Express Visual Studio, the build step cannot be automated"
+					print >> sys.stderr, "\nPlease see https://wiki.secondlife.com/wiki/Microsoft_Visual_Studio#Extra_steps_for_Visual_Studio_Express_editions for Visual Studio Express specific information"
+					exit(0)
     
         # devenv.com is CLI friendly, devenv.exe... not so much.
         return ('"%sdevenv.com" %s.sln /build %s' % 

indra/llmath/llv4math.h

@@ -52,6 +52,8 @@
 //
 // Sorry the code is such a mess. JC
 
+#include "llpreprocessor.h"
+
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // LLV4MATH - GNUC

indra/newview/skins/default/xui/en-us/floater_avatar_textures.xml

@@ -1,63 +1,45 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+<floater
-     can_resize="false" height="950" name="avatar_texture_debug"
+  can_close="true"
-     title="Avatar Textures" width="960">
+  can_drag_on_left="false"
-	<text bottom="-40" height="16" left="10" name="label" width="80">
+  can_minimize="true"
-		Baked Textures
+  can_resize="false"
-	</text>
+  height="570"
-	<text bottom="-40" height="16" left="150" name="composite_label" width="120">
+  width="600"
-		Composite Textures
+  name="avatar_texture_debug"
-	</text>
+  title="Avatar Textures"
-
+	rect_control="FloaterAvatarTextRect"
+  >
 	<button bottom="-45" left="-160" font="SansSerif" halign="center" height="20" label="Dump IDs to Console"
 	     label_selected="Dump" mouse_opaque="true" name="Dump" scale_image="TRUE" width="150" />
 
+  <texture_picker bottom="-130" height="111" label="Hair Baked" left="4" name="hair-baked" width="96" />
+  <texture_picker bottom_delta="0" height="111" label="Hair" left_delta="99" name="hair" width="96" />
+  <texture_picker bottom_delta="0" height="111" label="Eyes Baked" left_delta="99" name="eyes-baked" width="96" />
+  <texture_picker bottom_delta="0" height="111" label="Eyes" left_delta="99" name="iris" width="96" />
 
-	<texture_picker bottom_delta="-145" height="143" label="Hair" left="10" name="hair-baked"
+  <texture_picker bottom_delta="-110" height="111" label="Head Baked" left="4" name="head-baked" width="96" />
-	     width="128" />
+  <texture_picker bottom_delta="0" height="111" label="Makeup" left_delta="99" name="head bodypaint" width="96" />
-	<texture_picker bottom_delta="0" height="143" label="Hair" left_delta="135" name="hair"
+  <texture_picker bottom_delta="0" height="111" label="Head Tattoo" left_delta="99" name="head_tattoo" width="96" />
-	     width="128" />
+  <texture_picker bottom_delta="0" height="111" label="Upper Tattoo" left_delta="99" name="upper_tattoo" width="96" />
+  <texture_picker bottom_delta="0" height="111" label="Lower Tattoo" left_delta="99" name="lower_tattoo" width="96" />
 
-	<texture_picker bottom_delta="-150" height="143" label="Head" left="10" name="head-baked"
+  <texture_picker bottom_delta="-110" height="111" label="Upper Baked" left="4" name="upper-baked" width="96" />
-	     width="128" />
+  <texture_picker bottom_delta="0" height="111" label="Upper Skin" left_delta="99" name="upper bodypaint" width="96" />
-	<texture_picker bottom_delta="0" height="143" label="Makeup" left_delta="135"
+  <texture_picker bottom_delta="0" height="111" label="Undershirt" left_delta="99" name="undershirt" width="96" />
-	     name="head bodypaint" width="128" />
+  <texture_picker bottom_delta="0" height="111" label="Shirt" left_delta="99" name="shirt" width="96" />
+  <texture_picker bottom_delta="0" height="111" label="Upper Jacket" left_delta="99" name="upper jacket" width="96" />
+  <texture_picker bottom_delta="0" height="111" label="Gloves" left_delta="99" name="gloves" width="96" />
 
-	<texture_picker bottom_delta="-150" height="143" label="Eyes" left="10" name="eyes-baked"
+  <texture_picker bottom_delta="-110" height="111" label="Lower Baked" left="4" name="lower-baked" width="96" />
-	     width="128" />
+  <texture_picker bottom_delta="0" height="111" label="Lower Skin" left_delta="99" name="lower bodypaint" width="96" />
-	<texture_picker bottom_delta="0" height="143" label="Eye" left_delta="135" name="iris"
+  <texture_picker bottom_delta="0" height="111" label="Underpants" left_delta="99" name="underpants" width="96" />
-	     width="128" />
+  <texture_picker bottom_delta="0" height="111" label="Pants" left_delta="99" name="pants" width="96" />
+  <texture_picker bottom_delta="0" height="111" label="Lower Jacket" left_delta="99" name="lower jacket" width="96" />
+  <texture_picker bottom_delta="0" height="111" label="Socks" left_delta="99" name="socks" width="96" />
 
-	<texture_picker bottom_delta="-150" height="143" label="Upper Body" left="10"
+  <texture_picker bottom_delta="-110" height="111" label="Skirt Baked" left="4" name="skirt-baked" width="96" />
-	     name="upper-baked" width="128" />
+  <texture_picker bottom_delta="0" height="111" label="Skirt" left_delta="99" name="skirt" width="96" />
-	<texture_picker bottom_delta="0" height="143" label="Upper Body Tattoo" left_delta="135"
+  <texture_picker bottom_delta="0" height="111" label="Shoes" left_delta="99" name="shoes" width="96" />
-	     name="upper bodypaint" width="128" />
-	<texture_picker bottom_delta="0" height="143" label="Undershirt" left_delta="135"
-	     name="undershirt" width="128" />
-	<texture_picker bottom_delta="0" height="143" label="Gloves" left_delta="135" name="gloves"
-	     width="128" />
-	<texture_picker bottom_delta="0" height="143" label="Shirt" left_delta="135" name="shirt"
-	     width="128" />
-	<texture_picker bottom_delta="0" height="143" label="Upper Jacket" left_delta="135"
-	     name="upper jacket" width="128" />
 
-	<texture_picker bottom_delta="-150" height="143" label="Lower Body" left="10"
-	     name="lower-baked" width="128" />
-	<texture_picker bottom_delta="0" height="143" label="Lower Body Tattoo" left_delta="135"
-	     name="lower bodypaint" width="128" />
-	<texture_picker bottom_delta="0" height="143" label="Underpants" left_delta="135"
-	     name="underpants" width="128" />
-	<texture_picker bottom_delta="0" height="143" label="Socks" left_delta="135" name="socks"
-	     width="128" />
-	<texture_picker bottom_delta="0" height="143" label="Shoes" left_delta="135" name="shoes"
-	     width="128" />
-	<texture_picker bottom_delta="0" height="143" label="Pants" left_delta="135" name="pants"
-	     width="128" />
-	<texture_picker bottom_delta="0" height="143" label="Jacket" left_delta="135" name="lower jacket"
-	     width="128" />
-
-	<texture_picker bottom_delta="-150" height="143" label="Skirt" left="10" name="skirt-baked"
-	     width="128" />
-	<texture_picker bottom_delta="0" height="143" label="Skirt" left_delta="135"
-	     name="skirt" width="128" />
 </floater>