summaryrefslogtreecommitdiff
path: root/indra/newview/icons
diff options
context:
space:
mode:
authorCinder Roxley <cinder.roxley@phoenixviewer.com>2013-06-27 21:35:23 -0600
committerCinder Roxley <cinder.roxley@phoenixviewer.com>2013-06-27 21:35:23 -0600
commit35b27d558caa8a719e6648e0bf3129629c1cc5fa (patch)
tree6a1d20ad270bd7df3141e91ec9ba0ff0a080a6fc /indra/newview/icons
parent38c1cd2d29fa48b1a28a6ba1d7ef49ae00c9a5e0 (diff)
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/icons')
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/beta/secondlife.icnsbin242261 -> 242261 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/beta/secondlife.icobin78692 -> 78692 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/beta/secondlife_128.pngbin18268 -> 18268 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/beta/secondlife_16.pngbin3536 -> 3536 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/beta/secondlife_256.BMPbin196662 -> 196662 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/beta/secondlife_256.pngbin49418 -> 49418 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/beta/secondlife_32.pngbin4767 -> 4767 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/beta/secondlife_48.pngbin6438 -> 6438 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/beta/secondlife_512.pngbin151779 -> 151779 bytes
-rw-r--r--indra/newview/icons/development/secondlife.icnsbin233026 -> 0 bytes
-rw-r--r--indra/newview/icons/development/secondlife.icobin77117 -> 0 bytes
-rw-r--r--indra/newview/icons/development/secondlife_128.pngbin17499 -> 0 bytes
-rw-r--r--indra/newview/icons/development/secondlife_16.pngbin3471 -> 0 bytes
-rw-r--r--indra/newview/icons/development/secondlife_256.BMPbin196662 -> 0 bytes
-rw-r--r--indra/newview/icons/development/secondlife_256.pngbin47952 -> 0 bytes
-rw-r--r--indra/newview/icons/development/secondlife_32.pngbin4649 -> 0 bytes
-rw-r--r--indra/newview/icons/development/secondlife_48.pngbin6190 -> 0 bytes
-rw-r--r--indra/newview/icons/development/secondlife_512.pngbin147689 -> 0 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/project/secondlife.icnsbin235133 -> 235133 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/project/secondlife.icobin77791 -> 77791 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/project/secondlife_128.pngbin17706 -> 17706 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/project/secondlife_16.pngbin3471 -> 3471 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/project/secondlife_256.BMPbin196662 -> 196662 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/project/secondlife_256.pngbin48488 -> 48488 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/project/secondlife_32.pngbin4675 -> 4675 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/project/secondlife_48.pngbin6195 -> 6195 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/project/secondlife_512.pngbin149145 -> 149145 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/release/secondlife.icnsbin228390 -> 228390 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/release/secondlife.icobin77552 -> 77552 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/release/secondlife_128.pngbin17198 -> 17198 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/release/secondlife_16.pngbin3524 -> 3524 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/release/secondlife_256.BMPbin196662 -> 196662 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/release/secondlife_256.pngbin47946 -> 47946 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/release/secondlife_32.pngbin4746 -> 4746 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/release/secondlife_48.pngbin6249 -> 6249 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/icons/release/secondlife_512.pngbin147963 -> 147963 bytes
-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
45 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/icons/beta/secondlife.icns b/indra/newview/icons/beta/secondlife.icns
index 1fa50547bb..1fa50547bb 100644..100755
--- a/indra/newview/icons/beta/secondlife.icns
+++ b/indra/newview/icons/beta/secondlife.icns
Binary files differ
diff --git a/indra/newview/icons/beta/secondlife.ico b/indra/newview/icons/beta/secondlife.ico
index 9bdd21b904..9bdd21b904 100644..100755
--- a/indra/newview/icons/beta/secondlife.ico
+++ b/indra/newview/icons/beta/secondlife.ico
Binary files differ
diff --git a/indra/newview/icons/beta/secondlife_128.png b/indra/newview/icons/beta/secondlife_128.png
index fa42aa764b..fa42aa764b 100644..100755
--- a/indra/newview/icons/beta/secondlife_128.png
+++ b/indra/newview/icons/beta/secondlife_128.png
Binary files differ
diff --git a/indra/newview/icons/beta/secondlife_16.png b/indra/newview/icons/beta/secondlife_16.png
index ff648cf3fc..ff648cf3fc 100644..100755
--- a/indra/newview/icons/beta/secondlife_16.png
+++ b/indra/newview/icons/beta/secondlife_16.png
Binary files differ
diff --git a/indra/newview/icons/beta/secondlife_256.BMP b/indra/newview/icons/beta/secondlife_256.BMP
index 97bd67d3d6..97bd67d3d6 100644..100755
--- a/indra/newview/icons/beta/secondlife_256.BMP
+++ b/indra/newview/icons/beta/secondlife_256.BMP
Binary files differ
diff --git a/indra/newview/icons/beta/secondlife_256.png b/indra/newview/icons/beta/secondlife_256.png
index 245e2c3e9f..245e2c3e9f 100644..100755
--- a/indra/newview/icons/beta/secondlife_256.png
+++ b/indra/newview/icons/beta/secondlife_256.png
Binary files differ
diff --git a/indra/newview/icons/beta/secondlife_32.png b/indra/newview/icons/beta/secondlife_32.png
index fd7f46bf4d..fd7f46bf4d 100644..100755
--- a/indra/newview/icons/beta/secondlife_32.png
+++ b/indra/newview/icons/beta/secondlife_32.png
Binary files differ
diff --git a/indra/newview/icons/beta/secondlife_48.png b/indra/newview/icons/beta/secondlife_48.png
index cc3a795e2b..cc3a795e2b 100644..100755
--- a/indra/newview/icons/beta/secondlife_48.png
+++ b/indra/newview/icons/beta/secondlife_48.png
Binary files differ
diff --git a/indra/newview/icons/beta/secondlife_512.png b/indra/newview/icons/beta/secondlife_512.png
index a959bd9a9e..a959bd9a9e 100644..100755
--- a/indra/newview/icons/beta/secondlife_512.png
+++ b/indra/newview/icons/beta/secondlife_512.png
Binary files differ
diff --git a/indra/newview/icons/development/secondlife.icns b/indra/newview/icons/development/secondlife.icns
deleted file mode 100644
index 44f63d384c..0000000000
--- a/indra/newview/icons/development/secondlife.icns
+++ /dev/null
Binary files differ
diff --git a/indra/newview/icons/development/secondlife.ico b/indra/newview/icons/development/secondlife.ico
deleted file mode 100644
index b53f23ae58..0000000000
--- a/indra/newview/icons/development/secondlife.ico
+++ /dev/null
Binary files differ
diff --git a/indra/newview/icons/development/secondlife_128.png b/indra/newview/icons/development/secondlife_128.png
deleted file mode 100644
index 9b9fe656fc..0000000000
--- a/indra/newview/icons/development/secondlife_128.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/icons/development/secondlife_16.png b/indra/newview/icons/development/secondlife_16.png
deleted file mode 100644
index 91493a033c..0000000000
--- a/indra/newview/icons/development/secondlife_16.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/icons/development/secondlife_256.BMP b/indra/newview/icons/development/secondlife_256.BMP
deleted file mode 100644
index 174b22319a..0000000000
--- a/indra/newview/icons/development/secondlife_256.BMP
+++ /dev/null
Binary files differ
diff --git a/indra/newview/icons/development/secondlife_256.png b/indra/newview/icons/development/secondlife_256.png
deleted file mode 100644
index 29ed40abdc..0000000000
--- a/indra/newview/icons/development/secondlife_256.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/icons/development/secondlife_32.png b/indra/newview/icons/development/secondlife_32.png
deleted file mode 100644
index 3b84f5ec77..0000000000
--- a/indra/newview/icons/development/secondlife_32.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/icons/development/secondlife_48.png b/indra/newview/icons/development/secondlife_48.png
deleted file mode 100644
index d2636d9d72..0000000000
--- a/indra/newview/icons/development/secondlife_48.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/icons/development/secondlife_512.png b/indra/newview/icons/development/secondlife_512.png
deleted file mode 100644
index 75f9b231f4..0000000000
--- a/indra/newview/icons/development/secondlife_512.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/icons/project/secondlife.icns b/indra/newview/icons/project/secondlife.icns
index d6e26a8ed9..d6e26a8ed9 100644..100755
--- a/indra/newview/icons/project/secondlife.icns
+++ b/indra/newview/icons/project/secondlife.icns
Binary files differ
diff --git a/indra/newview/icons/project/secondlife.ico b/indra/newview/icons/project/secondlife.ico
index ebb27e5325..ebb27e5325 100644..100755
--- a/indra/newview/icons/project/secondlife.ico
+++ b/indra/newview/icons/project/secondlife.ico
Binary files differ
diff --git a/indra/newview/icons/project/secondlife_128.png b/indra/newview/icons/project/secondlife_128.png
index d67b8228f9..d67b8228f9 100644..100755
--- a/indra/newview/icons/project/secondlife_128.png
+++ b/indra/newview/icons/project/secondlife_128.png
Binary files differ
diff --git a/indra/newview/icons/project/secondlife_16.png b/indra/newview/icons/project/secondlife_16.png
index 91493a033c..91493a033c 100644..100755
--- a/indra/newview/icons/project/secondlife_16.png
+++ b/indra/newview/icons/project/secondlife_16.png
Binary files differ
diff --git a/indra/newview/icons/project/secondlife_256.BMP b/indra/newview/icons/project/secondlife_256.BMP
index cd890725f8..cd890725f8 100644..100755
--- a/indra/newview/icons/project/secondlife_256.BMP
+++ b/indra/newview/icons/project/secondlife_256.BMP
Binary files differ
diff --git a/indra/newview/icons/project/secondlife_256.png b/indra/newview/icons/project/secondlife_256.png
index cccfaf7cba..cccfaf7cba 100644..100755
--- a/indra/newview/icons/project/secondlife_256.png
+++ b/indra/newview/icons/project/secondlife_256.png
Binary files differ
diff --git a/indra/newview/icons/project/secondlife_32.png b/indra/newview/icons/project/secondlife_32.png
index ad7b33f789..ad7b33f789 100644..100755
--- a/indra/newview/icons/project/secondlife_32.png
+++ b/indra/newview/icons/project/secondlife_32.png
Binary files differ
diff --git a/indra/newview/icons/project/secondlife_48.png b/indra/newview/icons/project/secondlife_48.png
index 104a931fbc..104a931fbc 100644..100755
--- a/indra/newview/icons/project/secondlife_48.png
+++ b/indra/newview/icons/project/secondlife_48.png
Binary files differ
diff --git a/indra/newview/icons/project/secondlife_512.png b/indra/newview/icons/project/secondlife_512.png
index 74e2fa9bc6..74e2fa9bc6 100644..100755
--- a/indra/newview/icons/project/secondlife_512.png
+++ b/indra/newview/icons/project/secondlife_512.png
Binary files differ
diff --git a/indra/newview/icons/release/secondlife.icns b/indra/newview/icons/release/secondlife.icns
index e15e34140d..e15e34140d 100644..100755
--- a/indra/newview/icons/release/secondlife.icns
+++ b/indra/newview/icons/release/secondlife.icns
Binary files differ
diff --git a/indra/newview/icons/release/secondlife.ico b/indra/newview/icons/release/secondlife.ico
index 28bf1e7664..28bf1e7664 100644..100755
--- a/indra/newview/icons/release/secondlife.ico
+++ b/indra/newview/icons/release/secondlife.ico
Binary files differ
diff --git a/indra/newview/icons/release/secondlife_128.png b/indra/newview/icons/release/secondlife_128.png
index bcf94dcae8..bcf94dcae8 100644..100755
--- a/indra/newview/icons/release/secondlife_128.png
+++ b/indra/newview/icons/release/secondlife_128.png
Binary files differ
diff --git a/indra/newview/icons/release/secondlife_16.png b/indra/newview/icons/release/secondlife_16.png
index 90311ea8b0..90311ea8b0 100644..100755
--- a/indra/newview/icons/release/secondlife_16.png
+++ b/indra/newview/icons/release/secondlife_16.png
Binary files differ
diff --git a/indra/newview/icons/release/secondlife_256.BMP b/indra/newview/icons/release/secondlife_256.BMP
index 74deedd7d3..74deedd7d3 100644..100755
--- a/indra/newview/icons/release/secondlife_256.BMP
+++ b/indra/newview/icons/release/secondlife_256.BMP
Binary files differ
diff --git a/indra/newview/icons/release/secondlife_256.png b/indra/newview/icons/release/secondlife_256.png
index a89fb4c74f..a89fb4c74f 100644..100755
--- a/indra/newview/icons/release/secondlife_256.png
+++ b/indra/newview/icons/release/secondlife_256.png
Binary files differ
diff --git a/indra/newview/icons/release/secondlife_32.png b/indra/newview/icons/release/secondlife_32.png
index 530e8fc80c..530e8fc80c 100644..100755
--- a/indra/newview/icons/release/secondlife_32.png
+++ b/indra/newview/icons/release/secondlife_32.png
Binary files differ
diff --git a/indra/newview/icons/release/secondlife_48.png b/indra/newview/icons/release/secondlife_48.png
index cb33c51f8a..cb33c51f8a 100644..100755
--- a/indra/newview/icons/release/secondlife_48.png
+++ b/indra/newview/icons/release/secondlife_48.png
Binary files differ
diff --git a/indra/newview/icons/release/secondlife_512.png b/indra/newview/icons/release/secondlife_512.png
index f291e60586..f291e60586 100644..100755
--- a/indra/newview/icons/release/secondlife_512.png
+++ b/indra/newview/icons/release/secondlife_512.png
Binary files differ
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