added default sourceid and check that sourceid is not blank, hoping to get the...

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

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

indra/newview/viewer_manifest.py

@@ -113,12 +113,14 @@ def construct(self):
                     # 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")