diff options
author | McCabe Maxsted | 2010-01-08 02:11:15 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-01-08 02:11:15 -0700 |
commit | bbf9e34774508bf0f1e80f927d59d9d7902f80d9 (patch) | |
tree | cac59ba7d106b143b35d9f30ff93b6e001192ae6 | |
parent | Merge branch '1.3.0-clienttags' into next (diff) | |
download | meta-impy-bbf9e34774508bf0f1e80f927d59d9d7902f80d9.zip meta-impy-bbf9e34774508bf0f1e80f927d59d9d7902f80d9.tar.gz meta-impy-bbf9e34774508bf0f1e80f927d59d9d7902f80d9.tar.bz2 meta-impy-bbf9e34774508bf0f1e80f927d59d9d7902f80d9.tar.xz |
Fixed GStreamer missing libpng12-0.dll (TODO: update gstreamer)
-rw-r--r-- | ChangeLog.txt | 21 | ||||
-rw-r--r-- | linden/indra/cmake/CopyWinLibs.cmake | 2 | ||||
-rw-r--r-- | linden/install.xml | 4 |
3 files changed, 25 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 64894ab..7648c58 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,24 @@ | |||
1 | 2010-01-07 McCabe Maxsted <hakushakukun@gmail.com> | ||
2 | |||
3 | * Fixed GStreamer missing libpng12-0.dll (TODO: update gstreamer). | ||
4 | |||
5 | modified: linden/indra/cmake/CopyWinLibs.cmake | ||
6 | modified: linden/install.xml | ||
7 | |||
8 | |||
9 | 2010-01-06 McCabe Maxsted <hakushakukun@gmail.com> | ||
10 | |||
11 | * Applied VWR-4232: some particles do not disappear when UI is hidden, from snowglobe. | ||
12 | |||
13 | modified: linden/indra/newview/llhudeffectbeam.cpp | ||
14 | modified: linden/indra/newview/llhudeffectbeam.h | ||
15 | modified: linden/indra/newview/llhudeffecttrail.cpp | ||
16 | modified: linden/indra/newview/llhudeffecttrail.h | ||
17 | modified: linden/indra/newview/llhudobject.cpp | ||
18 | modified: linden/indra/newview/llhudobject.h | ||
19 | modified: linden/indra/newview/pipeline.cpp | ||
20 | |||
21 | |||
1 | 2010-01-03 Armin Weatherwax <Armin.Weatherwax@gmail.com> | 22 | 2010-01-03 Armin Weatherwax <Armin.Weatherwax@gmail.com> |
2 | 23 | ||
3 | * Several changes to work better on 64bit Linux. | 24 | * Several changes to work better on 64bit Linux. |
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index add94dd..c051103 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake | |||
@@ -62,6 +62,7 @@ set(debug_files | |||
62 | libogg-0.dll | 62 | libogg-0.dll |
63 | liboil-0.3-0.dll | 63 | liboil-0.3-0.dll |
64 | libopenjpeg-2.dll | 64 | libopenjpeg-2.dll |
65 | libpng12-0.dll | ||
65 | libschroedinger-1.0-0.dll | 66 | libschroedinger-1.0-0.dll |
66 | libspeex-1.dll | 67 | libspeex-1.dll |
67 | libtheora-0.dll | 68 | libtheora-0.dll |
@@ -136,6 +137,7 @@ set(release_files | |||
136 | libogg-0.dll | 137 | libogg-0.dll |
137 | liboil-0.3-0.dll | 138 | liboil-0.3-0.dll |
138 | libopenjpeg-2.dll | 139 | libopenjpeg-2.dll |
140 | libpng12-0.dll | ||
139 | libschroedinger-1.0-0.dll | 141 | libschroedinger-1.0-0.dll |
140 | libspeex-1.dll | 142 | libspeex-1.dll |
141 | libtheora-0.dll | 143 | libtheora-0.dll |
diff --git a/linden/install.xml b/linden/install.xml index 8600d11..da058e8 100644 --- a/linden/install.xml +++ b/linden/install.xml | |||
@@ -620,9 +620,9 @@ | |||
620 | <key>windows</key> | 620 | <key>windows</key> |
621 | <map> | 621 | <map> |
622 | <key>md5sum</key> | 622 | <key>md5sum</key> |
623 | <string>70ffd9d5e1c45a634be1beed70371784</string> | 623 | <string>c432e168a46d782688e86bc9f7144f15</string> |
624 | <key>url</key> | 624 | <key>url</key> |
625 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.22-windows-20090903.tar.bz2</uri> | 625 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.22-windows-20100105.tar.bz2</uri> |
626 | </map> | 626 | </map> |
627 | </map> | 627 | </map> |
628 | </map> | 628 | </map> |