summaryrefslogtreecommitdiff
path: root/indra/lib/python
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-02-21 16:49:40 -0500
committerOz Linden <oz@lindenlab.com>2013-02-21 16:49:40 -0500
commit4e407da22b97b53811c89f2a16523a1f1a4a758c (patch)
tree71cf471a4f48500ee9bda0b96b3ca492ac5a8d8b /indra/lib/python
parentcf1019859def2af4414def7991e95a9020b0688f (diff)
parent4925c27b0dada2b1939fa8473d6039938cfa15ba (diff)
merge changes for windows installer fixes
Diffstat (limited to 'indra/lib/python')
-rw-r--r--indra/lib/python/indra/util/llmanifest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index 25a1b95b9a..9cb830a2db 100644
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -85,7 +85,7 @@ def get_default_platform(dummy):
}[sys.platform]
DEFAULT_SRCTREE = os.path.dirname(sys.argv[0])
-DEFAULT_CHANNEL = 'Second Life Test'
+RELEASE_CHANNEL = 'Second Life Release'
ARGUMENTS=[
dict(name='actions',
@@ -269,7 +269,7 @@ class LLManifest(object):
def default_grid(self):
return self.args.get('grid', None) == ''
def default_channel(self):
- return self.args.get('channel', None) == DEFAULT_CHANNEL
+ return self.args.get('channel', None) == RELEASE_CHANNEL
def construct(self):
""" Meant to be overriden by LLManifest implementors with code that