summaryrefslogtreecommitdiff
path: root/indra/newview/icons/project
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/project
parente6fb7564b02ba73c8a402efaca65cb944ce7bef2 (diff)
parentc2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff)
Automated merge with tip of viewer-release to pick up 4.0.5
Diffstat (limited to 'indra/newview/icons/project')
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/project/secondlife.icnsbin235133 -> 235133 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/project/secondlife.icobin77791 -> 77791 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/project/secondlife_128.pngbin15587 -> 15587 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/project/secondlife_16.pngbin956 -> 956 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/project/secondlife_256.BMPbin196662 -> 196662 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/project/secondlife_256.pngbin48230 -> 48230 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/project/secondlife_32.pngbin2153 -> 2153 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/project/secondlife_48.pngbin3704 -> 3704 bytes
-rw-r--r--[-rwxr-xr-x]indra/newview/icons/project/secondlife_512.pngbin155555 -> 155555 bytes
9 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/icons/project/secondlife.icns b/indra/newview/icons/project/secondlife.icns
index d6e26a8ed9..d6e26a8ed9 100755..100644
--- 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 100755..100644
--- 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 b1b4997306..b1b4997306 100755..100644
--- 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 7d3d74b534..7d3d74b534 100755..100644
--- 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 100755..100644
--- 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 88ad959275..88ad959275 100755..100644
--- 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 e55f75e1dd..e55f75e1dd 100755..100644
--- 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 c29703e164..c29703e164 100755..100644
--- 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 4fa3474d70..4fa3474d70 100755..100644
--- a/indra/newview/icons/project/secondlife_512.png
+++ b/indra/newview/icons/project/secondlife_512.png
Binary files differ