diff options
author | Andrew Meadows <andrew@lindenlab.com> | 2010-10-11 10:40:05 -0700 |
---|---|---|
committer | Andrew Meadows <andrew@lindenlab.com> | 2010-10-11 10:40:05 -0700 |
commit | 92a8d93b0d3084c1ccd4fb9cccc285bc14d01404 (patch) | |
tree | a07a9cba41f8609a6cfc6449877ca5c2d6ddfdd9 /indra/newview/skins/default/textures/icons | |
parent | c2f5bc0b129e0e0d2606a8e7849bbf37eb0276ea (diff) | |
parent | 48c2b2496d3ed6aeeebb0bc8950725f8ef7e305f (diff) |
Another merge from http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/skins/default/textures/icons')
-rw-r--r-- | indra/newview/skins/default/textures/icons/edit_mine.png | bin | 0 -> 639 bytes |
-rw-r--r-- | indra/newview/skins/default/textures/icons/edit_theirs.png | bin | 0 -> 634 bytes |
-rw-r--r-- | indra/newview/skins/default/textures/icons/pop_up_caution.png | bin | 0 -> 3158 bytes |
-rw-r--r-- | indra/newview/skins/default/textures/icons/see_me_online.png | bin | 0 -> 330 bytes |
-rw-r--r-- | indra/newview/skins/default/textures/icons/see_on_map.png | bin | 0 -> 613 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/edit_mine.png b/indra/newview/skins/default/textures/icons/edit_mine.png Binary files differnew file mode 100644 index 0000000000..a0bc7efd25 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/edit_mine.png diff --git a/indra/newview/skins/default/textures/icons/edit_theirs.png b/indra/newview/skins/default/textures/icons/edit_theirs.png Binary files differnew file mode 100644 index 0000000000..ed36ad7cfc --- /dev/null +++ b/indra/newview/skins/default/textures/icons/edit_theirs.png diff --git a/indra/newview/skins/default/textures/icons/pop_up_caution.png b/indra/newview/skins/default/textures/icons/pop_up_caution.png Binary files differnew file mode 100644 index 0000000000..78b681cb33 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/pop_up_caution.png diff --git a/indra/newview/skins/default/textures/icons/see_me_online.png b/indra/newview/skins/default/textures/icons/see_me_online.png Binary files differnew file mode 100644 index 0000000000..52dc2ae74f --- /dev/null +++ b/indra/newview/skins/default/textures/icons/see_me_online.png diff --git a/indra/newview/skins/default/textures/icons/see_on_map.png b/indra/newview/skins/default/textures/icons/see_on_map.png Binary files differnew file mode 100644 index 0000000000..200e649818 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/see_on_map.png |