FIRE-8226: Add district icons for OpenSim builds vs Havok builds

2013-07-11 21:35:59 -06:00 · 2013-07-11 21:35:59 -06:00 · 74615570f8
parent d5ffd472f1
commit 74615570f8
56 changed files with 4 additions and 0 deletions
--- a/indra/newview/firestormos_icon.icns
+++ b/indra/newview/firestormos_icon.icns
--- a/indra/newview/icons/beta-os/firestorm_128.png
+++ b/indra/newview/icons/beta-os/firestorm_128.png
--- a/indra/newview/icons/beta-os/firestorm_16.png
+++ b/indra/newview/icons/beta-os/firestorm_16.png
--- a/indra/newview/icons/beta-os/firestorm_256.bmp
+++ b/indra/newview/icons/beta-os/firestorm_256.bmp
--- a/indra/newview/icons/beta-os/firestorm_256.png
+++ b/indra/newview/icons/beta-os/firestorm_256.png
--- a/indra/newview/icons/beta-os/firestorm_32.png
+++ b/indra/newview/icons/beta-os/firestorm_32.png
--- a/indra/newview/icons/beta-os/firestorm_48.png
+++ b/indra/newview/icons/beta-os/firestorm_48.png
--- a/indra/newview/icons/beta-os/firestorm_512.png
+++ b/indra/newview/icons/beta-os/firestorm_512.png
--- a/indra/newview/icons/beta-os/firestorm_icon.icns
+++ b/indra/newview/icons/beta-os/firestorm_icon.icns
--- a/indra/newview/icons/beta-os/firestorm_icon.ico
+++ b/indra/newview/icons/beta-os/firestorm_icon.ico
--- a/indra/newview/icons/development-os/firestorm_128.png
+++ b/indra/newview/icons/development-os/firestorm_128.png
--- a/indra/newview/icons/development-os/firestorm_16.png
+++ b/indra/newview/icons/development-os/firestorm_16.png
--- a/indra/newview/icons/development-os/firestorm_256.bmp
+++ b/indra/newview/icons/development-os/firestorm_256.bmp
--- a/indra/newview/icons/development-os/firestorm_256.png
+++ b/indra/newview/icons/development-os/firestorm_256.png
--- a/indra/newview/icons/development-os/firestorm_32.png
+++ b/indra/newview/icons/development-os/firestorm_32.png
--- a/indra/newview/icons/development-os/firestorm_48.png
+++ b/indra/newview/icons/development-os/firestorm_48.png
--- a/indra/newview/icons/development-os/firestorm_512.png
+++ b/indra/newview/icons/development-os/firestorm_512.png
--- a/indra/newview/icons/development-os/firestorm_icon.icns
+++ b/indra/newview/icons/development-os/firestorm_icon.icns
--- a/indra/newview/icons/development-os/firestorm_icon.ico
+++ b/indra/newview/icons/development-os/firestorm_icon.ico
--- a/indra/newview/icons/private-os/firestorm_128.png
+++ b/indra/newview/icons/private-os/firestorm_128.png
--- a/indra/newview/icons/private-os/firestorm_16.png
+++ b/indra/newview/icons/private-os/firestorm_16.png
--- a/indra/newview/icons/private-os/firestorm_256.bmp
+++ b/indra/newview/icons/private-os/firestorm_256.bmp
--- a/indra/newview/icons/private-os/firestorm_256.png
+++ b/indra/newview/icons/private-os/firestorm_256.png
--- a/indra/newview/icons/private-os/firestorm_32.png
+++ b/indra/newview/icons/private-os/firestorm_32.png
--- a/indra/newview/icons/private-os/firestorm_48.png
+++ b/indra/newview/icons/private-os/firestorm_48.png
--- a/indra/newview/icons/private-os/firestorm_512.png
+++ b/indra/newview/icons/private-os/firestorm_512.png
--- a/indra/newview/icons/private-os/firestorm_icon.icns
+++ b/indra/newview/icons/private-os/firestorm_icon.icns
--- a/indra/newview/icons/private-os/firestorm_icon.ico
+++ b/indra/newview/icons/private-os/firestorm_icon.ico
--- a/indra/newview/icons/project-os/firestorm_128.png
+++ b/indra/newview/icons/project-os/firestorm_128.png
--- a/indra/newview/icons/project-os/firestorm_16.png
+++ b/indra/newview/icons/project-os/firestorm_16.png
--- a/indra/newview/icons/project-os/firestorm_256.bmp
+++ b/indra/newview/icons/project-os/firestorm_256.bmp
--- a/indra/newview/icons/project-os/firestorm_256.png
+++ b/indra/newview/icons/project-os/firestorm_256.png
--- a/indra/newview/icons/project-os/firestorm_32.png
+++ b/indra/newview/icons/project-os/firestorm_32.png
--- a/indra/newview/icons/project-os/firestorm_48.png
+++ b/indra/newview/icons/project-os/firestorm_48.png
--- a/indra/newview/icons/project-os/firestorm_512.png
+++ b/indra/newview/icons/project-os/firestorm_512.png
--- a/indra/newview/icons/project-os/firestorm_icon.icns
+++ b/indra/newview/icons/project-os/firestorm_icon.icns
--- a/indra/newview/icons/project-os/firestorm_icon.ico
+++ b/indra/newview/icons/project-os/firestorm_icon.ico
--- a/indra/newview/icons/release-os/firestorm_128.png
+++ b/indra/newview/icons/release-os/firestorm_128.png
--- a/indra/newview/icons/release-os/firestorm_16.png
+++ b/indra/newview/icons/release-os/firestorm_16.png
--- a/indra/newview/icons/release-os/firestorm_256.bmp
+++ b/indra/newview/icons/release-os/firestorm_256.bmp
--- a/indra/newview/icons/release-os/firestorm_256.png
+++ b/indra/newview/icons/release-os/firestorm_256.png
--- a/indra/newview/icons/release-os/firestorm_32.png
+++ b/indra/newview/icons/release-os/firestorm_32.png
--- a/indra/newview/icons/release-os/firestorm_48.png
+++ b/indra/newview/icons/release-os/firestorm_48.png
--- a/indra/newview/icons/release-os/firestorm_512.png
+++ b/indra/newview/icons/release-os/firestorm_512.png
--- a/indra/newview/icons/release-os/firestorm_icon.icns
+++ b/indra/newview/icons/release-os/firestorm_icon.icns
--- a/indra/newview/icons/release-os/firestorm_icon.ico
+++ b/indra/newview/icons/release-os/firestorm_icon.ico
--- a/indra/newview/icons/test-os/firestorm_128.png
+++ b/indra/newview/icons/test-os/firestorm_128.png
--- a/indra/newview/icons/test-os/firestorm_16.png
+++ b/indra/newview/icons/test-os/firestorm_16.png
--- a/indra/newview/icons/test-os/firestorm_256.bmp
+++ b/indra/newview/icons/test-os/firestorm_256.bmp
--- a/indra/newview/icons/test-os/firestorm_256.png
+++ b/indra/newview/icons/test-os/firestorm_256.png
--- a/indra/newview/icons/test-os/firestorm_32.png
+++ b/indra/newview/icons/test-os/firestorm_32.png
--- a/indra/newview/icons/test-os/firestorm_48.png
+++ b/indra/newview/icons/test-os/firestorm_48.png
--- a/indra/newview/icons/test-os/firestorm_512.png
+++ b/indra/newview/icons/test-os/firestorm_512.png
--- a/indra/newview/icons/test-os/firestorm_icon.icns
+++ b/indra/newview/icons/test-os/firestorm_icon.icns
--- a/indra/newview/icons/test-os/firestorm_icon.ico
+++ b/indra/newview/icons/test-os/firestorm_icon.ico
--- 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):