From c017694d391e56b532b311505100d9b1ebcd9636 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 10 Dec 2013 15:42:21 -0500
Subject: [PATCH] MAINT-3571: include settings_install.xml whether it contains
settings or not
---
indra/newview/viewer_manifest.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 9e8623c1f9c..9a617c2a138 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -136,13 +136,11 @@ def construct(self):
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")
--
GitLab