Merge branch 'objectbackup' into next

1 files changed, 19 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 15b30f8..99d82c9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -105,6 +105,25 @@
                 modified:   linden/indra/llcharacter/llkeyframemotion.cpp
 
 
+        * Updated object backup feature to Meerkat's SVN, imported floater.
+
+                modified:   linden/indra/newview/primbackup.cpp
+                modified:   linden/indra/newview/primbackup.h
+                new file:   linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml
+
+
+        * Imported Meerkat's object backup feature.
+
+                modified:   linden/indra/newview/CMakeLists.txt
+                modified:   linden/indra/newview/app_settings/settings.xml
+                modified:   linden/indra/newview/llviewermenu.cpp
+                modified:   linden/indra/newview/llviewerobjectlist.cpp
+                new file:   linden/indra/newview/primbackup.cpp
+                new file:   linden/indra/newview/primbackup.h
+                modified:   linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+                modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
         * Updated some python scripts to not use deprecated modules.
 
                 modified:   linden/indra/lib/python/indra/base/lluuid.py