From b63c21a13eb4bb5bb6630bc360de2383814816c9 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 27 Sep 2012 14:13:03 -0500
Subject: [PATCH] Modify installer to remove libtcmalloc_minimal.dll
---
indra/newview/viewer_manifest.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 894d2f09251..027bdbfb30b 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -404,11 +404,9 @@ def construct(self):
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"
--
GitLab