livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added default sourceid and check that sourceid is not blank, hoping to get the windows builds to recognize the value

master
JJ Linden 2013-07-24 14:38:23 -07:00
parent 39bd14f3ca
commit 10c8fbbedb
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BuildParams
View File

@ -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 ####
#

14
indra/newview/viewer_manifest.py
View File

@ -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")