Duh... I didn't test with default arguments, apparently.

* SConstruct doesn't like None as a default value; "False" will do nicely, since later logic tests for truth
* Was using [] instead of get() for a value that might not be present (and wanted None in that case)

1 files changed, 1 insertions, 1 deletions

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index a030a64401..b19e4e2c9c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -97,7 +97,7 @@ class ViewerManifest(LLManifest):
                 """Channel reported for login and upgrade purposes ONLY; used for A/B testing"""
                 # NOTE: Do not return the normal channel if login_channel is not specified, as
                 # some code may branch depending on whether or not this is present
-                return self.args['login_channel']
+                return self.args.get('login_channel')
 
         def channel(self):
                 return self.args['channel']