diff options
| author | Richard Linden <none@none> | 2011-03-18 11:42:39 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-18 11:42:39 -0700 |
| commit | 097e076a7221f8b25914f1fad61e27ac316915e5 (patch) | |
| tree | 8a57fcda493436d53a8f783a3d874ce39a093f6e /indra/newview/skins/default/textures | |
| parent | f64a20ddcff91677b02b7688e08819cffb0989c9 (diff) | |
| parent | e5a4b145b435396aa2c0d3d9a49019984658cdf4 (diff) | |
Automated merge with bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.yibew7\http__hg.secondlife.com_viewer-development_t3uwtb.hg
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 |
