diff --git a/indra/newview/firestormos_icon.icns b/indra/newview/firestormos_icon.icns new file mode 100644 index 0000000000..3315b96441 Binary files /dev/null and b/indra/newview/firestormos_icon.icns differ diff --git a/indra/newview/icons/beta-os/firestorm_128.png b/indra/newview/icons/beta-os/firestorm_128.png new file mode 100644 index 0000000000..d60b03fe48 Binary files /dev/null and b/indra/newview/icons/beta-os/firestorm_128.png differ diff --git a/indra/newview/icons/beta-os/firestorm_16.png b/indra/newview/icons/beta-os/firestorm_16.png new file mode 100644 index 0000000000..87f546cd1b Binary files /dev/null and b/indra/newview/icons/beta-os/firestorm_16.png differ diff --git a/indra/newview/icons/beta-os/firestorm_256.bmp b/indra/newview/icons/beta-os/firestorm_256.bmp new file mode 100644 index 0000000000..fc71c12d02 Binary files /dev/null and b/indra/newview/icons/beta-os/firestorm_256.bmp differ diff --git a/indra/newview/icons/beta-os/firestorm_256.png b/indra/newview/icons/beta-os/firestorm_256.png new file mode 100644 index 0000000000..4dbf326e52 Binary files /dev/null and b/indra/newview/icons/beta-os/firestorm_256.png differ diff --git a/indra/newview/icons/beta-os/firestorm_32.png b/indra/newview/icons/beta-os/firestorm_32.png new file mode 100644 index 0000000000..9dafd13c08 Binary files /dev/null and b/indra/newview/icons/beta-os/firestorm_32.png differ diff --git a/indra/newview/icons/beta-os/firestorm_48.png b/indra/newview/icons/beta-os/firestorm_48.png new file mode 100644 index 0000000000..2e868845fc Binary files /dev/null and b/indra/newview/icons/beta-os/firestorm_48.png differ diff --git a/indra/newview/icons/beta-os/firestorm_512.png b/indra/newview/icons/beta-os/firestorm_512.png new file mode 100644 index 0000000000..7f1b6ba38d Binary files /dev/null and b/indra/newview/icons/beta-os/firestorm_512.png differ diff --git a/indra/newview/icons/beta-os/firestorm_icon.icns b/indra/newview/icons/beta-os/firestorm_icon.icns new file mode 100644 index 0000000000..3315b96441 Binary files /dev/null and b/indra/newview/icons/beta-os/firestorm_icon.icns differ diff --git a/indra/newview/icons/beta-os/firestorm_icon.ico b/indra/newview/icons/beta-os/firestorm_icon.ico new file mode 100644 index 0000000000..eea7ecfef3 Binary files /dev/null and b/indra/newview/icons/beta-os/firestorm_icon.ico differ diff --git a/indra/newview/icons/development-os/firestorm_128.png b/indra/newview/icons/development-os/firestorm_128.png new file mode 100644 index 0000000000..d60b03fe48 Binary files /dev/null and b/indra/newview/icons/development-os/firestorm_128.png differ diff --git a/indra/newview/icons/development-os/firestorm_16.png b/indra/newview/icons/development-os/firestorm_16.png new file mode 100644 index 0000000000..87f546cd1b Binary files /dev/null and b/indra/newview/icons/development-os/firestorm_16.png differ diff --git a/indra/newview/icons/development-os/firestorm_256.bmp b/indra/newview/icons/development-os/firestorm_256.bmp new file mode 100644 index 0000000000..fc71c12d02 Binary files /dev/null and b/indra/newview/icons/development-os/firestorm_256.bmp differ diff --git a/indra/newview/icons/development-os/firestorm_256.png b/indra/newview/icons/development-os/firestorm_256.png new file mode 100644 index 0000000000..4dbf326e52 Binary files /dev/null and b/indra/newview/icons/development-os/firestorm_256.png differ diff --git a/indra/newview/icons/development-os/firestorm_32.png b/indra/newview/icons/development-os/firestorm_32.png new file mode 100644 index 0000000000..9dafd13c08 Binary files /dev/null and b/indra/newview/icons/development-os/firestorm_32.png differ diff --git a/indra/newview/icons/development-os/firestorm_48.png b/indra/newview/icons/development-os/firestorm_48.png new file mode 100644 index 0000000000..2e868845fc Binary files /dev/null and b/indra/newview/icons/development-os/firestorm_48.png differ diff --git a/indra/newview/icons/development-os/firestorm_512.png b/indra/newview/icons/development-os/firestorm_512.png new file mode 100644 index 0000000000..7f1b6ba38d Binary files /dev/null and b/indra/newview/icons/development-os/firestorm_512.png differ diff --git a/indra/newview/icons/development-os/firestorm_icon.icns b/indra/newview/icons/development-os/firestorm_icon.icns new file mode 100644 index 0000000000..3315b96441 Binary files /dev/null and b/indra/newview/icons/development-os/firestorm_icon.icns differ diff --git a/indra/newview/icons/development-os/firestorm_icon.ico b/indra/newview/icons/development-os/firestorm_icon.ico new file mode 100644 index 0000000000..eea7ecfef3 Binary files /dev/null and b/indra/newview/icons/development-os/firestorm_icon.ico differ diff --git a/indra/newview/icons/private-os/firestorm_128.png b/indra/newview/icons/private-os/firestorm_128.png new file mode 100644 index 0000000000..d60b03fe48 Binary files /dev/null and b/indra/newview/icons/private-os/firestorm_128.png differ diff --git a/indra/newview/icons/private-os/firestorm_16.png b/indra/newview/icons/private-os/firestorm_16.png new file mode 100644 index 0000000000..87f546cd1b Binary files /dev/null and b/indra/newview/icons/private-os/firestorm_16.png differ diff --git a/indra/newview/icons/private-os/firestorm_256.bmp b/indra/newview/icons/private-os/firestorm_256.bmp new file mode 100644 index 0000000000..fc71c12d02 Binary files /dev/null and b/indra/newview/icons/private-os/firestorm_256.bmp differ diff --git a/indra/newview/icons/private-os/firestorm_256.png b/indra/newview/icons/private-os/firestorm_256.png new file mode 100644 index 0000000000..4dbf326e52 Binary files /dev/null and b/indra/newview/icons/private-os/firestorm_256.png differ diff --git a/indra/newview/icons/private-os/firestorm_32.png b/indra/newview/icons/private-os/firestorm_32.png new file mode 100644 index 0000000000..9dafd13c08 Binary files /dev/null and b/indra/newview/icons/private-os/firestorm_32.png differ diff --git a/indra/newview/icons/private-os/firestorm_48.png b/indra/newview/icons/private-os/firestorm_48.png new file mode 100644 index 0000000000..2e868845fc Binary files /dev/null and b/indra/newview/icons/private-os/firestorm_48.png differ diff --git a/indra/newview/icons/private-os/firestorm_512.png b/indra/newview/icons/private-os/firestorm_512.png new file mode 100644 index 0000000000..7f1b6ba38d Binary files /dev/null and b/indra/newview/icons/private-os/firestorm_512.png differ diff --git a/indra/newview/icons/private-os/firestorm_icon.icns b/indra/newview/icons/private-os/firestorm_icon.icns new file mode 100644 index 0000000000..3315b96441 Binary files /dev/null and b/indra/newview/icons/private-os/firestorm_icon.icns differ diff --git a/indra/newview/icons/private-os/firestorm_icon.ico b/indra/newview/icons/private-os/firestorm_icon.ico new file mode 100644 index 0000000000..eea7ecfef3 Binary files /dev/null and b/indra/newview/icons/private-os/firestorm_icon.ico differ diff --git a/indra/newview/icons/project-os/firestorm_128.png b/indra/newview/icons/project-os/firestorm_128.png new file mode 100644 index 0000000000..d60b03fe48 Binary files /dev/null and b/indra/newview/icons/project-os/firestorm_128.png differ diff --git a/indra/newview/icons/project-os/firestorm_16.png b/indra/newview/icons/project-os/firestorm_16.png new file mode 100644 index 0000000000..87f546cd1b Binary files /dev/null and b/indra/newview/icons/project-os/firestorm_16.png differ diff --git a/indra/newview/icons/project-os/firestorm_256.bmp b/indra/newview/icons/project-os/firestorm_256.bmp new file mode 100644 index 0000000000..fc71c12d02 Binary files /dev/null and b/indra/newview/icons/project-os/firestorm_256.bmp differ diff --git a/indra/newview/icons/project-os/firestorm_256.png b/indra/newview/icons/project-os/firestorm_256.png new file mode 100644 index 0000000000..4dbf326e52 Binary files /dev/null and b/indra/newview/icons/project-os/firestorm_256.png differ diff --git a/indra/newview/icons/project-os/firestorm_32.png b/indra/newview/icons/project-os/firestorm_32.png new file mode 100644 index 0000000000..9dafd13c08 Binary files /dev/null and b/indra/newview/icons/project-os/firestorm_32.png differ diff --git a/indra/newview/icons/project-os/firestorm_48.png b/indra/newview/icons/project-os/firestorm_48.png new file mode 100644 index 0000000000..2e868845fc Binary files /dev/null and b/indra/newview/icons/project-os/firestorm_48.png differ diff --git a/indra/newview/icons/project-os/firestorm_512.png b/indra/newview/icons/project-os/firestorm_512.png new file mode 100644 index 0000000000..7f1b6ba38d Binary files /dev/null and b/indra/newview/icons/project-os/firestorm_512.png differ diff --git a/indra/newview/icons/project-os/firestorm_icon.icns b/indra/newview/icons/project-os/firestorm_icon.icns new file mode 100644 index 0000000000..3315b96441 Binary files /dev/null and b/indra/newview/icons/project-os/firestorm_icon.icns differ diff --git a/indra/newview/icons/project-os/firestorm_icon.ico b/indra/newview/icons/project-os/firestorm_icon.ico new file mode 100644 index 0000000000..eea7ecfef3 Binary files /dev/null and b/indra/newview/icons/project-os/firestorm_icon.ico differ diff --git a/indra/newview/icons/release-os/firestorm_128.png b/indra/newview/icons/release-os/firestorm_128.png new file mode 100644 index 0000000000..d60b03fe48 Binary files /dev/null and b/indra/newview/icons/release-os/firestorm_128.png differ diff --git a/indra/newview/icons/release-os/firestorm_16.png b/indra/newview/icons/release-os/firestorm_16.png new file mode 100644 index 0000000000..87f546cd1b Binary files /dev/null and b/indra/newview/icons/release-os/firestorm_16.png differ diff --git a/indra/newview/icons/release-os/firestorm_256.bmp b/indra/newview/icons/release-os/firestorm_256.bmp new file mode 100644 index 0000000000..fc71c12d02 Binary files /dev/null and b/indra/newview/icons/release-os/firestorm_256.bmp differ diff --git a/indra/newview/icons/release-os/firestorm_256.png b/indra/newview/icons/release-os/firestorm_256.png new file mode 100644 index 0000000000..4dbf326e52 Binary files /dev/null and b/indra/newview/icons/release-os/firestorm_256.png differ diff --git a/indra/newview/icons/release-os/firestorm_32.png b/indra/newview/icons/release-os/firestorm_32.png new file mode 100644 index 0000000000..9dafd13c08 Binary files /dev/null and b/indra/newview/icons/release-os/firestorm_32.png differ diff --git a/indra/newview/icons/release-os/firestorm_48.png b/indra/newview/icons/release-os/firestorm_48.png new file mode 100644 index 0000000000..2e868845fc Binary files /dev/null and b/indra/newview/icons/release-os/firestorm_48.png differ diff --git a/indra/newview/icons/release-os/firestorm_512.png b/indra/newview/icons/release-os/firestorm_512.png new file mode 100644 index 0000000000..7f1b6ba38d Binary files /dev/null and b/indra/newview/icons/release-os/firestorm_512.png differ diff --git a/indra/newview/icons/release-os/firestorm_icon.icns b/indra/newview/icons/release-os/firestorm_icon.icns new file mode 100644 index 0000000000..3315b96441 Binary files /dev/null and b/indra/newview/icons/release-os/firestorm_icon.icns differ diff --git a/indra/newview/icons/release-os/firestorm_icon.ico b/indra/newview/icons/release-os/firestorm_icon.ico new file mode 100644 index 0000000000..eea7ecfef3 Binary files /dev/null and b/indra/newview/icons/release-os/firestorm_icon.ico differ diff --git a/indra/newview/icons/test-os/firestorm_128.png b/indra/newview/icons/test-os/firestorm_128.png new file mode 100644 index 0000000000..d60b03fe48 Binary files /dev/null and b/indra/newview/icons/test-os/firestorm_128.png differ diff --git a/indra/newview/icons/test-os/firestorm_16.png b/indra/newview/icons/test-os/firestorm_16.png new file mode 100644 index 0000000000..87f546cd1b Binary files /dev/null and b/indra/newview/icons/test-os/firestorm_16.png differ diff --git a/indra/newview/icons/test-os/firestorm_256.bmp b/indra/newview/icons/test-os/firestorm_256.bmp new file mode 100644 index 0000000000..fc71c12d02 Binary files /dev/null and b/indra/newview/icons/test-os/firestorm_256.bmp differ diff --git a/indra/newview/icons/test-os/firestorm_256.png b/indra/newview/icons/test-os/firestorm_256.png new file mode 100644 index 0000000000..4dbf326e52 Binary files /dev/null and b/indra/newview/icons/test-os/firestorm_256.png differ diff --git a/indra/newview/icons/test-os/firestorm_32.png b/indra/newview/icons/test-os/firestorm_32.png new file mode 100644 index 0000000000..9dafd13c08 Binary files /dev/null and b/indra/newview/icons/test-os/firestorm_32.png differ diff --git a/indra/newview/icons/test-os/firestorm_48.png b/indra/newview/icons/test-os/firestorm_48.png new file mode 100644 index 0000000000..2e868845fc Binary files /dev/null and b/indra/newview/icons/test-os/firestorm_48.png differ diff --git a/indra/newview/icons/test-os/firestorm_512.png b/indra/newview/icons/test-os/firestorm_512.png new file mode 100644 index 0000000000..7f1b6ba38d Binary files /dev/null and b/indra/newview/icons/test-os/firestorm_512.png differ diff --git a/indra/newview/icons/test-os/firestorm_icon.icns b/indra/newview/icons/test-os/firestorm_icon.icns new file mode 100644 index 0000000000..3315b96441 Binary files /dev/null and b/indra/newview/icons/test-os/firestorm_icon.icns differ diff --git a/indra/newview/icons/test-os/firestorm_icon.ico b/indra/newview/icons/test-os/firestorm_icon.ico new file mode 100644 index 0000000000..eea7ecfef3 Binary files /dev/null and b/indra/newview/icons/test-os/firestorm_icon.ico differ diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f9d1941fb7..a68d4b7b14 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -257,6 +257,10 @@ class ViewerManifest(LLManifest): icon_path += 'project' else : icon_path += 'private' # FS default + #[FS:CR] OpenSim app icons + if (self.flavor() == 'oss') : + icon_path += '-os' + # [/FS:CR] return icon_path def flags_list(self):