aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/openmetaverse_data/bump_face_wrinkles.tga
diff options
context:
space:
mode:
authorMelanie2012-09-24 20:14:00 +0100
committerMelanie2012-09-24 20:14:00 +0100
commitbbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6 (patch)
tree2ac67907f6333bbbc9e4d821c6607b53d0e22acb /bin/openmetaverse_data/bump_face_wrinkles.tga
parentMerge branch 'master' into careminster (diff)
parentHG Rez object: warn the user if the item or asset cannot be found. (diff)
downloadopensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.zip
opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.gz
opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.bz2
opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/openmetaverse_data/bump_face_wrinkles.tga')
-rw-r--r--bin/openmetaverse_data/bump_face_wrinkles.tgabin0 -> 25243 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/bin/openmetaverse_data/bump_face_wrinkles.tga b/bin/openmetaverse_data/bump_face_wrinkles.tga
new file mode 100644
index 0000000..54bf7a5
--- /dev/null
+++ b/bin/openmetaverse_data/bump_face_wrinkles.tga
Binary files differ