summaryrefslogtreecommitdiff
path: root/indra/newview/icons/release
diff options
context:
space:
mode:
authorcallum_linden <none@none>2016-05-19 11:00:03 -0700
committercallum_linden <none@none>2016-05-19 11:00:03 -0700
commit9c4ed8d1138de86041b740139c4deec1bc6bf8ee (patch)
treed7452bc7faeae01964f13faaa16e2812b27ba93c /indra/newview/icons/release
parente6fb7564b02ba73c8a402efaca65cb944ce7bef2 (diff)
parentc2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff)
Automated merge with tip of viewer-release to pick up 4.0.5
Diffstat (limited to 'indra/newview/icons/release')
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/release/secondlife.icnsbin228390 -> 228390 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/release/secondlife.icobin77552 -> 77552 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/release/secondlife_128.pngbin15184 -> 15184 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/release/secondlife_16.pngbin1009 -> 1009 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/release/secondlife_256.BMPbin196662 -> 196662 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/release/secondlife_256.pngbin47740 -> 47740 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/release/secondlife_32.pngbin2237 -> 2237 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/release/secondlife_48.pngbin3748 -> 3748 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/release/secondlife_512.pngbin154396 -> 154396 bytes
9 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/icons/release/secondlife.icns b/indra/newview/icons/release/secondlife.icns
index e15e34140d..e15e34140d 100755..100644
--- 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 100755..100644
--- 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 4c9544f498..4c9544f498 100755..100644
--- 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 bb3168b8be..bb3168b8be 100755..100644
--- 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 100755..100644
--- 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 bece338a90..bece338a90 100755..100644
--- 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 736359c147..736359c147 100755..100644
--- 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 07d39ae585..07d39ae585 100755..100644
--- 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 53d1643f45..53d1643f45 100755..100644
--- a/indra/newview/icons/release/secondlife_512.png
+++ b/indra/newview/icons/release/secondlife_512.png
Binary files differ