Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

indra/newview/skins/default/textures/textures.xml

@@ -133,6 +133,9 @@
   <texture name="inv_item_object.tga"/>
   <texture name="inv_item_object_multi.tga"/>
   <texture name="inv_item_pants.tga"/>
+  <texture name="inv_item_mesh.tga"/>
+  <texture name="inv_item_physics.tga"/>
+  <texture name="inv_item_tattoo.tga"/>
   <texture name="inv_item_script.tga"/>
   <texture name="inv_item_shape.tga"/>
   <texture name="inv_item_shirt.tga"/>

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

@@ -306,5 +306,5 @@
 	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="--no options--" left="0"
 	     mouse_opaque="true" name="--no options--" width="128" />
-	<--menu_item_separator name="Wearable Separator" /-->
+	<!--menu_item_separator name="Wearable Separator" -->
 </menu>

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

@@ -1739,6 +1739,7 @@ string llGetEnv(string name)
 Returns a string with the requested data about the region
   </string>
 
+
   <string name="LSLTipText_llCastRay">
 list llCastRay( Vector start, Vector end, list options )
 Returns a list consisting of the following three values for each hit: UUID, Link number, Hit position.
@@ -1803,18 +1804,32 @@ key llAvatarOnLinkSitTarget( integer link )
 Returns a key that is the UUID of the user seated on the prim.
   </string>
 
+
 <!-- No info on these functions yet....
   <string name="LSLTipText_llSetVelocity">
   </string>
   <string name="LSLTipText_llSetRotationalVelocity">
   </string>
 -->
+  <!-- Avatar busy/away mode -->
+	<string name="AvatarSetNotAway">Not Away</string>
+	<string name="AvatarSetAway">Away</string>
+	<string name="AvatarSetNotBusy">Not Busy</string>
+	<string name="AvatarSetBusy">Busy</string>
 
 
 
 	<!-- mouselook -->
 	<string name="LeaveMouselook">Press ESC to return to World View</string>
- 	<!-- menu accelerators -->
+	<string name="Stone">Stone</string>
+	<string name="Metal">Metal</string>
+	<string name="Glass">Glass</string>
+	<string name="Wood">Wood</string>
+	<string name="Flesh">Flesh</string>
+	<string name="Plastic">Plastic</string>
+	<string name="Rubber">Rubber</string>
+	<string name="Light">Light</string>
+	<!-- menu accelerators -->
 	<string name="accel-mac-control">Ctrl-</string>
 	<string name="accel-mac-command">Cmd-</string>
 	<string name="accel-mac-option">Opt-</string>