26 files changed, 989 insertions, 225 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index ad157c6..df80290 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -36,25 +36,47 @@ using OpenSim.Framework.Console;
 namespace OpenSim
 {
+    /// <summary>
+    /// Starting class for the OpenSimulator Region
+    /// </summary>
    public class Application
    {
+        /// <summary>
+        /// Text Console Logger
+        /// </summary>
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        /// <summary>
+        /// Path to the main ini Configuration file
+        /// </summary>
        public static string iniFilePath = "";
+        /// <summary>
+        /// Save Crashes in the bin/crashes folder.  Configurable with m_crashDir
+        /// </summary>
        public static bool m_saveCrashDumps = false;
+        /// <summary>
+        /// Directory to save crash reports to.  Relative to bin/
+        /// </summary>
        public static string m_crashDir = "crashes";
+        /// <summary>
+        /// Instance of the OpenSim class.  This could be OpenSim or OpenSimBackground depending on the configuration
+        /// </summary>
        protected static OpenSimBase m_sim = null;
        //could move our main function into OpenSimMain and kill this class
        public static void Main(string[] args)
        {
-            // First line
+            // First line, hook the appdomain to the crash reporter
            AppDomain.CurrentDomain.UnhandledException +=
                new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
+            // Add the arguments supplied when running the application to the configuration
            ArgvConfigSource configSource = new ArgvConfigSource(args);
+            // Configure Log4Net
            configSource.AddSwitch("Startup", "logconfig");
            string logConfigFile = configSource.Configs["Startup"].GetString("logconfig", String.Empty);
            if (logConfigFile != String.Empty)
@@ -69,6 +91,8 @@ namespace OpenSim
                m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config");
            }
+            // Check if the system is compatible with OpenSimulator.   
+            // Ensures that the minimum system requirements are met
            m_log.Info("Performing compatibility checks... ");
            string supported = String.Empty;
            if (Util.IsEnvironmentSupported(ref supported))
@@ -80,6 +104,7 @@ namespace OpenSim
                m_log.Warn("Environment is unsupported (" + supported + ")\n");
            }
+            // Configure nIni aliases and localles
            Culture.SetCurrentCulture();
@@ -99,8 +124,13 @@ namespace OpenSim
            configSource.AddConfig("StandAlone");
            configSource.AddConfig("Network");
+            // Check if we're running in the background or not
            bool background = configSource.Configs["Startup"].GetBoolean("background", false);
+            // Check if we're saving crashes
            m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false);
+            // load Crash directory config
            m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);
            if (background)
@@ -118,6 +148,7 @@ namespace OpenSim
                {
                    try
                    {
+                        // Block thread here for input
                        MainConsole.Instance.Prompt();
                    }
                    catch (Exception e)
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 3a65242..c3e7b86 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -37,12 +37,32 @@ using OpenSim.Framework;
 namespace OpenSim
 {
+    /// <summary>
+    /// Loads the Configuration files into nIni
+    /// </summary>
    public class ConfigurationLoader
    {
+        /// <summary>
+        /// Various Config settings the region needs to start
+        /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor, 
+        /// StorageDLL, Storage Connection String, Estate connection String, Client Stack
+        /// Standalone settings.
+        /// </summary>
        protected ConfigSettings m_configSettings;
+        /// <summary>
+        /// A source of Configuration data
+        /// </summary>
        protected OpenSimConfigSource m_config;
+        /// <summary>
+        /// Grid Service Information.  This refers to classes and addresses of the grid service
+        /// </summary>
        protected NetworkServersInfo m_networkServersInfo;
+        /// <summary>
+        /// Console logger
+        /// </summary>
        private static readonly ILog m_log =
                LogManager.GetLogger(
                MethodBase.GetCurrentMethod().DeclaringType);
@@ -51,6 +71,13 @@ namespace OpenSim
        {
        }
+        /// <summary>
+        /// Loads the region configuration
+        /// </summary>
+        /// <param name="argvSource">Parameters passed into the process when started</param>
+        /// <param name="configSettings"></param>
+        /// <param name="networkInfo"></param>
+        /// <returns>A configuration that gets passed to modules</returns>
        public OpenSimConfigSource LoadConfigSettings(
                IConfigSource argvSource, out ConfigSettings configSettings,
                out NetworkServersInfo networkInfo)
@@ -169,15 +196,22 @@ namespace OpenSim
            return m_config;
        }
+        /// <summary>
+        /// Adds the included files as ini configuration files
+        /// </summary>
+        /// <param name="sources">List of URL strings or filename strings</param>
        private void AddIncludes(List<string> sources)
        {
+            //loop over config sources
            foreach (IConfig config in m_config.Source.Configs)
            {
+                // Look for Include-* in the key name
                string[] keys = config.GetKeys();
                foreach (string k in keys)
                {
                    if (k.StartsWith("Include-"))
                    {
+                        // read the config file to be included.
                        string file = config.GetString(k);
                        if (IsUri(file))
                        {
@@ -199,7 +233,11 @@ namespace OpenSim
                }
            }
        }
+        /// <summary>
+        /// Check if we can convert the string to a URI
+        /// </summary>
+        /// <param name="file">String uri to the remote resource</param>
+        /// <returns>true if we can convert the string to a Uri object</returns>
        bool IsUri(string file)
        {
            Uri configUri;
@@ -253,7 +291,7 @@ namespace OpenSim
        /// <summary>
        /// Setup a default config values in case they aren't present in the ini file
        /// </summary>
-        /// <returns></returns>
+        /// <returns>A Configuration source containing the default configuration</returns>
        private static IConfigSource DefaultConfig()
        {
            IConfigSource defaultConfig = new IniConfigSource();
@@ -322,6 +360,9 @@ namespace OpenSim
            return defaultConfig;
        }
+        /// <summary>
+        /// Read initial region settings from the ConfigSource
+        /// </summary>
        protected virtual void ReadConfigSettings()
        {
            IConfig startupConfig = m_config.Source.Configs["Startup"];
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index 1e1dae0..6e6d48c 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -29,12 +29,24 @@ using OpenSim.Framework;
 namespace OpenSim
 {
+    /// <summary>
+    /// OpenSimulator Application Plugin framework interface
+    /// </summary>
    public interface IApplicationPlugin : IPlugin
    {
+        /// <summary>
+        /// Initialize the Plugin
+        /// </summary>
+        /// <param name="openSim">The Application instance</param>
        void Initialise(OpenSimBase openSim);
+        /// <summary>
+        /// Called when the application loading is completed 
+        /// </summary>
        void PostInitialise();
    }
    public class ApplicationPluginInitialiser : PluginInitialiserBase
    {
        private OpenSimBase server;
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index aeb6f57..390cfcd 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -146,6 +146,9 @@ namespace OpenSim
                ChangeSelectedRegion("region", new string[] {"change", "region", "root"});
        }
+        /// <summary>
+        /// Register standard set of region console commands
+        /// </summary>
        private void RegisterConsoleCommands()
        {
            m_console.Commands.AddCommand("region", false, "clear assets",
@@ -332,6 +335,11 @@ namespace OpenSim
            base.ShutdownSpecific();
        }
+        /// <summary>
+        /// Timer to run a specific text file as console commands.  Configured in in the main ini file
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
        private void RunAutoTimerScript(object sender, EventArgs e)
        {
            if (m_timedScript != "disabled")
@@ -342,6 +350,11 @@ namespace OpenSim
        #region Console Commands
+        /// <summary>
+        /// Kicks users off the region
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmdparams">name of avatar to kick</param>
        private void KickUserCommand(string module, string[] cmdparams)
        {
            if (cmdparams.Length < 4)
@@ -401,6 +414,10 @@ namespace OpenSim
            }
        }
+        /// <summary>
+        /// Opens a file and uses it as input to the console command parser.
+        /// </summary>
+        /// <param name="fileName">name of file to use as input to the console</param>
        private static void PrintFileToConsole(string fileName)
        {
            if (File.Exists(fileName))
@@ -419,12 +436,22 @@ namespace OpenSim
            m_log.Info("Not implemented.");
        }
+        /// <summary>
+        /// Force resending of all updates to all clients in active region(s)
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="args"></param>
        private void HandleForceUpdate(string module, string[] args)
        {
            m_log.Info("Updating all clients");
            m_sceneManager.ForceCurrentSceneClientUpdate();
        }
+        /// <summary>
+        /// Edits the scale of a primative with the name specified
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="args">0,1, name, x, y, z</param>
        private void HandleEditScale(string module, string[] args)
        {
            if (args.Length == 6)
@@ -437,6 +464,11 @@ namespace OpenSim
            }
        }
+        /// <summary>
+        /// Creates a new region based on the parameters specified.   This will ask the user questions on the console
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmd">0,1,region name, region XML file</param>
        private void HandleCreateRegion(string module, string[] cmd)
        {
            if (cmd.Length < 4)
@@ -473,16 +505,32 @@ namespace OpenSim
            }
        }
+        /// <summary>
+        /// Enable logins
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmd"></param>
        private void HandleLoginEnable(string module, string[] cmd)
        {
            ProcessLogin(true);
        }
+        /// <summary>
+        /// Disable logins
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmd"></param>
        private void HandleLoginDisable(string module, string[] cmd)
        {
            ProcessLogin(false);
        }
+        /// <summary>
+        /// Log login status to the console
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmd"></param>
        private void HandleLoginStatus(string module, string[] cmd)
        {
            if (m_commsManager.GridService.RegionLoginsEnabled == false)
@@ -492,6 +540,12 @@ namespace OpenSim
                m_log.Info("[ Login ]  Login are enabled");
        }
+        /// <summary>
+        /// Change and load configuration file data.
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmd"></param>
        private void HandleConfig(string module, string[] cmd)
        {
            List<string> args = new List<string>(cmd);
@@ -557,6 +611,12 @@ namespace OpenSim
            }
        }
+        /// <summary>
+        /// Load, Unload, and list Region modules in use
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmd"></param>
        private void HandleModules(string module, string[] cmd)
        {
            List<string> args = new List<string>(cmd);
@@ -797,6 +857,11 @@ namespace OpenSim
        }
        // see BaseOpenSimServer
+        /// <summary>
+        /// Many commands list objects for debugging.  Some of the types are listed  here
+        /// </summary>
+        /// <param name="mod"></param>
+        /// <param name="cmd"></param>
        public override void HandleShow(string mod, string[] cmd)
        {
            base.HandleShow(mod, cmd);
@@ -902,6 +967,10 @@ namespace OpenSim
            }
        }
+        /// <summary>
+        /// print UDP Queue data for each client
+        /// </summary>
+        /// <returns></returns>
        private string GetQueuesReport()
        {
            string report = String.Empty;
@@ -1010,6 +1079,11 @@ namespace OpenSim
            m_commsManager.UserAdminService.ResetUserPassword(firstName, lastName, newPassword);
        }
+        /// <summary>
+        /// Use XML2 format to serialize data to a file
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmdparams"></param>
        protected void SavePrimsXml2(string module, string[] cmdparams)
        {
            if (cmdparams.Length > 5)
@@ -1022,6 +1096,11 @@ namespace OpenSim
            }
        }
+        /// <summary>
+        /// Use XML format to serialize data to a file
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmdparams"></param>
        protected void SaveXml(string module, string[] cmdparams)
        {
            m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon.  If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason.");
@@ -1036,6 +1115,11 @@ namespace OpenSim
            }
        }
+        /// <summary>
+        /// Loads data and region objects from XML format.
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmdparams"></param>
        protected void LoadXml(string module, string[] cmdparams)
        {
            m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon.  If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason.");
@@ -1079,7 +1163,11 @@ namespace OpenSim
                }
            }
        }
+        /// <summary>
+        /// Serialize region data to XML2Format
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmdparams"></param>
        protected void SaveXml2(string module, string[] cmdparams)
        {
            if (cmdparams.Length > 2)
@@ -1092,6 +1180,11 @@ namespace OpenSim
            }
        }
+        /// <summary>
+        /// Load region data from Xml2Format
+        /// </summary>
+        /// <param name="module"></param>
+        /// <param name="cmdparams"></param>
        protected void LoadXml2(string module, string[] cmdparams)
        {
            if (cmdparams.Length > 2)
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 99a4057..381070e 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -40,9 +40,6 @@ namespace OpenSim.Region.Communications.Hypergrid
 {
    public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1
    {
-        private static readonly ILog m_log
-            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        IHyperlink m_osw = null;
        public IHyperlink HGServices
        {
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 28b4d64..470a386 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
        /// <summary>
        /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
        /// </summary>
-        //[Test]
+        [Test]
        public void TestSaveIarV0_1()
        {
            TestHelper.InMethod();
@@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-            Scene scene = SceneSetupHelpers.SetupScene("");
+            Scene scene = SceneSetupHelpers.SetupScene("Inventory");
            SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
            CommunicationsManager cm = scene.CommsManager;
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
        /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
        /// an account exists with the creator name.
        /// </summary>
-        //[Test]
+        [Test]
        public void TestLoadIarV0_1ExistingUsers()
        {   
            TestHelper.InMethod();
@@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            InventoryArchiverModule archiverModule = new InventoryArchiverModule();
            
            // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
-            Scene scene = SceneSetupHelpers.SetupScene();
+            Scene scene = SceneSetupHelpers.SetupScene("inventory");
            IUserAdminService userAdminService = scene.CommsManager.UserAdminService;
            
            SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
@@ -276,16 +276,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            CachedUserInfo userInfo 
                = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
-            //userInfo.FetchInventory();
-            /*
-            for (int i = 0 ; i < 50 ; i++)
-            {
-                if (userInfo.HasReceivedInventory == true)
-                    break;
-                Thread.Sleep(200);
-            }
-            Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
-            */
            InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
            Assert.That(foundItem, Is.Not.Null, "Didn't find loaded item");
            Assert.That(
@@ -395,17 +386,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, InventoryReceived);
                Monitor.Wait(this, 60000);
            }
-           
-            //userInfo.FetchInventory();
-            /*
-            for (int i = 0 ; i < 50 ; i++)
-            {
-                if (userInfo.HasReceivedInventory == true)
-                    break;
-                Thread.Sleep(200);
-            }
-            Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
-            */
            
            Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder);
            
@@ -429,22 +409,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder);
-            try
+            new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null)
-            {
+                .ReplicateArchivePathToUserInventory(
-                new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null)
+                    itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded);
-                    .ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded);           
+            Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder);
-                Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder);
+            InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
-                InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
+            Assert.That(folder1, Is.Not.Null, "Could not find folder a");
-                Assert.That(folder1, Is.Not.Null, "Could not find folder a");
+            InventoryFolderImpl folder2 = folder1.FindFolderByPath("b");            
-                InventoryFolderImpl folder2 = folder1.FindFolderByPath("b");            
+            Assert.That(folder2, Is.Not.Null, "Could not find folder b");
-                Assert.That(folder2, Is.Not.Null, "Could not find folder b");
-            }
-            catch (NullReferenceException e)
-            {
-                // Non fatal for now until we resolve the race condition
-                Console.WriteLine("Test failed with {0}", e);
-            }
        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
index d3324e4..0f58788 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -26,6 +26,7 @@
 */
 using System;
+using System.Collections;
 using System.Globalization;
 using System.Reflection;
 using log4net;
@@ -41,6 +42,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private Scene m_scene;
+        private IProfileModule m_profileModule = null;
        public AvatarProfilesModule()
        {
@@ -56,6 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
        public void PostInitialise()
        {
+            m_profileModule = m_scene.RequestModuleInterface<IProfileModule>();
        }
        public void Close()
@@ -108,6 +111,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
                    charterMember = Utils.StringToBytes(profile.CustomType);
                }
+                if (m_profileModule != null)
+                {
+                    Hashtable profileData = m_profileModule.GetProfileData(remoteClient.AgentId);
+                    if (profileData["ProfileUrl"] != null)
+                        profile.ProfileUrl = profileData["ProfileUrl"].ToString();
+                }
                remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
                                                  Util.ToDateTime(profile.Created).ToString("M/d/yyyy", CultureInfo.InvariantCulture),
                                                  charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff),
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
new file mode 100644
index 0000000..375faf5
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+using Nini.Config;
+using log4net;
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
+{
+    public abstract class BaseInventoryConnector : IInventoryService
+    {
+        protected InventoryCache m_cache;
+        protected virtual void Init(IConfigSource source)
+        {
+            m_cache = new InventoryCache();
+            m_cache.Init(source, this);
+        }
+        /// <summary>
+        /// Create the entire inventory for a given user
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public abstract bool CreateUserInventory(UUID user);
+        /// <summary>
+        /// Gets the skeleton of the inventory -- folders only
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public abstract List<InventoryFolderBase> GetInventorySkeleton(UUID userId);
+        /// <summary>
+        /// Synchronous inventory fetch.
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns></returns>
+        public abstract InventoryCollection GetUserInventory(UUID userID);
+        /// <summary>
+        /// Request the inventory for a user.  This is an asynchronous operation that will call the callback when the
+        /// inventory has been received
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="callback"></param>
+        public abstract void GetUserInventory(UUID userID, InventoryReceiptCallback callback);
+        /// <summary>
+        /// Retrieve the root inventory folder for the given user.
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns>null if no root folder was found</returns>
+        public abstract InventoryFolderBase GetRootFolder(UUID userID);
+        public abstract Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID);
+        /// <summary>
+        /// Gets the user folder for the given folder-type
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
+        {
+            return m_cache.GetFolderForType(userID, type);
+        }
+        /// <summary>
+        /// Gets everything (folders and items) inside a folder
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="folderID"></param>
+        /// <returns></returns>
+        public abstract InventoryCollection GetFolderContent(UUID userID, UUID folderID);
+        /// <summary>
+        /// Gets the items inside a folder
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="folderID"></param>
+        /// <returns></returns>
+        public abstract List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID);
+        /// <summary>
+        /// Add a new folder to the user's inventory
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns>true if the folder was successfully added</returns>
+        public abstract bool AddFolder(InventoryFolderBase folder);
+        /// <summary>
+        /// Update a folder in the user's inventory
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns>true if the folder was successfully updated</returns>
+        public abstract bool UpdateFolder(InventoryFolderBase folder);
+        /// <summary>
+        /// Move an inventory folder to a new location
+        /// </summary>
+        /// <param name="folder">A folder containing the details of the new location</param>
+        /// <returns>true if the folder was successfully moved</returns>
+        public abstract bool MoveFolder(InventoryFolderBase folder);
+        /// <summary>
+        /// Purge an inventory folder of all its items and subfolders.
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns>true if the folder was successfully purged</returns>
+        public abstract bool PurgeFolder(InventoryFolderBase folder);
+        /// <summary>
+        /// Add a new item to the user's inventory.
+        /// If the given item has to parent folder, it tries to find the most
+        /// suitable folder for it.
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was successfully added</returns>
+        public bool AddItem(InventoryItemBase item)
+        {
+            if (item.Folder == UUID.Zero)
+            {
+                InventoryFolderBase f = GetFolderForType(item.Owner, (AssetType)item.AssetType);
+                if (f != null)
+                    item.Folder = f.ID;
+                else
+                {
+                    f = GetRootFolder(item.Owner);
+                    if (f != null)
+                        item.Folder = f.ID;
+                    else
+                        return false;
+                }
+            }
+            return AddItemPlain(item);
+        }
+        protected abstract bool AddItemPlain(InventoryItemBase item);
+        /// <summary>
+        /// Update an item in the user's inventory
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was successfully updated</returns>
+        public abstract bool UpdateItem(InventoryItemBase item);
+        /// <summary>
+        /// Delete an item from the user's inventory
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was successfully deleted</returns>
+        public abstract bool DeleteItem(InventoryItemBase item);
+        public abstract InventoryItemBase QueryItem(InventoryItemBase item);
+        public abstract InventoryFolderBase QueryFolder(InventoryFolderBase folder);
+        /// <summary>
+        /// Does the given user have an inventory structure?
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns></returns>
+        public abstract bool HasInventoryForUser(UUID userID);
+        /// <summary>
+        /// Get the active gestures of the agent.
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public abstract List<InventoryItemBase> GetActiveGestures(UUID userId);
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index d4168fe..62b9bed 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -41,7 +41,7 @@ using OpenMetaverse;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
-    public class HGInventoryBroker : InventoryCache, ISharedRegionModule, IInventoryService
+    public class HGInventoryBroker : BaseInventoryConnector, ISharedRegionModule, IInventoryService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        {
        }
-        public override void AddRegion(Scene scene)
+        public void AddRegion(Scene scene)
        {
            if (!m_Enabled)
                return;
@@ -156,12 +156,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
            scene.RegisterModuleInterface<IInventoryService>(this);
-            base.AddRegion(scene);
+            m_cache.AddRegion(scene);
        }
-        public override void RemoveRegion(Scene scene)
+        public void RemoveRegion(Scene scene)
        {
-            base.RemoveRegion(scene);
+            if (!m_Enabled)
+                return;
+            
+            m_cache.RemoveRegion(scene);
        }
        public void RegionLoaded(Scene scene)
@@ -175,17 +178,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        #region IInventoryService
-        public bool CreateUserInventory(UUID userID)
+        public override bool CreateUserInventory(UUID userID)
        {
            return m_GridService.CreateUserInventory(userID);
        }
-        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
+        public override List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
        {
            return m_GridService.GetInventorySkeleton(userId);
        }
-        public InventoryCollection GetUserInventory(UUID userID)
+        public override InventoryCollection GetUserInventory(UUID userID)
        {
            if (IsLocalGridUser(userID))
                return m_GridService.GetUserInventory(userID);
@@ -193,7 +196,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                return null;
        }
-        public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
+        public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
        {
            if (IsLocalGridUser(userID))
                m_GridService.GetUserInventory(userID, callback);
@@ -220,7 +223,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        //    }
        //}
-        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
+        public override InventoryCollection GetFolderContent(UUID userID, UUID folderID)
        {
            if (IsLocalGridUser(userID))
                return m_GridService.GetFolderContent(userID, folderID);
@@ -271,12 +274,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return new Dictionary<AssetType, InventoryFolderBase>();
        }
-        public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
+        public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
        {
            return new List<InventoryItemBase>();
        }
-        public bool AddFolder(InventoryFolderBase folder)
+        public override bool AddFolder(InventoryFolderBase folder)
        {
            if (folder == null)
                return false;
@@ -291,7 +294,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
        }
-        public bool UpdateFolder(InventoryFolderBase folder)
+        public override bool UpdateFolder(InventoryFolderBase folder)
        {
            if (folder == null)
                return false;
@@ -306,7 +309,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
        }
-        public bool MoveFolder(InventoryFolderBase folder)
+        public override bool MoveFolder(InventoryFolderBase folder)
        {
            if (folder == null)
                return false;
@@ -321,7 +324,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
        }
-        public bool PurgeFolder(InventoryFolderBase folder)
+        public override bool PurgeFolder(InventoryFolderBase folder)
        {
            if (folder == null)
                return false;
@@ -336,7 +339,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
        }
-        public bool AddItem(InventoryItemBase item)
+        // public bool AddItem(InventoryItemBase item) inherited
+        // Uses AddItemPlain
+        protected override bool AddItemPlain(InventoryItemBase item)
        {
            if (item == null)
                return false;
@@ -351,7 +357,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
        }
-        public bool UpdateItem(InventoryItemBase item)
+        public override bool UpdateItem(InventoryItemBase item)
        {
            if (item == null)
                return false;
@@ -366,7 +372,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
        }
-        public bool DeleteItem(InventoryItemBase item)
+        public override bool DeleteItem(InventoryItemBase item)
        {
            if (item == null)
                return false;
@@ -381,7 +387,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
        }
-        public InventoryItemBase QueryItem(InventoryItemBase item)
+        public override InventoryItemBase QueryItem(InventoryItemBase item)
        {
            if (item == null)
                return null;
@@ -396,7 +402,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
        }
-        public InventoryFolderBase QueryFolder(InventoryFolderBase folder)
+        public override InventoryFolderBase QueryFolder(InventoryFolderBase folder)
        {
            if (folder == null)
                return null;
@@ -411,17 +417,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
        }
-        public bool HasInventoryForUser(UUID userID)
+        public override bool HasInventoryForUser(UUID userID)
        {
            return false;
        }
-        public InventoryFolderBase GetRootFolder(UUID userID)
+        public override InventoryFolderBase GetRootFolder(UUID userID)
        {
            return null;
        }
-        public List<InventoryItemBase> GetActiveGestures(UUID userId)
+        public override List<InventoryItemBase> GetActiveGestures(UUID userId)
        {
            return new List<InventoryItemBase>();
        }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index b4785f4..c16e92e 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -1,4 +1,31 @@
-using System;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -12,21 +39,23 @@ using log4net;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
-    public abstract class InventoryCache
+    public class InventoryCache
    {
        private static readonly ILog m_log =
            LogManager.GetLogger(
            MethodBase.GetCurrentMethod().DeclaringType);
+        protected BaseInventoryConnector m_Connector;
        protected List<Scene> m_Scenes;
        // The cache proper
        protected Dictionary<UUID, Dictionary<AssetType, InventoryFolderBase>> m_InventoryCache;
-        protected virtual void Init(IConfigSource source)
+        public virtual void Init(IConfigSource source, BaseInventoryConnector connector)
        {
            m_Scenes = new List<Scene>();
            m_InventoryCache = new Dictionary<UUID, Dictionary<AssetType, InventoryFolderBase>>();
+            m_Connector = connector;
        }
        public virtual void AddRegion(Scene scene)
@@ -59,9 +88,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
            // If not, go get them and place them in the cache
-            Dictionary<AssetType, InventoryFolderBase> folders = GetSystemFolders(presence.UUID);
+            Dictionary<AssetType, InventoryFolderBase> folders = m_Connector.GetSystemFolders(presence.UUID);
-            m_log.DebugFormat("[INVENTORY CACHE]: OnMakeRootAgent, fetched system folders for {0} {1}: count {2}", 
+            m_log.DebugFormat("[INVENTORY CACHE]: OnMakeRootAgent in {0}, fetched system folders for {1} {2}: count {3}", 
-                presence.Firstname, presence.Lastname, folders.Count);
+                presence.Scene.RegionInfo.RegionName, presence.Firstname, presence.Lastname, folders.Count);
            if (folders.Count > 0)
                lock (m_InventoryCache)
                    m_InventoryCache.Add(presence.UUID, folders);
@@ -69,28 +98,32 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        void OnClientClosed(UUID clientID, Scene scene)
        {
-            ScenePresence sp = null;
+            if (m_InventoryCache.ContainsKey(clientID)) // if it's still in cache
-            foreach (Scene s in m_Scenes)
            {
-                s.TryGetAvatar(clientID, out sp);
+                ScenePresence sp = null;
-                if ((sp != null) && !sp.IsChildAgent)
+                foreach (Scene s in m_Scenes)
                {
-                    m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, but user {1} still in sim. Keeping system folders in cache", 
+                    s.TryGetAvatar(clientID, out sp);
-                        scene.RegionInfo.RegionName, clientID);
+                    if ((sp != null) && !sp.IsChildAgent && (s != scene))
-                    return;
+                    {
+                        m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, but user {1} still in sim. Keeping system folders in cache",
+                            scene.RegionInfo.RegionName, clientID);
+                        return;
+                    }
                }
-            }
-            m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, user {1} out of sim. Dropping system folders", 
+                // Drop system folders
-                scene.RegionInfo.RegionName, clientID);
+                lock (m_InventoryCache)
-            // Drop system folders
+                    if (m_InventoryCache.ContainsKey(clientID))
-            lock (m_InventoryCache)
+                    {
-                if (m_InventoryCache.ContainsKey(clientID))
+                        m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, user {1} out of sim. Dropping system folders",
-                    m_InventoryCache.Remove(clientID);
+                            scene.RegionInfo.RegionName, clientID);
+                        m_InventoryCache.Remove(clientID);
+                    }
+            }
        }
-        public abstract Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID);
        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
        {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 98e30ce..6efe903 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -41,7 +41,7 @@ using OpenMetaverse;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
-    public class LocalInventoryServicesConnector : InventoryCache, ISharedRegionModule, IInventoryService
+    public class LocalInventoryServicesConnector : BaseInventoryConnector, ISharedRegionModule, IInventoryService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        {
        }
-        public override void AddRegion(Scene scene)
+        public void AddRegion(Scene scene)
        {
            if (!m_Enabled)
                return;
@@ -141,12 +141,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 //                "[INVENTORY CONNECTOR]: Registering IInventoryService to scene {0}", scene.RegionInfo.RegionName);
            
            scene.RegisterModuleInterface<IInventoryService>(this);
-            base.AddRegion(scene);
+            m_cache.AddRegion(scene);
        }
-        public override void RemoveRegion(Scene scene)
+        public void RemoveRegion(Scene scene)
        {
-            base.RemoveRegion(scene);
+            if (!m_Enabled)
+                return;
+            m_cache.RemoveRegion(scene);
        }
        public void RegionLoaded(Scene scene)
@@ -160,22 +163,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        #region IInventoryService
-        public bool CreateUserInventory(UUID user)
+        public override bool CreateUserInventory(UUID user)
        {
            return m_InventoryService.CreateUserInventory(user);
        }
-        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
+        public override List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
        {
            return m_InventoryService.GetInventorySkeleton(userId);
        }
-        public InventoryCollection GetUserInventory(UUID id)
+        public override InventoryCollection GetUserInventory(UUID id)
        {
            return m_InventoryService.GetUserInventory(id);
        }
-        public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
+        public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
        {
            m_InventoryService.GetUserInventory(userID, callback);
        }
@@ -207,13 +210,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return new Dictionary<AssetType, InventoryFolderBase>();
        }
-        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
+        public override InventoryCollection GetFolderContent(UUID userID, UUID folderID)
        {
            return m_InventoryService.GetFolderContent(userID, folderID);
        }
-        public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
+        public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
        {
            return m_InventoryService.GetFolderItems(userID, folderID);
        }
@@ -223,7 +226,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        /// </summary>
        /// <param name="folder"></param>
        /// <returns>true if the folder was successfully added</returns>
-        public bool AddFolder(InventoryFolderBase folder)
+        public override bool AddFolder(InventoryFolderBase folder)
        {
            return m_InventoryService.AddFolder(folder);
        }
@@ -233,7 +236,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        /// </summary>
        /// <param name="folder"></param>
        /// <returns>true if the folder was successfully updated</returns>
-        public bool UpdateFolder(InventoryFolderBase folder)
+        public override bool UpdateFolder(InventoryFolderBase folder)
        {
            return m_InventoryService.UpdateFolder(folder);
        }
@@ -243,7 +246,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        /// </summary>
        /// <param name="folder">A folder containing the details of the new location</param>
        /// <returns>true if the folder was successfully moved</returns>
-        public bool MoveFolder(InventoryFolderBase folder)
+        public override bool MoveFolder(InventoryFolderBase folder)
        {
            return m_InventoryService.MoveFolder(folder);
        }
@@ -253,17 +256,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        /// </summary>
        /// <param name="folder"></param>
        /// <returns>true if the folder was successfully purged</returns>
-        public bool PurgeFolder(InventoryFolderBase folder)
+        public override bool PurgeFolder(InventoryFolderBase folder)
        {
            return m_InventoryService.PurgeFolder(folder);
        }
        /// <summary>
-        /// Add a new item to the user's inventory
+        /// Add a new item to the user's inventory, plain
+        /// Called by base class AddItem
        /// </summary>
        /// <param name="item"></param>
        /// <returns>true if the item was successfully added</returns>
-        public bool AddItem(InventoryItemBase item)
+        protected override bool AddItemPlain(InventoryItemBase item)
        {
            return m_InventoryService.AddItem(item);
        }
@@ -273,7 +277,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        /// </summary>
        /// <param name="item"></param>
        /// <returns>true if the item was successfully updated</returns>
-        public bool UpdateItem(InventoryItemBase item)
+        public override bool UpdateItem(InventoryItemBase item)
        {
            return m_InventoryService.UpdateItem(item);
        }
@@ -283,17 +287,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        /// </summary>
        /// <param name="item"></param>
        /// <returns>true if the item was successfully deleted</returns>
-        public bool DeleteItem(InventoryItemBase item)
+        public override bool DeleteItem(InventoryItemBase item)
        {
            return m_InventoryService.DeleteItem(item);
        }
-        public InventoryItemBase QueryItem(InventoryItemBase item)
+        public override InventoryItemBase QueryItem(InventoryItemBase item)
        {
            return m_InventoryService.QueryItem(item);
        }
-        public InventoryFolderBase QueryFolder(InventoryFolderBase folder)
+        public override InventoryFolderBase QueryFolder(InventoryFolderBase folder)
        {
            return m_InventoryService.QueryFolder(folder);
        }
@@ -303,7 +307,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        /// </summary>
        /// <param name="userID"></param>
        /// <returns></returns>
-        public bool HasInventoryForUser(UUID userID)
+        public override bool HasInventoryForUser(UUID userID)
        {
            return m_InventoryService.HasInventoryForUser(userID);
        }
@@ -313,12 +317,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        /// </summary>
        /// <param name="userID"></param>
        /// <returns>null if no root folder was found</returns>
-        public InventoryFolderBase GetRootFolder(UUID userID)
+        public override InventoryFolderBase GetRootFolder(UUID userID)
        {
            return m_InventoryService.GetRootFolder(userID);
        }
-        public List<InventoryItemBase> GetActiveGestures(UUID userId)
+        public override List<InventoryItemBase> GetActiveGestures(UUID userId)
        {
            return m_InventoryService.GetActiveGestures(userId);
        }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index dceda38..f87aab9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -40,7 +40,7 @@ using OpenMetaverse;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
-    public class RemoteInventoryServicesConnector : InventoryCache, ISharedRegionModule, IInventoryService
+    public class RemoteInventoryServicesConnector : BaseInventoryConnector, ISharedRegionModule, IInventoryService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        {
        }
-        public override void AddRegion(Scene scene)
+        public void AddRegion(Scene scene)
        {
            if (!m_Enabled)
                return;
@@ -117,12 +117,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            }
            scene.RegisterModuleInterface<IInventoryService>(this);
-            base.AddRegion(scene);
+            m_cache.AddRegion(scene);
        }
-        public override void RemoveRegion(Scene scene)
+        public void RemoveRegion(Scene scene)
        {
-            base.RemoveRegion(scene);
+            if (!m_Enabled)
+                return;
+            m_cache.RemoveRegion(scene);
        }
        public void RegionLoaded(Scene scene)
@@ -138,22 +141,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        #region IInventoryService
-        public bool CreateUserInventory(UUID user)
+        public override bool CreateUserInventory(UUID user)
        {
            return false;
        }
-        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
+        public override List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
        {
            return new List<InventoryFolderBase>();
        }
-        public InventoryCollection GetUserInventory(UUID userID)
+        public override InventoryCollection GetUserInventory(UUID userID)
        {
            return null;
        }
-        public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
+        public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
        {
            UUID sessionID = GetSessionID(userID);
            try
@@ -180,7 +183,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return m_RemoteConnector.GetSystemFolders(userID.ToString(), sessionID);
        }
-        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
+        public override InventoryCollection GetFolderContent(UUID userID, UUID folderID)
        {
            UUID sessionID = GetSessionID(userID);
            try
@@ -199,12 +202,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return nullCollection;
        }
-        public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
+        public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
        {
            return new List<InventoryItemBase>();
        }
-        public bool AddFolder(InventoryFolderBase folder)
+        public override bool AddFolder(InventoryFolderBase folder)
        {
            if (folder == null)
                return false;
@@ -213,7 +216,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return m_RemoteConnector.AddFolder(folder.Owner.ToString(), folder, sessionID);
        }
-        public bool UpdateFolder(InventoryFolderBase folder)
+        public override bool UpdateFolder(InventoryFolderBase folder)
        {
            if (folder == null)
                return false;
@@ -222,7 +225,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return m_RemoteConnector.UpdateFolder(folder.Owner.ToString(), folder, sessionID);
        }
-        public bool MoveFolder(InventoryFolderBase folder)
+        public override bool MoveFolder(InventoryFolderBase folder)
        {
            if (folder == null)
                return false;
@@ -231,7 +234,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return m_RemoteConnector.MoveFolder(folder.Owner.ToString(), folder, sessionID);
        }
-        public bool PurgeFolder(InventoryFolderBase folder)
+        public override bool PurgeFolder(InventoryFolderBase folder)
        {
            if (folder == null)
                return false;
@@ -240,7 +243,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return m_RemoteConnector.PurgeFolder(folder.Owner.ToString(), folder, sessionID);
        }
-        public bool AddItem(InventoryItemBase item)
+        // public bool AddItem(InventoryItemBase item) inherited
+        // Uses AddItemPlain
+        protected override bool AddItemPlain(InventoryItemBase item)
        {
            if (item == null)
                return false;
@@ -249,7 +255,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return m_RemoteConnector.AddItem(item.Owner.ToString(), item, sessionID);
        }
-        public bool UpdateItem(InventoryItemBase item)
+        public override bool UpdateItem(InventoryItemBase item)
        {
            if (item == null)
                return false;
@@ -258,7 +264,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return m_RemoteConnector.UpdateItem(item.Owner.ToString(), item, sessionID);
        }
-        public bool DeleteItem(InventoryItemBase item)
+        public override bool DeleteItem(InventoryItemBase item)
        {
            if (item == null)
                return false;
@@ -267,7 +273,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return m_RemoteConnector.DeleteItem(item.Owner.ToString(), item, sessionID);
        }
-        public InventoryItemBase QueryItem(InventoryItemBase item)
+        public override InventoryItemBase QueryItem(InventoryItemBase item)
        {
            if (item == null)
                return null;
@@ -276,7 +282,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID);
        }
-        public InventoryFolderBase QueryFolder(InventoryFolderBase folder)
+        public override InventoryFolderBase QueryFolder(InventoryFolderBase folder)
        {
            if (folder == null)
                return null;
@@ -285,17 +291,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            return m_RemoteConnector.QueryFolder(folder.Owner.ToString(), folder, sessionID);
        }
-        public bool HasInventoryForUser(UUID userID)
+        public override bool HasInventoryForUser(UUID userID)
        {
            return false;
        }
-        public InventoryFolderBase GetRootFolder(UUID userID)
+        public override InventoryFolderBase GetRootFolder(UUID userID)
        {
            return null;
        }
-        public List<InventoryItemBase> GetActiveGestures(UUID userId)
+        public override List<InventoryItemBase> GetActiveGestures(UUID userId)
        {
            return new List<InventoryItemBase>();
        }
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 1d4d6d7..7bbe045 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -429,7 +429,7 @@ namespace OpenSim.Region.Framework.Scenes
        private RequestParcelPrimCountUpdate handlerRequestParcelPrimCountUpdate = null;
        private ParcelPrimCountTainted handlerParcelPrimCountTainted = null;
        private ObjectBeingRemovedFromScene handlerObjectBeingRemovedFromScene = null;
-        private ScriptTimerEvent handlerScriptTimerEvent = null;
+        // TODO: unused: private ScriptTimerEvent handlerScriptTimerEvent = null;
        private EstateToolsSunUpdate handlerEstateToolsSunUpdate = null;
        private ScriptColliding handlerCollidingStart = null;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 9251aa6..113918d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -622,8 +622,26 @@ namespace OpenSim.Region.Framework.Scenes
                     "[AGENT INVENTORY]: Failed to move folder {0} to {1} for user {2}",
                     folderID, parentID, remoteClient.Name);
            }
+        }
+        public void HandleMoveInventoryFolder2(IClientAPI remoteClient, UUID folderID, UUID parentID)
+        {
+            InventoryFolderBase folder = new InventoryFolderBase(folderID);
+            folder = InventoryService.QueryFolder(folder);
+            if (folder != null)
+            {
+                folder.ParentID = parentID;
+                if (!InventoryService.MoveFolder(folder))
+                    m_log.WarnFormat("[AGENT INVENTORY]: could not move folder {0}", folderID);
+                else
+                    m_log.DebugFormat("[AGENT INVENTORY]: folder {0} moved to parent {1}", folderID, parentID);
+            }
+            else
+            {
+                m_log.WarnFormat("[AGENT INVENTORY]: request to move folder {0} but folder not found", folderID);
+            }
        }      
-        
        /// <summary>
        /// This should delete all the items and folders in the given directory.
        /// </summary>
@@ -647,6 +665,17 @@ namespace OpenSim.Region.Framework.Scenes
                     "[AGENT INVENTORY]: Failed to purge folder for user {0} {1}",
                     remoteClient.Name, remoteClient.AgentId);
            }
+        }
+        public void HandlePurgeInventoryDescendents2(IClientAPI remoteClient, UUID folderID)
+        {
+            InventoryFolderBase folder = new InventoryFolderBase(folderID);
+            if (InventoryService.PurgeFolder(folder))
+                m_log.DebugFormat("[AGENT INVENTORY]: folder {0} purged successfully", folderID);
+            else
+                m_log.WarnFormat("[AGENT INVENTORY]: could not purge folder {0}", folderID);
        }        
    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7f1936e..18d7bad 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1038,6 +1038,10 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Send out simstats data to all clients
+        /// </summary>
+        /// <param name="stats">Stats on the Simulator's performance</param>
        private void SendSimStatsPackets(SimStats stats)
        {
            List<ScenePresence> StatSendAgents = GetScenePresences();
@@ -1050,6 +1054,9 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Recount SceneObjectPart in parcel aabb
+        /// </summary>
        private void UpdateLand()
        {
            if (LandChannel != null)
@@ -1061,11 +1068,17 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Update the terrain if it needs to be updated.
+        /// </summary>
        private void UpdateTerrain()
        {
            EventManager.TriggerTerrainTick();
        }
+        /// <summary>
+        /// Back up queued up changes
+        /// </summary>
        private void UpdateStorageBackup()
        {
            if (!m_backingup)
@@ -1078,6 +1091,9 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Sends out the OnFrame event to the modules
+        /// </summary>
        private void UpdateEvents()
        {
            m_eventManager.TriggerOnFrame();
@@ -1133,6 +1149,10 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Synchronous force backup.  For deletes and links/unlinks
+        /// </summary>
+        /// <param name="group">Object to be backed up</param>
        public void ForceSceneObjectBackup(SceneObjectGroup group)
        {
            if (group != null)
@@ -1141,6 +1161,13 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Return object to avatar Message
+        /// </summary>
+        /// <param name="agentID">Avatar Unique Id</param>
+        /// <param name="objectName">Name of object returned</param>
+        /// <param name="location">Location of object returned</param>
+        /// <param name="reason">Reasion for object return</param>
        public void AddReturn(UUID agentID, string objectName, Vector3 location, string reason)
        {
            lock (m_returns)
@@ -1167,6 +1194,9 @@ namespace OpenSim.Region.Framework.Scenes
        #region Load Terrain
+        /// <summary>
+        /// Store the terrain in the persistant data store
+        /// </summary>
        public void SaveTerrain()
        {
            m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID);
@@ -1269,6 +1299,10 @@ namespace OpenSim.Region.Framework.Scenes
        #region Load Land
+        /// <summary>
+        /// Loads all Parcel data from the datastore for region identified by regionID
+        /// </summary>
+        /// <param name="regionID">Unique Identifier of the Region to load parcel data for</param>
        public void loadAllLandObjectsFromStorage(UUID regionID)
        {
            m_log.Info("[SCENE]: Loading land objects from storage");
@@ -1322,6 +1356,20 @@ namespace OpenSim.Region.Framework.Scenes
            m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)");
        }
+        /// <summary>
+        /// Gets a new rez location based on the raycast and the size of the object that is being rezzed.
+        /// </summary>
+        /// <param name="RayStart"></param>
+        /// <param name="RayEnd"></param>
+        /// <param name="RayTargetID"></param>
+        /// <param name="rot"></param>
+        /// <param name="bypassRayCast"></param>
+        /// <param name="RayEndIsIntersection"></param>
+        /// <param name="frontFacesOnly"></param>
+        /// <param name="scale"></param>
+        /// <param name="FaceCenter"></param>
+        /// <returns></returns>
        public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter)
        {
            Vector3 pos = Vector3.Zero;
@@ -1412,6 +1460,19 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Create a New SceneObjectGroup/Part by raycasting
+        /// </summary>
+        /// <param name="ownerID"></param>
+        /// <param name="groupID"></param>
+        /// <param name="RayEnd"></param>
+        /// <param name="rot"></param>
+        /// <param name="shape"></param>
+        /// <param name="bypassRaycast"></param>
+        /// <param name="RayStart"></param>
+        /// <param name="RayTargetID"></param>
+        /// <param name="RayEndIsIntersection"></param>
        public virtual void AddNewPrim(UUID ownerID, UUID groupID, Vector3 RayEnd, Quaternion rot, PrimitiveBaseShape shape,
                                       byte bypassRaycast, Vector3 RayStart, UUID RayTargetID,
                                       byte RayEndIsIntersection)
@@ -1829,6 +1890,12 @@ namespace OpenSim.Region.Framework.Scenes
            return true;
        }
+        /// <summary>
+        /// Attachment rezzing
+        /// </summary>
+        /// <param name="userID">Agent Unique ID</param>
+        /// <param name="itemID">Object ID</param>
+        /// <returns>False</returns>
        public virtual bool IncomingCreateObject(UUID userID, UUID itemID)
        {
            ScenePresence sp = GetScenePresence(userID);
@@ -1841,6 +1908,13 @@ namespace OpenSim.Region.Framework.Scenes
            return false;
        }
+        /// <summary>
+        /// Adds a Scene Object group to the Scene.
+        /// Verifies that the creator of the object is not banned from the simulator.
+        /// Checks if the item is an Attachment
+        /// </summary>
+        /// <param name="sceneObject"></param>
+        /// <returns>True if the SceneObjectGroup was added, False if it was not</returns>
        public bool AddSceneObject(SceneObjectGroup sceneObject)
        {
            // If the user is banned, we won't let any of their objects
@@ -1933,6 +2007,10 @@ namespace OpenSim.Region.Framework.Scenes
        #region Add/Remove Avatar Methods
+        /// <summary>
+        /// Adding a New Client and Create a Presence for it.
+        /// </summary>
+        /// <param name="client"></param>
        public override void AddNewClient(IClientAPI client)
        {
            SubscribeToClientEvents(client);
@@ -1977,6 +2055,10 @@ namespace OpenSim.Region.Framework.Scenes
            EventManager.TriggerOnNewClient(client);
        }
+        /// <summary>
+        /// Register for events from the client
+        /// </summary>
+        /// <param name="client">The IClientAPI of the connected client</param>
        protected virtual void SubscribeToClientEvents(IClientAPI client)
        {
            client.OnRegionHandShakeReply += SendLayerData;
@@ -2019,12 +2101,13 @@ namespace OpenSim.Region.Framework.Scenes
            client.OnUpdatePrimFlags += m_sceneGraph.UpdatePrimFlags;
            client.OnRequestObjectPropertiesFamily += m_sceneGraph.RequestObjectPropertiesFamily;
            client.OnObjectPermissions += HandleObjectPermissionsUpdate;
            client.OnCreateNewInventoryItem += CreateNewInventoryItem;
            client.OnCreateNewInventoryFolder += HandleCreateInventoryFolder;
            client.OnUpdateInventoryFolder += HandleUpdateInventoryFolder;
-            client.OnMoveInventoryFolder += HandleMoveInventoryFolder;
+            client.OnMoveInventoryFolder += HandleMoveInventoryFolder; // 2; //!!
            client.OnFetchInventoryDescendents += HandleFetchInventoryDescendents;
-            client.OnPurgeInventoryDescendents += HandlePurgeInventoryDescendents;
+            client.OnPurgeInventoryDescendents += HandlePurgeInventoryDescendents; // 2; //!!
            client.OnFetchInventory += HandleFetchInventory;
            client.OnUpdateInventoryItem += UpdateInventoryItemAsset;
            client.OnCopyInventoryItem += CopyInventoryItem;
@@ -2036,6 +2119,7 @@ namespace OpenSim.Region.Framework.Scenes
            client.OnRemoveTaskItem += RemoveTaskInventory;
            client.OnUpdateTaskInventory += UpdateTaskInventory;
            client.OnMoveTaskItem += ClientMoveTaskInventoryItem;
            client.OnGrabObject += ProcessObjectGrab;
            client.OnDeGrabObject += ProcessObjectDeGrab;
            client.OnMoneyTransferRequest += ProcessMoneyTransferRequest;
@@ -2068,8 +2152,8 @@ namespace OpenSim.Region.Framework.Scenes
        /// <summary>
        /// Teleport an avatar to their home region
        /// </summary>
-        /// <param name="agentId"></param>
+        /// <param name="agentId">The avatar's Unique ID</param>
-        /// <param name="client"></param>
+        /// <param name="client">The IClientAPI for the client</param>
        public virtual void TeleportClientHome(UUID agentId, IClientAPI client)
        {
            UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(agentId);
@@ -2097,6 +2181,21 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Duplicates object specified by localID at position raycasted against RayTargetObject using 
+        /// RayEnd and RayStart to determine what the angle of the ray is
+        /// </summary>
+        /// <param name="localID">ID of object to duplicate</param>
+        /// <param name="dupeFlags"></param>
+        /// <param name="AgentID">Agent doing the duplication</param>
+        /// <param name="GroupID">Group of new object</param>
+        /// <param name="RayTargetObj">The target of the Ray</param>
+        /// <param name="RayEnd">The ending of the ray (farthest away point)</param>
+        /// <param name="RayStart">The Beginning of the ray (closest point)</param>
+        /// <param name="BypassRaycast">Bool to bypass raycasting</param>
+        /// <param name="RayEndIsIntersection">The End specified is the place to add the object</param>
+        /// <param name="CopyCenters">Position the object at the center of the face that it's colliding with</param>
+        /// <param name="CopyRotates">Rotate the object the same as the localID object</param>
        public void doObjectDuplicateOnRay(uint localID, uint dupeFlags, UUID AgentID, UUID GroupID,
                                           UUID RayTargetObj, Vector3 RayEnd, Vector3 RayStart,
                                           bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates)
@@ -2168,6 +2267,14 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Sets the Home Point.   The GridService uses this to know where to put a user when they log-in
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="regionHandle"></param>
+        /// <param name="position"></param>
+        /// <param name="lookAt"></param>
+        /// <param name="flags"></param>
        public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags)
        {
            UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(remoteClient.AgentId);
@@ -2338,6 +2445,12 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Removes region from an avatar's known region list.  This coincides with child agents.  For each child agent, there will be a known region entry.
+        /// 
+        /// </summary>
+        /// <param name="avatarID"></param>
+        /// <param name="regionslst"></param>
        public void HandleRemoveKnownRegionsFromAvatar(UUID avatarID, List<ulong> regionslst)
        {
            ScenePresence av = GetScenePresence(avatarID);
@@ -2353,12 +2466,19 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Closes all endpoints with the circuitcode provided.
+        /// </summary>
+        /// <param name="circuitcode">Circuit Code of the endpoint to close</param>
        public override void CloseAllAgents(uint circuitcode)
        {
            // Called by ClientView to kill all circuit codes
            ClientManager.CloseAllAgents(circuitcode);
        }
+        /// <summary>
+        /// Inform all other ScenePresences on this Scene that someone else has changed position on the minimap.
+        /// </summary>
        public void NotifyMyCoarseLocationChange()
        {
            ForEachScenePresence(delegate(ScenePresence presence) { presence.CoarseLocationChange(); });
@@ -2453,9 +2573,10 @@ namespace OpenSim.Region.Framework.Scenes
        /// The return bool should allow for connections to be refused, but as not all calling paths
        /// take proper notice of it let, we allowed banned users in still.
        /// </summary>
-        /// <param name="regionHandle"></param>
+        /// <param name="agent">CircuitData of the agent who is connecting</param>
-        /// <param name="agent"></param>
+        /// <param name="reason">Outputs the reason for the false response on this string</param>
-        /// <param name="reason"></param>
+        /// <returns>True if the region accepts this agent.  False if it does not.  False will 
+        /// also return a reason.</returns>
        public bool NewUserConnection(AgentCircuitData agent, out string reason)
        {
            // Don't disable this log message - it's too helpful
@@ -2528,6 +2649,13 @@ namespace OpenSim.Region.Framework.Scenes
            return true;
        }
+        /// <summary>
+        /// Verifies that the user has a session on the Grid
+        /// </summary>
+        /// <param name="agent">Circuit Data of the Agent we're verifying</param>
+        /// <param name="reason">Outputs the reason for the false response on this string</param>
+        /// <returns>True if the user has a session on the grid.  False if it does not.  False will 
+        /// also return a reason.</returns>
        public virtual bool AuthenticateUser(AgentCircuitData agent, out string reason)
        {
            reason = String.Empty;
@@ -2540,6 +2668,13 @@ namespace OpenSim.Region.Framework.Scenes
            return result;
        }
+        /// <summary>
+        /// Verify if the user can connect to this region.  Checks the banlist and ensures that the region is set for public access
+        /// </summary>
+        /// <param name="agent">The circuit data for the agent</param>
+        /// <param name="reason">outputs the reason to this string</param>
+        /// <returns>True if the region accepts this agent.  False if it does not.  False will 
+        /// also return a reason.</returns>
        protected virtual bool AuthorizeUser(AgentCircuitData agent, out string reason)
        {
            reason = String.Empty;
@@ -2598,16 +2733,32 @@ namespace OpenSim.Region.Framework.Scenes
            return true;
        }
+        /// <summary>
+        /// Update an AgentCircuitData object with new information
+        /// </summary>
+        /// <param name="data">Information to update the AgentCircuitData with</param>
        public void UpdateCircuitData(AgentCircuitData data)
        {
            m_authenticateHandler.UpdateAgentData(data);
        }
+        /// <summary>
+        /// Change the Circuit Code for the user's Circuit Data
+        /// </summary>
+        /// <param name="oldcc">The old Circuit Code.  Must match a previous circuit code</param>
+        /// <param name="newcc">The new Circuit Code.  Must not be an already existing circuit code</param>
+        /// <returns>True if we successfully changed it.  False if we did not</returns>
        public bool ChangeCircuitCode(uint oldcc, uint newcc)
        {
            return m_authenticateHandler.TryChangeCiruitCode(oldcc, newcc);
        }
+        /// <summary>
+        /// The Grid has requested that we log-off a user.  Log them off.
+        /// </summary>
+        /// <param name="AvatarID">Unique ID of the avatar to log-off</param>
+        /// <param name="RegionSecret">SecureSessionID of the user, or the RegionSecret text when logging on to the grid</param>
+        /// <param name="message">message to display to the user.  Reason for being logged off</param>
        public void HandleLogOffUserFromGrid(UUID AvatarID, UUID RegionSecret, string message)
        {
            ScenePresence loggingOffUser = null;
@@ -2673,6 +2824,13 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// We've got an update about an agent that sees into this region, 
+        /// send it to ScenePresence for processing  It's the full data.
+        /// </summary>
+        /// <param name="cAgentData">Agent that contains all of the relevant things about an agent.  
+        /// Appearance, animations, position, etc.</param>
+        /// <returns>true if we handled it.</returns>
        public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData)
        {
 //            m_log.DebugFormat(
@@ -2690,6 +2848,12 @@ namespace OpenSim.Region.Framework.Scenes
            return false;
        }
+        /// <summary>
+        /// We've got an update about an agent that sees into this region, 
+        /// send it to ScenePresence for processing  It's only positional data
+        /// </summary>
+        /// <param name="cAgentData">AgentPosition that contains agent positional data so we can know what to send</param>
+        /// <returns>true if we handled it.</returns>
        public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData)
        {
            //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 0140faa..c1e39a9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -48,6 +48,9 @@ namespace OpenSim.Region.Framework.Scenes
    public delegate void RemoveKnownRegionsFromAvatarList(UUID avatarID, List<ulong> regionlst);
+    /// <summary>
+    /// Class that Region communications runs through
+    /// </summary>
    public class SceneCommunicationService //one instance per region
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -60,15 +63,46 @@ namespace OpenSim.Region.Framework.Scenes
        protected List<UUID> m_agentsInTransit;
+        /// <summary>
+        /// An agent is crossing into this region
+        /// </summary>
        public event AgentCrossing OnAvatarCrossingIntoRegion;
+        /// <summary>
+        /// A user will arrive shortly, set up appropriate credentials so it can connect
+        /// </summary>
        public event ExpectUserDelegate OnExpectUser;
+        /// <summary>
+        /// A Prim will arrive shortly
+        /// </summary>
        public event ExpectPrimDelegate OnExpectPrim;
        public event CloseAgentConnection OnCloseAgentConnection;
+        /// <summary>
+        /// A new prim has arrived
+        /// </summary>
        public event PrimCrossing OnPrimCrossingIntoRegion;
+        /// <summary>
+        /// A New Region is up and available
+        /// </summary>
        public event RegionUp OnRegionUp;
+        /// <summary>
+        /// We have a child agent for this avatar and we're getting a status update about it
+        /// </summary>
        public event ChildAgentUpdate OnChildAgentUpdate;
        //public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar;
+        /// <summary>
+        /// Time to log one of our users off.   Grid Service sends this mostly
+        /// </summary>
        public event LogOffUser OnLogOffUser;
+        /// <summary>
+        /// A region wants land data from us!
+        /// </summary>
        public event GetLandData OnGetLandData;
        private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
@@ -123,11 +157,20 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// Returns a region with the name closest to string provided
+        /// </summary>
+        /// <param name="name">Partial Region Name for matching</param>
+        /// <returns>Region Information for the region</returns>
        public RegionInfo RequestClosestRegion(string name)
        {
            return m_commsProvider.GridService.RequestClosestRegion(name);
        }
+        /// <summary>
+        /// This region is shutting down, de-register all events!
+        /// De-Register region from Grid!
+        /// </summary>
        public void Close()
        {
            if (regionCommsHost != null)
@@ -159,10 +202,9 @@ namespace OpenSim.Region.Framework.Scenes
        #region CommsManager Event handlers
        /// <summary>
-        ///
+        /// A New User will arrive shortly, Informs the scene that there's a new user on the way
        /// </summary>
-        /// <param name="regionHandle"></param>
+        /// <param name="agent">Data we need to ensure that the agent can connect</param>
-        /// <param name="agent"></param>
        ///
        protected void NewUserConnection(AgentCircuitData agent)
        {
@@ -174,6 +216,12 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// The Grid has requested us to log-off the user
+        /// </summary>
+        /// <param name="AgentID">Unique ID of agent to log-off</param>
+        /// <param name="RegionSecret">The secret string that the region establishes with the grid when registering</param>
+        /// <param name="message">The message to send to the user that tells them why they were logged off</param>
        protected void GridLogOffUser(UUID AgentID, UUID RegionSecret, string message)
        {
            handlerLogOffUser = OnLogOffUser;
@@ -183,6 +231,11 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// A New Region is now available.  Inform the scene that there is a new region available.
+        /// </summary>
+        /// <param name="region">Information about the new region that is available</param>
+        /// <returns>True if the event was handled</returns>
        protected bool newRegionUp(RegionInfo region)
        {
            handlerRegionUp = OnRegionUp;
@@ -194,6 +247,11 @@ namespace OpenSim.Region.Framework.Scenes
            return true;
        }
+        /// <summary>
+        /// Inform the scene that we've got an update about a child agent that we have
+        /// </summary>
+        /// <param name="cAgentData"></param>
+        /// <returns></returns>
        protected bool ChildAgentUpdate(ChildAgentDataUpdate cAgentData)
        {
            handlerChildAgentUpdate = OnChildAgentUpdate;
@@ -204,6 +262,7 @@ namespace OpenSim.Region.Framework.Scenes
            return true;
        }
        protected void AgentCrossing(UUID agentID, Vector3 position, bool isFlying)
        {
            handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion;
@@ -213,6 +272,13 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        /// <summary>
+        /// We have a new prim from a neighbor
+        /// </summary>
+        /// <param name="primID">unique ID for the primative</param>
+        /// <param name="objXMLData">XML2 encoded data of the primative</param>
+        /// <param name="XMLMethod">An Int that represents the version of the XMLMethod</param>
+        /// <returns>True if the prim was accepted, false if it was not</returns>
        protected bool IncomingPrimCrossing(UUID primID, String objXMLData, int XMLMethod)
        {
            handlerExpectPrim = OnExpectPrim;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 61dfa52..3646811 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1098,30 +1098,29 @@ if (m_shape != null) {
            }
        }
-        private void handleTimerAccounting(uint localID, double interval)
+        // TODO: unused:
-        {
+        // private void handleTimerAccounting(uint localID, double interval)
-            if (localID == LocalId)
+        // {
-            {
+        //     if (localID == LocalId)
+        //     {
-                float sec = (float)interval;
+        //         float sec = (float)interval;
-                if (m_parentGroup != null)
+        //         if (m_parentGroup != null)
-                {
+        //         {
-                    if (sec == 0)
+        //             if (sec == 0)
-                    {
+        //             {
-                        if (m_parentGroup.scriptScore + 0.001f >= float.MaxValue - 0.001)
+        //                 if (m_parentGroup.scriptScore + 0.001f >= float.MaxValue - 0.001)
-                            m_parentGroup.scriptScore = 0;
+        //                     m_parentGroup.scriptScore = 0;
+        //
-                        m_parentGroup.scriptScore += 0.001f;
+        //                 m_parentGroup.scriptScore += 0.001f;
-                        return;
+        //                 return;
-                    }
+        //             }
+        //
-                    if (m_parentGroup.scriptScore + (0.001f / sec) >= float.MaxValue - (0.001f / sec))
+        //             if (m_parentGroup.scriptScore + (0.001f / sec) >= float.MaxValue - (0.001f / sec))
-                        m_parentGroup.scriptScore = 0;
+        //                 m_parentGroup.scriptScore = 0;
-                    m_parentGroup.scriptScore += (0.001f / sec);
+        //             m_parentGroup.scriptScore += (0.001f / sec);
-                }
+        //         }
+        //     }
-            }
+        // }
-        }
        #endregion Private Methods
@@ -1248,7 +1247,6 @@ if (m_shape != null) {
            }
        }
        /// <summary>
        /// hook to the physics scene to apply angular impulse
        /// This is sent up to the group, which then finds the root prim
@@ -1809,7 +1807,6 @@ if (m_shape != null) {
            m_parentGroup.SetHoverHeight(0f, PIDHoverType.Ground, 0f);
        }
        public virtual void OnGrab(Vector3 offsetPos, IClientAPI remoteClient)
        {
        }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 1836447..88452d2 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -113,6 +113,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            agent.InventoryFolder = UUID.Zero;
            agent.startpos = Vector3.Zero;
            agent.CapsPath = GetRandomCapsObjectPath();
+            agent.ChildrenCapSeeds = new Dictionary<ulong, string>();
            string reason;
            scene.NewUserConnection(agent, out reason);
@@ -147,7 +148,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            TestHelper.InMethod();
            string reason;
+            if (acd1 == null)
+                fixNullPresence();
            scene.NewUserConnection(acd1, out reason);
+            if (testclient == null)
+                testclient = new TestClient(acd1, scene);
            scene.AddNewClient(testclient);
            ScenePresence presence = scene.GetScenePresence(agent1);
@@ -162,6 +169,24 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            Assert.That(neighbours.Count, Is.EqualTo(2));
        }
+        public void fixNullPresence()
+        {
+            string firstName = "testfirstname";
+            AgentCircuitData agent = new AgentCircuitData();
+            agent.AgentID = agent1;
+            agent.firstname = firstName;
+            agent.lastname = "testlastname";
+            agent.SessionID = UUID.Zero;
+            agent.SecureSessionID = UUID.Zero;
+            agent.circuitcode = 123;
+            agent.BaseFolder = UUID.Zero;
+            agent.InventoryFolder = UUID.Zero;
+            agent.startpos = Vector3.Zero;
+            agent.CapsPath = GetRandomCapsObjectPath();
+            acd1 = agent;
+        }
        [Test]
        public void T013_TestRemoveNeighbourRegion()
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index ed2d317..23eab90 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -38,6 +38,7 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
+using System.Threading;
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
@@ -55,56 +56,130 @@ namespace OpenSim.Region.Framework.Scenes.Tests
        public void TestSimpleNotNeighboursTeleport()
        {
            TestHelper.InMethod();
+            ThreadRunResults results = new ThreadRunResults();
+            results.Result = false;
+            results.Message = "Test did not run";
+            TestRunning testClass = new TestRunning(results);
+            Thread testThread = new Thread(testClass.run);
+            try
+            {
+                // Seems kind of redundant to start a thread and then join it, however..   We need to protect against
+                // A thread abort exception in the simulator code.
+                testThread.Start();
+                testThread.Join();
+            } 
+            catch (ThreadAbortException)
+            {
+                
+            }
+            Assert.That(testClass.results.Result, Is.EqualTo(true), testClass.results.Message);
            // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+        }
+    }
+    public class ThreadRunResults
+    {
+        public bool Result = false;
+        public string Message = string.Empty;
+    }
+    public class TestRunning
+    {
+        public ThreadRunResults results;
+        public TestRunning(ThreadRunResults t)
+        {
+            results = t;
+        }
+        public void run(object o)
+        {
            
+            //results.Result = true;
            log4net.Config.XmlConfigurator.Configure();
-            
            UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100");
            UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200");
            TestCommunicationsManager cm = new TestCommunicationsManager();
            // shared module
            ISharedRegionModule interregionComms = new RESTInterregionComms();
-            
            Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm);
            SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
            sceneA.RegisterRegionWithGrid();
-            
            Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm);
            SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms);
            sceneB.RegisterRegionWithGrid();
- 
-            UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");                      
+            UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");
            TestClient client = SceneSetupHelpers.AddRootAgent(sceneA, agentId);
- 
            ICapabilitiesModule sceneACapsModule = sceneA.RequestModuleInterface<ICapabilitiesModule>();
+            results.Result = (sceneACapsModule.GetCapsPath(agentId) == client.CapsSeedUrl);
            
+            if (!results.Result)
+            {
+                results.Message = "Incorrect caps object path set up in sceneA";
+                return;
+            }
+            /*
            Assert.That(
-                sceneACapsModule.GetCapsPath(agentId), 
+                sceneACapsModule.GetCapsPath(agentId),
-                Is.EqualTo(client.CapsSeedUrl), 
+                Is.EqualTo(client.CapsSeedUrl),
                "Incorrect caps object path set up in sceneA");
-                        
+            */
            // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used.
-            client.TeleportTargetScene = sceneB;            
-            client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
            
-            Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB");                                   
-            Assert.That(sceneA.GetScenePresence(agentId), Is.Null, "Client still had an agent in sceneA");
+            client.TeleportTargetScene = sceneB;
+            client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
+            results.Result = (sceneB.GetScenePresence(agentId) != null);
+            if (!results.Result)
+            {
+                results.Message = "Client does not have an agent in sceneB";
+                return;
+            }
+            //Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB");
            
+            //Assert.That(sceneA.GetScenePresence(agentId), Is.Null, "Client still had an agent in sceneA");
+            results.Result = (sceneA.GetScenePresence(agentId) == null);
+            if (!results.Result)
+            {
+                results.Message = "Client still had an agent in sceneA";
+                return;
+            }
            ICapabilitiesModule sceneBCapsModule = sceneB.RequestModuleInterface<ICapabilitiesModule>();
-            
+            results.Result = ("http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort +
+                              "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/" == client.CapsSeedUrl);
+            if (!results.Result)
+            {
+                results.Message = "Incorrect caps object path set up in sceneB";
+                return;
+            }
            // Temporary assertion - caps url construction should at least be doable through a method.
+            /*
            Assert.That(
-                "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", 
+                "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/",
-                Is.EqualTo(client.CapsSeedUrl), 
+                Is.EqualTo(client.CapsSeedUrl),
-                "Incorrect caps object path set up in sceneB");  
+                "Incorrect caps object path set up in sceneB");
-            
+            */
            // This assertion will currently fail since we don't remove the caps paths when no longer needed
            //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path");
-            
            // TODO: Check that more of everything is as it should be
-            
            // TODO: test what happens if we try to teleport to a region that doesn't exist
        }
    }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 81f200a..00163f6 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -304,12 +304,10 @@ namespace OpenSim.Region.Physics.OdePlugin
        public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f);
        public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f);
-        private uint heightmapWidth = m_regionWidth + 1;
+        // TODO: unused: private uint heightmapWidth = m_regionWidth + 1;
-        private uint heightmapHeight = m_regionHeight + 1;
+        // TODO: unused: private uint heightmapHeight = m_regionHeight + 1;
+        // TODO: unused: private uint heightmapWidthSamples;
-        private uint heightmapWidthSamples;
+        // TODO: unused: private uint heightmapHeightSamples;
-        private uint heightmapHeightSamples;
        private volatile int m_global_contactcount = 0;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ff85b96..691732a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -125,9 +125,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (lease.CurrentState == LeaseState.Initial)
            {
-                lease.InitialLeaseTime = TimeSpan.FromMinutes(1.0);
+                lease.InitialLeaseTime = TimeSpan.FromMinutes(0);
-                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
+//                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
-                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
+//                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
            }
            return lease;
        }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 6539bda..6e3a3ab 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -166,9 +166,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (lease.CurrentState == LeaseState.Initial)
            {
-                lease.InitialLeaseTime = TimeSpan.FromMinutes(1.0);
+                lease.InitialLeaseTime = TimeSpan.FromMinutes(0);
-                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
+//                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
-                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
+//                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
            }
            return lease;
        }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index d119a77..838cafb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -42,16 +42,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
    public partial class ScriptBaseClass : MarshalByRefObject, IScript
    {
        private Dictionary<string, MethodInfo> inits = new Dictionary<string, MethodInfo>();
-        private ScriptSponsor m_sponser;
+//        private ScriptSponsor m_sponser;
        public override Object InitializeLifetimeService()
        {
            ILease lease = (ILease)base.InitializeLifetimeService();
            if (lease.CurrentState == LeaseState.Initial)
            {
-                lease.InitialLeaseTime = TimeSpan.FromMinutes(1.0);
+                // Infinite
-                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
+                lease.InitialLeaseTime = TimeSpan.FromMinutes(0);
-                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
+//                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
+//                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
            }
            return lease;
        }
@@ -79,7 +80,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
                }
            }
-            m_sponser = new ScriptSponsor();
+//            m_sponser = new ScriptSponsor();
        }
        private Executor m_Executor = null;
@@ -112,7 +113,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
                return;
            ILease lease = (ILease)RemotingServices.GetLifetimeService(data as MarshalByRefObject);
-            lease.Register(m_sponser);
+//            lease.Register(m_sponser);
            MethodInfo mi = inits[api];
@@ -126,7 +127,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
        public void Close()
        {
-            m_sponser.Close();
+//            m_sponser.Close();
        }
        public Dictionary<string, object> GetVars()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 4211ced..225126d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -53,7 +53,7 @@ using OpenSim.Region.ScriptEngine.Interfaces;
 namespace OpenSim.Region.ScriptEngine.Shared.Instance
 {
-    public class ScriptInstance : MarshalByRefObject, IScriptInstance, ISponsor
+    public class ScriptInstance : MarshalByRefObject, IScriptInstance
    {
        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
@@ -261,7 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                    "SecondLife.Script");
                ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
-                lease.Register(this);
+//                lease.Register(this);
            }
            catch (Exception)
            {
@@ -1006,10 +1006,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
        {
            return true;
        }
-        public TimeSpan Renewal(ILease lease)
-        {
-            return lease.InitialLeaseTime;
-        }
    }
 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
index aac52a4..045abb4 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
@@ -40,6 +40,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
    /// <summary>
    /// Scene presence tests
    /// </summary>
+    /// Commented out XEngineTests that don't do anything
+    /*
    [TestFixture]
    public class XEngineTest
    {
@@ -65,4 +67,5 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
            xengine.RegionLoaded(scene);
        }
    }
+    */
 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 3ef5ae8..76218c8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -729,8 +729,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                                  item.Name, startParam, postOnRez,
                                                  stateSource, m_MaxScriptQueue);
                    
-                    m_log.DebugFormat("[XEngine] Loaded script {0}.{1}",
+                    m_log.DebugFormat("[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}",
-                            part.ParentGroup.RootPart.Name, item.Name);
+                            part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, part.ParentGroup.RootPart.AbsolutePosition.ToString());
                    instance.AppDomain = appDomain;
                    instance.LineMap = linemap;