diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-12-10 15:42:21 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-12-10 15:42:21 -0500 |
| commit | c017694d391e56b532b311505100d9b1ebcd9636 (patch) | |
| tree | 4b69383f19689ab6ba67421a5eb9d765f3678f44 | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
MAINT-3571: include settings_install.xml whether it contains settings or not
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 9e8623c1f9..9a617c2a13 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -136,13 +136,11 @@ class ViewerManifest(LLManifest): settings_install['CmdLineGridChoice']['Value'] = self.grid() print "Set CmdLineGridChoice in settings_install.xml to '%s'" % self.grid() - # did we actually copy anything into settings_install dict? - if settings_install: - # put_in_file(src=) need not be an actual pathname; it - # only needs to be non-empty - self.put_in_file(llsd.format_pretty_xml(settings_install), - "settings_install.xml", - src="environment") + # put_in_file(src=) need not be an actual pathname; it + # only needs to be non-empty + self.put_in_file(llsd.format_pretty_xml(settings_install), + "settings_install.xml", + src="environment") self.end_prefix("app_settings") |