summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-21 10:38:39 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-21 10:38:39 -0400
commitbe553242ef706e33260f3f9e62d02f4720f00473 (patch)
tree553a150a63cd8105f8860780ef7d02f12a69eb23 /indra/newview/skins/default/textures
parent9c1c791b29cb5087ebff142d4ad7a55b65be0ad0 (diff)
parentdf63c6931e81c034887611711095e3134b9a7318 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r--indra/newview/skins/default/textures/textures.xml1
-rw-r--r--indra/newview/skins/default/textures/world/CameraDragDot.pngbin0 -> 3101 bytes
2 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 87d8e54a89..bfcf130e33 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -696,4 +696,5 @@ with the same filename but different name
<texture name="Yellow_Gradient" file_name="windows/yellow_gradient.png"/>
<texture name="Popup_Caution" file_name="icons/pop_up_caution.png"/>
+ <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
</textures>
diff --git a/indra/newview/skins/default/textures/world/CameraDragDot.png b/indra/newview/skins/default/textures/world/CameraDragDot.png
new file mode 100644
index 0000000000..57698e1956
--- /dev/null
+++ b/indra/newview/skins/default/textures/world/CameraDragDot.png
Binary files differ