From 2ba175befd66d94715719aa6f6bed606c786d64b Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 10 Aug 2011 15:50:04 -0400
Subject: [PATCH] convert linden names list to string
---
indra/newview/viewer_manifest.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d81809b3a51..3629b2d4e75 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -75,7 +75,8 @@ def construct(self):
if linden_names_path :
try:
linden_file = open(linden_names_path,'r')
- linden_names = linden_file.readlines() # all names are on one line
+ # all names should be one line, but the join below also converts to a string
+ linden_names = ', '.join(linden_file.readlines())
self.put_in_file(linden_names, "lindens.txt")
linden_file.close()
except IOError:
--
GitLab