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

Conflicts:
	indra/newview/llpanelmaininventory.cpp
	indra/newview/llpanelmaininventory.h
	indra/newview/llvoavatar.cpp

indra/newview/skins/Pony-Aquablue/textures/textures.xml

@@ -130,6 +130,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/Pony-Purple/textures/textures.xml

@@ -130,6 +130,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/dark/textures/textures.xml

@@ -154,6 +154,9 @@
   <inv_item_object.tga/>
   <inv_item_object_multi.tga/>
   <inv_item_pants.tga/>
+  <inv_item_mesh.tga/>
+  <inv_item_physics.tga/>
+  <inv_item_tattoo.tga/>
   <inv_item_script.tga/>
   <inv_item_shape.tga/>
   <inv_item_shirt.tga/>

indra/newview/skins/darkgred/textures/textures.xml

@@ -154,6 +154,9 @@
   <inv_item_object.tga/>
   <inv_item_object_multi.tga/>
   <inv_item_pants.tga/>
+  <inv_item_mesh.tga/>
+  <inv_item_physics.tga/>
+  <inv_item_tattoo.tga/>
   <inv_item_script.tga/>
   <inv_item_shape.tga/>
   <inv_item_shirt.tga/>

indra/newview/skins/darkorange/textures/textures.xml

@@ -130,6 +130,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/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/emerald/textures/textures.xml

@@ -130,6 +130,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/gemini/textures/textures.xml

@@ -130,6 +130,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/gred/textures/textures.xml

@@ -154,6 +154,9 @@
   <inv_item_object.tga/>
   <inv_item_object_multi.tga/>
   <inv_item_pants.tga/>
+  <inv_item_mesh.tga/>
+  <inv_item_physics.tga/>
+  <inv_item_tattoo.tga/>
   <inv_item_script.tga/>
   <inv_item_shape.tga/>
   <inv_item_shirt.tga/>

indra/newview/skins/kdarknv/textures/textures.xml

@@ -130,6 +130,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/kliteat/textures/textures.xml

@@ -134,6 +134,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/openlife/textures/textures.xml

@@ -134,6 +134,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/pslgreen/textures/textures.xml

@@ -154,6 +154,9 @@
   <inv_item_object.tga/>
   <inv_item_object_multi.tga/>
   <inv_item_pants.tga/>
+  <inv_item_mesh.tga/>
+  <inv_item_physics.tga/>
+  <inv_item_tattoo.tga/>
   <inv_item_script.tga/>
   <inv_item_shape.tga/>
   <inv_item_shirt.tga/>

indra/newview/skins/pslpurple/textures/textures.xml

@@ -154,6 +154,9 @@
   <inv_item_object.tga/>
   <inv_item_object_multi.tga/>
   <inv_item_pants.tga/>
+  <inv_item_mesh.tga/>
+  <inv_item_physics.tga/>
+  <inv_item_tattoo.tga/>
   <inv_item_script.tga/>
   <inv_item_shape.tga/>
   <inv_item_shirt.tga/>

indra/newview/skins/wisdom/textures/textures.xml

@@ -130,6 +130,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"/>