Merge branch 'Release' of https://github.com/Lirusaito/SingularityViewer.git

Author: Shyotl

indra/CMakeLists.txt

@@ -14,9 +14,6 @@ set(ROOT_PROJECT_NAME "Singularity" CACHE STRING
     "The root project/makefile/solution name. Defaults to Singularity.")
 project(${ROOT_PROJECT_NAME})
 
-string(REPLACE " " "" VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL})
-set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_NOSPACE} CACHE STRING "Prefix used for resulting artifacts.")
-
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 include(Variables)

indra/cmake/Variables.cmake

@@ -186,6 +186,9 @@ set(GRID agni CACHE STRING "Target Grid")
 
 set(VIEWER_CHANNEL "Singularity Test" CACHE STRING "Viewer Channel Name")
 
+string(REPLACE " " "" VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL})
+set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_NOSPACE} CACHE STRING "Prefix used for resulting artifacts.")
+
 set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer")
 set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")
 

indra/newview/character/avatar_lad.xml

@@ -3655,6 +3655,7 @@
        group="1"
        name="Muscular_Torso"
        label="Torso Muscles"
+       sex="male"
 	   show_simple="true"
        wearable="shape"
        edit_group="shape_torso"
@@ -3692,6 +3693,49 @@
 		 </param_morph>
       </param>
 
+     <param
+     id="107"
+     group="1"
+     name="Muscular_Torso"
+     label="Torso Muscles"
+     sex="female"
+	   show_simple="true"
+     wearable="shape"
+     edit_group="shape_torso"
+     label_min="Regular"
+     label_max="Muscular"
+     value_min="0"
+     value_max="1.4"
+     camera_elevation=".3"
+     camera_distance="1.2">
+       <param_morph>
+         <volume_morph
+           name="L_CLAVICLE"
+           scale="0.02 0.0 0.005"
+           pos="0.0 0 0.005"/>
+         <volume_morph
+           name="L_UPPER_ARM"
+           scale="0.015 0.0 0.005"
+           pos="0.015 0 0"/>
+         <volume_morph
+           name="L_LOWER_ARM"
+           scale="0.005 0.0 0.005"
+           pos="0.005 0 0"/>
+         <volume_morph
+           name="R_CLAVICLE"
+           scale="0.02 0.0 0.005"
+           pos="0.0 0 0.005"/>
+         <volume_morph
+           name="R_UPPER_ARM"
+           scale="0.015 0.0 0.005"
+           pos="0.015 0 0"/>
+         <volume_morph
+           name="R_LOWER_ARM"
+           scale="0.005 0.0 0.005"
+           pos="0.005 0 0"/>
+       </param_morph>
+     </param>
+
       <param
        id="648"
        group="1"
@@ -10263,7 +10307,7 @@
              min2=".5" />
 
             <driven
-             id="106"
+             id="107"
              min1=".5"
              max1="1"
              max2="1"

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

@@ -66,7 +66,7 @@
 		<combo_item name="(Korean)" value="ko">한국어(Korean)*</combo_item>
 	</combo_box>
 	<string name="region_name_prompt">&lt;Type region name&gt;</string>
-	<combo_box bottom="-328" height="18" left="103" name="crash_behavior_combobox" width="115">
+	<combo_box bottom="-328" height="18" left="103" name="crash_behavior_combobox" width="140">
 		<combo_item name="Askbeforesending" value="Ask before sending">Ask before sending</combo_item>
 		<combo_item name="Alwayssend" value="Always send">Always send</combo_item>
 		<combo_item name="Neversend" value="Never send">Never send</combo_item>