summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-06-17 04:39:47 -0400
committerGeenz <geenz@geenzo.com>2013-06-17 04:39:47 -0400
commit0af636e63270047a61ced51b7f3b22f45003120a (patch)
treeeefb829c8d2afb0489eccc456db8e134718bf145 /indra/newview/viewer_manifest.py
parent7decac40e6453b2d8822d2677b9b59300bc260cf (diff)
parentdcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff)
Merged with viewer-release
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index bc473f6d62..2578c81224 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -154,10 +154,8 @@ class ViewerManifest(LLManifest):
# Files in the newview/ directory
self.path("gpu_table.txt")
-
- # The summary.json file gets left in the base checkout dir by
- # build.sh. It's only created for a build.sh build.
- if not self.path2basename(os.path.join(os.pardir, os.pardir), "summary.json"):
+ # The summary.json file gets left in the build directory by newview/CMakeLists.txt.
+ if not self.path2basename(os.pardir, "summary.json"):
print "No summary.json file"
def grid(self):