diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-04-12 14:40:10 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-04-12 14:40:10 -0400 |
| commit | c0163bb2e63b9c2bea5d3f6def2f41d98498a389 (patch) | |
| tree | 2100d9f0372cd5e6df0a55a8ba64a88fce2b642f | |
| parent | e0c509d4634960ba33be3ce744110934b381ba4d (diff) | |
| parent | 2027eb8c2bfdc7952fc613f0642192e0c807ec07 (diff) | |
merge
| -rw-r--r-- | indra/newview/viewer_manifest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0850309d77..6f70034624 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -275,9 +275,9 @@ class WindowsManifest(ViewerManifest): # Mesh 3rd party libs needed for auto LOD and collada reading try: if self.args['configuration'].lower() == 'debug': - self.path("libcollada14dom21-d.dll") + self.path("libcollada14dom22-d.dll") else: - self.path("libcollada14dom21.dll") + self.path("libcollada14dom22.dll") self.path("glod.dll") except RuntimeError, err: |