Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

12 files changed, 269 insertions, 249 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1395030..a09b903 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -251,14 +251,20 @@ namespace OpenSim
                                           "Save named prim to XML2", SavePrimsXml2);
 
             m_console.Commands.AddCommand("region", false, "load oar",
-                                          "load oar [--merge] [--skip-assets] <oar name>",
-                                          "Load a region's data from OAR archive.  --merge will merge the oar with the existing scene.  --skip-assets will load the oar but ignore the assets it contains", 
+                                          "load oar [--merge] [--skip-assets] [<OAR path>]",
+                                          "Load a region's data from an OAR archive.",
+                                          "--merge will merge the OAR with the existing scene." + Environment.NewLine
+                                          + "--skip-assets will load the OAR but ignore the assets it contains." + Environment.NewLine
+                                          + "The path can be either a filesystem location or a URI."
+                                          + "  If this is not given then the command looks for an OAR named region.oar in the current directory.",
                                           LoadOar);
 
             m_console.Commands.AddCommand("region", false, "save oar",
-                                          "save oar <oar name>",
-                                          "Save a region's data to an OAR archive",
-                                          "More information on forthcoming options here soon", SaveOar);
+                                          "save oar [<OAR path>]",
+                                          "Save a region's data to an OAR archive.",
+                                          "The OAR path must be a filesystem path."
+                                          + "  If this is not given then the oar is saved to region.oar in the current directory.",
+                                          SaveOar);
 
             m_console.Commands.AddCommand("region", false, "edit scale",
                                           "edit scale <name> <x> <y> <z>",
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index dc7439c..806aa4f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -37,7 +37,6 @@ using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-
 using OpenSim.Framework.Communications.Osp;
 using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Serialization.External;
@@ -72,7 +71,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 scene,
                 userInfo,
                 invPath,
-                new GZipStream(new FileStream(loadPath, FileMode.Open), CompressionMode.Decompress))
+                new GZipStream(ArchiveHelpers.GetStream(loadPath), CompressionMode.Decompress))
         {
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index cfe3caa..8f3f65b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -37,7 +37,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Serialization.External;
 using OpenSim.Framework.Communications;
-
 using OpenSim.Framework.Communications.Osp;
 using OpenSim.Region.CoreModules.World.Archiver;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index f570999..307db97 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -91,13 +91,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 
                 scene.AddCommand(
                     this, "load iar",
-                    "load iar <first> <last> <inventory path> <password> [<archive path>]",
-                    "Load user inventory archive.", HandleLoadInvConsoleCommand); 
+                    "load iar <first> <last> <inventory path> <password> [<IAR path>]",
+                    "Load user inventory archive (IAR).",
+                    "<first> is user's first name." + Environment.NewLine
+                    + "<last> is user's last name." + Environment.NewLine
+                    + "<inventory path> is the path inside the user's inventory where the IAR should be loaded." + Environment.NewLine
+                    + "<password> is the user's password." + Environment.NewLine
+                    + "<IAR path> is the filesystem path or URI from which to load the IAR."
+                    + string.Format("  If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME),
+                    HandleLoadInvConsoleCommand);
                 
                 scene.AddCommand(
                     this, "save iar",
-                    "save iar <first> <last> <inventory path> <password> [<archive path>]",
-                    "Save user inventory archive.", HandleSaveInvConsoleCommand);
+                    "save iar <first> <last> <inventory path> <password> [<IAR path>]",
+                    "Save user inventory archive (IAR).", 
+                    "<first> is the user's first name." + Environment.NewLine
+                    + "<last> is the user's last name." + Environment.NewLine
+                    + "<inventory path> is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine
+                    + "<IAR path> is the filesystem path at which to save the IAR."
+                    + string.Format("  If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME),
+                    HandleSaveInvConsoleCommand);
 
                 m_aScene = scene;
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 9c95e78..c81f295 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -38,7 +38,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Serialization.External;
 using OpenSim.Framework.Communications;
-
 using OpenSim.Framework.Communications.Osp;
 using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
 using OpenSim.Region.CoreModules.World.Serialiser;
@@ -77,125 +76,118 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         // Commenting for now! The mock inventory service needs more beef, at least for
         // GetFolderForType
         // REFACTORING PROBLEM. This needs to be rewritten.
+        //[Test]
+        public void TestSaveIarV0_1()
+        {
+            TestHelper.InMethod();
+            log4net.Config.XmlConfigurator.Configure();
 
-//        [Test]
-//        public void TestSaveIarV0_1()
-//        {
-//            TestHelper.InMethod();
-//            //log4net.Config.XmlConfigurator.Configure();
-
-//            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
-
-//            Scene scene = SceneSetupHelpers.SetupScene("Inventory");
-//            SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
-//            CommunicationsManager cm = scene.CommsManager;
+            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
 
-//            // Create user
-//            string userFirstName = "Jock";
-//            string userLastName = "Stirrup";
-//            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
+            Scene scene = SceneSetupHelpers.SetupScene("Inventory");
+            SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
 
-//            lock (this)
-//            {
-//                UserProfileTestUtils.CreateUserWithInventory(
-//                    cm, userFirstName, userLastName, userId, InventoryReceived);
-//                Monitor.Wait(this, 60000);
-//            }
+            // Create user
+            string userFirstName = "Jock";
+            string userLastName = "Stirrup";
+            string userPassword = "troll";
+            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
+            UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, userPassword);
             
-//            // Create asset
-//            SceneObjectGroup object1;
-//            SceneObjectPart part1;
-//            {
-//                string partName = "My Little Dog Object";
-//                UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
-//                PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
-//                Vector3 groupPosition = new Vector3(10, 20, 30);
-//                Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
-//                Vector3 offsetPosition = new Vector3(5, 10, 15);
-
-//                part1
-//                    = new SceneObjectPart(
-//                        ownerId, shape, groupPosition, rotationOffset, offsetPosition);
-//                part1.Name = partName;
-
-//                object1 = new SceneObjectGroup(part1);
-//                scene.AddNewSceneObject(object1, false);
-//            }
-
-//            UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
-//            AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
-//            scene.AssetService.Store(asset1);
-
-//            // Create item
-//            UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
-//            InventoryItemBase item1 = new InventoryItemBase();
-//            item1.Name = "My Little Dog";
-//            item1.AssetID = asset1.FullID;
-//            item1.ID = item1Id;
-//            InventoryFolderBase objsFolder 
-//                = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects");
-//            item1.Folder = objsFolder.ID;
-//            scene.AddInventoryItem(userId, item1);
-
-//            MemoryStream archiveWriteStream = new MemoryStream();
-//            archiverModule.OnInventoryArchiveSaved += SaveCompleted;
-
-//            mre.Reset();
-//            archiverModule.ArchiveInventory(
-//                Guid.NewGuid(), userFirstName, userLastName, "Objects", "troll", archiveWriteStream);
-//            mre.WaitOne(60000, false);
-
-//            byte[] archive = archiveWriteStream.ToArray();
-//            MemoryStream archiveReadStream = new MemoryStream(archive);
-//            TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
-
-//            //bool gotControlFile = false;
-//            bool gotObject1File = false;
-//            //bool gotObject2File = false;
-//            string expectedObject1FileName = InventoryArchiveWriteRequest.CreateArchiveItemName(item1);
-//            string expectedObject1FilePath = string.Format(
-//                "{0}{1}{2}",
-//                ArchiveConstants.INVENTORY_PATH,
-//                InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder),
-//                expectedObject1FileName);
+            // Create asset
+            SceneObjectGroup object1;
+            SceneObjectPart part1;
+            {
+                string partName = "My Little Dog Object";
+                UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
+                PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
+                Vector3 groupPosition = new Vector3(10, 20, 30);
+                Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
+                Vector3 offsetPosition = new Vector3(5, 10, 15);
+
+                part1
+                    = new SceneObjectPart(
+                        ownerId, shape, groupPosition, rotationOffset, offsetPosition);
+                part1.Name = partName;
+
+                object1 = new SceneObjectGroup(part1);
+                scene.AddNewSceneObject(object1, false);
+            }
 
-//            string filePath;
-//            TarArchiveReader.TarEntryType tarEntryType;
+            UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
+            AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
+            scene.AssetService.Store(asset1);
+
+            // Create item
+            UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
+            InventoryItemBase item1 = new InventoryItemBase();
+            item1.Name = "My Little Dog";
+            item1.AssetID = asset1.FullID;
+            item1.ID = item1Id;
+            InventoryFolderBase objsFolder 
+                = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects");
+            item1.Folder = objsFolder.ID;
+            scene.AddInventoryItem(userId, item1);
+
+            MemoryStream archiveWriteStream = new MemoryStream();
+            archiverModule.OnInventoryArchiveSaved += SaveCompleted;
+
+            mre.Reset();
+            archiverModule.ArchiveInventory(
+                Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream);
+            mre.WaitOne(60000, false);
+
+            byte[] archive = archiveWriteStream.ToArray();
+            MemoryStream archiveReadStream = new MemoryStream(archive);
+            TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
+
+            //bool gotControlFile = false;
+            bool gotObject1File = false;
+            //bool gotObject2File = false;
+            string expectedObject1FileName = InventoryArchiveWriteRequest.CreateArchiveItemName(item1);
+            string expectedObject1FilePath = string.Format(
+                "{0}{1}{2}",
+                ArchiveConstants.INVENTORY_PATH,
+                InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder),
+                expectedObject1FileName);
+
+            string filePath;
+            TarArchiveReader.TarEntryType tarEntryType;
 
 //            Console.WriteLine("Reading archive");
             
-//            while (tar.ReadEntry(out filePath, out tarEntryType) != null)
-//            {
-//                Console.WriteLine("Got {0}", filePath);
+            while (tar.ReadEntry(out filePath, out tarEntryType) != null)
+            {
+                Console.WriteLine("Got {0}", filePath);
 
-////                if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
-////                {
-////                    gotControlFile = true;
-////                }
-                
-//                if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
+//                if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
 //                {
-////                    string fileName = filePath.Remove(0, "Objects/".Length);
-////
-////                    if (fileName.StartsWith(part1.Name))
-////                    {
-//                        Assert.That(expectedObject1FilePath, Is.EqualTo(filePath));
-//                        gotObject1File = true;
-////                    }
-////                    else if (fileName.StartsWith(part2.Name))
-////                    {
-////                        Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
-////                        gotObject2File = true;
-////                    }
+//                    gotControlFile = true;
 //                }
-//            }
+                
+                if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
+                {
+//                    string fileName = filePath.Remove(0, "Objects/".Length);
+//
+//                    if (fileName.StartsWith(part1.Name))
+//                    {
+                        Assert.That(expectedObject1FilePath, Is.EqualTo(filePath));
+                        gotObject1File = true;
+//                    }
+//                    else if (fileName.StartsWith(part2.Name))
+//                    {
+//                        Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
+//                        gotObject2File = true;
+//                    }
+                }
+            }
 
-////            Assert.That(gotControlFile, Is.True, "No control file in archive");
-//            Assert.That(gotObject1File, Is.True, "No item1 file in archive");
-////            Assert.That(gotObject2File, Is.True, "No object2 file in archive");
+//            Assert.That(gotControlFile, Is.True, "No control file in archive");
+            Assert.That(gotObject1File, Is.True, "No item1 file in archive");
+//            Assert.That(gotObject2File, Is.True, "No object2 file in archive");
 
-//            // TODO: Test presence of more files and contents of files.
-//        }
+            // TODO: Test presence of more files and contents of files.
+        }
         
         /// <summary>
         /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
@@ -541,56 +533,41 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         /// <summary>
         /// Test replication of an archive path to the user's inventory.
         /// </summary>
-        //[Test]
-        //public void TestReplicateArchivePathToUserInventory()
-        //{
-        //    TestHelper.InMethod();
-
-        //    //log4net.Config.XmlConfigurator.Configure();
-            
-        //    Scene scene = SceneSetupHelpers.SetupScene("inventory");
-        //    CommunicationsManager commsManager = scene.CommsManager;
-        //    CachedUserInfo userInfo;
-
-        //    lock (this)
-        //    {
-        //        // !!! REFACTORING PROBLEM. This needs to be rewritten
-        //        userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, InventoryReceived);
-        //        Monitor.Wait(this, 60000);
-        //    }
-            
-        //    //Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder);
-            
-        //    Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>();
-        //    List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();
-            
-        //    string folder1Name = "a";
-        //    string folder2Name = "b";
-        //    string itemName = "c.lsl";
-            
-        //    string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1Name, UUID.Random());
-        //    string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
-        //    string itemArchiveName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random());
-            
-        //    string itemArchivePath
-        //        = string.Format(
-        //            "{0}{1}{2}{3}", 
-        //            ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName);
-
-        //    //Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder);
-
-        //    new InventoryArchiveReadRequest(scene, userInfo, null, (Stream)null)
-        //        .ReplicateArchivePathToUserInventory(
-        //            itemArchivePath, false, scene.InventoryService.GetRootFolder(userInfo.UserProfile.ID), 
-        //            foldersCreated, nodesLoaded);
-
-        //    //Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder);
-        //    //InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
-        //    InventoryFolderBase folder1 
-        //        = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userInfo.UserProfile.ID, "a");
-        //    Assert.That(folder1, Is.Not.Null, "Could not find folder a");
-        //    InventoryFolderBase folder2 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1, "b");
-        //    Assert.That(folder2, Is.Not.Null, "Could not find folder b");
-        //}
+        [Test]
+        public void TestReplicateArchivePathToUserInventory()
+        {
+            TestHelper.InMethod();
+            //log4net.Config.XmlConfigurator.Configure();
+            
+            Scene scene = SceneSetupHelpers.SetupScene("inventory");
+            UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene);
+            
+            Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>();
+            List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();
+            
+            string folder1Name = "a";
+            string folder2Name = "b";
+            string itemName = "c.lsl";
+            
+            string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1Name, UUID.Random());
+            string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
+            string itemArchiveName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random());
+            
+            string itemArchivePath
+                = string.Format(
+                    "{0}{1}{2}{3}", 
+                    ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName);
+
+            new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null)
+                .ReplicateArchivePathToUserInventory(
+                    itemArchivePath, false, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
+                    foldersCreated, nodesLoaded);
+
+            InventoryFolderBase folder1 
+                = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, "a");
+            Assert.That(folder1, Is.Not.Null, "Could not find folder a");
+            InventoryFolderBase folder2 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1, "b");
+            Assert.That(folder2, Is.Not.Null, "Could not find folder b");
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
index 880bd7c..ddc3dd7 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
@@ -25,6 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+using System.IO;
+using System.Net;
 using OpenMetaverse;
 using OpenSim.Framework.Serialization;
 using OpenSim.Region.Framework.Scenes;
@@ -60,5 +63,66 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         {
             return ArchiveConstants.CreateOarObjectPath(sog.Name, sog.UUID, sog.AbsolutePosition);
         }             
+
+        /// <summary>
+        /// Resolve path to a working FileStream
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static Stream GetStream(string path)
+        {
+            if (File.Exists(path))
+            {
+                return new FileStream(path, FileMode.Open, FileAccess.Read);
+            }
+            else
+            {
+                try
+                {
+                    Uri uri = new Uri(path);
+                    if (uri.Scheme == "file")
+                    {
+                        return new FileStream(uri.AbsolutePath, FileMode.Open, FileAccess.Read);
+                    }
+                    else
+                    {
+                        if (uri.Scheme != "http")
+                            throw new Exception(String.Format("Unsupported URI scheme ({0})", path));
+
+                        // OK, now we know we have an HTTP URI to work with
+                        return URIFetch(uri);
+                    }
+                }
+                catch (UriFormatException)
+                {
+                    // In many cases the user will put in a plain old filename that cannot be found so assume that
+                    // this is the problem rather than confusing the issue with a UriFormatException
+                    throw new Exception(String.Format("Cannot find file {0}", path));
+                }
+            }
+        }
+
+        public static Stream URIFetch(Uri uri)
+        {
+            HttpWebRequest request  = (HttpWebRequest)WebRequest.Create(uri);
+
+            // request.Credentials = credentials;
+
+            request.ContentLength = 0;
+            request.KeepAlive     = false;
+
+            WebResponse response = request.GetResponse();
+            Stream file = response.GetResponseStream();
+
+            // justincc: gonna ignore the content type for now and just try anything
+            //if (response.ContentType != "application/x-oar")
+            //    throw new Exception(String.Format("{0} does not identify an OAR file", uri.ToString()));
+
+            if (response.ContentLength == 0)
+                throw new Exception(String.Format("{0} returned an empty file", uri.ToString()));
+
+            // return new BufferedStream(file, (int) response.ContentLength);
+            return new BufferedStream(file, 1000000);
+        }        
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 9c8193a..57b7672 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             try
             {
-                m_loadStream = new GZipStream(GetStream(loadPath), CompressionMode.Decompress);
+                m_loadStream = new GZipStream(ArchiveHelpers.GetStream(loadPath), CompressionMode.Decompress);
             }
             catch (EntryPointNotFoundException e)
             {
@@ -473,68 +473,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         }
 
         /// <summary>
-        /// Resolve path to a working FileStream
-        /// </summary>
-        /// <param name="path"></param>
-        /// <returns></returns>
-        private Stream GetStream(string path)
-        {
-            if (File.Exists(path))
-            {
-                return new FileStream(path, FileMode.Open, FileAccess.Read);
-            }
-            else
-            {
-                try
-                {
-                    Uri uri = new Uri(path);
-                    if (uri.Scheme == "file")
-                    {
-                        return new FileStream(uri.AbsolutePath, FileMode.Open, FileAccess.Read);
-                    }
-                    else
-                    {
-                        if (uri.Scheme != "http")
-                            throw new Exception(String.Format("Unsupported URI scheme ({0})", path));
-
-                        // OK, now we know we have an HTTP URI to work with
-
-                        return URIFetch(uri);
-                    }
-                }
-                catch (UriFormatException)
-                {
-                    // In many cases the user will put in a plain old filename that cannot be found so assume that
-                    // this is the problem rather than confusing the issue with a UriFormatException
-                    throw new Exception(String.Format("Cannot find file {0}", path));
-                }
-            }
-        }
-
-        private static Stream URIFetch(Uri uri)
-        {
-            HttpWebRequest request  = (HttpWebRequest)WebRequest.Create(uri);
-
-            // request.Credentials = credentials;
-
-            request.ContentLength = 0;
-            request.KeepAlive     = false;
-
-            WebResponse response = request.GetResponse();
-            Stream file = response.GetResponseStream();
-
-            // justincc: gonna ignore the content type for now and just try anything
-            //if (response.ContentType != "application/x-oar")
-            //    throw new Exception(String.Format("{0} does not identify an OAR file", uri.ToString()));
-
-            if (response.ContentLength == 0)
-                throw new Exception(String.Format("{0} returned an empty file", uri.ToString()));
-
-            // return new BufferedStream(file, (int) response.ContentLength);
-            return new BufferedStream(file, 1000000);
-        }
-
-        /// <summary>
         /// Load oar control file
         /// </summary>
         /// <param name="path"></param>
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index ac6a633..c6fb18d 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1014,7 +1014,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             int lastMapRefresh = 0;
             int twoDays = 172800;
-            int RefreshSeconds = twoDays;
+//            int RefreshSeconds = twoDays;
 
             try
             {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3e20766..933999e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2149,7 +2149,7 @@ namespace OpenSim.Region.Framework.Scenes
         }        
 
         /// <summary>
-        /// Delete every object from the scene
+        /// Delete every object from the scene.  This does not include attachments worn by avatars.
         /// </summary>
         public void DeleteAllSceneObjects()
         {
@@ -2160,7 +2160,11 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (EntityBase e in entities)
                 {
                     if (e is SceneObjectGroup)
-                        DeleteSceneObject((SceneObjectGroup)e, false);
+                    {
+                        SceneObjectGroup sog = (SceneObjectGroup)e;
+                        if (!sog.IsAttachment)
+                            DeleteSceneObject((SceneObjectGroup)e, false);
+                    }
                 }
             }
         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index bfc19b7..ee17fbf 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -376,6 +376,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="mod"></param>
         public void RegisterModuleInterface<M>(M mod)
         {
+            m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M));
+            
             List<Object> l = null;
             if (!ModuleInterfaces.TryGetValue(typeof(M), out l))
             {
@@ -498,8 +500,31 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        /// <summary>
+        /// Call this from a region module to add a command to the OpenSim console.
+        /// </summary>
+        /// <param name="mod"></param>
+        /// <param name="command"></param>
+        /// <param name="shorthelp"></param>
+        /// <param name="longhelp"></param>
+        /// <param name="callback"></param>
         public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback)
         {
+            AddCommand(mod, command, shorthelp, longhelp, string.Empty, callback);
+        }
+
+        /// <summary>
+        /// Call this from a region module to add a command to the OpenSim console.
+        /// </summary>
+        /// <param name="mod"></param>
+        /// <param name="command"></param>
+        /// <param name="shorthelp"></param>
+        /// <param name="longhelp"></param>
+        /// <param name="descriptivehelp"></param>
+        /// <param name="callback"></param>        
+        public void AddCommand(
+            object mod, string command, string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
+        {
             if (MainConsole.Instance == null)
                 return;
 
@@ -523,7 +548,8 @@ namespace OpenSim.Region.Framework.Scenes
                 else throw new Exception("AddCommand module parameter must be IRegionModule or IRegionModuleBase");
             }
 
-            MainConsole.Instance.Commands.AddCommand(modulename, shared, command, shorthelp, longhelp, callback);
+            MainConsole.Instance.Commands.AddCommand(
+                modulename, shared, command, shorthelp, longhelp, descriptivehelp, callback);
         }
 
         public virtual ISceneObject DeserializeObject(string representation)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 683df93..c84596b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1289,10 +1289,13 @@ namespace OpenSim.Region.Framework.Scenes
         {
             m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
             {
-                avatar.SceneViewer.QueuePartForUpdate(this);
+                AddFullUpdateToAvatar(avatar);
             });
         }
 
+        /// <summary>
+        /// Tell the scene presence that it should send updates for this part to its client
+        /// </summary>        
         public void AddFullUpdateToAvatar(ScenePresence presence)
         {
             presence.SceneViewer.QueuePartForUpdate(this);
@@ -1313,7 +1316,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
             {
-                avatar.SceneViewer.QueuePartForUpdate(this);
+                AddTerseUpdateToAvatar(avatar);
             });
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d7660fd..e3bbe8a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -820,15 +820,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion
 
-        /// <summary>
-        /// Add the part to the queue of parts for which we need to send an update to the client
-        /// </summary>
-        /// <param name="part"></param>
-        public void QueuePartForUpdate(SceneObjectPart part)
-        {
-            m_sceneViewer.QueuePartForUpdate(part);
-        }
-
         public uint GenerateClientFlags(UUID ObjectID)
         {
             return m_scene.Permissions.GenerateClientFlags(m_uuid, ObjectID);