Merge branch 'cvpatches' into next

1 files changed, 24 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 64a65cd..23b79da 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -21,6 +21,30 @@
         * linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml:
         Ditto.
 
+        * linden/indra/newview/llfilepicker.cpp:
+        Applied patch for VWR-5575 (crash in the file picker dealing
+        with accented characters and bad locale) by Alissa Sabre.
+
+        * linden/indra/newview/pipeline.cpp:
+        Backported possible crash fix while changing graphics settings from 1.22.
+
+        * linden/indra/llui/llfloater.cpp:
+        Backported possible crash fix in llfloater.cpp from 1.22.
+
+        * linden/indra/newview/lldrawable.cpp:
+        Backported fix for VWR-3871 (prim position appears to be off) from 1.22.
+
+        * linden/indra/newview/llcompilequeue.cpp:
+        Backported fix for SVC-2771 (script resetting can fail) from 1.22.
+        * linden/indra/newview/llviewermenu.cpp:
+        Ditto.
+
+        * linden/indra/llcharacter/llbvhloader.cpp:
+        Backported fix for VWR-996 (wrong visualisation of animations) from 1.22.
+
+        * linden/indra/newview/app_settings/keywords.ini:
+        Applied my patch for VWR-8454 (PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS
+        not highlighted in script editor).
 
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-