diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-21 07:00:20 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 07:00:20 -0400 |
commit | d3023153e9c7aa2eaf18468e8d81aebf0d6223e0 (patch) | |
tree | f1265d15e702f1dd449476fd5e7b956ccd7f33f8 /indra/newview/skins/default/textures | |
parent | 7766d424d0f8cf8a6c882f50bc4dd04bf8f2096b (diff) | |
parent | cb47ae3264f3d9d22add17f2cbc5699c8620705f (diff) |
merge changes for storm-1035
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 | ||||
-rw-r--r-- | indra/newview/skins/default/textures/world/CameraDragDot.png | bin | 0 -> 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 cec2942b35..d79d660724 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -673,4 +673,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 Binary files differnew file mode 100644 index 0000000000..57698e1956 --- /dev/null +++ b/indra/newview/skins/default/textures/world/CameraDragDot.png |