summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-10 15:50:04 -0400
committerOz Linden <oz@lindenlab.com>2011-08-10 15:50:04 -0400
commit2ba175befd66d94715719aa6f6bed606c786d64b (patch)
tree148b499af213af201f57c18b6cb3310fb2059f66 /indra
parent1ccb5f855c46999259c3a755a71917cddd50df28 (diff)
convert linden names list to string
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/viewer_manifest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d81809b3a5..3629b2d4e7 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -75,7 +75,8 @@ class ViewerManifest(LLManifest):
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: