diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 12:06:09 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 12:06:09 -0700 |
commit | 9488baada3c0aec7cfa4256708fdda82861cd502 (patch) | |
tree | 1f71293b54161733269a6f340574ec4960623d0f /indra/newview/skins/default/textures | |
parent | de08d74dc6da594c20aed3673114cbc0ef6d3305 (diff) | |
parent | 1869a399beb2cb3fa52d21f9c288f4c3b6ab4deb (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png | bin | 0 -> 553 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png | bin | 0 -> 384 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 3 |
3 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png Binary files differnew file mode 100644 index 0000000000..cfa12cb7cc --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png Binary files differnew file mode 100644 index 0000000000..0622141848 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 0404fdae48..212f05d284 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -445,6 +445,9 @@ with the same filename but different name <texture name="Parcel_Voice_Light" file_name="icons/Parcel_Voice_Light.png" preload="false" /> <texture name="Parcel_VoiceNo_Light" file_name="icons/Parcel_VoiceNo_Light.png" preload="false" /> + <texture name="Pathfinding_Dirty" file_name="icons/Pathfinding_Dirty.png" preload="false" /> + <texture name="Pathfinding_Disabled" file_name="icons/Pathfinding_Disabled.png" preload="false" /> + <texture name="Pause_Off" file_name="icons/Pause_Off.png" preload="false" /> <texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" /> <texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" /> |