summaryrefslogtreecommitdiff
path: root/indra/newview/icons/test
diff options
context:
space:
mode:
authorsimon <none@none>2013-05-09 14:10:45 -0700
committersimon <none@none>2013-05-09 14:10:45 -0700
commitee2fce8790b69d61845cc32fbf7cdce8a33b0dab (patch)
tree5060f42dca293102c868038f127c1a74f5c4a6aa /indra/newview/icons/test
parentcd8e0b92e1c8f9f8544b1011e61c21c7789b93b7 (diff)
parent8895e795763d14c3dae495b3648da3d4a52ba30a (diff)
Merge downstream code and viewer-beta
Diffstat (limited to 'indra/newview/icons/test')
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/test/secondlife.icnsbin232905 -> 232905 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/test/secondlife.icobin76861 -> 76861 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/test/secondlife_128.pngbin17156 -> 17156 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/test/secondlife_16.pngbin3471 -> 3471 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/test/secondlife_256.BMPbin196662 -> 196662 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/test/secondlife_256.pngbin47522 -> 47522 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/test/secondlife_32.pngbin4644 -> 4644 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/test/secondlife_48.pngbin6115 -> 6115 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/test/secondlife_512.pngbin146971 -> 146971 bytes
9 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/icons/test/secondlife.icns b/indra/newview/icons/test/secondlife.icns
index eb8d16a7e7..eb8d16a7e7 100644..100755
--- a/indra/newview/icons/test/secondlife.icns
+++ b/indra/newview/icons/test/secondlife.icns
Binary files differ
diff --git a/indra/newview/icons/test/secondlife.ico b/indra/newview/icons/test/secondlife.ico
index ceb8e8e6eb..ceb8e8e6eb 100644..100755
--- a/indra/newview/icons/test/secondlife.ico
+++ b/indra/newview/icons/test/secondlife.ico
Binary files differ
diff --git a/indra/newview/icons/test/secondlife_128.png b/indra/newview/icons/test/secondlife_128.png
index 019f65db28..019f65db28 100644..100755
--- a/indra/newview/icons/test/secondlife_128.png
+++ b/indra/newview/icons/test/secondlife_128.png
Binary files differ
diff --git a/indra/newview/icons/test/secondlife_16.png b/indra/newview/icons/test/secondlife_16.png
index 91493a033c..91493a033c 100644..100755
--- a/indra/newview/icons/test/secondlife_16.png
+++ b/indra/newview/icons/test/secondlife_16.png
Binary files differ
diff --git a/indra/newview/icons/test/secondlife_256.BMP b/indra/newview/icons/test/secondlife_256.BMP
index e23fcfdbe9..e23fcfdbe9 100644..100755
--- a/indra/newview/icons/test/secondlife_256.BMP
+++ b/indra/newview/icons/test/secondlife_256.BMP
Binary files differ
diff --git a/indra/newview/icons/test/secondlife_256.png b/indra/newview/icons/test/secondlife_256.png
index f402424c51..f402424c51 100644..100755
--- a/indra/newview/icons/test/secondlife_256.png
+++ b/indra/newview/icons/test/secondlife_256.png
Binary files differ
diff --git a/indra/newview/icons/test/secondlife_32.png b/indra/newview/icons/test/secondlife_32.png
index 80d6efe13d..80d6efe13d 100644..100755
--- a/indra/newview/icons/test/secondlife_32.png
+++ b/indra/newview/icons/test/secondlife_32.png
Binary files differ
diff --git a/indra/newview/icons/test/secondlife_48.png b/indra/newview/icons/test/secondlife_48.png
index bba938feba..bba938feba 100644..100755
--- a/indra/newview/icons/test/secondlife_48.png
+++ b/indra/newview/icons/test/secondlife_48.png
Binary files differ
diff --git a/indra/newview/icons/test/secondlife_512.png b/indra/newview/icons/test/secondlife_512.png
index 10ff65312b..10ff65312b 100644..100755
--- a/indra/newview/icons/test/secondlife_512.png
+++ b/indra/newview/icons/test/secondlife_512.png
Binary files differ