summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJJ Linden <jj@lindenlab.com>2013-07-24 14:38:23 -0700
committerJJ Linden <jj@lindenlab.com>2013-07-24 14:38:23 -0700
commit10c8fbbedbee07355f71ef206c50957a422d7ccf (patch)
tree95c95d69f820b0fcf36f869e0375a50a679a5c31 /indra/newview
parent39bd14f3ca26c04072dcee68c5757232412f4014 (diff)
added default sourceid and check that sourceid is not blank, hoping to get the windows builds to recognize the value
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/viewer_manifest.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 206f81cdc2..827a8f44c3 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -113,12 +113,14 @@ class ViewerManifest(LLManifest):
# no sourceid, no settings_install.xml file
pass
else:
- # Single-entry subset of the LLSD content of settings.xml
- content = dict(sourceid=dict(Comment='Identify referring agency to Linden web servers',
- Persist=1,
- Type='String',
- Value=sourceid))
- self.put_in_file(llsd.format_pretty_xml(content), "settings_install.xml")
+ if len(sourceid) > 0:
+ print "Using sourceid: " + sourceid
+ # Single-entry subset of the LLSD content of settings.xml
+ content = dict(sourceid=dict(Comment='Identify referring agency to Linden web servers',
+ Persist=1,
+ Type='String',
+ Value=sourceid))
+ self.put_in_file(llsd.format_pretty_xml(content), "settings_install.xml")
self.end_prefix("app_settings")