summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2007-07-16 20:29:28 +0000
committerAaron Brashears <aaronb@lindenlab.com>2007-07-16 20:29:28 +0000
commit7964c6f7a5b622d698f7d471690b29122966b1b2 (patch)
tree78a708bc316db2e2ff3047089a3edf8020c4d7cb /indra/newview/viewer_manifest.py
parent88d7d45316186af931285b7f03d2a78cd04f888f (diff)
Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0ef6a0cfed..b310ea515c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -12,7 +12,7 @@ import re
import tarfile
viewer_dir = os.path.dirname(__file__)
# add llmanifest library to our path so we don't have to muck with PYTHONPATH
-sys.path.append(os.path.join(viewer_dir, '../lib/python/indra'))
+sys.path.append(os.path.join(viewer_dir, '../lib/python/indra/util'))
from llmanifest import LLManifest, main, proper_windows_path, path_ancestors
class ViewerManifest(LLManifest):