[sldev-commits] r2441 - projects/2009/http-texture/indra/newview

rob.linden at svn.secondlife.com rob.linden at svn.secondlife.com
Thu Jun 18 17:53:05 PDT 2009


Author: rob.linden
Date: 2009-06-18 19:53:05 -0500 (Thu, 18 Jun 2009)
New Revision: 2441

Modified:
   projects/2009/http-texture/indra/newview/viewer_manifest.py
Trac: http://svn.secondlife.com/trac/linden/changeset/2441
Log:
Part of a fix for SNOW-33


Modified: projects/2009/http-texture/indra/newview/viewer_manifest.py
===================================================================
--- projects/2009/http-texture/indra/newview/viewer_manifest.py	2009-06-19 00:44:54 UTC (rev 2440)
+++ projects/2009/http-texture/indra/newview/viewer_manifest.py	2009-06-19 00:53:05 UTC (rev 2441)
@@ -513,6 +513,15 @@
                  "snowglobe":"Snowglobe"}
         return mapping[self.viewer_branding_id()]
 
+    # *TODO: put this in llmanifest.py.  This was a last minute change that 
+    # I've put here because it's safer here. -- robla 2009-06-18
+    def default_channel(self):
+        if self.viewer_branding_id()=='secondlife':
+            return self.args.get('channel', None) == DEFAULT_CHANNEL
+        elif self.viewer_branding_id()=="snowglobe":
+            return self.args.get('channel', None) == "Snowglobe Release"
+        raise ValueError, "Invalid branding id: " + self.viewer_branding_id()
+        
     def info_plist_name(self):
         mapping={"secondlife":"Info-SecondLife.plist",
                  "snowglobe":"Info-Snowglobe.plist"}



More information about the sldev-commits mailing list