summaryrefslogtreecommitdiff
path: root/indra/newview/icons/project
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-10 10:56:40 -0400
committerOz Linden <oz@lindenlab.com>2013-05-10 10:56:40 -0400
commit4d22c32aa9ac42b4a720200386d68339e8656974 (patch)
treec84419f0f3ac44d2f64b7082c3c69c1fbec919d2 /indra/newview/icons/project
parent73e6711268adb93025386ffb766055125f0d849e (diff)
parent33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff)
merge changes for 3.5.2-beta4
Diffstat (limited to 'indra/newview/icons/project')
-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
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 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