diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-11 09:10:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-11 09:10:56 -0400 |
| commit | 011f6f9ad07d0a71c9a392f5e25af2aad69110ee (patch) | |
| tree | fc9de905222568f6f81db6c468cddde28468f97e | |
| parent | e2e70577f90d9551f4afe637bfd486654d778e5e (diff) | |
| parent | d18b636fb848f58eb103a01701b9a292344b8bd4 (diff) | |
merge fix for STORM-275 (class Linux_x86_64Manifest missing from viewer_manifest.py)
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index ef0f81d9c8..e9afca3ebf 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -669,6 +669,7 @@ Techwolf Lupindo SNOW-690 SNOW-746 VWR-12385 + VWR-20893 tenebrous pau VWR-247 Tharax Ferraris diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 949fa3cc1c..648366fa4c 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -956,6 +956,13 @@ class Linux_i686Manifest(LinuxManifest): self.path("libvivoxplatform.so") self.end_prefix("lib") +class Linux_x86_64Manifest(LinuxManifest): + def construct(self): + super(Linux_x86_64Manifest, self).construct() + + # support file for valgrind debug tool + self.path("secondlife-i686.supp") + ################################################################ if __name__ == "__main__": |