diff options
author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-30 12:00:29 -0700 |
---|---|---|
committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-30 12:00:29 -0700 |
commit | 60f8c8279071b791fbc7179d8bc2bb9ca4880a03 (patch) | |
tree | 20a513fdb383dfd36ca0dbe0a99eacd72faad835 /indra/newview/skins/default/textures/icons | |
parent | 569f3f4b06fc2f5a0fa658a49d519428983403f9 (diff) | |
parent | d95b08c4a6830fc8a2319e77242d8f76eb4cbdae (diff) |
Merge
Diffstat (limited to 'indra/newview/skins/default/textures/icons')
-rw-r--r-- | indra/newview/skins/default/textures/icons/Generic_Group_Large.png | bin | 7061 -> 7507 bytes |
-rw-r--r-- | indra/newview/skins/default/textures/icons/Generic_Person_Large.png | bin | 1630 -> 51508 bytes |
-rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_Invalid.png | bin | 0 -> 329 bytes |
-rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_Mesh.png | bin | 0 -> 3263 bytes |
-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 |
9 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png Binary files differindex de8a39fc8a..75833eccf3 100644 --- a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png +++ b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png diff --git a/indra/newview/skins/default/textures/icons/Generic_Person_Large.png b/indra/newview/skins/default/textures/icons/Generic_Person_Large.png Binary files differindex 65b0ce8b67..532288b430 100644 --- a/indra/newview/skins/default/textures/icons/Generic_Person_Large.png +++ b/indra/newview/skins/default/textures/icons/Generic_Person_Large.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Invalid.png b/indra/newview/skins/default/textures/icons/Inv_Invalid.png Binary files differnew file mode 100644 index 0000000000..328be104ee --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Invalid.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Mesh.png b/indra/newview/skins/default/textures/icons/Inv_Mesh.png Binary files differnew file mode 100644 index 0000000000..f1f21f7941 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Mesh.png 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 |