Merge branch '1.2-maint' into next

Conflicts:
	linden/indra/newview/res/viewerRes.rc

7 files changed, 74 insertions, 12 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f7636d9..e584818 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -167,6 +167,42 @@
 
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                         1.2.1                          -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+
+2009-11-25 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Updated version to 1.2.1.
+        
+          modified:   ChangeLog.txt
+          modified:   linden/indra/llcommon/llversionviewer.h
+          modified:   linden/indra/newview/English.lproj/InfoPlist.strings
+          modified:   linden/indra/newview/Info-Imprudence.plist
+          modified:   linden/indra/newview/res/viewerRes.rc
+
+
+        * Updated windows openal libs to openal-soft 1.10.622. 
+        
+          modified:   linden/install.xml
+
+
+2009-11-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Fixed Linux's gstreamer, gstreamer-plugins, and liboil.
+          Compiled with the correct version of glibc.
+
+          modified:   linden/install.xml
+
+
+2009-11-21  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * libxml2.so.2 was missing from Linux viewer manifest.
+
+          modified:   linden/indra/newview/viewer_manifest.py
+
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 =-                         1.2.0                          -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 50e3bb2..263899c 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -4,6 +4,31 @@
 
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                         1.2.1                          -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+   Imprudence 1.2.1 is a small bugfix release, which updates and fixes
+   some libraries that are distributed with Imprudence.
+
+   Please see the Imprudence 1.2.0 Release Notes for information about
+   the changes in Imprudence 1.2.
+
+
+   CHANGES
+
+     * Updated OpenAL on Windows to fix error messages flooding the
+       logs.
+
+     * Recompiled GStreamer, GStreamer plugins, and liboil on Linux,
+       to use the correct version of glibc.
+
+     * libxml2 is now distributed with Imprudence on Linux. It was
+       accidently left out of past releases.
+
+
+
+
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   =-                         1.2.0                          -=
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 2435e4d..18a3182 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -45,7 +45,7 @@ const char * const IMP_VIEWER_NAME = "Imprudence";
 
 const S32 IMP_VERSION_MAJOR = 1;
 const S32 IMP_VERSION_MINOR = 2;
-const S32 IMP_VERSION_PATCH = 0;
+const S32 IMP_VERSION_PATCH = 1;
 const char * const IMP_VERSION_TEST = "";
 
 #endif
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 2657d6f..3b90609 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Imprudence";
-CFBundleShortVersionString = "Imprudence version 1.2.0";
-CFBundleGetInfoString = "Imprudence version 1.2.0";
+CFBundleShortVersionString = "Imprudence version 1.2.1";
+CFBundleGetInfoString = "Imprudence version 1.2.1";
diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist
index 42164c6..affdb57 100644
--- a/linden/indra/newview/Info-Imprudence.plist
+++ b/linden/indra/newview/Info-Imprudence.plist
@@ -32,7 +32,7 @@
                 </dict>
         </array>
         <key>CFBundleVersion</key>
-        <string>1.2.0</string>
+        <string>1.2.1</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 32b553b..39df657 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -824,6 +824,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libSDL-1.2.so.0")
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
+            self.path("libxml2.so.2")
             self.path("libz.so.1")
 
             # OpenAL
diff --git a/linden/install.xml b/linden/install.xml
index 8a59096..b5fc1e0 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -517,9 +517,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>605ecd92affb57ed3c70f7564b8bc6b5</string>
+            <string>2cd3f6499f8444f1d119d097e4047252</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux-20091115.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux-20091125.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
@@ -553,9 +553,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>627aef3c307aed6d2c013bdfa11bb0af</string>
+            <string>62b96bb2721798958743d92a403d122a</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-linux-20091115.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-linux-20091125.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -748,9 +748,9 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>5ab0f986317b1a5c4f1682ad1972c318</string>
+            <string>85219034b4e4c17e792f8bb54a1973f7</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/liboil-0.3.16-linux-20091118.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/liboil-0.3.16-linux-20091125.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -1067,9 +1067,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>7c33758dc0a047c244de03133dd76c2a</string>
+            <string>3dc9b085b2a1b23501396ef9a87a393e</string>
             <key>url</key>
-            <uri>http://imprudence.s3.amazonaws.com/extras/openal-soft-1.6.372-windows-01262009.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/openal-soft-1.10.622-windows-20091124.tar.bz2</uri>
           </map>
         </map>
       </map>