diff options
| author | JJ Linden <jj@lindenlab.com> | 2013-07-24 14:38:23 -0700 |
|---|---|---|
| committer | JJ Linden <jj@lindenlab.com> | 2013-07-24 14:38:23 -0700 |
| commit | 10c8fbbedbee07355f71ef206c50957a422d7ccf (patch) | |
| tree | 95c95d69f820b0fcf36f869e0375a50a679a5c31 | |
| parent | 39bd14f3ca26c04072dcee68c5757232412f4014 (diff) | |
added default sourceid and check that sourceid is not blank, hoping to get the windows builds to recognize the value
| -rwxr-xr-x | BuildParams | 3 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/BuildParams b/BuildParams index 84d30f651b..5ee1bd11ea 100755 --- a/BuildParams +++ b/BuildParams @@ -26,6 +26,9 @@ codeticket_since = 3.3.0-release Linux.gcc_version = /usr/bin/gcc-4.6 Linux.cxx_version = /usr/bin/g++-4.6 +# Setup default sourceid so Windows can pick up the TeamCity override +sourceid = "" + ################################################################ #### Examples of how to set the viewer_channel #### # 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") |