Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	indra/newview/llpanelmaininventory.cpp
	indra/newview/llpanelmaininventory.h
	indra/newview/llvoavatar.cpp
This commit is contained in:
Lirusaito
2012-01-31 02:47:02 -05:00
parent dfe33963bb eaecc9a4d0
commit 655365247c
55 changed files with 1435 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
indra/newview/skins/default/textures/inv_item_mesh.tga Normal file
View File

Binary file not shown.

3
indra/newview/skins/default/textures/textures.xml
View File

@@ -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"/>