summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-09-27 14:13:03 -0500
committerDave Parks <davep@lindenlab.com>2012-09-27 14:13:03 -0500
commitb63c21a13eb4bb5bb6630bc360de2383814816c9 (patch)
tree7fefcd293b3f7d4c8d8c920e92327919808c3c03
parent55d7310d969638ecc853c2165b287fdb45eba8c6 (diff)
Modify installer to remove libtcmalloc_minimal.dll
-rw-r--r--indra/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 894d2f0925..027bdbfb30 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -404,11 +404,9 @@ class WindowsManifest(ViewerManifest):
self.path("libhunspell.dll")
# For google-perftools tcmalloc allocator.
+ # no longer used, make sure old .dll is removed
try:
- if self.args['configuration'].lower() == 'debug':
- self.path('libtcmalloc_minimal-debug.dll')
- else:
- self.path('libtcmalloc_minimal.dll')
+ self.remove('libtcmalloc_minimal.dll')
except:
print "Skipping libtcmalloc_minimal.dll"