Merge branch 'next' into openal

Conflicts:

	ChangeLog.txt

1 files changed, 112 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0b7585a..a9bb1b7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,72 @@
+2008-12-12  Balp Allen  <Anders@Arnholm.se>
+
+        * Bumped version to RC3
+
+        * Applied patches from Henri's CoolViewer:
+        Possible to discard much more given items.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                         1.0.0                          -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+
+2008-12-12  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Imprudence 1.0.0 finalized.
+
+        
+        * RELEASE_NOTES.txt:
+        Added release notes.
+        * linden/indra/newview/viewer_manifest.py:
+        Ditto.
+
+
+        * linden/indra/llcommon/llversionviewer.h:
+        Blanked the test version string. Not RC anymore.
+
+
+        * linden/install.xml:
+        Windows build uses OpenJPEG 1.3.
+        Fixes half-opaque skirts/textures issue.
+
+
+        * linden/indra/newview/viewer_manifest.py:
+        README.txt will stay that name; README-linux.txt removed.
+
+
+2008-12-11  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llfloaterabout.cpp:
+        Simplified release notes URL scheme.
+        Now uses e.g. "wiki/Release Notes/1.0.0-RC2",
+        which is set up as a wiki redirect.
+
+
+        * linden/indra/newview/llfloaterabout.cpp:
+        Fixed bad string comparison (rel notes url) [#28]
+        Reported by Balp Allen.
+
+
+2008-12-10  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llpanellogin.cpp:
+        Fix grid selector having a duplicate entry. [#24]
+        Patch by Balp Allen.
+        * linden/indra/newview/llpanellogin.h:
+        Ditto.
+        * linden/indra/newview/llstartup.cpp:
+        Ditto.
+
+
+        * linden/indra/newview/llurlhistory.cpp:
+        Better warning when url_history.xml save fails.
+
+
+        * linden/indra/newview/llviewernetwork.cpp:
+        Fixed bad string comparison (grid code name). [#22]
+        Reported by Balp Allen.
+
+
 2008-12-06  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * ChangeLog:
@@ -93,6 +162,45 @@
         * indra/newview/llappviewer.cpp: Ditto.
         * indra/newview/llstartup.cpp: Ditto.
 
+2008-12-06  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llcommon/llversionviewer.h:
+        Added test version info.
+        * linden/indra/newview/llfloaterabout.cpp:
+        Ditto.
+        * linden/indra/newview/llappviewer.cpp:
+        Ditto.
+        * linden/indra/newview/llpanellogin.cpp:
+        Ditto.
+
+
+2008-12-05  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llcommon/llsecondlifeurls.cpp:
+        Changed Release Notes link to point to Imprudence.
+        * linden/indra/newview/llfloaterabout.cpp:
+        Ditto.
+
+
+        * linden/indra/newview/skins/default/xui/en-us/menu_login.xml:
+        Rebranded login menu. [#23]
+
+
+        * linden/indra/newview/llurlhistory.cpp:
+        Fixed blank url_history.xml creation. (VWR-5808)
+
+
+2008-12-01  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/viewer_manifest.py:
+        Fixed indentation for 'skins' prefix.
+
+        * linden/indra/newview/viewer_manifest.py:
+        Doc packaging moved to platform-independent manifest.
+
+
+        * Imported license files for libraries and artwork.
+
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 =-                       1.0.0 RC2                        -=
@@ -110,6 +218,10 @@
 
 2008-11-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/newview/viewer_manifest.py:
+        Package up README.txt, etc. on Linux.
+
+
         * linden/indra/llmedia/llmediamanager.cpp:
         Disable llmozlib-dependent code when not available.
         Patch by Stephen Zenith. [#12]