380 files changed, 42493 insertions, 33366 deletions

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 6215055..e441cc8 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -130,7 +130,7 @@ namespace OpenSim
             if (workerThreads < workerThreadsMin)
             {
                 workerThreads = workerThreadsMin;
-                m_log.InfoFormat("[OPENSIM MAIN]: Bumping up to max worker threads to {0}",workerThreads);
+                m_log.InfoFormat("[OPENSIM MAIN]: Bumping up max worker threads to {0}",workerThreads);
             }
             if (workerThreads > workerThreadsMax)
             {
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 52e520c..b19e549 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -82,8 +82,7 @@ namespace OpenSim
 
             List<string> sources = new List<string>();
 
-            string masterFileName =
-                    startupConfig.GetString("inimaster", "OpenSimDefaults.ini");
+            string masterFileName = startupConfig.GetString("inimaster", "OpenSimDefaults.ini");
 
             if (masterFileName == "none")
                 masterFileName = String.Empty;
@@ -207,25 +206,14 @@ namespace OpenSim
                 Environment.Exit(1);
             }
 
+            // Merge OpSys env vars
+            m_log.Info("[CONFIG]: Loading environment variables for Config");
+            Util.MergeEnvironmentToConfig(m_config.Source);
+
             // Make sure command line options take precedence
             m_config.Source.Merge(argvSource);
 
-            IConfig enVars = m_config.Source.Configs["Environment"];
-
-            if( enVars != null )
-            {
-                string[] env_keys = enVars.GetKeys();
-
-                foreach ( string key in env_keys )
-                {
-                    envConfigSource.AddEnv(key, string.Empty);
-                }
-
-                envConfigSource.LoadEnv();
-                m_config.Source.Merge(envConfigSource);
-            }
-
-            m_config.Source.ExpandKeyValues();
+            m_config.Source.ReplaceKeyValues();
 
             ReadConfigSettings();
 
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index 6e6d48c..a3fa66c 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -26,12 +26,14 @@
  */
 
 using OpenSim.Framework;
+using Mono.Addins;
 
 namespace OpenSim
 {
     /// <summary>
     /// OpenSimulator Application Plugin framework interface
     /// </summary>
+    [TypeExtensionPoint(NodeName="Plugin", NodeType = typeof(PluginExtensionNode), Path="/OpenSim/Startup")]
     public interface IApplicationPlugin : IPlugin
     {
         /// <summary>
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1e6ef3b..a350510 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -45,6 +45,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim
 {
@@ -114,8 +115,13 @@ namespace OpenSim
                 if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod))
                     Util.FireAndForgetMethod = asyncCallMethod;
 
+<<<<<<< HEAD
+                stpMinThreads = startupConfig.GetInt("MinPoolThreads", 15);
+                stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 300);
+=======
                 stpMinThreads = startupConfig.GetInt("MinPoolThreads", 2 );
                 stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 25);
+>>>>>>> avn/ubitvar
                 m_consolePrompt = startupConfig.GetString("ConsolePrompt", @"Region (\R) ");
             }
 
@@ -155,7 +161,7 @@ namespace OpenSim
                     ((RemoteConsole)m_console).ReadConfig(Config);
                     break;
                 default:
-                    m_console = new LocalConsole("Region");
+                    m_console = new LocalConsole("Region", Config.Configs["Startup"]);
                     break;
                 }
             }
@@ -267,13 +273,20 @@ namespace OpenSim
                                           SavePrimsXml2);
 
             m_console.Commands.AddCommand("Archiving", false, "load oar",
+<<<<<<< HEAD
+=======
 
+>>>>>>> avn/ubitvar
                                           "load oar [--merge] [--skip-assets]"
                                              + " [--default-user \"User Name\"]"
                                              + " [--force-terrain] [--force-parcels]"
                                              + " [--no-objects]"
                                              + " [--rotation degrees] [--rotation-center \"<x,y,z>\"]"
+<<<<<<< HEAD
+                                             + " [--displacement \"<x,y,z>\"]"                                             
+=======
                                              + " [--displacement \"<x,y,z>\"]"
+>>>>>>> avn/ubitvar
                                              + " [<OAR path>]",
                                           "Load a region's data from an OAR archive.",
                                           "--merge will merge the OAR with the existing scene (suppresses terrain and parcel info loading).\n"
@@ -386,7 +399,7 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("Regions", false, "restart",
                                           "restart",
-                                          "Restart all sims in this instance", 
+                                          "Restart the currently selected region(s) in this instance", 
                                           RunCommand);
 
             m_console.Commands.AddCommand("General", false, "command-script",
@@ -403,6 +416,27 @@ namespace OpenSim
                                           "delete-region <name>",
                                           "Delete a region from disk", 
                                           RunCommand);
+
+            m_console.Commands.AddCommand("Estates", false, "estate create",
+                                          "estate create <owner UUID> <estate name>",
+                                          "Creates a new estate with the specified name, owned by the specified user."
+                                          + " Estate name must be unique.",
+                                          CreateEstateCommand);
+
+            m_console.Commands.AddCommand("Estates", false, "estate set owner",
+                                          "estate set owner <estate-id>[ <UUID> | <Firstname> <Lastname> ]",
+                                          "Sets the owner of the specified estate to the specified UUID or user. ",
+                                          SetEstateOwnerCommand);
+
+            m_console.Commands.AddCommand("Estates", false, "estate set name",
+                                          "estate set name <estate-id> <new name>",
+                                          "Sets the name of the specified estate to the specified value. New name must be unique.",
+                                          SetEstateNameCommand);
+
+            m_console.Commands.AddCommand("Estates", false, "estate link region",
+                                          "estate link region <estate ID> <region ID>",
+                                          "Attaches the specified region to the specified estate.",
+                                          EstateLinkRegionCommand);
         }
 
         protected override void ShutdownSpecific()
@@ -563,7 +597,7 @@ namespace OpenSim
             {
                 scene.ForEachSOG(delegate(SceneObjectGroup sog)
                 {
-                    if (sog.AttachmentPoint == 0)
+                    if (!sog.IsAttachment)
                     {
                         sog.RootPart.UpdateRotation(rot * sog.GroupRotation);
                         Vector3 offset = sog.AbsolutePosition - center;
@@ -592,7 +626,7 @@ namespace OpenSim
             {
                 scene.ForEachSOG(delegate(SceneObjectGroup sog)
                 {
-                    if (sog.AttachmentPoint == 0)
+                    if (!sog.IsAttachment)
                     {
                         if (sog.RootPart.AbsolutePosition.Z < minZ)
                             minZ = sog.RootPart.AbsolutePosition.Z;
@@ -604,7 +638,7 @@ namespace OpenSim
             {
                 scene.ForEachSOG(delegate(SceneObjectGroup sog)
                 {
-                    if (sog.AttachmentPoint == 0)
+                    if (!sog.IsAttachment)
                     {
                         Vector3 tmpRootPos = sog.RootPart.AbsolutePosition;
                         tmpRootPos.Z -= minZ;
@@ -644,7 +678,7 @@ namespace OpenSim
             {
                 scene.ForEachSOG(delegate(SceneObjectGroup sog)
                 {
-                    if (sog.AttachmentPoint == 0)
+                    if (!sog.IsAttachment)
                         sog.UpdateGroupPosition(sog.AbsolutePosition + offset);
                 });
             });
@@ -711,7 +745,9 @@ namespace OpenSim
             CreateRegion(regInfo, true, out scene);
 
             if (changed)
-                    regInfo.EstateSettings.Save();
+                    m_estateDataService.StoreEstateSettings(regInfo.EstateSettings);
+        
+            scene.Start();
         }
 
         /// <summary>
@@ -902,7 +938,7 @@ namespace OpenSim
 
                             foreach (IRegionModuleBase module in scene.RegionModules.Values)
                             {
-                                if (module.GetType().GetInterface("ISharedRegionModule") != null)
+                                if (module.GetType().GetInterface("ISharedRegionModule") == null)
                                     nonSharedModules.Add(module);
                                 else
                                     sharedModules.Add(module);
@@ -920,17 +956,30 @@ namespace OpenSim
                     break;
 
                 case "regions":
+                    ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+                    cdt.AddColumn("Name", ConsoleDisplayUtil.RegionNameSize);
+                    cdt.AddColumn("ID", ConsoleDisplayUtil.UuidSize);
+                    cdt.AddColumn("Position", ConsoleDisplayUtil.CoordTupleSize);
+                    cdt.AddColumn("Size", 11);
+                    cdt.AddColumn("Port", ConsoleDisplayUtil.PortSize);
+                    cdt.AddColumn("Ready?", 6);
+                    cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize);
                     SceneManager.ForEachScene(
-                        delegate(Scene scene)
-                            {
-                                MainConsole.Instance.Output(String.Format(
-                                           "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}, Estate Name: {4}",
-                                           scene.RegionInfo.RegionName,
-                                           scene.RegionInfo.RegionLocX,
-                                           scene.RegionInfo.RegionLocY,
-                                           scene.RegionInfo.InternalEndPoint.Port,
-                                           scene.RegionInfo.EstateSettings.EstateName));
-                            });
+                        scene => 
+                        { 
+                            RegionInfo ri = scene.RegionInfo; 
+                            cdt.AddRow(
+                                ri.RegionName, 
+                                ri.RegionID, 
+                                string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY), 
+                                string.Format("{0}x{1}", ri.RegionSizeX, ri.RegionSizeY),
+                                ri.InternalEndPoint.Port, 
+                                scene.Ready ? "Yes" : "No", 
+                                ri.EstateSettings.EstateName);
+                        }
+                    );
+
+                    MainConsole.Instance.Output(cdt.ToString());
                     break;
 
                 case "ratings":
@@ -979,7 +1028,7 @@ namespace OpenSim
                             aCircuit.child ? "child" : "root",
                             aCircuit.circuitcode.ToString(),
                             aCircuit.IPAddress != null ? aCircuit.IPAddress.ToString() : "not set",
-                            aCircuit.Viewer);
+                            Util.GetViewerName(aCircuit));
                 });
 
             MainConsole.Instance.Output(cdt.ToString());
@@ -1172,6 +1221,232 @@ namespace OpenSim
             SceneManager.SaveCurrentSceneToArchive(cmdparams);
         }
 
+        protected void CreateEstateCommand(string module, string[] args)
+        {
+            string response = null;
+            UUID userID;
+
+            if (args.Length == 2)
+            {
+                response = "No user specified.";
+            }
+            else if (!UUID.TryParse(args[2], out userID))
+            {
+                response = String.Format("{0} is not a valid UUID", args[2]);
+            }
+            else if (args.Length == 3)
+            {
+                response = "No estate name specified.";
+            }
+            else
+            {
+                Scene scene = SceneManager.CurrentOrFirstScene;
+
+                // TODO: Is there a better choice here?
+                UUID scopeID = UUID.Zero;
+                UserAccount account = scene.UserAccountService.GetUserAccount(scopeID, userID);
+                if (account == null)
+                {
+                    response = String.Format("Could not find user {0}", userID);
+                }
+                else
+                {
+                    // concatenate it all to "name"
+                    StringBuilder sb = new StringBuilder(args[3]);
+                    for (int i = 4; i < args.Length; i++)
+                        sb.Append (" " + args[i]);
+                    string estateName = sb.ToString().Trim();
+
+                    // send it off for processing.
+                    IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
+                    response = estateModule.CreateEstate(estateName, userID);
+                    if (response == String.Empty)
+                    {
+                        List<int> estates = scene.EstateDataService.GetEstates(estateName);
+                        response = String.Format("Estate {0} created as \"{1}\"", estates.ElementAt(0), estateName);
+                    }
+                }
+            }
+
+            // give the user some feedback
+            if (response != null)
+                MainConsole.Instance.Output(response);
+        }
+
+        protected void SetEstateOwnerCommand(string module, string[] args)
+        {
+            string response = null;
+
+            Scene scene = SceneManager.CurrentOrFirstScene;
+            IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
+
+            if (args.Length == 3)
+            {
+                response = "No estate specified.";
+            }
+            else
+            {
+                int estateId;
+                if (!int.TryParse(args[3], out estateId))
+                {
+                    response = String.Format("\"{0}\" is not a valid ID for an Estate", args[3]);
+                }
+                else
+                {
+                    if (args.Length == 4)
+                    {
+                        response = "No user specified.";
+                    }
+                    else
+                    {
+                        UserAccount account = null;
+
+                        // TODO: Is there a better choice here?
+                        UUID scopeID = UUID.Zero;
+
+                        string s1 = args[4];
+                        if (args.Length == 5)
+                        {
+                            // attempt to get account by UUID
+                            UUID u;
+                            if (UUID.TryParse(s1, out u))
+                            {
+                                account = scene.UserAccountService.GetUserAccount(scopeID, u);
+                                if (account == null)
+                                    response = String.Format("Could not find user {0}", s1);
+                            }
+                            else
+                            {
+                                response = String.Format("Invalid UUID {0}", s1);
+                            }
+                        }
+                        else
+                        {
+                            // attempt to get account by Firstname, Lastname
+                            string s2 = args[5];
+                            account = scene.UserAccountService.GetUserAccount(scopeID, s1, s2);
+                            if (account == null)
+                                response = String.Format("Could not find user {0} {1}", s1, s2);
+                        }
+
+                        // If it's valid, send it off for processing.
+                        if (account != null)
+                            response = estateModule.SetEstateOwner(estateId, account);
+
+                        if (response == String.Empty)
+                        {
+                            response = String.Format("Estate owner changed to {0} ({1} {2})", account.PrincipalID, account.FirstName, account.LastName);
+                        }
+                    }
+                }
+            }
+
+            // give the user some feedback
+            if (response != null)
+                MainConsole.Instance.Output(response);
+        }
+
+        protected void SetEstateNameCommand(string module, string[] args)
+        {
+            string response = null;
+
+            Scene scene = SceneManager.CurrentOrFirstScene;
+            IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
+
+            if (args.Length == 3)
+            {
+                response = "No estate specified.";
+            }
+            else
+            {
+                int estateId;
+                if (!int.TryParse(args[3], out estateId))
+                {
+                    response = String.Format("\"{0}\" is not a valid ID for an Estate", args[3]);
+                }
+                else
+                {
+                    if (args.Length == 4)
+                    {
+                        response = "No name specified.";
+                    }
+                    else
+                    {
+                        // everything after the estate ID is "name"
+                        StringBuilder sb = new StringBuilder(args[4]);
+                        for (int i = 5; i < args.Length; i++)
+                            sb.Append (" " + args[i]);
+
+                        string estateName = sb.ToString();
+
+                        // send it off for processing.
+                        response = estateModule.SetEstateName(estateId, estateName);
+
+                        if (response == String.Empty)
+                        {
+                            response = String.Format("Estate {0} renamed to \"{1}\"", estateId, estateName);
+                        }
+                    }
+                }
+            }
+
+            // give the user some feedback
+            if (response != null)
+                MainConsole.Instance.Output(response);
+        }
+
+        private void EstateLinkRegionCommand(string module, string[] args)
+        {
+            int estateId =-1;
+            UUID regionId = UUID.Zero;
+            Scene scene = null;
+            string response = null;
+
+            if (args.Length == 3)
+            {
+                response = "No estate specified.";
+            }
+            else if (!int.TryParse(args [3], out estateId))
+            {
+                response = String.Format("\"{0}\" is not a valid ID for an Estate", args [3]);
+            }
+            else if (args.Length == 4)
+            {
+                response = "No region specified.";
+            }
+            else if (!UUID.TryParse(args[4], out regionId))
+            {
+                response = String.Format("\"{0}\" is not a valid UUID for a Region", args [4]);
+            }
+            else if (!SceneManager.TryGetScene(regionId, out scene))
+            {
+                // region may exist, but on a different sim.
+                response = String.Format("No access to Region \"{0}\"", args [4]);
+            }
+
+            if (response != null)
+            {
+                MainConsole.Instance.Output(response);
+                return;
+            }
+
+            // send it off for processing.
+            IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
+            response = estateModule.SetRegionEstate(scene.RegionInfo, estateId);
+            if (response == String.Empty)
+            {
+                estateModule.TriggerRegionInfoChange();
+                estateModule.sendRegionHandshakeToAll();
+                response = String.Format ("Region {0} is now attached to estate {1}", regionId, estateId);
+            }
+
+            // give the user some feedback
+            if (response != null)
+                MainConsole.Instance.Output (response);
+        }
+
+        #endregion
+
         private static string CombineParams(string[] commandParams, int pos)
         {
             string result = String.Empty;
@@ -1182,7 +1457,5 @@ namespace OpenSim
             result = result.TrimEnd(' ');
             return result;
         }
-
-        #endregion
     }
 }
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index e8cf7cc..760decd 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -71,6 +71,20 @@ namespace OpenSim
         // OpenSim.ini Section name for ESTATES Settings
         public const string ESTATE_SECTION_NAME = "Estates";
 
+        /// <summary>
+        /// Allow all plugin loading to be disabled for tests/debug.
+        /// </summary>
+        /// <remarks>
+        /// true by default
+        /// </remarks>
+        public bool EnableInitialPluginLoad { get; set; }
+
+        /// <summary>
+        /// Control whether we attempt to load an estate data service.
+        /// </summary>
+        /// <remarks>For tests/debugging</remarks>
+        public bool LoadEstateDataService { get; set; }
+
         protected string proxyUrl;
         protected int proxyOffset = 0;
         
@@ -96,7 +110,7 @@ namespace OpenSim
 
         public ConsoleCommand CreateAccount = null;
 
-        protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
+        public List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
 
         private List<string> m_permsModules;
 
@@ -139,6 +153,8 @@ namespace OpenSim
         /// <param name="configSource"></param>
         public OpenSimBase(IConfigSource configSource) : base()
         {
+            EnableInitialPluginLoad = true;
+            LoadEstateDataService = true;
             LoadConfigSettings(configSource);
         }
 
@@ -158,14 +174,37 @@ namespace OpenSim
                 proxyUrl = networkConfig.GetString("proxy_url", "");
                 proxyOffset = Int32.Parse(networkConfig.GetString("proxy_offset", "0"));
             }
+
+            IConfig startupConfig = Config.Configs["Startup"];
+            if (startupConfig != null)
+            {
+                Util.LogOverloads = startupConfig.GetBoolean("LogOverloads", true);
+            }
         }
 
         protected virtual void LoadPlugins()
         {
-            using (PluginLoader<IApplicationPlugin> loader = new PluginLoader<IApplicationPlugin>(new ApplicationPluginInitialiser(this)))
+            IConfig startupConfig = Config.Configs["Startup"];
+            string registryLocation = (startupConfig != null) ? startupConfig.GetString("RegistryLocation", String.Empty) : String.Empty;
+
+            // The location can also be specified in the environment. If there
+            // is no location in the configuration, we must call the constructor
+            // without a location parameter to allow that to happen.
+            if (registryLocation == String.Empty)
             {
-                loader.Load("/OpenSim/Startup");
-                m_plugins = loader.Plugins;
+                using (PluginLoader<IApplicationPlugin> loader = new PluginLoader<IApplicationPlugin>(new ApplicationPluginInitialiser(this)))
+                {
+                    loader.Load("/OpenSim/Startup");
+                    m_plugins = loader.Plugins;
+                }
+            }
+            else
+            {
+                using (PluginLoader<IApplicationPlugin> loader = new PluginLoader<IApplicationPlugin>(new ApplicationPluginInitialiser(this), registryLocation))
+                {
+                    loader.Load("/OpenSim/Startup");
+                    m_plugins = loader.Plugins;
+                }
             }
         }
 
@@ -221,23 +260,29 @@ namespace OpenSim
                         module));
 
             // Load the estate data service
-            IConfig estateDataConfig = Config.Configs["EstateDataStore"];
-            if (estateDataConfig == null)
-                throw new Exception("Configuration file is missing the [EstateDataStore] section.  Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?");
-
-            module = estateDataConfig.GetString("LocalServiceModule", String.Empty);
+            module = Util.GetConfigVarFromSections<string>(Config, "LocalServiceModule", new string[]{"EstateDataStore", "EstateService"}, String.Empty); 
             if (String.IsNullOrEmpty(module))
-                throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] section");
+                throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] or [EstateService] section");
 
-            m_estateDataService = ServerUtils.LoadPlugin<IEstateDataService>(module, new object[] { Config });
-            if (m_estateDataService == null)
-                throw new Exception(
-                    string.Format(
-                        "Could not load an IEstateDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [EstateDataStore] config section.", 
-                        module));
+            if (LoadEstateDataService)
+            {
+                m_estateDataService = ServerUtils.LoadPlugin<IEstateDataService>(module, new object[] { Config });
+                if (m_estateDataService == null)
+                    throw new Exception(
+                        string.Format(
+                            "Could not load an IEstateDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [EstateDataStore] config section.", 
+                            module));
+            }
 
             base.StartupSpecific();
 
+<<<<<<< HEAD
+            if (EnableInitialPluginLoad)
+                LoadPlugins();
+
+            // We still want to post initalize any plugins even if loading has been disabled since a test may have
+            // inserted them manually.
+=======
             LoadPlugins();
 
             if (m_plugins.Count == 0) // We failed to load any modules. Mono Addins glitch!
@@ -245,10 +290,9 @@ namespace OpenSim
                 Environment.Exit(1);
             }
 
+>>>>>>> avn/ubitvar
             foreach (IApplicationPlugin plugin in m_plugins)
-            {
                 plugin.PostInitialise();
-            }
 
             if (m_console != null)
                 AddPluginCommands(m_console);
@@ -315,6 +359,10 @@ namespace OpenSim
         {
             // Called from base.StartUp()
 
+            IConfig startupConfig = Config.Configs["Startup"];
+            if (startupConfig == null || startupConfig.GetBoolean("JobEngineEnabled", true))
+                WorkManager.JobEngine.Start();
+
             m_httpServerPort = m_networkServersInfo.HttpListenerPort;
             SceneManager.OnRestartSim += HandleRestartRegion;
 
@@ -604,7 +652,7 @@ namespace OpenSim
             else
             {
                 regionInfo.EstateSettings.EstateOwner = account.PrincipalID;
-                regionInfo.EstateSettings.Save();
+                m_estateDataService.StoreEstateSettings(regionInfo.EstateSettings);
             }
         }
 
@@ -784,6 +832,10 @@ namespace OpenSim
         {
             Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
             PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent);
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
             SceneCommunicationService sceneGridService = new SceneCommunicationService();
 
             return new Scene(
@@ -932,6 +984,9 @@ namespace OpenSim
             try
             {
                 SceneManager.Close();
+
+                foreach (IApplicationPlugin plugin in m_plugins)
+                    plugin.Dispose();
             }
             catch (Exception e)
             {
@@ -1004,7 +1059,7 @@ namespace OpenSim
             // back to the default.  The reloading of estate settings by scene could be eliminated if it
             // knows that the passed in settings in RegionInfo are already valid.  Also, it might be 
             // possible to eliminate some additional later saves made by callers of this method.
-            regInfo.EstateSettings.Save();   
+            EstateDataService.StoreEstateSettings(regInfo.EstateSettings);   
             
             return true;
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Properties/AssemblyInfo.cs b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
index 342dbff..8652312 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
@@ -1,12 +1,13 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Mono.Addins;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.YieldProlog")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("OpenSim")]
+[assembly: AssemblyDescription("The executable for for simulator")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("http://opensimulator.org")]
 [assembly: AssemblyProduct("OpenSim")]
@@ -20,7 +21,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8df98e6b-0425-44d6-8d91-2b3b4c56acdf")]
+[assembly: Guid("f6700ed5-1e6f-44d8-8397-e5eac42b3856")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -29,5 +30,7 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.8.2.*")]
+
+[assembly: AddinRoot("OpenSim", OpenSim.VersionInfo.VersionNumber)]
+[assembly: ImportAddinAssembly("OpenSim.Framework.dll")]
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index 299aabd..3ec968f 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.ClientStack
                     {
                         if (pluginType.IsPublic)
                         {
-                            Type typeInterface = pluginType.GetInterface("IClientNetworkServer", true);
+                            Type typeInterface = pluginType.GetInterface("IClientNetworkServer");
 
                             if (typeInterface != null)
                             {
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
new file mode 100644
index 0000000..aabdb51
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
@@ -0,0 +1,182 @@
+/*
+ * 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;
+using System.IO;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OpenSim.Capabilities.Handlers;
+
+namespace OpenSim.Region.ClientStack.LindenCaps
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AgentPreferencesModule")]
+    public class AgentPreferencesModule : ISharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private List<Scene> m_scenes = new List<Scene>();
+
+        public void Initialise(IConfigSource source)
+        {
+
+        }
+
+        #region Region module
+
+        public void AddRegion(Scene scene)
+        {
+            lock (m_scenes) m_scenes.Add(scene);
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            lock (m_scenes) m_scenes.Remove(scene);
+            scene.EventManager.OnRegisterCaps -= RegisterCaps;
+            scene = null;
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            scene.EventManager.OnRegisterCaps += delegate(UUID agentID, OpenSim.Framework.Capabilities.Caps caps)
+            {
+                RegisterCaps(agentID, caps);
+            };
+        }
+
+        public void PostInitialise() {}
+
+        public void Close() {}
+
+        public string Name { get { return "AgentPreferencesModule"; } }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void RegisterCaps(UUID agent, Caps caps)
+        {
+            UUID capId = UUID.Random();
+            caps.RegisterHandler("AgentPreferences",
+                new RestStreamHandler("POST", "/CAPS/" + capId,
+                    delegate(string request, string path, string param,
+                        IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                    {
+                        return UpdateAgentPreferences(request, path, param, agent);
+                    }));
+            caps.RegisterHandler("UpdateAgentLanguage",
+                new RestStreamHandler("POST", "/CAPS/" + capId,
+                    delegate(string request, string path, string param,
+                        IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                    {
+                        return UpdateAgentPreferences(request, path, param, agent);
+                    }));
+            caps.RegisterHandler("UpdateAgentInformation",
+                new RestStreamHandler("POST", "/CAPS/" + capId,
+                    delegate(string request, string path, string param,
+                        IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                    {
+                        return UpdateAgentPreferences(request, path, param, agent);
+                    }));
+        }
+
+        public string UpdateAgentPreferences(string request, string path, string param, UUID agent)
+        {
+            OSDMap resp = new OSDMap();
+            // The viewer doesn't do much with the return value, so for now, if there is no preference service,
+            // we'll return a null llsd block for debugging purposes. This may change if someone knows what the
+            // correct server response would be here.
+            if (m_scenes[0].AgentPreferencesService == null)
+            {
+                return OSDParser.SerializeLLSDXmlString(resp);
+            }
+            m_log.DebugFormat("[AgentPrefs]: UpdateAgentPreferences for {0}", agent.ToString());
+            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+            AgentPrefs data = m_scenes[0].AgentPreferencesService.GetAgentPreferences(agent);
+            if (data == null)
+            {
+                data = new AgentPrefs(agent);
+            }
+                
+            if (req.ContainsKey("access_prefs"))
+            {
+                OSDMap accessPrefs = (OSDMap)req["access_prefs"];  // We could check with ContainsKey...
+                data.AccessPrefs = accessPrefs["max"].AsString();
+            }
+            if (req.ContainsKey("default_object_perm_masks"))
+            {
+                OSDMap permsMap = (OSDMap)req["default_object_perm_masks"];
+                data.PermEveryone = permsMap["Everyone"].AsInteger();
+                data.PermGroup = permsMap["Group"].AsInteger();
+                data.PermNextOwner = permsMap["NextOwner"].AsInteger();
+            }
+            if (req.ContainsKey("hover_height"))
+            {
+                data.HoverHeight = req["hover_height"].AsReal();
+            }
+            if (req.ContainsKey("language"))
+            {
+                data.Language = req["language"].AsString();
+            }
+            if (req.ContainsKey("language_is_public"))
+            {
+                data.LanguageIsPublic = req["language_is_public"].AsBoolean();
+            }
+            m_scenes[0].AgentPreferencesService.StoreAgentPreferences(data);
+            OSDMap respAccessPrefs = new OSDMap();
+            respAccessPrefs["max"] = data.AccessPrefs;
+            resp["access_prefs"] = respAccessPrefs;
+            OSDMap respDefaultPerms = new OSDMap();
+            respDefaultPerms["Everyone"] = data.PermEveryone;
+            respDefaultPerms["Group"] = data.PermGroup;
+            respDefaultPerms["NextOwner"] = data.PermNextOwner;
+            resp["default_object_perm_masks"] = respDefaultPerms;
+            resp["god_level"] = 0; // *TODO: Add this
+            resp["hover_height"] = data.HoverHeight;
+            resp["language"] = data.Language;
+            resp["language_is_public"] = data.LanguageIsPublic;
+
+            string response = OSDParser.SerializeLLSDXmlString(resp);
+            return response;
+        }
+
+        #endregion Region module
+    }
+}
+
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index ab8f0c9..4e6d196 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -45,6 +45,7 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework.Client;
 using OpenSim.Services.Interfaces;
 
 using Caps = OpenSim.Framework.Capabilities.Caps;
@@ -359,8 +360,8 @@ namespace OpenSim.Region.ClientStack.Linden
         public string SeedCapRequest(string request, string path, string param,
                                   IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            m_log.DebugFormat(
-                "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID);
+//            m_log.DebugFormat(
+//                "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID);
 
             if (!m_HostCapsObj.WaitForActivation())
                 return string.Empty;
@@ -788,10 +789,99 @@ namespace OpenSim.Region.ClientStack.Linden
             }
             else if (inventoryType == "object")
             {
+<<<<<<< HEAD
+                inType = (sbyte)InventoryType.Object;
+                assType = (sbyte)AssetType.Object;
+
+                List<Vector3> positions = new List<Vector3>();
+                List<Quaternion> rotations = new List<Quaternion>();
+                OSDMap request = (OSDMap)OSDParser.DeserializeLLSDXml(data);
+                OSDArray instance_list = (OSDArray)request["instance_list"];
+                OSDArray mesh_list = (OSDArray)request["mesh_list"];
+                OSDArray texture_list = (OSDArray)request["texture_list"];
+                SceneObjectGroup grp = null;
+
+                InventoryFolderBase textureUploadFolder = null;
+
+                List<InventoryFolderBase> foldersToUpdate = new List<InventoryFolderBase>();
+                List<InventoryItemBase> itemsToUpdate = new List<InventoryItemBase>();
+                IClientInventory clientInv = null;
+                
+                if (texture_list.Count > 0)
+                {
+                    ScenePresence avatar = null;
+                    m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar);
+
+                    if (avatar != null)
+                    {
+                        IClientCore core = (IClientCore)avatar.ControllingClient;
+
+                        if (core.TryGet<IClientInventory>(out clientInv))
+                        {
+                            var systemTextureFolder = m_Scene.InventoryService.GetFolderForType(m_HostCapsObj.AgentID, FolderType.Texture);
+                            textureUploadFolder = new InventoryFolderBase(UUID.Random(), assetName, m_HostCapsObj.AgentID, (short)FolderType.None, systemTextureFolder.ID, 1);
+                            if (m_Scene.InventoryService.AddFolder(textureUploadFolder))
+                            {
+                                foldersToUpdate.Add(textureUploadFolder);
+
+                                m_log.DebugFormat(
+                                    "[BUNCH OF CAPS]: Created new folder '{0}' ({1}) for textures uploaded with mesh object {2}", 
+                                    textureUploadFolder.Name, textureUploadFolder.ID, assetName);
+                            }
+                            else
+                            {
+                                textureUploadFolder = null;
+                            }
+                        }
+                    }
+                }
+
+                List<UUID> textures = new List<UUID>();
+                for (int i = 0; i < texture_list.Count; i++)
+                {
+                    AssetBase textureAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Texture, "");
+                    textureAsset.Data = texture_list[i].AsBinary();
+                    m_assetService.Store(textureAsset);
+                    textures.Add(textureAsset.FullID);
+
+                    if (textureUploadFolder != null)
+                    {
+                        InventoryItemBase textureItem = new InventoryItemBase();
+                        textureItem.Owner = m_HostCapsObj.AgentID;
+                        textureItem.CreatorId = m_HostCapsObj.AgentID.ToString();
+                        textureItem.CreatorData = String.Empty;
+                        textureItem.ID = UUID.Random();
+                        textureItem.AssetID = textureAsset.FullID;
+                        textureItem.Description = assetDescription;
+                        textureItem.Name = assetName + " - Texture " + (i + 1).ToString();
+                        textureItem.AssetType = (int)AssetType.Texture;
+                        textureItem.InvType = (int)InventoryType.Texture;
+                        textureItem.Folder = textureUploadFolder.ID;
+                        textureItem.CurrentPermissions
+                            = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Export);
+                        textureItem.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export;
+                        textureItem.EveryOnePermissions = 0;
+                        textureItem.NextPermissions = (uint)PermissionMask.All;
+                        textureItem.CreationDate = Util.UnixTimeSinceEpoch();
+                        m_Scene.InventoryService.AddItem(textureItem);
+                        itemsToUpdate.Add(textureItem);
+
+                        m_log.DebugFormat(
+                            "[BUNCH OF CAPS]: Created new inventory item '{0}' ({1}) for texture uploaded with mesh object {2}", 
+                            textureItem.Name, textureItem.ID, assetName);
+                    }
+                }
+
+                if (clientInv != null && (foldersToUpdate.Count > 0 || itemsToUpdate.Count > 0))
+                {
+                    clientInv.SendBulkUpdateInventory(foldersToUpdate.ToArray(), itemsToUpdate.ToArray());
+                }
+=======
                 if (assetType == "mesh") // this code for now is for mesh models uploads only
                 {
                     inType = (sbyte)InventoryType.Object;
                     assType = (sbyte)AssetType.Object;
+>>>>>>> avn/ubitvar
 
                     List<Vector3> positions = new List<Vector3>();
                     List<Quaternion> rotations = new List<Quaternion>();
@@ -1375,18 +1465,26 @@ namespace OpenSim.Region.ClientStack.Linden
                 item = m_Scene.InventoryService.GetItem(new InventoryItemBase(itemID));
                 if (item != null)
                 {
-                    copyItem = m_Scene.GiveInventoryItem(m_HostCapsObj.AgentID, item.Owner, itemID, folderID);
-                    if (copyItem != null && client != null)
+                    string message;
+                    copyItem = m_Scene.GiveInventoryItem(m_HostCapsObj.AgentID, item.Owner, itemID, folderID, out message);
+                    if (client != null)
                     {
-                        m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, ItemID:{0}, FolderID:{1}", copyItem.ID, copyItem.Folder);
-                        client.SendBulkUpdateInventory(copyItem);
+                        if (copyItem != null)
+                        {
+                            m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, ItemID:{0}, FolderID:{1}", copyItem.ID, copyItem.Folder);
+                            client.SendBulkUpdateInventory(copyItem);
+                        }
+                        else
+                        {
+                            client.SendAgentAlertMessage(message, false);
+                        }
                     }
                 }
                 else
                 {
                     m_log.ErrorFormat("[CAPS]: CopyInventoryFromNotecard - Failed to retrieve item {0} from notecard {1}", itemID, notecardID);
                     if (client != null)
-                        client.SendAlertMessage("Failed to retrieve item");
+                        client.SendAgentAlertMessage("Failed to retrieve item", false);
                 }
             }
             catch (Exception e)
@@ -1558,13 +1656,14 @@ namespace OpenSim.Region.ClientStack.Linden
                 string param, IOSHttpRequest httpRequest,
                 IOSHttpResponse httpResponse)
         {
-//            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
-            OSDMap resp = new OSDMap();
-
-            OSDMap accessPrefs = new OSDMap();
-            accessPrefs["max"] = "A";
+            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+            OSDMap accessPrefs = (OSDMap)req["access_prefs"];
+            string desiredMaturity = accessPrefs["max"];
 
-            resp["access_prefs"] = accessPrefs;
+            OSDMap resp = new OSDMap();
+            OSDMap respAccessPrefs = new OSDMap();
+            respAccessPrefs["max"] = desiredMaturity;   // echoing the maturity back means success
+            resp["access_prefs"] = respAccessPrefs;
 
             string response = OSDParser.SerializeLLSDXmlString(resp);
             return response; 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
index b735dfa..c241075 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
@@ -40,8 +40,8 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 
-[assembly: Addin("LindenCaps", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.5")]
+[assembly: Addin("LindenCaps", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
 namespace OpenSim.Region.ClientStack.Linden
 {
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 51535a6..5fb028c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 "debug eq [0|1|2]",
                 "Turn on event queue debugging\n"
                     + "  <= 0 - turns off all event queue logging\n"
-                    + "  >= 1 - turns on outgoing event logging\n"
+                    + "  >= 1 - turns on event queue setup and outgoing event logging\n"
                     + "  >= 2 - turns on poll notification",
                 HandleDebugEq);
 
@@ -177,6 +177,32 @@ namespace OpenSim.Region.ClientStack.Linden
         }
 
         /// <summary>
+<<<<<<< HEAD
+        ///  Always returns a valid queue
+        /// </summary>
+        /// <param name="agentId"></param>
+        /// <returns></returns>
+        private Queue<OSD> TryGetQueue(UUID agentId)
+        {
+            lock (queues)
+            {
+                if (!queues.ContainsKey(agentId))
+                {
+                    if (DebugLevel > 0)
+                        m_log.DebugFormat(
+                            "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}", 
+                            agentId, m_scene.RegionInfo.RegionName);
+
+                    queues[agentId] = new Queue<OSD>();
+                }
+
+                return queues[agentId];
+            }
+        }
+
+        /// <summary>
+=======
+>>>>>>> avn/ubitvar
         /// May return a null queue
         /// </summary>
         /// <param name="agentId"></param>
@@ -207,12 +233,18 @@ namespace OpenSim.Region.ClientStack.Linden
                     lock (queue)
                         queue.Enqueue(ev);
                 }
-                else
+                else if (DebugLevel > 0)
                 {
-                    OSDMap evMap = (OSDMap)ev;
-                    m_log.WarnFormat(
-                        "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} when placing message {1} in region {2}", 
-                        avatarID, evMap["message"], m_scene.Name);
+                    ScenePresence sp = m_scene.GetScenePresence(avatarID);
+
+                    // This assumes that an NPC should never have a queue.
+                    if (sp != null && sp.PresenceType != PresenceType.Npc)
+                    {
+                        OSDMap evMap = (OSDMap)ev;
+                        m_log.WarnFormat(
+                            "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} {1} when placing message {2} in region {3}", 
+                            sp.Name, sp.UUID, evMap["message"], m_scene.Name);
+                    }
                 }
             } 
             catch (NullReferenceException e)
@@ -258,9 +290,17 @@ namespace OpenSim.Region.ClientStack.Linden
         public void OnRegisterCaps(UUID agentID, Caps caps)
         {
             // Register an event queue for the client
+<<<<<<< HEAD
+
+            if (DebugLevel > 0)
+                m_log.DebugFormat(
+                    "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
+                    agentID, caps, m_scene.RegionInfo.RegionName);
+=======
             m_log.DebugFormat(
                 "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
                 agentID, caps, m_scene.RegionInfo.RegionName);
+>>>>>>> avn/ubitvar
 
             UUID eventQueueGetUUID;
             Queue<OSD> queue;
@@ -479,8 +519,14 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
         {
+<<<<<<< HEAD
+            if (DebugLevel > 0)
+                m_log.DebugFormat("{0} EnableSimulator. handle={1}, endPoint={2}, avatarID={3}",
+                    LogHeader, handle, endPoint, avatarID, regionSizeX, regionSizeY);
+=======
             m_log.DebugFormat("{0} EnableSimulator. handle={1}, avatarID={2}, regionSize={3},{4}>",
                 LogHeader, handle, avatarID, regionSizeX, regionSizeY);
+>>>>>>> avn/ubitvar
 
             OSD item = EventQueueHelper.EnableSimulator(handle, endPoint, regionSizeX, regionSizeY);
             Enqueue(item, avatarID);
@@ -489,8 +535,15 @@ namespace OpenSim.Region.ClientStack.Linden
         public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath,
                                 ulong regionHandle, int regionSizeX, int regionSizeY) 
         {
+<<<<<<< HEAD
+            if (DebugLevel > 0)
+                m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, endPoint={2}, avatarID={3}",
+                    LogHeader, regionHandle, endPoint, avatarID, regionSizeX, regionSizeY);
+
+=======
             m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, avatarID={2}, regionSize={3},{4}>",
                 LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY);
+>>>>>>> avn/ubitvar
             OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath, regionHandle, regionSizeX, regionSizeY);
             Enqueue(item, avatarID);
         }
@@ -500,8 +553,14 @@ namespace OpenSim.Region.ClientStack.Linden
                                         uint locationID, uint flags, string capsURL, 
                                         UUID avatarID, int regionSizeX, int regionSizeY)
         {
+<<<<<<< HEAD
+            if (DebugLevel > 0)
+                m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, endPoint={2}, avatarID={3}",
+                    LogHeader, regionHandle, regionExternalEndPoint, avatarID, regionSizeX, regionSizeY);
+=======
             m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, avatarID={2}, regionSize={3},{4}>",
                 LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY);
+>>>>>>> avn/ubitvar
 
             OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint,
                                                             locationID, flags, capsURL, avatarID, regionSizeX, regionSizeY);
@@ -512,8 +571,14 @@ namespace OpenSim.Region.ClientStack.Linden
                                 IPEndPoint newRegionExternalEndPoint,
                                 string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY)
         {
+<<<<<<< HEAD
+            if (DebugLevel > 0)
+                m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>",
+                    LogHeader, handle, avatarID, regionSizeX, regionSizeY);
+=======
             m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>",
                 LogHeader, handle, avatarID, regionSizeX, regionSizeY);
+>>>>>>> avn/ubitvar
 
             OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint,
                                                     capsURL, avatarID, sessionID, regionSizeX, regionSizeY);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index 50e22f5..8b7e4c1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -77,8 +77,13 @@ namespace OpenSim.Region.ClientStack.Linden
             llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle)));
             llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes()));
             llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port));
+<<<<<<< HEAD
+            llsdSimInfo.Add("RegionSizeX", OSD.FromUInteger((uint) regionSizeX));
+            llsdSimInfo.Add("RegionSizeY", OSD.FromUInteger((uint) regionSizeY));
+=======
             llsdSimInfo.Add("RegionSizeX", OSD.FromUInteger((uint)regionSizeX));
             llsdSimInfo.Add("RegionSizeY", OSD.FromUInteger((uint)regionSizeY));
+>>>>>>> avn/ubitvar
 
             OSDArray arr = new OSDArray(1);
             arr.Add(llsdSimInfo);
@@ -171,8 +176,12 @@ namespace OpenSim.Region.ClientStack.Linden
             info.Add("SimAccess", OSD.FromInteger(simAccess));
             info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes()));
             info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port));
+<<<<<<< HEAD
+            info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
+=======
 //            info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
             info.Add("TeleportFlags", OSD.FromUInteger(flags));
+>>>>>>> avn/ubitvar
             info.Add("RegionSizeX", OSD.FromUInteger((uint)regionSizeX));
             info.Add("RegionSizeY", OSD.FromUInteger((uint)regionSizeY));
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index 9e24bce..16a902d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using log4net.Config;
@@ -33,13 +34,15 @@ using Nini.Config;
 using NUnit.Framework;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
+using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.ClientStack.Linden;
 using OpenSim.Region.CoreModules.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.OptionalModules.World.NPC;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ClientStack.Linden.Tests
 {
@@ -47,6 +50,8 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
     public class EventQueueTests : OpenSimTestCase
     {
         private TestScene m_scene;
+        private EventQueueGetModule m_eqgMod;
+        private NPCModule m_npcMod;
 
         [SetUp]
         public override void SetUp()
@@ -69,10 +74,15 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             config.Configs["Startup"].Set("EventQueue", "true");
 
             CapabilitiesModule capsModule = new CapabilitiesModule();
-            EventQueueGetModule eqgModule = new EventQueueGetModule();
+            m_eqgMod = new EventQueueGetModule();
+
+            // For NPC test support
+            config.AddConfig("NPC");
+            config.Configs["NPC"].Set("Enabled", "true");
+            m_npcMod = new NPCModule();
 
             m_scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(m_scene, config, capsModule, eqgModule);
+            SceneHelpers.SetupSceneModules(m_scene, config, capsModule, m_eqgMod, m_npcMod);
         }
 
         [Test]
@@ -101,5 +111,80 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             // TODO: Add more assertions for the other aspects of event queues
             Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0));
         }
+
+        [Test]
+        public void TestEnqueueMessage()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
+
+            string messageName = "TestMessage";
+
+            m_eqgMod.Enqueue(m_eqgMod.BuildEvent(messageName, new OSDMap()), sp.UUID);
+
+            Hashtable eventsResponse = m_eqgMod.GetEvents(UUID.Zero, sp.UUID);
+
+            Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.OK));
+
+//            Console.WriteLine("Response [{0}]", (string)eventsResponse["str_response_string"]);
+
+            OSDMap rawOsd = (OSDMap)OSDParser.DeserializeLLSDXml((string)eventsResponse["str_response_string"]);
+            OSDArray eventsOsd = (OSDArray)rawOsd["events"];
+
+            bool foundUpdate = false;
+            foreach (OSD osd in eventsOsd)
+            {
+                OSDMap eventOsd = (OSDMap)osd;
+
+                if (eventOsd["message"] == messageName)
+                    foundUpdate = true;
+            }
+
+            Assert.That(foundUpdate, Is.True, string.Format("Did not find {0} in response", messageName));
+        }
+
+        /// <summary>
+        /// Test an attempt to put a message on the queue of a user that is not in the region.
+        /// </summary>
+        [Test]
+        public void TestEnqueueMessageNoUser()
+        {
+            TestHelpers.InMethod();
+            TestHelpers.EnableLogging();
+
+            string messageName = "TestMessage";
+
+            m_eqgMod.Enqueue(m_eqgMod.BuildEvent(messageName, new OSDMap()), TestHelpers.ParseTail(0x1));
+
+            Hashtable eventsResponse = m_eqgMod.GetEvents(UUID.Zero, TestHelpers.ParseTail(0x1));
+
+            Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.BadGateway));
+        }
+
+        /// <summary>
+        /// NPCs do not currently have an event queue but a caller may try to send a message anyway, so check behaviour.
+        /// </summary>
+        [Test]
+        public void TestEnqueueMessageToNpc()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID npcId 
+                = m_npcMod.CreateNPC(
+                    "John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, new AvatarAppearance());
+
+            ScenePresence npc = m_scene.GetScenePresence(npcId);
+
+            string messageName = "TestMessage";
+
+            m_eqgMod.Enqueue(m_eqgMod.BuildEvent(messageName, new OSDMap()), npc.UUID);
+
+            Hashtable eventsResponse = m_eqgMod.GetEvents(UUID.Zero, npc.UUID);
+
+            Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.BadGateway));
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs b/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs
index 87d3d1c..e0a11cc 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs
@@ -25,20 +25,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Reflection;
-using log4net;
-using Nini.Config;
 using Mono.Addins;
+using Nini.Config;
 using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Capabilities.Handlers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
+using System;
 using Caps = OpenSim.Framework.Capabilities.Caps;
-using OpenSim.Capabilities.Handlers;
 
 namespace OpenSim.Region.ClientStack.Linden
 {
@@ -58,8 +54,6 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private string m_fetchInventory2Url;
 
-        private FetchInventory2Handler m_fetchHandler;
-
         #region ISharedRegionModule Members
 
         public void Initialise(IConfigSource source)
@@ -98,10 +92,6 @@ namespace OpenSim.Region.ClientStack.Linden
 
             m_inventoryService = m_scene.InventoryService;
 
-            // We'll reuse the same handler for all requests.
-            if (m_fetchInventory2Url == "localhost")
-                m_fetchHandler = new FetchInventory2Handler(m_inventoryService);
-
             m_scene.EventManager.OnRegisterCaps += RegisterCaps;
         }
 
@@ -131,9 +121,11 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 capUrl = "/CAPS/" + UUID.Random();
 
+                FetchInventory2Handler fetchHandler = new FetchInventory2Handler(m_inventoryService, agentID);
+
                 IRequestHandler reqHandler
                     = new RestStreamHandler(
-                        "POST", capUrl, m_fetchHandler.FetchInventoryRequest, capName, agentID.ToString());
+                        "POST", capUrl, fetchHandler.FetchInventoryRequest, capName, agentID.ToString());
 
                 caps.RegisterHandler(capName, reqHandler);
             }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs
new file mode 100644
index 0000000..6617bbc
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs
@@ -0,0 +1,144 @@
+/*
+ * 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;
+using System.Collections.Specialized;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using log4net;
+using Nini.Config;
+using Mono.Addins;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenMetaverse.Imaging;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OpenSim.Capabilities.Handlers;
+
+namespace OpenSim.Region.ClientStack.Linden
+{
+
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetDisplayNamesModule")]
+    public class GetDisplayNamesModule : INonSharedRegionModule
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        private Scene m_scene;
+        private IUserManagement m_UserManager;
+
+        private bool m_Enabled = false;
+
+        private string m_URL;
+
+        #region ISharedRegionModule Members
+
+        public void Initialise(IConfigSource source)
+        {
+            IConfig config = source.Configs["ClientStack.LindenCaps"];
+            if (config == null)
+                return;
+
+            m_URL = config.GetString("Cap_GetDisplayNames", string.Empty);
+            if (m_URL != string.Empty)
+                m_Enabled = true;
+        }
+
+        public void AddRegion(Scene s)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_scene = s;
+        }
+
+        public void RemoveRegion(Scene s)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
+            m_scene = null;
+        }
+
+        public void RegionLoaded(Scene s)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_UserManager = m_scene.RequestModuleInterface<IUserManagement>();
+            m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close() { }
+
+        public string Name { get { return "GetDisplayNamesModule"; } }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        #endregion
+
+        public void RegisterCaps(UUID agentID, Caps caps)
+        {
+            UUID capID = UUID.Random();
+
+            if (m_URL == "localhost")
+            {
+                m_log.DebugFormat("[GET_DISPLAY_NAMES]: /CAPS/agents/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
+                caps.RegisterHandler(
+                    "GetDisplayNames",
+                    new GetDisplayNamesHandler("/CAPS/agents" + capID + "/", m_UserManager, "GetDisplayNames", agentID.ToString()));
+            }
+            else
+            {
+//                m_log.DebugFormat("[GETTEXTURE]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName);
+                IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
+                if (handler != null)
+                    handler.RegisterExternalUserCapsHandler(agentID,caps,"GetDisplayNames", m_URL);
+                else
+                    caps.RegisterHandler("GetDisplayNames", m_URL);
+            }
+        }
+
+    }
+}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index a381a1b..91efe8a 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -60,6 +60,11 @@ namespace OpenSim.Region.ClientStack.Linden
         private IAssetService m_AssetService;
         private bool m_Enabled = true;
         private string m_URL;
+<<<<<<< HEAD
+        private string m_URL2;
+        private string m_RedirectURL = null;
+        private string m_RedirectURL2 = null;
+=======
        
         struct aPollRequest
         {
@@ -89,6 +94,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 new OpenMetaverse.BlockingQueue<aPollRequest>();
 
         private Dictionary<UUID, PollServiceMeshEventArgs> m_pollservices = new Dictionary<UUID, PollServiceMeshEventArgs>();
+>>>>>>> avn/ubitvar
 
         #region Region Module interfaceBase Members
 
@@ -113,8 +119,22 @@ namespace OpenSim.Region.ClientStack.Linden
             m_URL = config.GetString("Cap_GetMesh", string.Empty);
             // Cap doesn't exist
             if (m_URL != string.Empty)
+            {
+                m_Enabled = true;
+                m_RedirectURL = config.GetString("GetMeshRedirectURL");
+            }
+
+            m_URL2 = config.GetString("Cap_GetMesh2", string.Empty);
+            // Cap doesn't exist
+            if (m_URL2 != string.Empty)
+            {
                 m_Enabled = true;
+<<<<<<< HEAD
+                m_RedirectURL2 = config.GetString("GetMesh2RedirectURL");
+            }
+=======
          
+>>>>>>> avn/ubitvar
         }
 
         public void AddRegion(Scene pScene)
@@ -316,6 +336,21 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
+<<<<<<< HEAD
+            UUID capID = UUID.Random();
+            bool getMeshRegistered = false;
+
+            if (m_URL == string.Empty)
+            {
+
+            }
+            else if (m_URL == "localhost")
+            {
+                getMeshRegistered = true;
+                caps.RegisterHandler(
+                    "GetMesh",
+                    new GetMeshHandler("/CAPS/" + capID + "/", m_AssetService, "GetMesh", agentID.ToString(), m_RedirectURL));
+=======
 //            UUID capID = UUID.Random();
             if (m_URL == "localhost")
             {
@@ -343,12 +378,30 @@ namespace OpenSim.Region.ClientStack.Linden
 
 
            
+>>>>>>> avn/ubitvar
             }
             else
             {
-//                m_log.DebugFormat("[GETMESH]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName);
                 caps.RegisterHandler("GetMesh", m_URL);
             }
+
+            if(m_URL2 == string.Empty)
+            {
+
+            }
+            else if (m_URL2 == "localhost")
+            {
+                if (!getMeshRegistered)
+                {
+                    caps.RegisterHandler(
+                        "GetMesh2",
+                        new GetMeshHandler("/CAPS/" + capID + "/", m_AssetService, "GetMesh2", agentID.ToString(), m_RedirectURL2));
+                }
+            }
+            else
+            {
+                caps.RegisterHandler("GetMesh2", m_URL2);
+            }
         }
         private void DeregisterCaps(UUID agentID, Caps caps)
         {
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 99ccd4b..b9396b7 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -82,7 +82,12 @@ namespace OpenSim.Region.ClientStack.Linden
         private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue =
                 new OpenMetaverse.BlockingQueue<aPollRequest>();
 
+<<<<<<< HEAD
+        // TODO: Change this to a config option
+        private string m_RedirectURL = null;
+=======
         private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();
+>>>>>>> avn/ubitvar
 
         private string m_URL;
 
@@ -91,8 +96,21 @@ namespace OpenSim.Region.ClientStack.Linden
         public void Initialise(IConfigSource source)
         {
             IConfig config = source.Configs["ClientStack.LindenCaps"];
+<<<<<<< HEAD
+            if (config == null)
+                return;
+
+            m_URL = config.GetString("Cap_GetTexture", string.Empty);
+            // Cap doesn't exist
+            if (m_URL != string.Empty)
+            {
+                m_Enabled = true;
+                m_RedirectURL = config.GetString("GetTextureRedirectURL");
+            }
+=======
             if (config != null)
                 m_Url = config.GetString("Cap_GetTexture", "localhost");
+>>>>>>> avn/ubitvar
         }
 
         public void AddRegion(Scene s)
@@ -219,6 +237,12 @@ namespace OpenSim.Region.ClientStack.Linden
             public PollServiceTextureEventArgs(UUID pId, Scene scene) :
                     base(null, "", null, null, null, pId, int.MaxValue)              
             {
+<<<<<<< HEAD
+//                m_log.DebugFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
+                caps.RegisterHandler(
+                    "GetTexture",
+                    new GetTextureHandler("/CAPS/" + capID + "/", m_assetService, "GetTexture", agentID.ToString(), m_RedirectURL));
+=======
                 m_scene = scene;
                 // x is request id, y is userid
                 HasEvents = (x, y) =>
@@ -288,6 +312,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
                     return response;
                 };
+>>>>>>> avn/ubitvar
             }
 
             public void Process(aPollRequest requestinfo)
@@ -377,7 +402,11 @@ namespace OpenSim.Region.ClientStack.Linden
                 }
                 IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
                 if (handler != null)
+<<<<<<< HEAD
+                    handler.RegisterExternalUserCapsHandler(agentID,caps,"GetTexture", m_URL);
+=======
                     handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", capUrl);
+>>>>>>> avn/ubitvar
                 else
                     caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
                 m_pollservices[agentID] = args;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs b/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
index 112608b..264eaa3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index bedec80..54542c9 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 using Nini.Config;
@@ -37,7 +38,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
+// using OpenSim.Services.Interfaces;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 
 namespace OpenSim.Region.ClientStack.Linden
@@ -56,8 +57,8 @@ namespace OpenSim.Region.ClientStack.Linden
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimulatorFeaturesModule")]
     public class SimulatorFeaturesModule : ISharedRegionModule, ISimulatorFeaturesModule
     {
-//        private static readonly ILog m_log =
-//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public event SimulatorFeaturesRequestDelegate OnSimulatorFeaturesRequest;
 
@@ -69,18 +70,39 @@ namespace OpenSim.Region.ClientStack.Linden
         private OSDMap m_features = new OSDMap();
 
         private string m_SearchURL = string.Empty;
+        private string m_DestinationGuideURL = string.Empty;
         private bool m_ExportSupported = false;
+        private string m_GridName = string.Empty;
+        private string m_GridURL = string.Empty;
 
         #region ISharedRegionModule Members
 
         public void Initialise(IConfigSource source)
         {
             IConfig config = source.Configs["SimulatorFeatures"];
+
             if (config != null)
-            {    
-                m_SearchURL = config.GetString("SearchServerURI", string.Empty);
+            {  
+                //
+                // All this is obsolete since getting these features from the grid service!!
+                // Will be removed after the next release
+                //
+                m_SearchURL = config.GetString("SearchServerURI", m_SearchURL);
+
+                m_DestinationGuideURL = config.GetString ("DestinationGuideURI", m_DestinationGuideURL);
+
+                if (m_DestinationGuideURL == string.Empty) // Make this consistent with the variable in the LoginService config
+                    m_DestinationGuideURL = config.GetString("DestinationGuide", m_DestinationGuideURL);
 
                 m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
+
+                m_GridURL = Util.GetConfigVarFromSections<string>(
+                    source, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "SimulatorFeatures" }, String.Empty);
+
+                m_GridName = config.GetString("GridName", string.Empty);
+                if (m_GridName == string.Empty)
+                    m_GridName = Util.GetConfigVarFromSections<string>(
+                        source, "gridname", new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty);
             }
 
             AddDefaultFeatures();
@@ -101,6 +123,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegionLoaded(Scene s)
         {
+            GetGridExtraFeatures(s);
         }
 
         public void PostInitialise()
@@ -126,6 +149,7 @@ namespace OpenSim.Region.ClientStack.Linden
         /// </remarks>
         private void AddDefaultFeatures()
         {
+
             lock (m_features)
             {
                 m_features["MeshRezEnabled"] = true;
@@ -133,14 +157,29 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_features["MeshXferEnabled"] = true;
 
                 m_features["PhysicsMaterialsEnabled"] = true;
+<<<<<<< HEAD
+
+=======
    
+>>>>>>> avn/ubitvar
                 OSDMap typesMap = new OSDMap();
                 typesMap["convex"] = true;
                 typesMap["none"] = true;
                 typesMap["prim"] = true;
                 m_features["PhysicsShapeTypes"] = typesMap;
-    
+
                 // Extra information for viewers that want to use it
+<<<<<<< HEAD
+                // TODO: Take these out of here into their respective modules, like map-server-url
+                OSDMap extrasMap;
+                if(m_features.ContainsKey("OpenSimExtras"))
+                {
+                    extrasMap = (OSDMap)m_features["OpenSimExtras"];
+                }
+                else
+                    extrasMap = new OSDMap();
+
+=======
                 
                 OSDMap extrasMap = new OSDMap();
 
@@ -148,13 +187,25 @@ namespace OpenSim.Region.ClientStack.Linden
                 extrasMap["AnimationSet"] = true;
 
                 // TODO: Take these out of here into their respective modules, like map-server-url
+>>>>>>> avn/ubitvar
                 if (m_SearchURL != string.Empty)
                     extrasMap["search-server-url"] = m_SearchURL;
+                if (!string.IsNullOrEmpty(m_DestinationGuideURL))
+                    extrasMap["destination-guide-url"] = m_DestinationGuideURL;
                 if (m_ExportSupported)
                     extrasMap["ExportSupported"] = true;
-
+                if (m_GridURL != string.Empty)
+                    extrasMap["GridURL"] = m_GridURL;
+                if (m_GridName != string.Empty)
+                    extrasMap["GridName"] = m_GridName;
+
+<<<<<<< HEAD
+                if (extrasMap.Count > 0)
+                    m_features["OpenSimExtras"] = extrasMap;
+=======
                 m_features["OpenSimExtras"] = extrasMap;
 
+>>>>>>> avn/ubitvar
             }
         }
 
@@ -208,7 +259,12 @@ namespace OpenSim.Region.ClientStack.Linden
 
             OSDMap copy = DeepCopy();
 
+            // Let's add the agentID to the destination guide, if it is expecting that.
+            if (copy.ContainsKey("OpenSimExtras") && ((OSDMap)(copy["OpenSimExtras"])).ContainsKey("destination-guide-url"))
+                ((OSDMap)copy["OpenSimExtras"])["destination-guide-url"] = Replace(((OSDMap)copy["OpenSimExtras"])["destination-guide-url"], "[USERID]", agentID.ToString());
+
             SimulatorFeaturesRequestDelegate handlerOnSimulatorFeaturesRequest = OnSimulatorFeaturesRequest;
+
             if (handlerOnSimulatorFeaturesRequest != null)
                 handlerOnSimulatorFeaturesRequest(agentID, ref copy);
 
@@ -222,5 +278,46 @@ namespace OpenSim.Region.ClientStack.Linden
 
             return responsedata;
         }
+
+        /// <summary>
+        /// Gets the grid extra features.
+        /// </summary>
+        /// <param name='featuresURI'>
+        /// The URI Robust uses to handle the get_extra_features request
+        /// </param>
+        private void GetGridExtraFeatures(Scene scene)
+        {
+            Dictionary<string, object> extraFeatures = scene.GridService.GetExtraFeatures();
+            if (extraFeatures.ContainsKey("Result") && extraFeatures["Result"] != null && extraFeatures["Result"].ToString() == "Failure")
+            {
+                m_log.WarnFormat("[SIMULATOR FEATURES MODULE]: Unable to retrieve grid-wide features");
+                return;
+            }
+
+            lock (m_features)
+            {
+                OSDMap extrasMap = new OSDMap();
+
+                foreach(string key in extraFeatures.Keys)
+                {
+                    extrasMap[key] = (string)extraFeatures[key];
+
+                    if (key == "ExportSupported")
+                    {
+                        bool.TryParse(extraFeatures[key].ToString(), out m_ExportSupported);
+                    }
+                }
+                m_features["OpenSimExtras"] = extrasMap;
+
+            }
+        }
+
+        private string Replace(string url, string substring, string replacement)
+        {
+            if (!String.IsNullOrEmpty(url) && url.Contains(substring))
+                return url.Replace(substring, replacement);
+
+            return url;
+        }
     }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs
new file mode 100644
index 0000000..dd4a691
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs
@@ -0,0 +1,159 @@
+/*
+ * 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;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Text;
+using HttpServer;
+using log4net.Config;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenMetaverse.Packets;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.ClientStack.Linden;
+using OpenSim.Region.CoreModules.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+
+namespace OpenSim.Region.ClientStack.Linden.Caps.Tests
+{
+    [TestFixture]
+    public class WebFetchInvDescModuleTests : OpenSimTestCase
+    {
+        [TestFixtureSetUp]
+        public void TestFixtureSetUp()
+        {
+            // Don't allow tests to be bamboozled by asynchronous events.  Execute everything on the same thread.
+            Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest;
+        }
+
+        [TestFixtureTearDown]
+        public void TestFixureTearDown()
+        {
+            // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+            // threads.  Possibly, later tests should be rewritten so none of them require async stuff (which regression
+            // tests really shouldn't).
+            Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+        }
+
+        [SetUp]
+        public override void SetUp()
+        {
+            base.SetUp();
+
+            // This is an unfortunate bit of clean up we have to do because MainServer manages things through static
+            // variables and the VM is not restarted between tests.
+            uint port = 9999;
+            MainServer.RemoveHttpServer(port);
+
+            BaseHttpServer server = new BaseHttpServer(port, false, 0, "");
+            MainServer.AddHttpServer(server);
+            MainServer.Instance = server;
+
+            server.Start(false);
+        }
+
+        [Test]
+        public void TestInventoryDescendentsFetch()
+        {
+            TestHelpers.InMethod();
+            TestHelpers.EnableLogging();
+
+            BaseHttpServer httpServer = MainServer.Instance;
+            Scene scene = new SceneHelpers().SetupScene();
+
+            CapabilitiesModule capsModule = new CapabilitiesModule();
+            WebFetchInvDescModule wfidModule = new WebFetchInvDescModule(false);
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("ClientStack.LindenCaps");
+            config.Configs["ClientStack.LindenCaps"].Set("Cap_FetchInventoryDescendents2", "localhost");
+
+            SceneHelpers.SetupSceneModules(scene, config, capsModule, wfidModule);
+
+            UserAccount ua = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(0x1));
+
+            // We need a user present to have any capabilities set up
+            SceneHelpers.AddScenePresence(scene, ua.PrincipalID);
+
+            TestHttpRequest req = new TestHttpRequest();
+            OpenSim.Framework.Capabilities.Caps userCaps = capsModule.GetCapsForUser(ua.PrincipalID);
+            PollServiceEventArgs pseArgs;
+            userCaps.TryGetPollHandler("FetchInventoryDescendents2", out pseArgs);
+            req.UriPath = pseArgs.Url;
+            req.Uri = new Uri("file://" + req.UriPath);
+
+            // Retrieve root folder details directly so that we can request
+            InventoryFolderBase folder = scene.InventoryService.GetRootFolder(ua.PrincipalID);
+
+            OSDMap osdFolder = new OSDMap();
+            osdFolder["folder_id"] = folder.ID;
+            osdFolder["owner_id"] = ua.PrincipalID;
+            osdFolder["fetch_folders"] = true;
+            osdFolder["fetch_items"] = true;
+            osdFolder["sort_order"] = 0;
+
+            OSDArray osdFoldersArray = new OSDArray();
+            osdFoldersArray.Add(osdFolder);
+
+            OSDMap osdReqMap = new OSDMap();
+            osdReqMap["folders"] = osdFoldersArray;
+
+            req.Body = new MemoryStream(OSDParser.SerializeLLSDXmlBytes(osdReqMap));
+
+            TestHttpClientContext context = new TestHttpClientContext(false);
+
+            // WARNING: This results in a caught exception, because queryString is null
+            MainServer.Instance.OnRequest(context, new RequestEventArgs(req));
+
+            // Drive processing of the queued inventory request synchronously.
+            wfidModule.WaitProcessQueuedInventoryRequest();
+            MainServer.Instance.PollServiceRequestManager.WaitPerformResponse();
+
+//            System.Threading.Thread.Sleep(10000);
+
+            OSDMap responseOsd = (OSDMap)OSDParser.DeserializeLLSDXml(context.ResponseBody);
+            OSDArray foldersOsd = (OSDArray)responseOsd["folders"];
+            OSDMap folderOsd = (OSDMap)foldersOsd[0];
+           
+            // A sanity check that the response has the expected number of descendents for a default inventory
+            // TODO: Need a more thorough check.
+            Assert.That((int)folderOsd["descendents"], Is.EqualTo(16));
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 50e9275..c27d101 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -64,18 +64,13 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private Scene m_scene;
         private bool m_persistBakedTextures;
-        private string m_URL;
+
+        private IBakedTextureModule m_BakedTextureModule;
 
         private IBakedTextureModule m_BakedTextureModule;
 
         public void Initialise(IConfigSource source)
         {
-            IConfig config = source.Configs["ClientStack.LindenCaps"];
-            if (config == null)
-                return;
-
-            m_URL = config.GetString("Cap_UploadBakedTexture", string.Empty);
-
             IConfig appearanceConfig = source.Configs["Appearance"];
             if (appearanceConfig != null)
                 m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
@@ -96,7 +91,13 @@ namespace OpenSim.Region.ClientStack.Linden
             s.EventManager.OnRemovePresence -= DeRegisterPresence;
             m_BakedTextureModule = null;
             m_scene = null;
+<<<<<<< HEAD
+        }
+=======
         }     
+>>>>>>> avn/ubitvar
+
+       
 
         public void RegionLoaded(Scene s)
         {
@@ -108,12 +109,173 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private void DeRegisterPresence(UUID agentId)
         {
+<<<<<<< HEAD
+            ScenePresence presence = null;
+            if (m_scene.TryGetScenePresence(agentId, out presence))
+            {
+                presence.ControllingClient.OnSetAppearance -= CaptureAppearanceSettings;
+            }
+
+        }
+
+        private void RegisterNewPresence(ScenePresence presence)
+        {
+           presence.ControllingClient.OnSetAppearance += CaptureAppearanceSettings;
+
+        }
+
+        private void CaptureAppearanceSettings(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems)
+        {
+            int maxCacheitemsLoop = cacheItems.Length;
+            if (maxCacheitemsLoop > AvatarWearable.MAX_WEARABLES)
+            {
+                maxCacheitemsLoop = AvatarWearable.MAX_WEARABLES;
+                m_log.WarnFormat("[CACHEDBAKES]: Too Many Cache items Provided {0}, the max is {1}.  Truncating!", cacheItems.Length, AvatarWearable.MAX_WEARABLES);
+            }
+
+            m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+            if (cacheItems.Length > 0)
+            {
+//                m_log.Debug("[Cacheitems]: " + cacheItems.Length);
+//                for (int iter = 0; iter < maxCacheitemsLoop; iter++)
+//                {
+//                    m_log.Debug("[Cacheitems] {" + iter + "/" + cacheItems[iter].TextureIndex + "}: c-" + cacheItems[iter].CacheId + ", t-" +
+//                                      cacheItems[iter].TextureID);
+//                }
+               
+                ScenePresence p = null;
+                if (m_scene.TryGetScenePresence(remoteClient.AgentId, out p))
+                {
+
+                    WearableCacheItem[] existingitems = p.Appearance.WearableCacheItems;
+                    if (existingitems == null)
+                    {
+                        if (m_BakedTextureModule != null)
+                        {
+                            WearableCacheItem[] savedcache = null;
+                            try
+                            {
+                                if (p.Appearance.WearableCacheItemsDirty)
+                                {
+                                    savedcache = m_BakedTextureModule.Get(p.UUID);
+                                    p.Appearance.WearableCacheItems = savedcache;
+                                    p.Appearance.WearableCacheItemsDirty = false;
+                                }
+
+                            }
+                            /*
+                             * The following Catch types DO NOT WORK with m_BakedTextureModule.Get
+                             * it jumps to the General Packet Exception Handler if you don't catch Exception!
+                             * 
+                            catch (System.Net.Sockets.SocketException)
+                            {
+                                cacheItems = null;
+                            }
+                            catch (WebException)
+                            {
+                                cacheItems = null;
+                            }
+                            catch (InvalidOperationException)
+                            {
+                                cacheItems = null;
+                            } */
+                            catch (Exception)
+                            {
+                               // The service logs a sufficient error message.
+                            }
+                            
+
+                            if (savedcache != null)
+                                existingitems = savedcache;
+                        }
+                    }
+                    // Existing items null means it's a fully new appearance
+                    if (existingitems == null)
+                    {
+
+                        for (int i = 0; i < maxCacheitemsLoop; i++)
+                        {
+                            if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
+                            {
+                                Primitive.TextureEntryFace face = textureEntry.FaceTextures[cacheItems[i].TextureIndex];
+                                if (face == null)
+                                {
+                                    textureEntry.CreateFace(cacheItems[i].TextureIndex);
+                                    textureEntry.FaceTextures[cacheItems[i].TextureIndex].TextureID =
+                                        AppearanceManager.DEFAULT_AVATAR_TEXTURE;
+                                    continue;
+                                }
+                                cacheItems[i].TextureID =face.TextureID;
+                                if (m_scene.AssetService != null)
+                                    cacheItems[i].TextureAsset =
+                                        m_scene.AssetService.GetCached(cacheItems[i].TextureID.ToString());
+                            }
+                            else
+                            {
+                                m_log.WarnFormat("[CACHEDBAKES]: Invalid Texture Index Provided, Texture doesn't exist or hasn't been uploaded yet {0}, the max is {1}.  Skipping!", cacheItems[i].TextureIndex, textureEntry.FaceTextures.Length);
+                            }
+
+
+                        }
+                    }
+                    else
+
+
+                    {
+                        // for each uploaded baked texture
+                        for (int i = 0; i < maxCacheitemsLoop; i++)
+                        {
+                            if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
+                            {
+                                Primitive.TextureEntryFace face = textureEntry.FaceTextures[cacheItems[i].TextureIndex];
+                                if (face == null)
+                                {
+                                    textureEntry.CreateFace(cacheItems[i].TextureIndex);
+                                    textureEntry.FaceTextures[cacheItems[i].TextureIndex].TextureID =
+                                        AppearanceManager.DEFAULT_AVATAR_TEXTURE;
+                                    continue;
+                                }
+                                cacheItems[i].TextureID =
+                                    face.TextureID;
+                            }
+                            else
+                            {
+                                m_log.WarnFormat("[CACHEDBAKES]: Invalid Texture Index Provided, Texture doesn't exist or hasn't been uploaded yet {0}, the max is {1}.  Skipping!", cacheItems[i].TextureIndex, textureEntry.FaceTextures.Length);
+                            }
+                        }
+
+                        for (int i = 0; i < maxCacheitemsLoop; i++)
+                        {
+                            if (cacheItems[i].TextureAsset == null)
+                            {
+                                cacheItems[i].TextureAsset =
+                                    m_scene.AssetService.GetCached(cacheItems[i].TextureID.ToString());
+                            }
+                        }
+                    }
+
+
+
+                    p.Appearance.WearableCacheItems = cacheItems;
+                    
+                   
+
+                    if (m_BakedTextureModule != null)
+                    {
+                        m_BakedTextureModule.Store(remoteClient.AgentId, cacheItems);
+                        p.Appearance.WearableCacheItemsDirty = true;
+                        
+                    }
+                }
+            }
+=======
 //            ScenePresence presence = null;
 //            if (m_scene.TryGetScenePresence(agentId, out presence))
             {
 //                presence.ControllingClient.OnSetAppearance -= CaptureAppearanceSettings;
             }
 
+>>>>>>> avn/ubitvar
         }
 
         private void RegisterNewPresence(ScenePresence presence)
@@ -279,8 +441,25 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
-//            UUID capID = UUID.Random();
+            UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler(
+                caps, m_scene.AssetService, m_persistBakedTextures);
+
+<<<<<<< HEAD
+           
+            
+            caps.RegisterHandler(
+                "UploadBakedTexture",
+                new RestStreamHandler(
+                    "POST",
+                    "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
+                    avatarhandler.UploadBakedTexture,
+                    "UploadBakedTexture",
+                    agentID.ToString()));
+
+           
+            
 
+=======
             //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
             if (m_URL == "localhost")
             {
@@ -301,6 +480,7 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 caps.RegisterHandler("UploadBakedTexture", m_URL);
             }
+>>>>>>> avn/ubitvar
         }
     }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 6fc35cd..92f8c51 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -64,9 +64,32 @@ namespace OpenSim.Region.ClientStack.Linden
             public List<UUID> folders;
         }
 
+<<<<<<< HEAD
+         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+=======
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+>>>>>>> avn/ubitvar
 
-        private Scene m_scene;
+        /// <summary>
+        /// Control whether requests will be processed asynchronously.
+        /// </summary>
+        /// <remarks>
+        /// Defaults to true.  Can currently not be changed once a region has been added to the module.
+        /// </remarks>
+        public bool ProcessQueuedRequestsAsync { get; private set; }
+
+        /// <summary>
+        /// Number of inventory requests processed by this module.
+        /// </summary>
+        /// <remarks>
+        /// It's the PollServiceRequestManager that actually sends completed requests back to the requester.
+        /// </remarks>
+        public static int ProcessedRequestsCount { get; set; }
+
+        private static Stat s_queuedRequestsStat;
+        private static Stat s_processedRequestsStat;
+
+        public Scene Scene { get; private set; }
 
         private IInventoryService m_InventoryService;
         private ILibraryService m_LibraryService;
@@ -76,7 +99,7 @@ namespace OpenSim.Region.ClientStack.Linden
         private string m_fetchInventoryDescendents2Url;
         private string m_webFetchInventoryDescendentsUrl;
 
-        private static WebFetchInvDescHandler m_webFetchHandler;
+        private static FetchInvDescHandler m_webFetchHandler;
 
         private static Thread[] m_workerThreads = null;
 
@@ -85,6 +108,13 @@ namespace OpenSim.Region.ClientStack.Linden
 
         #region ISharedRegionModule Members
 
+        public WebFetchInvDescModule() : this(true) {}
+
+        public WebFetchInvDescModule(bool processQueuedResultsAsync)
+        {
+            ProcessQueuedRequestsAsync = processQueuedResultsAsync;
+        }
+
         public void Initialise(IConfigSource source)
         {
             IConfig config = source.Configs["ClientStack.LindenCaps"];
@@ -105,7 +135,7 @@ namespace OpenSim.Region.ClientStack.Linden
             if (!m_Enabled)
                 return;
 
-            m_scene = s;
+            Scene = s;
         }
 
         public void RemoveRegion(Scene s)
@@ -113,12 +143,23 @@ namespace OpenSim.Region.ClientStack.Linden
             if (!m_Enabled)
                 return;
 
-            m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
+            Scene.EventManager.OnRegisterCaps -= RegisterCaps;
 
-            foreach (Thread t in m_workerThreads)
-                Watchdog.AbortThread(t.ManagedThreadId);
+            StatsManager.DeregisterStat(s_processedRequestsStat);
+            StatsManager.DeregisterStat(s_queuedRequestsStat);
 
-            m_scene = null;
+            if (ProcessQueuedRequestsAsync)
+            {
+                if (m_workerThreads != null)
+                {
+                    foreach (Thread t in m_workerThreads)
+                        Watchdog.AbortThread(t.ManagedThreadId);
+
+                    m_workerThreads = null;
+                }
+            }
+
+            Scene = null;
         }
 
         public void RegionLoaded(Scene s)
@@ -126,21 +167,53 @@ namespace OpenSim.Region.ClientStack.Linden
             if (!m_Enabled)
                 return;
 
-            m_InventoryService = m_scene.InventoryService;
-            m_LibraryService = m_scene.LibraryService;
+            if (s_processedRequestsStat == null)
+                s_processedRequestsStat =
+                    new Stat(
+                        "ProcessedFetchInventoryRequests",
+                        "Number of processed fetch inventory requests",
+                        "These have not necessarily yet been dispatched back to the requester.",
+                        "",
+                        "inventory",
+                        "httpfetch",
+                        StatType.Pull,
+                        MeasuresOfInterest.AverageChangeOverTime,
+                        stat => { stat.Value = ProcessedRequestsCount; },
+                        StatVerbosity.Debug);
+
+            if (s_queuedRequestsStat == null)
+                s_queuedRequestsStat =
+                    new Stat(
+                        "QueuedFetchInventoryRequests",
+                        "Number of fetch inventory requests queued for processing",
+                        "",
+                        "",
+                        "inventory",
+                        "httpfetch",
+                        StatType.Pull,
+                        MeasuresOfInterest.AverageChangeOverTime,
+                        stat => { stat.Value = m_queue.Count; },
+                        StatVerbosity.Debug);
+
+            StatsManager.RegisterStat(s_processedRequestsStat);
+            StatsManager.RegisterStat(s_queuedRequestsStat);
+
+            m_InventoryService = Scene.InventoryService;
+            m_LibraryService = Scene.LibraryService;
 
             // We'll reuse the same handler for all requests.
-            m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
+            m_webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService, Scene);
 
-            m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+            Scene.EventManager.OnRegisterCaps += RegisterCaps;
 
-            if (m_workerThreads == null)
+            int nworkers = 2; // was 2
+            if (ProcessQueuedRequestsAsync && m_workerThreads == null)
             {
-                m_workerThreads = new Thread[2];
+                m_workerThreads = new Thread[nworkers];
 
-                for (uint i = 0; i < 2; i++)
+                for (uint i = 0; i < nworkers; i++)
                 {
-                    m_workerThreads[i] = Watchdog.StartThread(DoInventoryRequests,
+                    m_workerThreads[i] = WorkManager.StartThread(DoInventoryRequests,
                             String.Format("InventoryWorkerThread{0}", i),
                             ThreadPriority.Normal,
                             false,
@@ -173,12 +246,12 @@ namespace OpenSim.Region.ClientStack.Linden
             private Dictionary<UUID, Hashtable> responses =
                     new Dictionary<UUID, Hashtable>();
 
-            private Scene m_scene;
+            private WebFetchInvDescModule m_module;
 
-            public PollServiceInventoryEventArgs(Scene scene, string url, UUID pId) :
-                    base(null, url, null, null, null, pId, int.MaxValue)
+            public PollServiceInventoryEventArgs(WebFetchInvDescModule module, string url, UUID pId) :
+                base(null, url, null, null, null, pId, int.MaxValue)
             {
-                m_scene = scene;
+                m_module = module;
 
                 HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); };
                 GetEvents = (x, y) =>
@@ -198,12 +271,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
                 Request = (x, y) =>
                 {
-                    ScenePresence sp = m_scene.GetScenePresence(Id);
-                    if (sp == null)
-                    {
-                        m_log.ErrorFormat("[INVENTORY]: Unable to find ScenePresence for {0}", Id);
-                        return;
-                    }
+                    ScenePresence sp = m_module.Scene.GetScenePresence(Id);
 
                     aPollRequest reqinfo = new aPollRequest();
                     reqinfo.thepoll = this;
@@ -298,7 +366,13 @@ namespace OpenSim.Region.ClientStack.Linden
                         requestinfo.request["body"].ToString(), String.Empty, String.Empty, null, null);
 
                 lock (responses)
+                {
+                    if (responses.ContainsKey(requestID))
+                        m_log.WarnFormat("[FETCH INVENTORY DESCENDENTS2 MODULE]: Caught in the act of loosing responses! Please report this on mantis #7054");
                     responses[requestID] = response;
+                }
+
+                WebFetchInvDescModule.ProcessedRequestsCount++;
             }
         }
 
@@ -322,7 +396,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 capUrl = "/CAPS/" + UUID.Random() + "/";
 
                 // Register this as a poll service
-                PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, capUrl, agentID);
+                PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(this, capUrl, agentID);
                 args.Type = PollServiceEventArgs.EventType.Inventory;
 
                 caps.RegisterPollHandler(capName, args);
@@ -331,7 +405,7 @@ namespace OpenSim.Region.ClientStack.Linden
             else
             {
                 capUrl = url;
-                IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
+                IExternalCapsModule handler = Scene.RequestModuleInterface<IExternalCapsModule>();
                 if (handler != null)
                     handler.RegisterExternalUserCapsHandler(agentID,caps,capName,capUrl);
                 else
@@ -360,10 +434,26 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 Watchdog.UpdateThread();
 
-                aPollRequest poolreq = m_queue.Dequeue();
+                WaitProcessQueuedInventoryRequest();
+            }
+        }
+
+        public void WaitProcessQueuedInventoryRequest()
+        {
+            aPollRequest poolreq = m_queue.Dequeue();
 
-                if (poolreq != null && poolreq.thepoll != null)
+            if (poolreq != null && poolreq.thepoll != null)
+            {
+                try
+                {
                     poolreq.thepoll.Process(poolreq);
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat(
+                        "[INVENTORY]: Failed to process queued inventory request {0} for {1} in {2}.  Exception {3}", 
+                        poolreq.reqID, poolreq.presence != null ? poolreq.presence.Name : "unknown", Scene.Name, e);
+                }
             }
         }
     }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 56069a3..806269f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -34,11 +34,13 @@ using System.Text;
 using System.Threading;
 using System.Timers;
 using System.Xml;
+
 using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenMetaverse.Messages.Linden;
 using OpenMetaverse.StructuredData;
+
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
 using OpenSim.Framework.Monitoring;
@@ -48,7 +50,6 @@ using OpenSim.Services.Interfaces;
 using Timer = System.Timers.Timer;
 using AssetLandmark = OpenSim.Framework.AssetLandmark;
 using RegionFlags = OpenMetaverse.RegionFlags;
-using Nini.Config;
 
 using System.IO;
 using PermissionMask = OpenSim.Framework.PermissionMask;
@@ -70,7 +71,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Events
 
-        public event GenericMessage OnGenericMessage;
         public event BinaryGenericMessage OnBinaryGenericMessage;
         public event Action<IClientAPI> OnLogout;
         public event ObjectPermissions OnObjectPermissions;
@@ -78,13 +78,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event ViewerEffectEventHandler OnViewerEffect;
         public event ImprovedInstantMessage OnInstantMessage;
         public event ChatMessage OnChatFromClient;
-        public event TextureRequest OnRequestTexture;
         public event RezObject OnRezObject;
         public event DeRezObject OnDeRezObject;
         public event ModifyTerrain OnModifyTerrain;
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall1 OnRequestWearables;
-        public event CachedTextureRequest OnCachedTextureRequest;
         public event SetAppearance OnSetAppearance;
         public event AvatarNowWearing OnAvatarNowWearing;
         public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
@@ -139,15 +137,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
         public event UpdateVector OnUpdatePrimScale;
         public event UpdateVector OnUpdatePrimGroupScale;
-        public event StatusChange OnChildAgentStatus;
-        public event GenericCall2 OnStopMovement;
-        public event Action<UUID> OnRemoveAvatar;
         public event RequestMapBlocks OnRequestMapBlocks;
         public event RequestMapName OnMapNameRequest;
         public event TeleportLocationRequest OnTeleportLocationRequest;
         public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
         public event TeleportCancel OnTeleportCancel;
-        public event DisconnectUser OnDisconnectUser;
         public event RequestAvatarProperties OnRequestAvatarProperties;
         public event SetAlwaysRun OnSetAlwaysRun;
         public event FetchInventory OnAgentDataUpdateRequest;
@@ -178,7 +172,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event UpdateTaskInventory OnUpdateTaskInventory;
         public event MoveTaskInventory OnMoveTaskItem;
         public event RemoveTaskInventory OnRemoveTaskItem;
-        public event RequestAsset OnRequestAsset;
         public event UUIDNameRequest OnNameFromUUIDRequest;
         public event ParcelAccessListRequest OnParcelAccessListRequest;
         public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
@@ -209,7 +202,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event RequestPayPrice OnRequestPayPrice;
         public event ObjectSaleInfo OnObjectSaleInfo;
         public event ObjectBuy OnObjectBuy;
-        public event BuyObjectInventory OnBuyObjectInventory;
         public event AgentSit OnUndo;
         public event AgentSit OnRedo;
         public event LandUndo OnLandUndo;
@@ -218,7 +210,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event RequestObjectPropertiesFamily OnObjectGroupRequest;
         public event DetailedEstateDataRequest OnDetailedEstateDataRequest;
         public event SetEstateFlagsRequest OnSetEstateFlagsRequest;
-        public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
         public event SetEstateTerrainDetailTexture OnSetEstateTerrainDetailTexture;
         public event SetEstateTerrainTextureHeights OnSetEstateTerrainTextureHeights;
         public event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest;
@@ -241,7 +232,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event GetScriptRunning OnGetScriptRunning;
         public event SetScriptRunning OnSetScriptRunning;
         public event Action<Vector3, bool, bool> OnAutoPilotGo;
-        public event TerrainUnacked OnUnackedTerrain;
         public event ActivateGesture OnActivateGesture;
         public event DeactivateGesture OnDeactivateGesture;
         public event ObjectOwner OnObjectOwner;
@@ -301,6 +291,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
         public event GenericCall2 OnUpdateThrottles;
 
+#pragma warning disable 0067
+        public event GenericMessage OnGenericMessage;
+        public event TextureRequest OnRequestTexture;
+        public event StatusChange OnChildAgentStatus;
+        public event GenericCall2 OnStopMovement;
+        public event Action<UUID> OnRemoveAvatar;
+        public event DisconnectUser OnDisconnectUser;
+        public event RequestAsset OnRequestAsset;
+        public event BuyObjectInventory OnBuyObjectInventory;
+        public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
+        public event TerrainUnacked OnUnackedTerrain;
+        public event CachedTextureRequest OnCachedTextureRequest;
+#pragma warning restore 0067
+
         #endregion Events
 
         #region Class Members
@@ -413,9 +417,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
         public UUID AgentId { get { return m_agentId; } }
         public ISceneAgent SceneAgent { get; set; }
-        public UUID ActiveGroupId { get { return m_activeGroupID; } }
-        public string ActiveGroupName { get { return m_activeGroupName; } }
-        public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } }
+        public UUID ActiveGroupId { get { return m_activeGroupID; } private set { m_activeGroupID = value; } }
+        public string ActiveGroupName { get { return m_activeGroupName; } private set { m_activeGroupName = value; } }
+        public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } private set { m_activeGroupPowers = value; } }
         public bool IsGroupMember(UUID groupID) { return m_groupPowers.ContainsKey(groupID); }
 
         public int PingTimeMS
@@ -482,7 +486,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
 //        ~LLClientView()
 //        {
-//            m_log.DebugFormat("[LLCLIENTVIEW]: Destructor called for {0}, circuit code {1}", Name, CircuitCode);
+//            m_log.DebugFormat("{0} Destructor called for {1}, circuit code {2}", LogHeader, Name, CircuitCode);
 //        }
 
         /// <summary>
@@ -553,9 +557,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // there is some unidentified connection problem, not where we have issues due to deadlock
                 if (!IsActive && !force)
                 {
-                    m_log.DebugFormat(
-                        "[CLIENT]: Not attempting to close inactive client {0} in {1} since force flag is not set", 
-                        Name, m_scene.Name);
+                    m_log.DebugFormat( "{0} Not attempting to close inactive client {1} in {2} since force flag is not set", 
+                        LogHeader, Name, m_scene.Name);
 
                     return;
                 }
@@ -720,7 +723,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (!m_packetHandlers.ContainsKey(packetType))
                 {
                     m_packetHandlers.Add(
+<<<<<<< HEAD
+                        packetType, new PacketProcessor() { method = handler, Async = doAsync, InEngine = inEngine });
+=======
                         packetType, new PacketProcessor() { method = handler, Async = doAsync });
+>>>>>>> avn/ubitvar
                     result = true;
                 }
             }
@@ -755,21 +762,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             PacketProcessor pprocessor;
             if (m_packetHandlers.TryGetValue(packet.Type, out pprocessor))
             {
+                ClientInfo cinfo = UDPClient.GetClientInfo();
+
                 //there is a local handler for this packet type
                 if (pprocessor.Async)
                 {
-                    ClientInfo cinfo = UDPClient.GetClientInfo();
                     if (!cinfo.AsyncRequests.ContainsKey(packet.Type.ToString()))
                         cinfo.AsyncRequests[packet.Type.ToString()] = 0;
                     cinfo.AsyncRequests[packet.Type.ToString()]++;
 
                     object obj = new AsyncPacketProcess(this, pprocessor.method, packet);
-                    Util.FireAndForget(ProcessSpecificPacketAsync, obj);
+
+                    if (pprocessor.InEngine)
+                        m_udpServer.IpahEngine.QueueJob(packet.Type.ToString(), () => ProcessSpecificPacketAsync(obj));
+                    else
+                        Util.FireAndForget(ProcessSpecificPacketAsync, obj, packet.Type.ToString());
+
                     result = true;
                 }
                 else
                 {
-                    ClientInfo cinfo = UDPClient.GetClientInfo();
                     if (!cinfo.SyncRequests.ContainsKey(packet.Type.ToString()))
                         cinfo.SyncRequests[packet.Type.ToString()] = 0;
                     cinfo.SyncRequests[packet.Type.ToString()]++;
@@ -810,9 +822,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             catch (Exception e)
             {
                 // Make sure that we see any exception caused by the asynchronous operation.
-                m_log.ErrorFormat(
-                    "[LLCLIENTVIEW]: Caught exception while processing {0} for {1}, {2} {3}", 
-                    packetObject.Pack, Name, e.Message, e.StackTrace);
+                m_log.Error(
+                    string.Format(
+                        "[LLCLIENTVIEW]: Caught exception while processing {0} for {1}  ", packetObject.Pack, Name), 
+                    e);
             }
         }
 
@@ -1215,11 +1228,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="map">heightmap</param>
         public virtual void SendLayerData(float[] map)
         {
+<<<<<<< HEAD
+            Util.FireAndForget(DoSendLayerData, m_scene.Heightmap.GetTerrainData(), "LLClientView.DoSendLayerData");
+=======
             Util.FireAndForget(DoSendLayerData, m_scene.Heightmap.GetTerrainData());
 
             // Send it sync, and async. It's not that much data
             // and it improves user experience just so much!
 //            DoSendLayerData(map);
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -1233,6 +1250,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             try
             {
                 // Send LayerData in typerwriter pattern
+<<<<<<< HEAD
+                //for (int y = 0; y < 16; y++)
+                //{
+                //    for (int x = 0; x < 16; x++)
+                //    {
+                //        SendLayerData(x, y, map);
+                //    }
+                //}
+
+                // Send LayerData in a spiral pattern. Fun!
+                SendLayerTopRight(map, 0, 0, map.SizeX/Constants.TerrainPatchSize-1, map.SizeY/Constants.TerrainPatchSize-1);
+=======
                 for (int y = 0; y < 16; y++)
                 {
                     for (int x = 0; x < 16; x++)
@@ -1240,6 +1269,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         SendLayerData(x, y, map);
                     }
                 }
+>>>>>>> avn/ubitvar
             }
             catch (Exception e)
             {
@@ -1247,6 +1277,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
+<<<<<<< HEAD
+        private void SendLayerTopRight(TerrainData map, int x1, int y1, int x2, int y2)
+=======
         // Legacy form of invocation that passes around a bare data array.
         // Just ignore what was passed and use the real terrain info that is part of the scene.
         // As a HORRIBLE kludge in an attempt to not change the definition of IClientAPI, 
@@ -1256,6 +1289,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         //    as -2 and map= [3, 5, 8, 4] would mean to send two terrain heightmap patches
         //    and the patches to send are <3,5> and <8,4>.
         public void SendLayerData(int px, int py, float[] map)
+>>>>>>> avn/ubitvar
         {
             if (px >= 0)
             {
@@ -1274,6 +1308,92 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 // DebugSendingPatches("SendLayerData", xPatches, yPatches);
 
+<<<<<<< HEAD
+            if (x2 - x1 > 0 && y2 - y1 > 0)
+                SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
+        }
+
+        void SendLayerBottomLeft(TerrainData map, int x1, int y1, int x2, int y2)
+        {
+            // Row in reverse
+            for (int i = x2; i >= x1; i--)
+                SendLayerData(i, y2, map);
+
+            // Column in reverse
+            for (int j = y2 - 1; j >= y1; j--)
+                SendLayerData(x1, j, map);
+
+            if (x2 - x1 > 0 && y2 - y1 > 0)
+                SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
+        }
+
+        /// <summary>
+        /// Sends a set of four patches (x, x+1, ..., x+3) to the client
+        /// </summary>
+        /// <param name="map">heightmap</param>
+        /// <param name="px">X coordinate for patches 0..12</param>
+        /// <param name="py">Y coordinate for patches 0..15</param>
+        // private void SendLayerPacket(float[] map, int y, int x)
+        // {
+        //     int[] patches = new int[4];
+        //     patches[0] = x + 0 + y * 16;
+        //     patches[1] = x + 1 + y * 16;
+        //     patches[2] = x + 2 + y * 16;
+        //     patches[3] = x + 3 + y * 16;
+
+        //     Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches);
+        //     OutPacket(layerpack, ThrottleOutPacketType.Land);
+        // }
+
+        // Legacy form of invocation that passes around a bare data array.
+        // Just ignore what was passed and use the real terrain info that is part of the scene.
+        // As a HORRIBLE kludge in an attempt to not change the definition of IClientAPI, 
+        //    there is a special form for specifying multiple terrain patches to send.
+        //    The form is to pass 'px' as negative the number of patches to send and to
+        //    pass the float array as pairs of patch X and Y coordinates. So, passing 'px'
+        //    as -2 and map= [3, 5, 8, 4] would mean to send two terrain heightmap patches
+        //    and the patches to send are <3,5> and <8,4>.
+        public void SendLayerData(int px, int py, float[] map)
+        {
+            if (px >= 0)
+            {
+                SendLayerData(px, py, m_scene.Heightmap.GetTerrainData());
+            }
+            else
+            {
+                int numPatches = -px;
+                int[] xPatches = new int[numPatches];
+                int[] yPatches = new int[numPatches];
+                for (int pp = 0; pp < numPatches; pp++)
+                {
+                    xPatches[pp] = (int)map[pp * 2];
+                    yPatches[pp] = (int)map[pp * 2 + 1];
+                }
+
+                // DebugSendingPatches("SendLayerData", xPatches, yPatches);
+
+                SendLayerData(xPatches, yPatches, m_scene.Heightmap.GetTerrainData());
+            }
+        }
+
+        private void DebugSendingPatches(string pWho, int[] pX, int[] pY)
+        {
+            if (m_log.IsDebugEnabled)
+            {
+                int numPatches = pX.Length;
+                string Xs = "";
+                string Ys = "";
+                for (int pp = 0; pp < numPatches; pp++)
+                {
+                    Xs += String.Format("{0}", (int)pX[pp]) + ",";
+                    Ys += String.Format("{0}", (int)pY[pp]) + ",";
+                }
+                m_log.DebugFormat("{0} {1}: numPatches={2}, X={3}, Y={4}", LogHeader, pWho, numPatches, Xs, Ys);
+            }
+        }
+
+        /// <summary>
+=======
                 SendLayerData(xPatches, yPatches, m_scene.Heightmap.GetTerrainData());
             }
         }
@@ -1295,6 +1415,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         /// <summary>
+>>>>>>> avn/ubitvar
         /// Sends a terrain packet for the point specified.
         /// This is a legacy call that has refarbed the terrain into a flat map of floats.
         /// We just use the terrain from the region we know about.
@@ -1337,6 +1458,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     SendTheLayerPacket(layerpack);
                 }
+                // LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLandPacket(terrData, px, py);
+
             }
             catch (Exception e)
             {
@@ -1344,9 +1467,40 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
+<<<<<<< HEAD
+        // When a user edits the terrain, so much data is sent, the data queues up fast and presents a
+        // sub optimal editing experience. To alleviate this issue, when the user edits the terrain, we
+        // start skipping the queues until they're done editing the terrain. We also make them
+        // unreliable because it's extremely likely that multiple packets will be sent for a terrain patch
+        // area invalidating previous packets for that area.
+
+        // It's possible for an editing user to flood themselves with edited packets but the majority
+        // of use cases are such that only a tiny percentage of users will be editing the terrain.
+        // Other, non-editing users will see the edits much slower.
+        
+        // One last note on this topic, by the time users are going to be editing the terrain, it's
+        // extremely likely that the sim will have rezzed already and therefore this is not likely going
+        // to cause any additional issues with lost packets, objects or terrain patches.
+
+        // m_justEditedTerrain is volatile, so test once and duplicate two affected statements so we
+        //    only have one cache miss.
+        private void SendTheLayerPacket(LayerDataPacket layerpack)
+        {
+            if (m_justEditedTerrain)
+            {
+                layerpack.Header.Reliable = false;
+                OutPacket(layerpack, ThrottleOutPacketType.Unknown );
+            }
+            else
+            {
+                layerpack.Header.Reliable = true;
+                OutPacket(layerpack, ThrottleOutPacketType.Land);
+            }
+=======
           private void SendTheLayerPacket(LayerDataPacket layerpack)
         {
                 OutPacket(layerpack, ThrottleOutPacketType.Land);
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -1355,7 +1509,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="windSpeeds">16x16 array of wind speeds</param>
         public virtual void SendWindData(Vector2[] windSpeeds)
         {
-            Util.FireAndForget(DoSendWindData, windSpeeds);
+            Util.FireAndForget(DoSendWindData, windSpeeds, "LLClientView.SendWindData");
         }
 
         /// <summary>
@@ -1364,7 +1518,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="windSpeeds">16x16 array of cloud densities</param>
         public virtual void SendCloudData(float[] cloudDensity)
         {
-            Util.FireAndForget(DoSendCloudData, cloudDensity);
+            Util.FireAndForget(DoSendCloudData, cloudDensity, "LLClientView.SendCloudData");
         }
 
         /// <summary>
@@ -1807,6 +1961,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             newBlock.Name = Util.StringToBytes256(folder.Name);
             newBlock.ParentID = folder.ParentID;
             newBlock.Type = (sbyte)folder.Type;
+            //if (newBlock.Type == InventoryItemBase.SUITCASE_FOLDER_TYPE)
+            //    newBlock.Type = InventoryItemBase.SUITCASE_FOLDER_FAKE_TYPE;
 
             return newBlock;
         }
@@ -2056,8 +2212,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             folderBlock.FolderID = folder.ID;
             folderBlock.ParentID = folder.ParentID;
-            //folderBlock.Type = -1;
             folderBlock.Type = (sbyte)folder.Type;
+            // Leaving this here for now, just in case we need to do this for a while
+            //if (folderBlock.Type == InventoryItemBase.SUITCASE_FOLDER_TYPE)
+            //    folderBlock.Type = InventoryItemBase.SUITCASE_FOLDER_FAKE_TYPE;
             folderBlock.Name = Util.StringToBytes256(folder.Name);
 
             return folderBlock;
@@ -2332,9 +2490,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             if (agentid == AgentId)
             {
+<<<<<<< HEAD
+                ActiveGroupId = activegroupid;
+                ActiveGroupName = groupname;
+                ActiveGroupPowers = grouppowers;
+=======
                 m_activeGroupID = activegroupid;
                 m_activeGroupName = groupname;
                 m_activeGroupPowers = grouppowers;
+>>>>>>> avn/ubitvar
             }
 
             AgentDataUpdatePacket sendAgentDataUpdate = (AgentDataUpdatePacket)PacketPool.Instance.GetPacket(PacketType.AgentDataUpdate);
@@ -2842,8 +3006,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             if (req.AssetInf.Data == null)
             {
-                m_log.ErrorFormat("Cannot send asset {0} ({1}), asset data is null",
-                    req.AssetInf.ID, req.AssetInf.Metadata.ContentType);
+                m_log.ErrorFormat("{0} Cannot send asset {1} ({2}), asset data is null",
+                                LogHeader, req.AssetInf.ID, req.AssetInf.Metadata.ContentType);
                 return;
             }
             int WearableOut = 0;
@@ -3724,11 +3888,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             avp.Sender.IsTrial = false;
             avp.Sender.ID = agentID;
             avp.AppearanceData = new AvatarAppearancePacket.AppearanceDataBlock[0];
+<<<<<<< HEAD
+            avp.AppearanceHover = new AvatarAppearancePacket.AppearanceHoverBlock[0];
+=======
 
             // this need be use in future
  //           avp.AppearanceData[0].AppearanceVersion = 0;
  //           avp.AppearanceData[0].CofVersion = 0;
 
+>>>>>>> avn/ubitvar
             //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString());
             OutPacket(avp, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
         }
@@ -3846,6 +4014,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
+<<<<<<< HEAD
+            if (entity.UUID == m_agentId && !updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
+            {
+                ImprovedTerseObjectUpdatePacket packet
+                    = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
+=======
             if (entity is SceneObjectPart)
             {
                 SceneObjectPart e = (SceneObjectPart)entity;
@@ -3855,9 +4029,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
             uint priority = m_prioritizer.GetUpdatePriority(this, entity);
+>>>>>>> avn/ubitvar
 
-            lock (m_entityUpdates.SyncRoot)
-                m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags, m_scene.TimeDilation));
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = Utils.FloatToUInt16(1, 0.0f, 1.0f);
+                packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
+                packet.ObjectData[0] = CreateImprovedTerseBlock(entity, false);
+                OutPacket(packet, ThrottleOutPacketType.Unknown, true);
+            }
+            else
+            {
+                //double priority = m_prioritizer.GetUpdatePriority(this, entity);
+                uint priority = m_prioritizer.GetUpdatePriority(this, entity);
+
+                lock (m_entityUpdates.SyncRoot)
+                    m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags, m_scene.TimeDilation));
+            }
         }
 
 
@@ -4198,6 +4385,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 OutPacket(packet, ThrottleOutPacketType.Task, true);
             }
+<<<<<<< HEAD
+
+//            m_log.DebugFormat(
+//                "[LLCLIENTVIEW]: Sent {0} updates in ProcessEntityUpdates() for {1} {2} in {3}", 
+//                updatesThisCall, Name, SceneAgent.IsChildAgent ? "child" : "root", Scene.Name);
+//
+            #endregion Packet Sending
+=======
+>>>>>>> avn/ubitvar
         }
         
         public void ReprioritizeUpdates()
@@ -5164,6 +5360,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 ScenePresence presence = (ScenePresence)entity;
 
+<<<<<<< HEAD
+//                m_log.DebugFormat( 
+//                    "[LLCLIENTVIEW]: Sending terse update to {0} with pos {1}, vel {2} in {3}", 
+//                    Name, presence.OffsetPosition, presence.Velocity, m_scene.Name);
+=======
                 position = presence.OffsetPosition;
                 rotation = presence.Rotation;
                 angularVelocity = presence.AngularVelocity;
@@ -5172,6 +5373,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 attachPoint = 0;
 //                m_log.DebugFormat(
 //                    "[LLCLIENTVIEW]: Sending terse update to {0} with position {1} in {2}", Name, presence.OffsetPosition, m_scene.Name);
+>>>>>>> avn/ubitvar
 
                 // attachPoint = presence.State; // Core: commented
                 collisionPlane = presence.CollisionPlane;
@@ -5290,9 +5492,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             uint parentID = data.ParentID;
   
 //            m_log.DebugFormat(
-//                "[LLCLIENTVIEW]: Sending full update to {0} with position {1} in {2}", Name, data.OffsetPosition, m_scene.Name);
+//                "[LLCLIENTVIEW]: Sending full update to {0} with pos {1}, vel {2} in {3}", Name, data.OffsetPosition, data.Velocity, m_scene.Name);
 
             byte[] objectData = new byte[76];
+<<<<<<< HEAD
+
+            data.CollisionPlane.ToBytes(objectData, 0);
+            data.OffsetPosition.ToBytes(objectData, 16);
+            data.Velocity.ToBytes(objectData, 28);
+//            data.Acceleration.ToBytes(objectData, 40);
+
+            // Whilst not in mouselook, an avatar will transmit only the Z rotation as this is the only axis
+            // it rotates around.
+            // In mouselook, X and Y co-ordinate will also be sent but when used in Rotation, these cause unwanted
+            // excessive up and down movements of the camera when looking up and down.
+            // See http://opensimulator.org/mantis/view.php?id=3274
+            // This does not affect head movement, since this is controlled entirely by camera movement rather than
+            // body rotation.  We still need to transmit X and Y for sitting avatars but mouselook does not change
+            // the rotation in this case.
+            Quaternion rot = data.Rotation;
+=======
+>>>>>>> avn/ubitvar
 
             Vector3 velocity = new Vector3(0, 0, 0);
             Vector3 acceleration = new Vector3(0, 0, 0);
@@ -5376,11 +5596,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             //update.JointType = 0;
             update.Material = data.Material;
             update.MediaURL = Utils.EmptyBytes; // FIXME: Support this in OpenSim
+<<<<<<< HEAD
+
+=======
 /*
+>>>>>>> avn/ubitvar
             if (data.ParentGroup.IsAttachment)
             {
-                update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.ParentGroup.FromItemID);
+                update.NameValue 
+                    = Util.StringToBytes256(
+                        string.Format("AttachItemID STRING RW SV {0}", data.ParentGroup.FromItemID));
+
                 update.State = (byte)((data.ParentGroup.AttachmentPoint % 16) * 16 + (data.ParentGroup.AttachmentPoint / 16));
+
+//                m_log.DebugFormat(
+//                    "[LLCLIENTVIEW]: Sending NameValue {0} for {1} {2} to {3}",
+//                    Util.UTF8.GetString(update.NameValue), data.Name, data.LocalId, Name);
+//
+//                m_log.DebugFormat(
+//                    "[LLCLIENTVIEW]: Sending state {0} for {1} {2} to {3}",
+//                    update.State, data.Name, data.LocalId, Name);
             }
             else
             {
@@ -5411,10 +5646,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
 
-//                m_log.DebugFormat(
-//                    "[LLCLIENTVIEW]: Sending state {0} for {1} {2} to {3}",
-//                    update.State, data.Name, data.LocalId, Name);
-
             update.ObjectData = objectData;
             update.ParentID = data.ParentID;
             update.PathBegin = data.Shape.PathBegin;
@@ -5514,8 +5745,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public ulong GetGroupPowers(UUID groupID)
         {
-            if (groupID == m_activeGroupID)
-                return m_activeGroupPowers;
+            if (groupID == ActiveGroupId)
+                return ActiveGroupPowers;
 
             if (m_groupPowers.ContainsKey(groupID))
                 return m_groupPowers[groupID];
@@ -5545,10 +5776,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.ParcelBuy, HandleParcelBuyRequest, false);
             AddLocalPacketHandler(PacketType.UUIDGroupNameRequest, HandleUUIDGroupNameRequest);
             AddLocalPacketHandler(PacketType.ObjectGroup, HandleObjectGroupRequest);
-            AddLocalPacketHandler(PacketType.GenericMessage, HandleGenericMessage);
-            AddLocalPacketHandler(PacketType.AvatarPropertiesRequest, HandleAvatarPropertiesRequest);
+            AddLocalPacketHandler(PacketType.GenericMessage, HandleGenericMessage, true, true);
+            AddLocalPacketHandler(PacketType.AvatarPropertiesRequest, HandleAvatarPropertiesRequest, true, true);
             AddLocalPacketHandler(PacketType.ChatFromViewer, HandleChatFromViewer);
-            AddLocalPacketHandler(PacketType.AvatarPropertiesUpdate, HandlerAvatarPropertiesUpdate);
+            AddLocalPacketHandler(PacketType.AvatarPropertiesUpdate, HandlerAvatarPropertiesUpdate, true, true);
             AddLocalPacketHandler(PacketType.ScriptDialogReply, HandlerScriptDialogReply);
             AddLocalPacketHandler(PacketType.ImprovedInstantMessage, HandlerImprovedInstantMessage);
             AddLocalPacketHandler(PacketType.AcceptFriendship, HandlerAcceptFriendship);
@@ -5734,8 +5965,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.PickDelete, HandlePickDelete);
             AddLocalPacketHandler(PacketType.PickGodDelete, HandlePickGodDelete);
             AddLocalPacketHandler(PacketType.PickInfoUpdate, HandlePickInfoUpdate);
-            AddLocalPacketHandler(PacketType.AvatarNotesUpdate, HandleAvatarNotesUpdate);
-            AddLocalPacketHandler(PacketType.AvatarInterestsUpdate, HandleAvatarInterestsUpdate);
+            AddLocalPacketHandler(PacketType.AvatarNotesUpdate, HandleAvatarNotesUpdate, true, true);
+            AddLocalPacketHandler(PacketType.AvatarInterestsUpdate, HandleAvatarInterestsUpdate, true, true);
             AddLocalPacketHandler(PacketType.GrantUserRights, HandleGrantUserRights);
             AddLocalPacketHandler(PacketType.PlacesQuery, HandlePlacesQuery);
             AddLocalPacketHandler(PacketType.UpdateMuteListEntry, HandleUpdateMuteListEntry);
@@ -7332,7 +7563,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     handlerObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset,
                                            dupe.SharedData.DuplicateFlags, AgentId,
-                                           m_activeGroupID);
+                                           ActiveGroupId);
                 }
             }
 
@@ -7949,7 +8180,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (handlerObjectDuplicateOnRay != null)
                 {
                     handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID, dupeOnRay.AgentData.DuplicateFlags,
-                                                AgentId, m_activeGroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd,
+                                                AgentId, ActiveGroupId, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd,
                                                 dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection,
                                                 dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates);
                 }
@@ -8154,7 +8385,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         // This requests the asset if needed
                         HandleSimInventoryTransferRequestWithPermsCheck(sender, transfer);
-                    });
+                    }, null, "LLClientView.HandleTransferRequest");
+
                     return true;
                 }
             }
@@ -9103,7 +9335,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (aCircuit != null && aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
             {
                 string assetServer = aCircuit.ServiceURLs["AssetServerURI"].ToString();
-                return ((Scene)Scene).AssetService.Get(assetServer + "/" + id);
+                if (!string.IsNullOrEmpty(assetServer))
+                    return ((Scene)Scene).AssetService.Get(assetServer + "/" + id);
             }
 
             return null;
@@ -9132,7 +9365,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if ((locX >= m_scene.RegionInfo.WorldLocX)
                             && (locX < (m_scene.RegionInfo.WorldLocX + m_scene.RegionInfo.RegionSizeX))
                             && (locY >= m_scene.RegionInfo.WorldLocY)
+<<<<<<< HEAD
+                            && (locY < (m_scene.RegionInfo.WorldLocY + m_scene.RegionInfo.RegionSizeY)) )
+=======
                             && (locY < (m_scene.RegionInfo.WorldLocY + m_scene.RegionInfo.RegionSizeY)))
+>>>>>>> avn/ubitvar
                 {
                     tpLocReq.Info.RegionHandle = m_scene.RegionInfo.RegionHandle;
                     tpLocReq.Info.Position.X += locX - m_scene.RegionInfo.WorldLocX;
@@ -9977,6 +10214,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     return true;
 
+                case "kickestate":
+                   
+                    if(((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false))
+                    {
+                        UUID invoice = messagePacket.MethodData.Invoice;
+                        UUID SenderID = messagePacket.AgentData.AgentID;
+                        UUID Prey;
+
+                        UUID.TryParse(Utils.BytesToString(messagePacket.ParamList[0].Parameter), out Prey);
+
+                        OnEstateTeleportOneUserHomeRequest(this, invoice, SenderID, Prey);
+                    }
+                    return true;
+
                 default:
                     m_log.WarnFormat(
                         "[LLCLIENTVIEW]: EstateOwnerMessage: Unknown method {0} requested for {1} in {2}",
@@ -10654,7 +10905,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 handlerDirFindQuery(this,
                                     dirFindQueryPacket.QueryData.QueryID,
                                     Utils.BytesToString(
-                                        dirFindQueryPacket.QueryData.QueryText),
+                                        dirFindQueryPacket.QueryData.QueryText).Trim(),
                                     dirFindQueryPacket.QueryData.QueryFlags,
                                     dirFindQueryPacket.QueryData.QueryStart);
             }
@@ -12037,22 +12288,79 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /*protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
         {
             AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
+            AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
 
             if (cachedtex.AgentData.SessionID != SessionId)
                 return false;
             
 
-            List<CachedTextureRequestArg> requestArgs = new List<CachedTextureRequestArg>();
 
-            for (int i = 0; i < cachedtex.WearableData.Length; i++)
+            // TODO: don't create new blocks if recycling an old packet
+            cachedresp.AgentData.AgentID = AgentId;
+            cachedresp.AgentData.SessionID = m_sessionId;
+            cachedresp.AgentData.SerialNum = m_cachedTextureSerial;
+            m_cachedTextureSerial++;
+            cachedresp.WearableData =
+                new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
+
+            int maxWearablesLoop = cachedtex.WearableData.Length;
+            if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES)
+                maxWearablesLoop = AvatarWearable.MAX_WEARABLES;
+
+            // Find the cached baked textures for this user, if they're available
+
+            IAssetService cache = m_scene.AssetService;
+            IBakedTextureModule bakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+            
+            WearableCacheItem[] cacheItems = null;
+
+            if (bakedTextureModule != null && cache != null)
             {
-                CachedTextureRequestArg arg = new CachedTextureRequestArg();
-                arg.BakedTextureIndex = cachedtex.WearableData[i].TextureIndex;
-                arg.WearableHashID = cachedtex.WearableData[i].ID;
-                
-                requestArgs.Add(arg);
+                ScenePresence p = m_scene.GetScenePresence(AgentId);
+                if (p.Appearance != null)
+                {
+                    if (p.Appearance.WearableCacheItems == null || p.Appearance.WearableCacheItemsDirty)
+                    {
+                        try
+                        {
+                            cacheItems = bakedTextureModule.Get(AgentId);
+                            p.Appearance.WearableCacheItems = cacheItems;
+                            p.Appearance.WearableCacheItemsDirty = false;
+                        }
+                        catch (Exception)
+                        {
+                            cacheItems = null;
+                        }
+
+                    }
+                    else if (p.Appearance.WearableCacheItems != null)
+                    {
+                        cacheItems = p.Appearance.WearableCacheItems;
+                    }
+                }
             }
 
+<<<<<<< HEAD
+            if (cacheItems != null)
+            {
+                // We need to make sure the asset stored in the bake is available on this server also by its assetid before we map it to a Cacheid.
+                // Copy the baked textures to the sim's assets cache (local only).
+                foreach (WearableCacheItem item in cacheItems)
+                {
+                    if (cache.GetCached(item.TextureID.ToString()) == null)
+                    {
+                        item.TextureAsset.Temporary = true;
+                        item.TextureAsset.Local = true;
+                        cache.Store(item.TextureAsset);
+                    }
+                }
+
+                // Return the cached textures
+                for (int i = 0; i < maxWearablesLoop; i++)
+                {
+                    WearableCacheItem item =
+                        WearableCacheItem.SearchTextureIndex(cachedtex.WearableData[i].TextureIndex, cacheItems);
+=======
             CachedTextureRequest handlerCachedTextureRequest = OnCachedTextureRequest;
             if (handlerCachedTextureRequest != null)
             {
@@ -12100,14 +12408,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 for (int i = 0; i < maxWearablesLoop; i++)
                 {
                     int idx = cachedtex.WearableData[i].TextureIndex;
+>>>>>>> avn/ubitvar
 
                     cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
                     cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
                     cachedresp.WearableData[i].HostName = new byte[0];
+<<<<<<< HEAD
+                    if (item != null && cachedtex.WearableData[i].ID == item.CacheId)
+                    {
+                        cachedresp.WearableData[i].TextureID = item.TextureID;
+=======
                     if (cachedtex.WearableData[i].ID == cacheItems[idx].CacheId)
                     {
                         cachedresp.WearableData[i].TextureID = cacheItems[idx].TextureID;
                         cacheHits++;
+>>>>>>> avn/ubitvar
                     }
                     else
                     {
@@ -12117,11 +12432,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
             else
             {
+<<<<<<< HEAD
+                // Cached textures not available
+=======
+>>>>>>> avn/ubitvar
                 for (int i = 0; i < maxWearablesLoop; i++)
                 {
                     cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
                     cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
                     cachedresp.WearableData[i].TextureID = UUID.Zero;
+<<<<<<< HEAD
+                    cachedresp.WearableData[i].HostName = new byte[0];
+                }
+            }
+            
+=======
                     //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
                     cachedresp.WearableData[i].HostName = new byte[0];
                 }
@@ -12129,6 +12454,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             m_log.DebugFormat("texture cached: hits {0}", cacheHits);
 
+>>>>>>> avn/ubitvar
             cachedresp.Header.Zerocoded = true;
             OutPacket(cachedresp, ThrottleOutPacketType.Task);
 
@@ -12483,6 +12809,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// provide your own method.</param>
         protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting, UnackedPacketMethod method)
         {
+            if (m_outPacketsToDrop != null)
+                if (m_outPacketsToDrop.Contains(packet.Type.ToString()))
+                    return;
+
             if (DebugPacketLevel > 0)
             {
                 bool logPacket = true;
@@ -12541,6 +12871,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="Pack">OpenMetaverse.packet</param>
         public void ProcessInPacket(Packet packet)
         {
+            if (m_inPacketsToDrop != null)
+                if (m_inPacketsToDrop.Contains(packet.Type.ToString()))
+                    return;
+
             if (DebugPacketLevel > 0)
             {
                 bool logPacket = true;
@@ -12831,16 +13165,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (asset == null)
             {
-                req.AssetInf = null;
-                req.AssetRequestSource = source;
-                req.IsTextureRequest = false;
-                req.NumPackets = 0;
-                req.Params = transferRequest.TransferInfo.Params;
-                req.RequestAssetID = requestID;
-                req.TransferRequestID = transferRequest.TransferInfo.TransferID;
+                // Try the user's asset server
+                IInventoryAccessModule inventoryAccessModule = Scene.RequestModuleInterface<IInventoryAccessModule>();
+
+                string assetServerURL = string.Empty;
+                if (inventoryAccessModule.IsForeignUser(AgentId, out assetServerURL) && !string.IsNullOrEmpty(assetServerURL))
+                {
+                    if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("="))
+                        assetServerURL = assetServerURL + "/";
+
+                    //m_log.DebugFormat("[LLCLIENTVIEW]: asset {0} not found in local storage. Trying user's storage.", assetServerURL + id);
+                    asset = m_scene.AssetService.Get(assetServerURL + id);
+                }
+
+                if (asset == null)
+                {
+                    req.AssetInf = null;
+                    req.AssetRequestSource = source;
+                    req.IsTextureRequest = false;
+                    req.NumPackets = 0;
+                    req.Params = transferRequest.TransferInfo.Params;
+                    req.RequestAssetID = requestID;
+                    req.TransferRequestID = transferRequest.TransferInfo.TransferID;
+
+                    SendAssetNotFound(req);
+                    return;
+                }
 
-                SendAssetNotFound(req);
-                return;
             }
 
             if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset)
@@ -12907,8 +13258,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public struct PacketProcessor
         {
-            public PacketMethod method;
-            public bool Async;
+            /// <summary>
+            /// Packet handling method.
+            /// </summary>
+            public PacketMethod method { get; set; }
+
+            /// <summary>
+            /// Should this packet be handled asynchronously?
+            /// </summary>
+            public bool Async { get; set; }
+
+            /// <summary>
+            /// If async is true, should this packet be handled in the async engine or given directly to a threadpool
+            /// thread?
+            /// </summary>
+            public bool InEngine { get; set; }
         }
 
         public class AsyncPacketProcess
@@ -13252,5 +13616,51 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             eq.Enqueue(BuildEvent("BulkUpdateInventory",
                     llsd), AgentId);
         }
+
+        private HashSet<string> m_outPacketsToDrop;
+
+        public bool AddOutPacketToDropSet(string packetName)
+        {
+            if (m_outPacketsToDrop == null)
+                m_outPacketsToDrop = new HashSet<string>();
+
+            return m_outPacketsToDrop.Add(packetName);
+        }
+
+        public bool RemoveOutPacketFromDropSet(string packetName)
+        {
+            if (m_outPacketsToDrop == null)
+                return false;
+
+            return m_outPacketsToDrop.Remove(packetName);
+        }
+
+        public HashSet<string> GetOutPacketDropSet()
+        {
+            return new HashSet<string>(m_outPacketsToDrop);
+        }
+
+        private HashSet<string> m_inPacketsToDrop;
+
+        public bool AddInPacketToDropSet(string packetName)
+        {
+            if (m_inPacketsToDrop == null)
+                m_inPacketsToDrop = new HashSet<string>();
+
+            return m_inPacketsToDrop.Add(packetName);
+        }
+
+        public bool RemoveInPacketFromDropSet(string packetName)
+        {
+            if (m_inPacketsToDrop == null)
+                return false;
+
+            return m_inPacketsToDrop.Remove(packetName);
+        }
+
+        public HashSet<string> GetInPacketDropSet()
+        {
+            return new HashSet<string>(m_inPacketsToDrop);
+        }
     }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 4b541e6..9293882 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -76,6 +76,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// or removed, this number must also change</summary>
         const int THROTTLE_CATEGORY_COUNT = 8;
 
+        /// <summary>
+        /// Controls whether information is logged about each outbound packet immediately before it is sent.  For debug purposes.
+        /// </summary>
+        /// <remarks>Any level above 0 will turn on logging.</remarks>
+        public int DebugDataOutLevel { get; set; }
+
+        /// <summary>
+        /// Controls whether information is logged about each outbound packet immediately before it is sent.  For debug purposes.
+        /// </summary>
+        /// <remarks>Any level above 0 will turn on logging.</remarks>
+        public int ThrottleDebugLevel 
+        { 
+            get
+            {
+                return m_throttleDebugLevel;
+            }
+
+            set
+            {
+                m_throttleDebugLevel = value;
+                m_throttleClient.DebugLevel = m_throttleDebugLevel;
+                foreach (TokenBucket tb in m_throttleCategories)
+                    tb.DebugLevel = m_throttleDebugLevel;
+            }
+        }
+        private int m_throttleDebugLevel;
+
         /// <summary>Fired when updated networking stats are produced for this client</summary>
         public event PacketStats OnPacketStats;
         /// <summary>Fired when the queue for a packet category is empty. This event can be
@@ -92,8 +119,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public readonly uint CircuitCode;
         /// <summary>Sequence numbers of packets we've received (for duplicate checking)</summary>
         public readonly IncomingPacketHistoryCollection PacketArchive = new IncomingPacketHistoryCollection(200);
+
+        /// <summary>
+        /// If true then we take action in response to unacked reliably sent packets such as resending the packet.
+        /// </summary>
+        public bool ProcessUnackedSends { get; set; }
+
         /// <summary>Packets we have sent that need to be ACKed by the client</summary>
         public readonly UnackedPacketCollection NeedAcks = new UnackedPacketCollection();
+
         /// <summary>ACKs that are queued up, waiting to be sent to the client</summary>
         public readonly DoubleLocklessQueue<uint> PendingAcks = new DoubleLocklessQueue<uint>();
 
@@ -216,11 +250,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (maxRTO != 0)
                 m_maxRTO = maxRTO;
 
+<<<<<<< HEAD
+            ProcessUnackedSends = true;
+
+            // Create a token bucket throttle for this client that has the scene token bucket as a parent
+            m_throttleClient 
+                = new AdaptiveTokenBucket(
+                    string.Format("adaptive throttle for {0} in {1}", AgentID, server.Scene.Name), 
+                    parentThrottle, 0, rates.Total, rates.MinimumAdaptiveThrottleRate, rates.AdaptiveThrottlesEnabled);
+
+=======
             m_burstTime = rates.BrustTime;
             float m_burst = rates.ClientMaxRate * m_burstTime;
 
             // Create a token bucket throttle for this client that has the scene token bucket as a parent
             m_throttleClient = new AdaptiveTokenBucket(parentThrottle, rates.ClientMaxRate, m_burst, rates.AdaptiveThrottlesEnabled);
+>>>>>>> avn/ubitvar
             // Create an array of token buckets for this clients different throttle categories
             m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT];
 
@@ -233,9 +278,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 ThrottleOutPacketType type = (ThrottleOutPacketType)i;
 
                 // Initialize the packet outboxes, where packets sit while they are waiting for tokens
+<<<<<<< HEAD
+                m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
+
+                // Initialize the token buckets that control the throttling for each category
+                m_throttleCategories[i]
+                    = new TokenBucket(
+                        string.Format("{0} throttle for {1} in {2}", type, AgentID, server.Scene.Name), 
+                    m_throttleClient, rates.GetRate(type), 0);
+=======
                 m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>();
                 // Initialize the token buckets that control the throttling for each category
                 m_throttleCategories[i] = new TokenBucket(m_throttleClient, rates.GetRate(type), m_burst);
+>>>>>>> avn/ubitvar
             }
 
             // Default the retransmission timeout to one second
@@ -282,6 +337,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_info.assetThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Asset].DripRate;
             m_info.textureThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Texture].DripRate;
             m_info.totalThrottle = (int)m_throttleClient.DripRate;
+<<<<<<< HEAD
+            m_info.targetThrottle = (int)m_throttleClient.TargetDripRate;
+            m_info.maxThrottle = (int)m_throttleClient.MaxDripRate;
+=======
+>>>>>>> avn/ubitvar
 
             return m_info;
         }
@@ -299,6 +359,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         /// <summary>
+        /// Get the total number of pakcets queued for this client.
+        /// </summary>
+        /// <returns></returns>
+        public int GetTotalPacketsQueuedCount()
+        {
+            int total = 0;
+
+            for (int i = 0; i <= (int)ThrottleOutPacketType.Asset; i++)
+                total += m_packetOutboxes[i].Count;
+
+            return total;
+        }
+
+        /// <summary>
+        /// Get the number of packets queued for the given throttle type.
+        /// </summary>
+        /// <returns></returns>
+        /// <param name="throttleType"></param>
+        public int GetPacketsQueuedCount(ThrottleOutPacketType throttleType)
+        {
+            if ((int)throttleType > 0)
+                return m_packetOutboxes[(int)throttleType].Count;
+            else
+                return 0;
+        }
+
+        /// <summary>
         /// Return statistics information about client packet queues.
         /// </summary>
         /// <remarks>
@@ -373,6 +460,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             int texture = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
             int asset = (int)(BitConverter.ToSingle(adjData, pos) * scale);
 
+            if (ThrottleDebugLevel > 0)
+            {
+                long total = resend + land + wind + cloud + task + texture + asset;
+                m_log.DebugFormat(
+                    "[LLUDPCLIENT]: {0} is setting throttles in {1} to Resend={2}, Land={3}, Wind={4}, Cloud={5}, Task={6}, Texture={7}, Asset={8}, TOTAL = {9}",
+                    AgentID, m_udpServer.Scene.Name, resend, land, wind, cloud, task, texture, asset, total);
+            }
+
             // Make sure none of the throttles are set below our packet MTU,
             // otherwise a throttle could become permanently clogged
 
@@ -391,6 +486,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // the task queue (e.g. object updates)
             task = task + (int)(m_cannibalrate * texture);
             texture = (int)((1 - m_cannibalrate) * texture);
+<<<<<<< HEAD
+            
+            //int total = resend + land + wind + cloud + task + texture + asset;
+
+            if (ThrottleDebugLevel > 0)
+            {
+                long total = resend + land + wind + cloud + task + texture + asset;
+                m_log.DebugFormat(
+                    "[LLUDPCLIENT]: {0} is setting throttles in {1} to Resend={2}, Land={3}, Wind={4}, Cloud={5}, Task={6}, Texture={7}, Asset={8}, TOTAL = {9}",
+                    AgentID, m_udpServer.Scene.Name, resend, land, wind, cloud, task, texture, asset, total);
+            }
+=======
 
             int total = resend + land + wind + cloud + task + texture + asset;
 
@@ -398,8 +505,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             //m_log.DebugFormat("[LLUDPCLIENT]: {0} is setting throttles. Resend={1}, Land={2}, Wind={3}, Cloud={4}, Task={5}, Texture={6}, Asset={7}, Total={8}",
             //                  AgentID, resend, land, wind, cloud, task, texture, asset, total);
+>>>>>>> avn/ubitvar
 
             // Update the token buckets with new throttle values
+            if (m_throttleClient.AdaptiveEnabled)
+            {
+                long total = resend + land + wind + cloud + task + texture + asset;
+                m_throttleClient.TargetDripRate = total;
+            }
+
             TokenBucket bucket;
 
             bucket = m_throttleCategories[(int)ThrottleOutPacketType.Resend];
@@ -744,8 +858,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 if (HasUpdates(categories))
                 {
-                    // Asynchronously run the callback
-                    Util.FireAndForget(FireQueueEmpty, categories);
+                    if (!m_udpServer.OqrEngine.IsRunning)
+                    {
+                        // Asynchronously run the callback
+                        Util.FireAndForget(FireQueueEmpty, categories, "LLUDPClient.BeginFireQueueEmpty");
+                    }
+                    else
+                    {
+                        m_udpServer.OqrEngine.QueueJob(AgentID.ToString(), () => FireQueueEmpty(categories));
+                    }
                 }
                 else
                 {
@@ -764,10 +885,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="o">Throttle categories to fire the callback for,
         /// stored as an object to match the WaitCallback delegate
         /// signature</param>
-        private void FireQueueEmpty(object o)
+        public void FireQueueEmpty(object o)
         {
+<<<<<<< HEAD
+//            m_log.DebugFormat("[LLUDPCLIENT]: FireQueueEmpty for {0} in {1}", AgentID, m_udpServer.Scene.Name);
+
+//            int start = Environment.TickCount & Int32.MaxValue;
+//            const int MIN_CALLBACK_MS = 30;
+
+//            if (m_udpServer.IsRunningOutbound)
+//            {        
+                ThrottleOutPacketTypeFlags categories = (ThrottleOutPacketTypeFlags)o;
+                QueueEmpty callback = OnQueueEmpty;                      
+=======
             ThrottleOutPacketTypeFlags categories = (ThrottleOutPacketTypeFlags)o;
             QueueEmpty callback = OnQueueEmpty;
+>>>>>>> avn/ubitvar
 
             if (callback != null)
             {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index b5f9da8..41e19fd 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -34,7 +34,6 @@ using System.Net.Sockets;
 using System.Reflection;
 using System.Threading;
 using log4net;
-using NDesk.Options;
 using Nini.Config;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
@@ -181,9 +180,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     scene.Name,
                     StatType.Pull,
                     MeasuresOfInterest.None,
-                    stat => stat.Value = m_udpServer.AverageReceiveTicksForLastSamplePeriod / TimeSpan.TicksPerMillisecond,
+                    stat => stat.Value = m_udpServer.AverageReceiveTicksForLastSamplePeriod,
 //                    stat => 
-//                        stat.Value = Math.Round(m_udpServer.AverageReceiveTicksForLastSamplePeriod / TimeSpan.TicksPerMillisecond, 7),
+//                        stat.Value = Math.Round(m_udpServer.AverageReceiveTicksForLastSamplePeriod, 7),
                     StatVerbosity.Debug));
         }
 
@@ -222,6 +221,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public int DefaultClientPacketDebugLevel { get; set; }
 
+        /// <summary>
+        /// If set then all inbound agent updates are discarded.  For debugging purposes.
+        /// discard agent update.
+        /// </summary>
+        public bool DiscardInboundAgentUpdates { get; set; }
+
         /// <summary>The measured resolution of Environment.TickCount</summary>
         public readonly float TickCountResolution;
 
@@ -240,19 +245,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private DoubleQueue<IncomingPacket> packetInbox = new DoubleQueue<IncomingPacket>();
 
-        /// <summary></summary>
-        //private UDPClientCollection m_clients = new UDPClientCollection();
         /// <summary>Bandwidth throttle for this UDP server</summary>
-        protected TokenBucket m_throttle;
+        public TokenBucket Throttle { get; private set; }
         
-        /// <summary>Bandwidth throttle rates for this UDP server</summary>
+        /// <summary>Per client throttle rates enforced by this server</summary>
+        /// <remarks>
+        /// If the total rate is non-zero, then this is the maximum total throttle setting that any client can ever have.
+        /// The other rates (resend, asset, etc.) are the defaults for a new client and can be changed (and usually
+        /// do get changed immediately).  They do not need to sum to the total.
+        /// </remarks>
         public ThrottleRates ThrottleRates { get; private set; }
         
         /// <summary>Manages authentication for agent circuits</summary>
         private AgentCircuitManager m_circuitManager;
 
         /// <summary>Reference to the scene this UDP server is attached to</summary>
-        protected Scene m_scene;
+        public Scene Scene { get; private set; }
 
         /// <summary>The X/Y coordinates of the scene this UDP server is attached to</summary>
         private Location m_location;
@@ -375,6 +383,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         private IClientAPI m_currentIncomingClient;
 
+        /// <summary>
+        /// Queue some low priority but potentially high volume async requests so that they don't overwhelm available
+        /// threadpool threads.
+        /// </summary>
+        public JobEngine IpahEngine { get; private set; }
+
+        /// <summary>
+        /// Run queue empty processing within a single persistent thread.
+        /// </summary>
+        /// <remarks>
+        /// This is the alternative to having every
+        /// connection schedule its own job in the threadpool which causes performance problems when there are many
+        /// connections.
+        /// </remarks>
+        public JobEngine OqrEngine { get; private set; }
+
         public LLUDPServer(
             IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port,
             IConfigSource configSource, AgentCircuitManager circuitManager)
@@ -449,7 +473,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
             #endregion BinaryStats
 
+<<<<<<< HEAD
+            // FIXME: Can't add info here because don't know scene yet.
+//            m_throttle 
+//                = new TokenBucket(
+//                    string.Format("server throttle bucket for {0}", Scene.Name), null, sceneThrottleBps);
+
+            Throttle = new TokenBucket("server throttle bucket", null, 0, sceneThrottleBps);
+
+=======
             m_throttle = new TokenBucket(null, sceneThrottleBps, sceneThrottleBps * 10e-3f);
+>>>>>>> avn/ubitvar
             ThrottleRates = new ThrottleRates(configSource);
 
             Random rnd = new Random(Util.EnvironmentTickCount());
@@ -463,11 +497,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             StartInbound();
             StartOutbound();
+            IpahEngine.Start();
+            OqrEngine.Start();
 
             m_elapsedMSSinceLastStatReport = Environment.TickCount;
         }
 
-        private void StartInbound()
+        public void StartInbound()
         {
             m_log.InfoFormat(
                 "[LLUDPSERVER]: Starting inbound packet processing for the LLUDP server in {0} mode with UsePools = {1}",
@@ -476,9 +512,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             base.StartInbound(m_recvBufferSize, m_asyncPacketHandling);
 
             // This thread will process the packets received that are placed on the packetInbox
-            Watchdog.StartThread(
+            WorkManager.StartThread(
                 IncomingPacketHandler,
-                string.Format("Incoming Packets ({0})", m_scene.RegionInfo.RegionName),
+                string.Format("Incoming Packets ({0})", Scene.Name),
                 ThreadPriority.Normal,
                 false,
                 true,
@@ -486,15 +522,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS);
         }
 
-        private new void StartOutbound()
+        public override void StartOutbound()
         {
             m_log.Info("[LLUDPSERVER]: Starting outbound packet processing for the LLUDP server");
 
             base.StartOutbound();
 
-            Watchdog.StartThread(
+            WorkManager.StartThread(
                 OutgoingPacketHandler,
-                string.Format("Outgoing Packets ({0})", m_scene.RegionInfo.RegionName),
+                string.Format("Outgoing Packets ({0})", Scene.Name),
                 ThreadPriority.Normal,
                 false,
                 true,
@@ -504,12 +540,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void Stop()
         {
-            m_log.Info("[LLUDPSERVER]: Shutting down the LLUDP server for " + m_scene.RegionInfo.RegionName);
+            m_log.Info("[LLUDPSERVER]: Shutting down the LLUDP server for " + Scene.Name);
             base.StopOutbound();
             base.StopInbound();
+            IpahEngine.Stop();
+            OqrEngine.Stop();
         }
 
-        protected override bool EnablePools()
+        public override bool EnablePools()
         {
             if (!UsePools)
             {
@@ -523,7 +561,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return false;
         }
 
-        protected override bool DisablePools()
+        public override bool DisablePools()
         {
             if (UsePools)
             {
@@ -543,7 +581,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// This is a seperate method so that it can be called once we have an m_scene to distinguish different scene
         /// stats.
         /// </summary>
-        private void EnablePoolStats()
+        protected internal void EnablePoolStats()
         {
             m_poolCountStat
                 = new Stat(
@@ -552,7 +590,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "The number of objects currently stored within the UDPPacketBuffer pool",
                     "",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat => stat.Value = Pool.Count,
                     StatVerbosity.Debug);
@@ -566,7 +604,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "The number of objects currently stored within the incoming packet pool",
                     "",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat => stat.Value = m_incomingPacketPool.Count,
                     StatVerbosity.Debug);
@@ -577,7 +615,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>
         /// Disables pool stats.
         /// </summary>
-        private void DisablePoolStats()
+        protected internal void DisablePoolStats()
         {
             StatsManager.DeregisterStat(m_poolCountStat);
             m_poolCountStat = null;
@@ -610,7 +648,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void AddScene(IScene scene)
         {
-            if (m_scene != null)
+            if (Scene != null)
             {
                 m_log.Error("[LLUDPSERVER]: AddScene() called on an LLUDPServer that already has a scene");
                 return;
@@ -622,8 +660,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 return;
             }
 
-            m_scene = (Scene)scene;
-            m_location = new Location(m_scene.RegionInfo.RegionHandle);
+            Scene = (Scene)scene;
+            m_location = new Location(Scene.RegionInfo.RegionHandle);
+                        
+            IpahEngine 
+                = new JobEngine(
+                    string.Format("Incoming Packet Async Handling Engine ({0})", Scene.Name), 
+                    "INCOMING PACKET ASYNC HANDLING ENGINE");
+
+            OqrEngine 
+                = new JobEngine(
+                    string.Format("Outgoing Queue Refill Engine ({0})", Scene.Name), 
+                    "OUTGOING QUEUE REFILL ENGINE");
 
             StatsManager.RegisterStat(
                 new Stat(
@@ -646,7 +694,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "Packets reused",
                     "Number of packets reused out of all requests to the packet pool",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat => 
                         { PercentageStat pstat = (PercentageStat)stat; 
@@ -660,7 +708,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "Packet data blocks reused",
                     "Number of data blocks reused out of all requests to the packet pool",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat =>
                         { PercentageStat pstat = (PercentageStat)stat; 
@@ -675,7 +723,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "The number of objects currently stored within the packet pool",
                     "",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat => stat.Value = PacketPool.Instance.PacketsPooled,
                     StatVerbosity.Debug));
@@ -687,16 +735,59 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "The number of objects currently stored within the packet data block pool",
                     "",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat => stat.Value = PacketPool.Instance.BlocksPooled,
                     StatVerbosity.Debug));
+
+            StatsManager.RegisterStat(
+                new Stat(
+                    "OutgoingPacketsQueuedCount",
+                    "Packets queued for outgoing send",
+                    "Number of queued outgoing packets across all connections",
+                    "",
+                    "clientstack",
+                    Scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    stat => stat.Value = GetTotalQueuedOutgoingPackets(),
+                    StatVerbosity.Info));
+
+            StatsManager.RegisterStat(
+                new Stat(
+                    "IncomingPacketAsyncRequestsWaiting",
+                    "Number of incoming packets waiting for async processing in engine.",
+                    "",
+                    "",
+                    "clientstack",
+                    Scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.None,
+                    stat => stat.Value = IpahEngine.JobsWaiting,
+                    StatVerbosity.Debug));
+                        
+            StatsManager.RegisterStat(
+                new Stat(
+                    "OQRERequestsWaiting",
+                    "Number of outgong queue refill requests waiting for processing.",
+                    "",
+                    "",
+                    "clientstack",
+                    Scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.None,
+                    stat => stat.Value = OqrEngine.JobsWaiting,
+                    StatVerbosity.Debug));
         
             // We delay enabling pool stats to AddScene() instead of Initialize() so that we can distinguish pool stats by
             // scene name
             if (UsePools)
                 EnablePoolStats();
 
+<<<<<<< HEAD
+            LLUDPServerCommands commands = new LLUDPServerCommands(MainConsole.Instance, this);
+            commands.Register();
+=======
             MainConsole.Instance.Commands.AddCommand(
                 "Debug", false, "debug lludp packet",
                  "debug lludp packet [--default] <level> [<avatar-first-name> <avatar-last-name>]",
@@ -837,96 +928,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (subCommand == "out" || subCommand == "all")
                 StartOutbound();
+>>>>>>> avn/ubitvar
         }
 
-        private void HandleStopCommand(string module, string[] args)
+        public bool HandlesRegion(Location x)
         {
-            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
-                return;
-
-            if (args.Length != 4)
-            {
-                MainConsole.Instance.Output("Usage: debug lludp stop <in|out|all>");
-                return;
-            }
-
-            string subCommand = args[3];
-
-            if (subCommand == "in" || subCommand == "all")
-                StopInbound();
-
-            if (subCommand == "out" || subCommand == "all")
-                StopOutbound();
+            return x == m_location;
         }
 
-        private void HandlePoolCommand(string module, string[] args)
+        public int GetTotalQueuedOutgoingPackets()
         {
-            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
-                return;
+            int total = 0;
 
-            if (args.Length != 4)
-            {
-                MainConsole.Instance.Output("Usage: debug lludp pool <on|off>");
-                return;
-            }
-
-            string enabled = args[3];
-
-            if (enabled == "on")
-            {
-                if (EnablePools())
-                {
-                    EnablePoolStats();
-                    MainConsole.Instance.OutputFormat("Packet pools enabled on {0}", m_scene.Name);
-                }
-            }
-            else if (enabled == "off")
+            foreach (ScenePresence sp in Scene.GetScenePresences())
             {
-                if (DisablePools())
+                // XXX: Need a better way to determine which IClientAPIs have UDPClients (NPCs do not, for instance).
+                if (sp.ControllingClient is LLClientView)
                 {
-                    DisablePoolStats();
-                    MainConsole.Instance.OutputFormat("Packet pools disabled on {0}", m_scene.Name);
+                    LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+                    total += udpClient.GetTotalPacketsQueuedCount();
                 }
             }
-            else
-            {
-                MainConsole.Instance.Output("Usage: debug lludp pool <on|off>");
-            }
-        }
-
-        bool m_discardAgentUpdates;
-
-        private void HandleAgentUpdateCommand(string module, string[] args)
-        {
-            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
-                return;
-
-            m_discardAgentUpdates = !m_discardAgentUpdates;
-
-            MainConsole.Instance.OutputFormat(
-                "Discard AgentUpdates now {0} for {1}", m_discardAgentUpdates, m_scene.Name);
-        }
-
-        private void HandleStatusCommand(string module, string[] args)
-        {
-            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
-                return;
-
-            MainConsole.Instance.OutputFormat(
-                "IN  LLUDP packet processing for {0} is {1}", m_scene.Name, IsRunningInbound ? "enabled" : "disabled");
 
-            MainConsole.Instance.OutputFormat(
-                "OUT LLUDP packet processing for {0} is {1}", m_scene.Name, IsRunningOutbound ? "enabled" : "disabled");
-
-            MainConsole.Instance.OutputFormat("LLUDP pools in {0} are {1}", m_scene.Name, UsePools ? "on" : "off");
-
-            MainConsole.Instance.OutputFormat(
-                "Packet debug level for new clients is {0}", DefaultClientPacketDebugLevel);
-        }
-
-        public bool HandlesRegion(Location x)
-        {
-            return x == m_location;
+            return total;
         }
 
 //        public void BroadcastPacket(Packet packet, ThrottleOutPacketType category, bool sendToPausedAgents, bool allowSplitting)
@@ -999,7 +1023,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 for (int i = 0; i < packetCount; i++)
                 {
                     byte[] data = datas[i];
-
                     if (!SendPacketData(udpClient, data, packet.Type, category, method))
                         packetQueued = true;
                 }
@@ -1007,7 +1030,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             else
             {
                 byte[] data = packet.ToBytes();
-                packetQueued = SendPacketData(udpClient, data, packet.Type, category, method);
+                if (!SendPacketData(udpClient, data, packet.Type, category, method))
+                    packetQueued = true;
             }
 
             PacketPool.Instance.ReturnPacket(packet);
@@ -1094,20 +1118,44 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
             OutgoingPacket outgoingPacket = new OutgoingPacket(udpClient, buffer, category, null);
+
             // If we were not provided a method for handling unacked, use the UDPServer default method
-            outgoingPacket.UnackedMethod = ((method == null) ? delegate(OutgoingPacket oPacket) { ResendUnacked(oPacket); } : method);
+            if ((outgoingPacket.Buffer.Data[0] & Helpers.MSG_RELIABLE) != 0)
+                outgoingPacket.UnackedMethod = ((method == null) ? delegate(OutgoingPacket oPacket) { ResendUnacked(oPacket); } : method);
 
             // If a Linden Lab 1.23.5 client receives an update packet after a kill packet for an object, it will 
             // continue to display the deleted object until relog.  Therefore, we need to always queue a kill object
             // packet so that it isn't sent before a queued update packet.
+<<<<<<< HEAD
+            bool forceQueue = (type == PacketType.KillObject);
+
+//            if (type == PacketType.ImprovedTerseObjectUpdate)
+//            {
+//                m_log.DebugFormat("Direct send ITOU to {0} in {1}", udpClient.AgentID, Scene.Name);
+//                SendPacketFinal(outgoingPacket);
+//                return false;
+//            }
+//            else
+//            {
+            if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, forceQueue))
+=======
             bool requestQueue = type == PacketType.KillObject;
             if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, requestQueue, highPriority))
+>>>>>>> avn/ubitvar
             {
                 SendPacketFinal(outgoingPacket);
                 return true;
             }
+<<<<<<< HEAD
+            else
+            {
+                return false;
+            }
+//            }
+=======
 
             return false;
+>>>>>>> avn/ubitvar
 
             #endregion Queue or Send
         }
@@ -1184,7 +1232,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // Fire this out on a different thread so that we don't hold up outgoing packet processing for
                 // everybody else if this is being called due to an ack timeout.
                 // This is the same as processing as the async process of a logout request.
-                Util.FireAndForget(o => DeactivateClientDueToTimeout(client, timeoutTicks));
+                Util.FireAndForget(
+                    o => DeactivateClientDueToTimeout(client, timeoutTicks), null, "LLUDPServer.DeactivateClientDueToTimeout");
 
                 return;
             }
@@ -1280,7 +1329,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 Utils.UIntToBytesBig(sequenceNumber, buffer.Data, 1);
                 outgoingPacket.SequenceNumber = sequenceNumber;
 
-                if (isReliable)
+                if (udpClient.ProcessUnackedSends && isReliable)
                 {
                     // Add this packet to the list of ACK responses we are waiting on from the server
                     udpClient.NeedAcks.Add(outgoingPacket);
@@ -1304,6 +1353,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // is 100% correct
             PacketsSentCount++;
 
+            if (udpClient.DebugDataOutLevel > 0)
+                m_log.DebugFormat(
+                    "[LLUDPSERVER]: Sending packet #{0} (rel: {1}, res: {2}) to {3} from {4}",
+                    outgoingPacket.SequenceNumber, isReliable, isResend, udpClient.AgentID, Scene.Name);
+
             // Put the UDP payload on the wire
             AsyncBeginSend(buffer);
 
@@ -1419,8 +1473,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         if (m_pendingCache.Contains(endPoint))
                             return;
 
+<<<<<<< HEAD
+                Util.FireAndForget(HandleUseCircuitCode, array, "LLUDPServer.HandleUseCircuitCode");
+=======
                         m_pendingCache.AddOrUpdate(endPoint, new Queue<UDPPacketBuffer>(), 60);
                     }
+>>>>>>> avn/ubitvar
 
                     // We need to copy the endpoint so that it doesn't get changed when another thread reuses the
                     // buffer.
@@ -1449,9 +1507,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // Send ack straight away to let the viewer know that we got it.
                     SendAckImmediate(endPoint, packet.Header.Sequence);
 
+<<<<<<< HEAD
+                Util.FireAndForget(
+                    HandleCompleteMovementIntoRegion, array, "LLUDPServer.HandleCompleteMovementIntoRegion");
+=======
                     // We need to copy the endpoint so that it doesn't get changed when another thread reuses the
                     // buffer.
                     object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet };
+>>>>>>> avn/ubitvar
 
                     Util.FireAndForget(HandleCompleteMovementIntoRegion, array);
 
@@ -1461,7 +1524,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
             // Determine which agent this packet came from
+<<<<<<< HEAD
+            IClientAPI client;
+            if (!Scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
+=======
             if (client == null || !(client is LLClientView))
+>>>>>>> avn/ubitvar
             {
                 //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
 
@@ -1493,30 +1561,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             #region ACK Receiving
 
-            // Handle appended ACKs
-            if (packet.Header.AppendedAcks && packet.Header.AckList != null)
+            if (udpClient.ProcessUnackedSends)
             {
-//                m_log.DebugFormat(
-//                    "[LLUDPSERVER]: Handling {0} appended acks from {1} in {2}",
-//                    packet.Header.AckList.Length, client.Name, m_scene.Name);
+                // Handle appended ACKs
+                if (packet.Header.AppendedAcks && packet.Header.AckList != null)
+                {
+    //                m_log.DebugFormat(
+    //                    "[LLUDPSERVER]: Handling {0} appended acks from {1} in {2}",
+    //                    packet.Header.AckList.Length, client.Name, m_scene.Name);
 
-                for (int i = 0; i < packet.Header.AckList.Length; i++)
-                    udpClient.NeedAcks.Acknowledge(packet.Header.AckList[i], now, packet.Header.Resent);
-            }
+                    for (int i = 0; i < packet.Header.AckList.Length; i++)
+                        udpClient.NeedAcks.Acknowledge(packet.Header.AckList[i], now, packet.Header.Resent);
+                }
 
-            // Handle PacketAck packets
-            if (packet.Type == PacketType.PacketAck)
-            {
-                PacketAckPacket ackPacket = (PacketAckPacket)packet;
+                // Handle PacketAck packets
+                if (packet.Type == PacketType.PacketAck)
+                {
+                    PacketAckPacket ackPacket = (PacketAckPacket)packet;
 
-//                m_log.DebugFormat(
-//                    "[LLUDPSERVER]: Handling {0} packet acks for {1} in {2}",
-//                    ackPacket.Packets.Length, client.Name, m_scene.Name);
+    //                m_log.DebugFormat(
+    //                    "[LLUDPSERVER]: Handling {0} packet acks for {1} in {2}",
+    //                    ackPacket.Packets.Length, client.Name, m_scene.Name);
 
-                for (int i = 0; i < ackPacket.Packets.Length; i++)
-                    udpClient.NeedAcks.Acknowledge(ackPacket.Packets[i].ID, now, packet.Header.Resent);
+                    for (int i = 0; i < ackPacket.Packets.Length; i++)
+                        udpClient.NeedAcks.Acknowledge(ackPacket.Packets[i].ID, now, packet.Header.Resent);
 
-                // We don't need to do anything else with PacketAck packets
+                    // We don't need to do anything else with PacketAck packets
+                    return;
+                }
+            }
+            else if (packet.Type == PacketType.PacketAck)
+            {
                 return;
             }
 
@@ -1577,7 +1652,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             LogPacketHeader(true, udpClient.CircuitCode, 0, packet.Type, (ushort)packet.Length);
             #endregion BinaryStats
 
+<<<<<<< HEAD
+            if (packet.Type == PacketType.AgentUpdate)
+            {
+                if (DiscardInboundAgentUpdates)
+                    return;
+
+                ((LLClientView)client).TotalAgentUpdates++;
+
+                AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
+
+                LLClientView llClient = client as LLClientView;
+                if (agentUpdate.AgentData.SessionID != client.SessionId 
+                    || agentUpdate.AgentData.AgentID != client.AgentId
+                    || !(llClient == null || llClient.CheckAgentUpdateSignificance(agentUpdate.AgentData)) )
+                {
+                    PacketPool.Instance.ReturnPacket(packet);
+                    return;
+                }
+            }
+=======
 // AgentUpdate mess removed from here
+>>>>>>> avn/ubitvar
 
             #region Ping Check Handling
 
@@ -1752,7 +1848,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 m_log.DebugFormat(
                     "[LLUDPSERVER]: Handling UseCircuitCode request for circuit {0} to {1} from IP {2}",
-                    uccp.CircuitCode.Code, m_scene.RegionInfo.RegionName, endPoint);
+                    uccp.CircuitCode.Code, Scene.RegionInfo.RegionName, endPoint);
     
                 AuthenticateResponse sessionInfo;
                 if (IsClientAuthorized(uccp, out sessionInfo))
@@ -1812,10 +1908,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // We only want to send initial data to new clients, not ones which are being converted from child to root.
                     if (client != null)
                     {
+<<<<<<< HEAD
+                        AgentCircuitData aCircuit = Scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
+=======
+>>>>>>> avn/ubitvar
                         bool tp = (aCircuit.teleportFlags > 0);
                         // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
-                        if (!tp)
-                            client.SceneAgent.SendInitialDataToMe();
+                        if (!tp && !client.SceneAgent.SentInitialDataToClient)
+                            client.SceneAgent.SendInitialDataToClient();
                     }
                 }
                 else
@@ -1823,11 +1923,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // Don't create clients for unauthorized requesters.
                     m_log.WarnFormat(
                         "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}",
+<<<<<<< HEAD
+                        uccp.CircuitCode.ID, Scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint);
+                }
+    
+=======
                         uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint);
 
                     lock (m_pendingCache)
                         m_pendingCache.Remove(endPoint);
                 }    
+>>>>>>> avn/ubitvar
                 //            m_log.DebugFormat(
     //                "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", 
     //                buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
@@ -1857,7 +1963,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 CompleteAgentMovementPacket packet = (CompleteAgentMovementPacket)array[1];
 
                 m_log.DebugFormat(
-                    "[LLUDPSERVER]: Handling CompleteAgentMovement request from {0} in {1}", endPoint, m_scene.Name);
+                    "[LLUDPSERVER]: Handling CompleteAgentMovement request from {0} in {1}", endPoint, Scene.Name);
 
                 // Determine which agent this packet came from
                 // We need to wait here because in when using the OpenSimulator V2 teleport protocol to travel to a destination
@@ -1868,7 +1974,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 int count = 40;
                 while (count-- > 0)
                 {
-                    if (m_scene.TryGetClient(endPoint, out client))
+                    if (Scene.TryGetClient(endPoint, out client))
                     {
                         if (!client.IsActive)
                         {
@@ -1877,7 +1983,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             // not yet been established).
                             m_log.DebugFormat(
                                 "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} for {1} in {2} but client is not active yet.  Waiting.",
-                                endPoint, client.Name, m_scene.Name);
+                                endPoint, client.Name, Scene.Name);
                         }
                         else if (client.SceneAgent == null)
                         {
@@ -1889,7 +1995,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             // the client manager
                             m_log.DebugFormat(
                                 "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} for {1} in {2} but client SceneAgent not set yet.  Waiting.",
-                                endPoint, client.Name, m_scene.Name);
+                                endPoint, client.Name, Scene.Name);
                         }
                         else
                         {
@@ -1900,7 +2006,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         m_log.DebugFormat(
                             "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} in {1} but no client exists yet.  Waiting.", 
-                            endPoint, m_scene.Name);
+                            endPoint, Scene.Name);
                     }
 
                     Thread.Sleep(200);
@@ -1910,7 +2016,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     m_log.DebugFormat(
                         "[LLUDPSERVER]: No client found for CompleteAgentMovement from {0} in {1} after wait.  Dropping.",
-                        endPoint, m_scene.Name);
+                        endPoint, Scene.Name);
 
                     return;
                 }
@@ -1922,7 +2028,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // purposes.
                     m_log.DebugFormat(
                         "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} for {1} in {2} but client is not active after wait.  Dropping.",
-                        endPoint, client.Name, m_scene.Name);
+                        endPoint, client.Name, Scene.Name);
 
                     return;
                 }
@@ -2019,8 +2125,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // consistently, this lock could probably be removed.
             lock (this)
             {
-                if (!m_scene.TryGetClient(agentID, out client))
+                if (!Scene.TryGetClient(agentID, out client))
                 {
+<<<<<<< HEAD
+                    LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, Throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO);
+=======
                     createNew = true;
                 }
                 else
@@ -2035,8 +2144,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (createNew)
                 {
                     LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO);
+>>>>>>> avn/ubitvar
     
-                    client = new LLClientView(m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
+                    client = new LLClientView(Scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
                     client.OnLogout += LogoutHandler;
                     client.DebugPacketLevel = DefaultClientPacketDebugLevel;
     
@@ -2064,23 +2174,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {    
                 ClientLogoutsDueToNoReceives++;
 
+<<<<<<< HEAD
+                m_log.WarnFormat(
+                    "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}.  Disconnecting.",
+                    client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, Scene.Name);
+=======
                 if (client.SceneAgent != null)
                 {
                     m_log.WarnFormat(
                         "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}.  Disconnecting.",
                         client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, m_scene.Name);
+>>>>>>> avn/ubitvar
     
                     if (!client.SceneAgent.IsChildAgent)
                          client.Kick("Simulator logged you out due to connection timeout.");
                 }
             }
 
+<<<<<<< HEAD
+            Scene.CloseAgent(client.AgentId, true);
+=======
             if (!m_scene.CloseAgent(client.AgentId, true))
                 client.Close(true,true);
+>>>>>>> avn/ubitvar
         }
 
         private void IncomingPacketHandler()
         {
+            Thread.CurrentThread.Priority = ThreadPriority.Highest;
+
             // Set this culture for the thread that incoming packets are received
             // on to en-US to avoid number parsing issues
             Culture.SetCurrentCulture();
@@ -2127,6 +2249,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void OutgoingPacketHandler()
         {
+            Thread.CurrentThread.Priority = ThreadPriority.Highest;
+
             // Set this culture for the thread that outgoing packets are sent
             // on to en-US to avoid number parsing issues
             Culture.SetCurrentCulture();
@@ -2190,7 +2314,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     // Handle outgoing packets, resends, acknowledgements, and pings for each
                     // client. m_packetSent will be set to true if a packet is sent
-                    m_scene.ForEachClient(clientPacketHandler);
+                    Scene.ForEachClient(clientPacketHandler);
 
                     m_currentOutgoingClient = null;
 
@@ -2227,7 +2351,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     if (udpClient.IsConnected)
                     {
-                        if (m_resendUnacked)
+                        if (udpClient.ProcessUnackedSends && m_resendUnacked)
                             HandleUnacked(llClient);
 
                         if (m_sendAcks)
@@ -2356,7 +2480,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             watch1.Reset();
 
             // reuse this -- it's every ~100ms
-            if (m_scene.EmergencyMonitoring && nticks % 100 == 0)
+            if (Scene.EmergencyMonitoring && nticks % 100 == 0)
             {
                 m_log.InfoFormat("[LLUDPSERVER]: avg processing ticks: {0} avg unacked: {1} avg acks: {2} avg ping: {3} avg dequeue: {4} (TickCountRes: {5} sent: {6} notsent: {7})", 
                     avgProcessingTicks, avgResendUnackedTicks, avgSendAcksTicks, avgSendPingTicks, avgDequeueTicks, TickCountResolution, npacksSent, npackNotSent);
@@ -2400,6 +2524,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     m_currentIncomingClient = null;
                 }
+<<<<<<< HEAD
+            }
+            else
+            {
+                m_log.DebugFormat(
+                    "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}",
+                    packet.Type, client.Name, Scene.RegionInfo.RegionName);
+            }
+=======
 //            }
 //            else
 //            {
@@ -2407,6 +2540,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //                    "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}",
 //                    packet.Type, client.Name, m_scene.RegionInfo.RegionName);
 //            }
+>>>>>>> avn/ubitvar
 
             IncomingPacketsProcessed++;
         }
@@ -2418,7 +2552,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (!client.IsLoggingOut)
             {
                 client.IsLoggingOut = true;
-                m_scene.CloseAgent(client.AgentId, false);
+                Scene.CloseAgent(client.AgentId, false);
             }
         }
     }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
new file mode 100644
index 0000000..ac6c0b4
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
@@ -0,0 +1,901 @@
+/*
+ * 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.Text;
+using NDesk.Options;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.ClientStack.LindenUDP
+{
+    public class LLUDPServerCommands
+    {
+        private ICommandConsole m_console;
+        private LLUDPServer m_udpServer;
+
+        public LLUDPServerCommands(ICommandConsole console, LLUDPServer udpServer)
+        {
+            m_console = console;
+            m_udpServer = udpServer;
+        }
+
+        public void Register()
+        {
+            m_console.Commands.AddCommand(
+                "Comms", false, "show server throttles",
+                "show server throttles",
+                "Show information about server throttles",
+                HandleShowServerThrottlesCommand); 
+
+            m_console.Commands.AddCommand(
+                "Debug", false, "debug lludp packet",
+                "debug lludp packet [--default | --all] <level> [<avatar-first-name> <avatar-last-name>]",
+                "Turn on packet debugging.  This logs information when the client stack hands a processed packet off to downstream code or when upstream code first requests that a certain packet be sent.",
+                "If level >  255 then all incoming and outgoing packets are logged.\n"
+                + "If level <= 255 then incoming AgentUpdate and outgoing SimStats and SimulatorViewerTimeMessage packets are not logged.\n"
+                + "If level <= 200 then incoming RequestImage and outgoing ImagePacket, ImageData, LayerData and CoarseLocationUpdate packets are not logged.\n"
+                + "If level <= 100 then incoming ViewerEffect and AgentAnimation and outgoing ViewerEffect and AvatarAnimation packets are not logged.\n"
+                + "If level <=  50 then outgoing ImprovedTerseObjectUpdate packets are not logged.\n"
+                + "If level <= 0 then no packets are logged.\n"
+                + "If --default is specified then the level becomes the default logging level for all subsequent agents.\n"
+                + "If --all is specified then the level becomes the default logging level for all current and subsequent agents.\n"
+                + "In these cases, you cannot also specify an avatar name.\n"
+                + "If an avatar name is given then only packets from that avatar are logged.",
+                HandlePacketCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug", false, "debug lludp data out",
+                "debug lludp data out <level> <avatar-first-name> <avatar-last-name>\"",
+                "Turn on debugging for final outgoing data to the given user's client.",
+                "This operates at a much lower level than the packet command and prints out available details when the data is actually sent.\n"
+                + "If level >  0 then information about all outgoing UDP data for this avatar is logged.\n"
+                + "If level <= 0 then no information about outgoing UDP data for this avatar is logged.",
+                HandleDataCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug", false, "debug lludp drop",
+                "debug lludp drop <in|out> <add|remove> <packet-name>",
+                "Drop all in or outbound packets that match the given name",
+                "For test purposes.",
+                HandleDropCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp start",
+                "debug lludp start <in|out|all>",
+                "Control LLUDP packet processing.",
+                "No effect if packet processing has already started.\n"
+                + "in  - start inbound processing.\n"
+                + "out - start outbound processing.\n"
+                + "all - start in and outbound processing.\n",
+                HandleStartCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp stop",
+                "debug lludp stop <in|out|all>",
+                "Stop LLUDP packet processing.",
+                "No effect if packet processing has already stopped.\n"
+                + "in  - stop inbound processing.\n"
+                + "out - stop outbound processing.\n"
+                + "all - stop in and outbound processing.\n",
+                HandleStopCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp pool",
+                "debug lludp pool <on|off>",
+                "Turn object pooling within the lludp component on or off.",
+                HandlePoolCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp status",
+                "debug lludp status",
+                "Return status of LLUDP packet processing.",
+                HandleStatusCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp throttles log",
+                "debug lludp throttles log <level> [<avatar-first-name> <avatar-last-name>]",
+                "Change debug logging level for throttles.",
+                "If level >= 0 then throttle debug logging is performed.\n"
+                + "If level <= 0 then no throttle debug logging is performed.",
+                HandleThrottleCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp throttles get",
+                "debug lludp throttles get [<avatar-first-name> <avatar-last-name>]",
+                "Return debug settings for throttles.",
+                      "adaptive - true/false, controls adaptive throttle setting.\n"
+                    + "request  - request drip rate in kbps.\n"
+                    + "max      - the max kbps throttle allowed for the specified existing clients.  Use 'debug lludp get new-client-throttle-max' to see the setting for new clients.\n",
+                HandleThrottleGetCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp throttles set",
+                "debug lludp throttles set <param> <value> [<avatar-first-name> <avatar-last-name>]",
+                "Set a throttle parameter for the given client.",
+                      "adaptive - true/false, controls adaptive throttle setting.\n"
+                    + "current  - current drip rate in kbps.\n"
+                    + "request  - requested drip rate in kbps.\n"
+                    + "max      - the max kbps throttle allowed for the specified existing clients.  Use 'debug lludp set new-client-throttle-max' to change the settings for new clients.\n",
+                HandleThrottleSetCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp get",
+                "debug lludp get",
+                "Get debug parameters for the server.",
+                      "max-scene-throttle      - the current max cumulative kbps provided for this scene to clients.\n"
+                    + "max-new-client-throttle - the max kbps throttle allowed to new clients.   Use 'debug lludp throttles get max' to see the settings for existing clients.",
+                HandleGetCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp set",
+                "debug lludp set <param> <value>",
+                "Set a parameter for the server.",
+                      "max-scene-throttle      - the current max cumulative kbps provided for this scene to clients.\n"
+                    + "max-new-client-throttle - the max kbps throttle allowed to each new client.  Use 'debug lludp throttles set max' to set for existing clients.",
+                HandleSetCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp toggle agentupdate",
+                "debug lludp toggle agentupdate",
+                "Toggle whether agentupdate packets are processed or simply discarded.",
+                HandleAgentUpdateCommand);
+
+            MainConsole.Instance.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp oqre",
+                "debug lludp oqre <start|stop|status>",
+                "Start, stop or get status of OutgoingQueueRefillEngine.",
+                "If stopped then refill requests are processed directly via the threadpool.",
+                HandleOqreCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp client get",
+                "debug lludp client get [<avatar-first-name> <avatar-last-name>]",
+                "Get debug parameters for the client.  If no name is given then all client information is returned.",
+                "process-unacked-sends - Do we take action if a sent reliable packet has not been acked.",
+                HandleClientGetCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug", 
+                false, 
+                "debug lludp client set",
+                "debug lludp client set <param> <value> [<avatar-first-name> <avatar-last-name>]",
+                "Set a debug parameter for a particular client.  If no name is given then the value is set on all clients.",
+                "process-unacked-sends - Do we take action if a sent reliable packet has not been acked.",
+                HandleClientSetCommand);
+        }
+
+        private void HandleShowServerThrottlesCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            m_console.OutputFormat("Throttles for {0}", m_udpServer.Scene.Name);
+            ConsoleDisplayList cdl = new ConsoleDisplayList();
+            cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled);
+
+            long maxSceneDripRate = m_udpServer.Throttle.MaxDripRate;
+            cdl.AddRow(
+                "Max scene throttle", 
+                maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset");
+
+            int maxClientDripRate = m_udpServer.ThrottleRates.Total;
+            cdl.AddRow(
+                "Max new client throttle", 
+                maxClientDripRate != 0 ? string.Format("{0} kbps", maxClientDripRate * 8 / 1000) : "unset");
+
+            m_console.Output(cdl.ToString());
+
+            m_console.OutputFormat("{0}\n", GetServerThrottlesReport(m_udpServer));
+        }
+                
+        private string GetServerThrottlesReport(LLUDPServer udpServer)
+        {
+            StringBuilder report = new StringBuilder();     
+
+            report.AppendFormat(
+                "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n",
+                "Total",
+                "Resend",
+                "Land",
+                "Wind",
+                "Cloud",
+                "Task",
+                "Texture",
+                "Asset");          
+
+            report.AppendFormat(
+                "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n",
+                "kb/s",
+                "kb/s",
+                "kb/s",
+                "kb/s",
+                "kb/s",
+                "kb/s",
+                "kb/s",
+                "kb/s");     
+
+            ThrottleRates throttleRates = udpServer.ThrottleRates;
+            report.AppendFormat(
+                "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}",
+                (throttleRates.Total * 8) / 1000,
+                (throttleRates.Resend * 8) / 1000,
+                (throttleRates.Land * 8) / 1000,
+                (throttleRates.Wind * 8) / 1000,
+                (throttleRates.Cloud * 8) / 1000,
+                (throttleRates.Task * 8) / 1000,
+                (throttleRates.Texture  * 8) / 1000,
+                (throttleRates.Asset  * 8) / 1000);  
+
+            return report.ToString();
+        }
+
+        protected string GetColumnEntry(string entry, int maxLength, int columnPadding)
+        {                       
+            return string.Format(
+                "{0,-" + maxLength +  "}{1,-" + columnPadding + "}", 
+                entry.Length > maxLength ? entry.Substring(0, maxLength) : entry, 
+                "");
+        }
+
+        private void HandleDataCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 7)
+            {
+                MainConsole.Instance.OutputFormat("Usage: debug lludp data out <true|false> <avatar-first-name> <avatar-last-name>");
+                return;
+            }
+
+            int level;
+            if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[4], out level))
+                return;
+
+            string firstName = args[5];
+            string lastName = args[6];
+
+            m_udpServer.Scene.ForEachScenePresence(sp =>
+                                       {
+                if (sp.Firstname == firstName && sp.Lastname == lastName)
+                {
+                    MainConsole.Instance.OutputFormat(
+                        "Data debug for {0} ({1}) set to {2} in {3}",
+                        sp.Name, sp.IsChildAgent ? "child" : "root", level, m_udpServer.Scene.Name);
+
+                    ((LLClientView)sp.ControllingClient).UDPClient.DebugDataOutLevel = level;
+                }
+            });
+        }
+
+        private void HandleThrottleCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            bool all = args.Length == 5;
+            bool one = args.Length == 7;
+
+            if (!all && !one)
+            {
+                MainConsole.Instance.OutputFormat(
+                    "Usage: debug lludp throttles log <level> [<avatar-first-name> <avatar-last-name>]");
+                return;
+            }
+
+            int level;
+            if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[4], out level))
+                return;
+
+            string firstName = null;
+            string lastName = null;
+
+            if (one)
+            {
+                firstName = args[5];
+                lastName = args[6];
+            }
+
+            m_udpServer.Scene.ForEachScenePresence(sp =>
+            {
+                if (all || (sp.Firstname == firstName && sp.Lastname == lastName))
+                {
+                    MainConsole.Instance.OutputFormat(
+                        "Throttle log level for {0} ({1}) set to {2} in {3}",
+                        sp.Name, sp.IsChildAgent ? "child" : "root", level, m_udpServer.Scene.Name);
+
+                    ((LLClientView)sp.ControllingClient).UDPClient.ThrottleDebugLevel = level;
+                }
+            });
+        }
+
+        private void HandleThrottleSetCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            bool all = args.Length == 6;
+            bool one = args.Length == 8;
+
+            if (!all && !one)
+            {
+                MainConsole.Instance.OutputFormat(
+                    "Usage: debug lludp throttles set <param> <value> [<avatar-first-name> <avatar-last-name>]");
+                return;
+            }           
+
+            string param = args[4];
+            string rawValue = args[5];
+
+            string firstName = null;
+            string lastName = null;
+
+            if (one)
+            {
+                firstName = args[6];
+                lastName = args[7];
+            }
+
+            if (param == "adaptive")
+            {
+                bool newValue;
+                if (!ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, rawValue, out newValue))
+                    return;
+
+                m_udpServer.Scene.ForEachScenePresence(sp =>
+                {
+                    if (all || (sp.Firstname == firstName && sp.Lastname == lastName))
+                    {
+                        MainConsole.Instance.OutputFormat(
+                            "Setting param {0} to {1} for {2} ({3}) in {4}",
+                            param, newValue, sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
+
+                        LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+                        udpClient.FlowThrottle.AdaptiveEnabled = newValue;
+                        //                        udpClient.FlowThrottle.MaxDripRate = 0;
+                        //                        udpClient.FlowThrottle.AdjustedDripRate = 0;
+                    }
+                });
+            }
+            else if (param == "request")
+            {
+                int newValue;
+                if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue))
+                    return;
+
+                int newCurrentThrottleKbps = newValue * 1000 / 8;
+
+                m_udpServer.Scene.ForEachScenePresence(sp =>
+                                                       {
+                    if (all || (sp.Firstname == firstName && sp.Lastname == lastName))
+                    {
+                        MainConsole.Instance.OutputFormat(
+                            "Setting param {0} to {1} for {2} ({3}) in {4}",
+                            param, newValue, sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
+
+                        LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+                        udpClient.FlowThrottle.RequestedDripRate = newCurrentThrottleKbps;
+                    }
+                });
+            }
+            else if (param == "max")
+            {
+                int newValue;
+                if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue))
+                    return;
+
+                int newThrottleMaxKbps = newValue * 1000 / 8;
+
+                m_udpServer.Scene.ForEachScenePresence(sp =>
+                {
+                    if (all || (sp.Firstname == firstName && sp.Lastname == lastName))
+                    {
+                        MainConsole.Instance.OutputFormat(
+                            "Setting param {0} to {1} for {2} ({3}) in {4}",
+                            param, newValue, sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
+
+                        LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+                        udpClient.FlowThrottle.MaxDripRate = newThrottleMaxKbps;
+                    }
+                });
+            }
+        }
+
+        private void HandleThrottleGetCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            bool all = args.Length == 4;
+            bool one = args.Length == 6;
+
+            if (!all && !one)
+            {
+                MainConsole.Instance.OutputFormat(
+                    "Usage: debug lludp throttles get [<avatar-first-name> <avatar-last-name>]");
+                return;
+            }           
+
+            string firstName = null;
+            string lastName = null;
+
+            if (one)
+            {
+                firstName = args[4];
+                lastName = args[5];
+            }
+
+            m_udpServer.Scene.ForEachScenePresence(sp =>
+             {
+                if (all || (sp.Firstname == firstName && sp.Lastname == lastName))
+                {
+                    m_console.OutputFormat(
+                        "Status for {0} ({1}) in {2}",
+                        sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
+
+                    LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+
+                    ConsoleDisplayList cdl = new ConsoleDisplayList();
+                    cdl.AddRow("adaptive", udpClient.FlowThrottle.AdaptiveEnabled);
+                    cdl.AddRow("current", string.Format("{0} kbps", udpClient.FlowThrottle.DripRate * 8 / 1000));
+                    cdl.AddRow("request", string.Format("{0} kbps", udpClient.FlowThrottle.RequestedDripRate * 8 / 1000));  
+                    cdl.AddRow("max", string.Format("{0} kbps", udpClient.FlowThrottle.MaxDripRate * 8 / 1000));
+
+                    m_console.Output(cdl.ToString());
+                }
+            });
+        }
+
+        private void HandleGetCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            m_console.OutputFormat("Debug settings for {0}", m_udpServer.Scene.Name);
+            ConsoleDisplayList cdl = new ConsoleDisplayList();
+
+            long maxSceneDripRate = m_udpServer.Throttle.MaxDripRate;
+            cdl.AddRow(
+                "max-scene-throttle", 
+                maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset");
+
+            int maxClientDripRate = m_udpServer.ThrottleRates.Total;
+            cdl.AddRow(
+                "max-new-client-throttle", 
+                maxClientDripRate != 0 ? string.Format("{0} kbps", maxClientDripRate * 8 / 1000) : "unset");
+
+            m_console.Output(cdl.ToString());
+        }
+
+        private void HandleSetCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 5)
+            {
+                MainConsole.Instance.OutputFormat("Usage: debug lludp set <param> <value>");
+                return;
+            }           
+
+            string param = args[3];
+            string rawValue = args[4];
+
+            int newValue;
+
+            if (param == "max-scene-throttle")
+            {
+                if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue))
+                    return;
+
+                m_udpServer.Throttle.MaxDripRate = newValue * 1000 / 8;
+            }
+            else if (param == "max-new-client-throttle")
+            {
+                if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue))
+                    return;
+
+                m_udpServer.ThrottleRates.Total = newValue * 1000 / 8;
+            }
+            else
+            {
+                return; 
+            }
+
+            m_console.OutputFormat("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name);
+        }
+
+        private void HandleClientGetCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 4 && args.Length != 6)
+            {
+                MainConsole.Instance.OutputFormat("Usage: debug lludp client get [<avatar-first-name> <avatar-last-name>]");
+                return;
+            }
+
+            string name = null;
+
+            if (args.Length == 6)
+                name = string.Format("{0} {1}", args[4], args[5]);
+
+            m_udpServer.Scene.ForEachScenePresence(
+                sp =>
+                {
+                    if ((name == null || sp.Name == name) && sp.ControllingClient is LLClientView)
+                    {
+                        LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+
+                        m_console.OutputFormat(
+                            "Client debug parameters for {0} ({1}) in {2}",
+                            sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
+
+                        ConsoleDisplayList cdl = new ConsoleDisplayList();
+                        cdl.AddRow("process-unacked-sends", udpClient.ProcessUnackedSends);
+
+                        m_console.Output(cdl.ToString());
+                    }
+                });
+        }
+
+        private void HandleClientSetCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 6 && args.Length != 8)
+            {
+                MainConsole.Instance.OutputFormat("Usage: debug lludp client set <param> <value> [<avatar-first-name> <avatar-last-name>]");
+                return;
+            }        
+
+            string param = args[4];
+            string rawValue = args[5];
+
+            string name = null;
+
+            if (args.Length == 8)
+                name = string.Format("{0} {1}", args[6], args[7]);
+
+            if (param == "process-unacked-sends")
+            {
+                bool newValue;
+
+                if (!ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, rawValue, out newValue))
+                    return;
+
+                m_udpServer.Scene.ForEachScenePresence(
+                    sp =>
+                    {
+                        if ((name == null || sp.Name == name) && sp.ControllingClient is LLClientView)
+                        {
+                            LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+                            udpClient.ProcessUnackedSends = newValue;
+
+                            m_console.OutputFormat("{0} set to {1} for {2} in {3}", param, newValue, sp.Name, m_udpServer.Scene.Name);
+                        }
+                    });
+            }
+        }
+
+        private void HandlePacketCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            bool setAsDefaultLevel = false;
+            bool setAll = false;
+            OptionSet optionSet = new OptionSet()
+                .Add("default", o => setAsDefaultLevel = (o != null))
+                    .Add("all", o => setAll = (o != null));
+            List<string> filteredArgs = optionSet.Parse(args);
+
+            string name = null;
+
+            if (filteredArgs.Count == 6)
+            {
+                if (!(setAsDefaultLevel || setAll))
+                {
+                    name = string.Format("{0} {1}", filteredArgs[4], filteredArgs[5]);
+                }
+                else
+                {
+                    MainConsole.Instance.OutputFormat("ERROR: Cannot specify a user name when setting default/all logging level");
+                    return;
+                }
+            }
+
+            if (filteredArgs.Count > 3)
+            {
+                int newDebug;
+                if (int.TryParse(filteredArgs[3], out newDebug))
+                {
+                    if (setAsDefaultLevel || setAll)
+                    {
+                        m_udpServer.DefaultClientPacketDebugLevel = newDebug;
+
+                        MainConsole.Instance.OutputFormat(
+                            "Packet debug for {0} clients set to {1} in {2}",
+                            (setAll ? "all" : "future"), m_udpServer.DefaultClientPacketDebugLevel, m_udpServer.Scene.Name);
+
+                        if (setAll)
+                        {
+                            m_udpServer.Scene.ForEachScenePresence(sp =>
+                                                       {
+                                MainConsole.Instance.OutputFormat(
+                                    "Packet debug for {0} ({1}) set to {2} in {3}",
+                                    sp.Name, sp.IsChildAgent ? "child" : "root", newDebug, m_udpServer.Scene.Name);
+
+                                sp.ControllingClient.DebugPacketLevel = newDebug;
+                            });
+                        }
+                    }
+                    else
+                    {
+                        m_udpServer.Scene.ForEachScenePresence(sp =>
+                                                   {
+                            if (name == null || sp.Name == name)
+                            {
+                                MainConsole.Instance.OutputFormat(
+                                    "Packet debug for {0} ({1}) set to {2} in {3}",
+                                    sp.Name, sp.IsChildAgent ? "child" : "root", newDebug, m_udpServer.Scene.Name);
+
+                                sp.ControllingClient.DebugPacketLevel = newDebug;
+                            }
+                        });
+                    }
+                }
+                else
+                {
+                    MainConsole.Instance.Output("Usage: debug lludp packet [--default | --all] 0..255 [<first-name> <last-name>]");
+                }
+            }
+        }
+
+        private void HandleDropCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 6)
+            {
+                MainConsole.Instance.Output("Usage: debug lludp drop <in|out> <add|remove> <packet-name>");
+                return;
+            }
+
+            string direction = args[3];
+            string subCommand = args[4];
+            string packetName = args[5];           
+
+            if (subCommand == "add")
+            {
+                MainConsole.Instance.OutputFormat(
+                    "Adding packet {0} to {1} drop list for all connections in {2}", 
+                    direction, packetName, m_udpServer.Scene.Name);
+
+                m_udpServer.Scene.ForEachScenePresence(
+                    sp =>
+                    {
+                    LLClientView llcv = (LLClientView)sp.ControllingClient;
+
+                    if (direction == "in")
+                        llcv.AddInPacketToDropSet(packetName);
+                    else if (direction == "out")
+                        llcv.AddOutPacketToDropSet(packetName);
+                }
+                );
+            }
+            else if (subCommand == "remove")
+            {
+                MainConsole.Instance.OutputFormat(
+                    "Removing packet {0} from {1} drop list for all connections in {2}", 
+                    direction, packetName, m_udpServer.Scene.Name);
+
+                m_udpServer.Scene.ForEachScenePresence(
+                    sp =>
+                    {
+                    LLClientView llcv = (LLClientView)sp.ControllingClient;
+
+                    if (direction == "in")
+                        llcv.RemoveInPacketFromDropSet(packetName);
+                    else if (direction == "out")
+                        llcv.RemoveOutPacketFromDropSet(packetName);
+                }
+                );
+            }
+        }
+
+        private void HandleStartCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 4)
+            {
+                MainConsole.Instance.Output("Usage: debug lludp start <in|out|all>");
+                return;
+            }
+
+            string subCommand = args[3];
+
+            if (subCommand == "in" || subCommand == "all")
+                m_udpServer.StartInbound();
+
+            if (subCommand == "out" || subCommand == "all")
+                m_udpServer.StartOutbound();
+        }
+
+        private void HandleStopCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 4)
+            {
+                MainConsole.Instance.Output("Usage: debug lludp stop <in|out|all>");
+                return;
+            }
+
+            string subCommand = args[3];
+
+            if (subCommand == "in" || subCommand == "all")
+                m_udpServer.StopInbound();
+
+            if (subCommand == "out" || subCommand == "all")
+                m_udpServer.StopOutbound();
+        }
+
+        private void HandlePoolCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 4)
+            {
+                MainConsole.Instance.Output("Usage: debug lludp pool <on|off>");
+                return;
+            }
+
+            string enabled = args[3];
+
+            if (enabled == "on")
+            {
+                if (m_udpServer.EnablePools())
+                {
+                    m_udpServer.EnablePoolStats();
+                    MainConsole.Instance.OutputFormat("Packet pools enabled on {0}", m_udpServer.Scene.Name);
+                }
+            }
+            else if (enabled == "off")
+            {
+                if (m_udpServer.DisablePools())
+                {
+                    m_udpServer.DisablePoolStats();
+                    MainConsole.Instance.OutputFormat("Packet pools disabled on {0}", m_udpServer.Scene.Name);
+                }
+            }
+            else
+            {
+                MainConsole.Instance.Output("Usage: debug lludp pool <on|off>");
+            }
+        }
+
+        private void HandleAgentUpdateCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            m_udpServer.DiscardInboundAgentUpdates = !m_udpServer.DiscardInboundAgentUpdates;
+
+            MainConsole.Instance.OutputFormat(
+                "Discard AgentUpdates now {0} for {1}", m_udpServer.DiscardInboundAgentUpdates, m_udpServer.Scene.Name);
+        }
+
+        private void HandleStatusCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            MainConsole.Instance.OutputFormat(
+                "IN  LLUDP packet processing for {0} is {1}", m_udpServer.Scene.Name, m_udpServer.IsRunningInbound ? "enabled" : "disabled");
+
+            MainConsole.Instance.OutputFormat(
+                "OUT LLUDP packet processing for {0} is {1}", m_udpServer.Scene.Name, m_udpServer.IsRunningOutbound ? "enabled" : "disabled");
+
+            MainConsole.Instance.OutputFormat("LLUDP pools in {0} are {1}", m_udpServer.Scene.Name, m_udpServer.UsePools ? "on" : "off");
+
+            MainConsole.Instance.OutputFormat(
+                "Packet debug level for new clients is {0}", m_udpServer.DefaultClientPacketDebugLevel);
+        }
+
+        private void HandleOqreCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 4)
+            {
+                MainConsole.Instance.Output("Usage: debug lludp oqre <stop|start|status>");
+                return;
+            }
+
+            string subCommand = args[3];
+
+            if (subCommand == "stop")
+            {
+                m_udpServer.OqrEngine.Stop();
+                MainConsole.Instance.OutputFormat("Stopped OQRE for {0}", m_udpServer.Scene.Name);
+            }
+            else if (subCommand == "start")
+            {
+                m_udpServer.OqrEngine.Start();
+                MainConsole.Instance.OutputFormat("Started OQRE for {0}", m_udpServer.Scene.Name);
+            }
+            else if (subCommand == "status")
+            {
+                MainConsole.Instance.OutputFormat("OQRE in {0}", m_udpServer.Scene.Name);
+                MainConsole.Instance.OutputFormat("Running: {0}", m_udpServer.OqrEngine.IsRunning);
+                MainConsole.Instance.OutputFormat(
+                    "Requests waiting: {0}", 
+                    m_udpServer.OqrEngine.IsRunning ? m_udpServer.OqrEngine.JobsWaiting.ToString() : "n/a");
+            }
+            else 
+            {
+                MainConsole.Instance.OutputFormat("Unrecognized OQRE subcommand {0}", subCommand);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index 0030dee..7171974 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -107,6 +107,62 @@ namespace OpenMetaverse
         /// </summary>
         public float AverageReceiveTicksForLastSamplePeriod { get; private set; }
 
+        #region PacketDropDebugging
+        /// <summary>
+        /// For debugging purposes only... random number generator for dropping
+        /// outbound packets.
+        /// </summary>
+        private Random m_dropRandomGenerator = new Random();
+        
+        /// <summary>
+        /// For debugging purposes only... parameters for a simplified
+        /// model of packet loss with bursts, overall drop rate should
+        /// be roughly 1 - m_dropLengthProbability / (m_dropProbabiliy + m_dropLengthProbability)
+        /// which is about 1% for parameters 0.0015 and 0.15
+        /// </summary>
+        private double m_dropProbability = 0.0030;
+        private double m_dropLengthProbability = 0.15;
+        private bool m_dropState = false;
+
+        /// <summary>
+        /// For debugging purposes only... parameters to control the time
+        /// duration over which packet loss bursts can occur, if no packets
+        /// have been sent for m_dropResetTicks milliseconds, then reset the
+        /// state of the packet dropper to its default.
+        /// </summary>
+        private int m_dropLastTick = 0;
+        private int m_dropResetTicks = 500;
+        
+        /// <summary>
+        /// Debugging code used to simulate dropped packets with bursts
+        /// </summary>
+        private bool DropOutgoingPacket()
+        {
+            double rnum = m_dropRandomGenerator.NextDouble();
+
+            // if the connection has been idle for awhile (more than m_dropResetTicks) then
+            // reset the state to the default state, don't continue a burst
+            int curtick = Util.EnvironmentTickCount();
+            if (Util.EnvironmentTickCountSubtract(curtick, m_dropLastTick) > m_dropResetTicks)
+                m_dropState = false;
+
+            m_dropLastTick = curtick;
+
+            // if we are dropping packets, then the probability of dropping
+            // this packet is the probability that we stay in the burst
+            if (m_dropState)
+            {
+                m_dropState = (rnum < (1.0 - m_dropLengthProbability)) ? true : false;
+            }
+            else
+            {
+                m_dropState = (rnum < m_dropProbability) ? true : false;
+            }
+
+            return m_dropState;
+        }
+        #endregion PacketDropDebugging
+
         /// <summary>
         /// Default constructor
         /// </summary>
@@ -117,6 +173,10 @@ namespace OpenMetaverse
         {
             m_localBindAddress = bindAddress;
             m_udpPort = port;
+
+            // for debugging purposes only, initializes the random number generator
+            // used for simulating packet loss
+            // m_dropRandomGenerator = new Random();
         }
 
         /// <summary>
@@ -135,7 +195,7 @@ namespace OpenMetaverse
         /// manner (not throwing an exception when the remote side resets the
         /// connection). This call is ignored on Mono where the flag is not
         /// necessary</remarks>
-        public void StartInbound(int recvBufferSize, bool asyncPacketHandling)
+        public virtual void StartInbound(int recvBufferSize, bool asyncPacketHandling)
         {
             m_asyncPacketHandling = asyncPacketHandling;
 
@@ -158,6 +218,17 @@ namespace OpenMetaverse
 
                 try
                 {
+                    if (m_udpSocket.Ttl < 128)
+                    {
+                        m_udpSocket.Ttl = 128;
+                    }
+                }
+                catch (SocketException)
+                {
+                    m_log.Debug("[UDPBASE]: Failed to increase default TTL");
+                }
+                try
+                {
                     // This udp socket flag is not supported under mono, 
                     // so we'll catch the exception and continue
                     m_udpSocket.IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null);
@@ -168,6 +239,12 @@ namespace OpenMetaverse
                     m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag not supported on this platform, ignoring");
                 }
 
+                // On at least Mono 3.2.8, multiple UDP sockets can bind to the same port by default.  At the moment
+                // we never want two regions to listen on the same port as they cannot demultiplex each other's messages,
+                // leading to a confusing bug.
+                // By default, Windows does not allow two sockets to bind to the same port.
+                m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false);
+
                 if (recvBufferSize != 0)
                     m_udpSocket.ReceiveBufferSize = recvBufferSize;
 
@@ -185,14 +262,14 @@ namespace OpenMetaverse
         /// <summary>
         /// Start outbound UDP packet handling.
         /// </summary>
-        public void StartOutbound()
+        public virtual void StartOutbound()
         {
             m_log.DebugFormat("[UDPBASE]: Starting outbound UDP loop");
 
             IsRunningOutbound = true;
         }
 
-        public void StopInbound()
+        public virtual void StopInbound()
         {
             if (IsRunningInbound)
             {
@@ -203,14 +280,14 @@ namespace OpenMetaverse
             }
         }
 
-        public void StopOutbound()
+        public virtual void StopOutbound()
         {
             m_log.DebugFormat("[UDPBASE]: Stopping outbound UDP loop");
 
             IsRunningOutbound = false;
         }
 
-        protected virtual bool EnablePools()
+        public virtual bool EnablePools()
         {
             if (!UsePools)
             {
@@ -224,7 +301,7 @@ namespace OpenMetaverse
             return false;
         }
 
-        protected virtual bool DisablePools()
+        public virtual bool DisablePools()
         {
             if (UsePools)
             {
@@ -389,6 +466,12 @@ namespace OpenMetaverse
         {
 //            if (IsRunningOutbound)
 //            {
+
+                // This is strictly for debugging purposes to simulate dropped
+                // packets when testing throttles & retransmission code
+                // if (DropOutgoingPacket())
+                //     return;
+            
                 try
                 {
                     m_udpSocket.BeginSendTo(
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs b/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs
index f8d0c02..8795c0c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index 9700224..a935dd2 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -36,7 +36,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 {
@@ -47,7 +46,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
     public class BasicCircuitTests : OpenSimTestCase
     {
         private Scene m_scene;
-        private TestLLUDPServer m_udpServer;
 
         [TestFixtureSetUp]
         public void FixtureInit()
@@ -73,72 +71,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             StatsManager.SimExtraStats = new SimExtraStatsCollector();
         }
         
-        /// <summary>
-        /// Build an object name packet for test purposes
-        /// </summary>
-        /// <param name="objectLocalId"></param>
-        /// <param name="objectName"></param>
-        private ObjectNamePacket BuildTestObjectNamePacket(uint objectLocalId, string objectName)
-        {
-            ObjectNamePacket onp = new ObjectNamePacket();
-            ObjectNamePacket.ObjectDataBlock odb = new ObjectNamePacket.ObjectDataBlock();
-            odb.LocalID = objectLocalId;
-            odb.Name = Utils.StringToBytes(objectName);
-            onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb };
-            onp.Header.Zerocoded = false;
-            
-            return onp;
-        }
-
-        private void AddUdpServer()
-        {
-            AddUdpServer(new IniConfigSource());
-        }
-
-        private void AddUdpServer(IniConfigSource configSource)
-        {
-            uint port = 0;
-            AgentCircuitManager acm = m_scene.AuthenticateHandler;
-
-            m_udpServer = new TestLLUDPServer(IPAddress.Any, ref port, 0, false, configSource, acm);
-            m_udpServer.AddScene(m_scene);
-        }
-
-        /// <summary>
-        /// Used by tests that aren't testing this stage.
-        /// </summary>
-        private ScenePresence AddClient()
-        {
-            UUID myAgentUuid   = TestHelpers.ParseTail(0x1);
-            UUID mySessionUuid = TestHelpers.ParseTail(0x2);
-            uint myCircuitCode = 123456;
-            IPEndPoint testEp = new IPEndPoint(IPAddress.Loopback, 999);
-
-            UseCircuitCodePacket uccp = new UseCircuitCodePacket();
-
-            UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock
-                = new UseCircuitCodePacket.CircuitCodeBlock();
-            uccpCcBlock.Code = myCircuitCode;
-            uccpCcBlock.ID = myAgentUuid;
-            uccpCcBlock.SessionID = mySessionUuid;
-            uccp.CircuitCode = uccpCcBlock;
-
-            byte[] uccpBytes = uccp.ToBytes();
-            UDPPacketBuffer upb = new UDPPacketBuffer(testEp, uccpBytes.Length);
-            upb.DataLength = uccpBytes.Length;  // God knows why this isn't set by the constructor.
-            Buffer.BlockCopy(uccpBytes, 0, upb.Data, 0, uccpBytes.Length);
-
-            AgentCircuitData acd = new AgentCircuitData();
-            acd.AgentID = myAgentUuid;
-            acd.SessionID = mySessionUuid;
-
-            m_scene.AuthenticateHandler.AddNewCircuit(myCircuitCode, acd);
-
-            m_udpServer.PacketReceived(upb);
-
-            return m_scene.GetScenePresence(myAgentUuid);
-        }
-        
+//        /// <summary>
+//        /// Build an object name packet for test purposes
+//        /// </summary>
+//        /// <param name="objectLocalId"></param>
+//        /// <param name="objectName"></param>
+//        private ObjectNamePacket BuildTestObjectNamePacket(uint objectLocalId, string objectName)
+//        {
+//            ObjectNamePacket onp = new ObjectNamePacket();
+//            ObjectNamePacket.ObjectDataBlock odb = new ObjectNamePacket.ObjectDataBlock();
+//            odb.LocalID = objectLocalId;
+//            odb.Name = Utils.StringToBytes(objectName);
+//            onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb };
+//            onp.Header.Zerocoded = false;
+//            
+//            return onp;
+//        }
+//
         /// <summary>
         /// Test adding a client to the stack
         /// </summary>
@@ -148,7 +97,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            AddUdpServer();
+            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(m_scene);
 
             UUID myAgentUuid   = TestHelpers.ParseTail(0x1);
             UUID mySessionUuid = TestHelpers.ParseTail(0x2);
@@ -169,7 +118,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             upb.DataLength = uccpBytes.Length;  // God knows why this isn't set by the constructor.
             Buffer.BlockCopy(uccpBytes, 0, upb.Data, 0, uccpBytes.Length);
 
-            m_udpServer.PacketReceived(upb);
+            udpServer.PacketReceived(upb);
 
             // Presence shouldn't exist since the circuit manager doesn't know about this circuit for authentication yet
             Assert.That(m_scene.GetScenePresence(myAgentUuid), Is.Null);
@@ -180,15 +129,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 
             m_scene.AuthenticateHandler.AddNewCircuit(myCircuitCode, acd);
 
-            m_udpServer.PacketReceived(upb);
+            udpServer.PacketReceived(upb);
 
             // Should succeed now
             ScenePresence sp = m_scene.GetScenePresence(myAgentUuid);
             Assert.That(sp.UUID, Is.EqualTo(myAgentUuid));
 
-            Assert.That(m_udpServer.PacketsSent.Count, Is.EqualTo(1));
+            Assert.That(udpServer.PacketsSent.Count, Is.EqualTo(1));
 
-            Packet packet = m_udpServer.PacketsSent[0];
+            Packet packet = udpServer.PacketsSent[0];
             Assert.That(packet, Is.InstanceOf(typeof(PacketAckPacket)));
 
             PacketAckPacket ackPacket = packet as PacketAckPacket;
@@ -200,15 +149,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         public void TestLogoutClientDueToAck()
         {
             TestHelpers.InMethod();
-            TestHelpers.EnableLogging();
+//            TestHelpers.EnableLogging();
 
             IniConfigSource ics = new IniConfigSource();
             IConfig config = ics.AddConfig("ClientStack.LindenUDP");
             config.Set("AckTimeout", -1);
-            AddUdpServer(ics);
+            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(m_scene, ics);
+
+            ScenePresence sp 
+                = ClientStackHelpers.AddChildClient(
+                    m_scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
 
-            ScenePresence sp = AddClient();
-            m_udpServer.ClientOutgoingPacketHandler(sp.ControllingClient, true, false, false);
+            udpServer.ClientOutgoingPacketHandler(sp.ControllingClient, true, false, false);
 
             ScenePresence spAfterAckTimeout = m_scene.GetScenePresence(sp.UUID);
             Assert.That(spAfterAckTimeout, Is.Null);
@@ -233,7 +185,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            testLLUDPServer.RemoveClientCircuit(myCircuitCode);
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode));
 //            
-//            // Check that removing a non-existant circuit doesn't have any bad effects
+//            // Check that removing a non-existent circuit doesn't have any bad effects
 //            testLLUDPServer.RemoveClientCircuit(101);
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(101));
 //        }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
index 575e54c..6c57e6d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
@@ -39,7 +39,6 @@ using OpenSim.Framework;
 using OpenSim.Region.CoreModules.Agent.TextureSender;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs
index 5f73a94..92f1fc3 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs
@@ -30,7 +30,6 @@ using NUnit.Framework;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common;
 
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/TestLLUDPServer.cs
deleted file mode 100644
index 27b9e5b..0000000
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/TestLLUDPServer.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * 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.Net;
-using System.Net.Sockets;
-using Nini.Config;
-using OpenMetaverse.Packets;
-using OpenSim.Framework;
-
-namespace OpenSim.Region.ClientStack.LindenUDP.Tests
-{
-    /// <summary>
-    /// This class enables regression testing of the LLUDPServer by allowing us to intercept outgoing data.
-    /// </summary>
-    public class TestLLUDPServer : LLUDPServer
-    {
-        public List<Packet> PacketsSent { get; private set; }
-
-        public TestLLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager circuitManager)
-            : base(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager)
-        {
-            PacketsSent = new List<Packet>();
-        }
-
-        public override void SendAckImmediate(IPEndPoint remoteEndpoint, PacketAckPacket ack)
-        {
-            PacketsSent.Add(ack);
-        }
-
-        public override void SendPacket(
-            LLUDPClient udpClient, Packet packet, ThrottleOutPacketType category, bool allowSplitting, UnackedPacketMethod method)
-        {
-            PacketsSent.Add(packet);
-        }
-
-        public void ClientOutgoingPacketHandler(IClientAPI client, bool resendUnacked, bool sendAcks, bool sendPing)
-        {
-            m_resendUnacked = resendUnacked;
-            m_sendAcks = sendAcks;
-            m_sendPing = sendPing;
-
-            ClientOutgoingPacketHandler(client);
-        }
-
-////        /// <summary>
-////        /// The chunks of data to pass to the LLUDPServer when it calls EndReceive
-////        /// </summary>
-////        protected Queue<ChunkSenderTuple> m_chunksToLoad = new Queue<ChunkSenderTuple>();
-//        
-////        protected override void BeginReceive()
-////        {
-////            if (m_chunksToLoad.Count > 0 && m_chunksToLoad.Peek().BeginReceiveException)
-////            {
-////                ChunkSenderTuple tuple = m_chunksToLoad.Dequeue();
-////                reusedEpSender = tuple.Sender;
-////                throw new SocketException();
-////            }
-////        }
-//        
-////        protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender)
-////        {
-////            numBytes = 0;
-////
-////            //m_log.Debug("Queue size " + m_chunksToLoad.Count);
-////            
-////            if (m_chunksToLoad.Count <= 0)
-////                return false;
-////            
-////            ChunkSenderTuple tuple = m_chunksToLoad.Dequeue();
-////            RecvBuffer = tuple.Data;
-////            numBytes   = tuple.Data.Length;
-////            epSender   = tuple.Sender;
-////            
-////            return true;
-////        }
-//        
-////        public override void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
-////        {
-////            // Don't do anything just yet
-////        }
-//        
-//        /// <summary>
-//        /// Signal that this chunk should throw an exception on Socket.BeginReceive()
-//        /// </summary>
-//        /// <param name="epSender"></param>
-//        public void LoadReceiveWithBeginException(EndPoint epSender)
-//        {
-//            ChunkSenderTuple tuple = new ChunkSenderTuple(epSender);
-//            tuple.BeginReceiveException = true;
-//            m_chunksToLoad.Enqueue(tuple);
-//        }
-//        
-//        /// <summary>
-//        /// Load some data to be received by the LLUDPServer on the next receive call
-//        /// </summary>
-//        /// <param name="data"></param>
-//        /// <param name="epSender"></param>
-//        public void LoadReceive(byte[] data, EndPoint epSender)
-//        {
-//            m_chunksToLoad.Enqueue(new ChunkSenderTuple(data, epSender));
-//        }
-//        
-//        /// <summary>
-//        /// Load a packet to be received by the LLUDPServer on the next receive call
-//        /// </summary>
-//        /// <param name="packet"></param>
-//        public void LoadReceive(Packet packet, EndPoint epSender)
-//        {
-//            LoadReceive(packet.ToBytes(), epSender);
-//        }
-//        
-//        /// <summary>
-//        /// Calls the protected asynchronous result method.  This fires out all data chunks currently queued for send
-//        /// </summary>
-//        /// <param name="result"></param>
-//        public void ReceiveData(IAsyncResult result)
-//        {
-//            // Doesn't work the same way anymore
-////            while (m_chunksToLoad.Count > 0)
-////                OnReceivedData(result);
-//        }
-    }
-    
-    /// <summary>
-    /// Record the data and sender tuple
-    /// </summary>
-    public class ChunkSenderTuple
-    {
-        public byte[] Data;
-        public EndPoint Sender;
-        public bool BeginReceiveException;
-        
-        public ChunkSenderTuple(byte[] data, EndPoint sender)
-        {
-            Data = data;
-            Sender = sender;
-        }
-        
-        public ChunkSenderTuple(EndPoint sender)
-        {
-            Sender = sender;
-        }
-    }
-}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs
new file mode 100644
index 0000000..3c82a78
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs
@@ -0,0 +1,427 @@
+/*
+ * 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 Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse.Packets;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.ClientStack.LindenUDP.Tests
+{
+    [TestFixture]
+    public class ThrottleTests : OpenSimTestCase
+    {
+        [TestFixtureSetUp]
+        public void FixtureInit()
+        {
+            // Don't allow tests to be bamboozled by asynchronous events.  Execute everything on the same thread.
+            Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest;
+        }
+
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+            // threads.  Possibly, later tests should be rewritten so none of them require async stuff (which regression
+            // tests really shouldn't).
+            Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+        }
+
+        [Test]
+        public void TestSetRequestDripRate()
+        {
+            TestHelpers.InMethod();
+
+            TokenBucket tb = new TokenBucket("tb", null, 5000, 0);
+            AssertRates(tb, 5000, 0, 5000, 0);
+
+            tb.RequestedDripRate = 4000;
+            AssertRates(tb, 4000, 0, 4000, 0);
+
+            tb.RequestedDripRate = 6000;
+            AssertRates(tb, 6000, 0, 6000, 0);
+        }
+
+        [Test]
+        public void TestSetRequestDripRateWithMax()
+        {
+            TestHelpers.InMethod();
+
+            TokenBucket tb = new TokenBucket("tb", null, 5000, 10000);
+            AssertRates(tb, 5000, 0, 5000, 10000);
+
+            tb.RequestedDripRate = 4000;
+            AssertRates(tb, 4000, 0, 4000, 10000);
+
+            tb.RequestedDripRate = 6000;
+            AssertRates(tb, 6000, 0, 6000, 10000);
+
+            tb.RequestedDripRate = 12000;
+            AssertRates(tb, 10000, 0, 10000, 10000);
+        }
+
+        [Test]
+        public void TestSetRequestDripRateWithChildren()
+        {
+            TestHelpers.InMethod();
+
+            TokenBucket tbParent = new TokenBucket("tbParent", null, 0, 0);
+            TokenBucket tbChild1 = new TokenBucket("tbChild1", tbParent, 3000, 0);
+            TokenBucket tbChild2 = new TokenBucket("tbChild2", tbParent, 5000, 0);
+
+            AssertRates(tbParent, 8000, 8000, 8000, 0);
+            AssertRates(tbChild1, 3000, 0, 3000, 0);
+            AssertRates(tbChild2, 5000, 0, 5000, 0);
+
+            // Test: Setting a parent request greater than total children requests.
+            tbParent.RequestedDripRate = 10000;
+
+            AssertRates(tbParent, 10000, 8000, 8000, 0);
+            AssertRates(tbChild1, 3000, 0, 3000, 0);
+            AssertRates(tbChild2, 5000, 0, 5000, 0);
+
+            // Test: Setting a parent request lower than total children requests.
+            tbParent.RequestedDripRate = 6000;
+
+            AssertRates(tbParent, 6000, 8000, 6000, 0);
+            AssertRates(tbChild1, 3000, 0, 6000 / 8 * 3, 0);
+            AssertRates(tbChild2, 5000, 0, 6000 / 8 * 5, 0);
+        }
+
+        private void AssertRates(
+            TokenBucket tb, double requestedDripRate, double totalDripRequest, double dripRate, double maxDripRate)
+        {
+            Assert.AreEqual((int)requestedDripRate, tb.RequestedDripRate, "Requested drip rate");
+            Assert.AreEqual((int)totalDripRequest, tb.TotalDripRequest, "Total drip request");
+            Assert.AreEqual((int)dripRate, tb.DripRate, "Drip rate");
+            Assert.AreEqual((int)maxDripRate, tb.MaxDripRate, "Max drip rate");
+        }
+
+        [Test]
+        public void TestClientThrottleSetNoLimit()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            Scene scene = new SceneHelpers().SetupScene();
+            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene);
+
+            ScenePresence sp 
+                = ClientStackHelpers.AddChildClient(
+                    scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
+
+            LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+
+            udpServer.Throttle.DebugLevel = 1;
+            udpClient.ThrottleDebugLevel = 1;
+            
+            int resendBytes = 1000;
+            int landBytes = 2000;
+            int windBytes = 3000;
+            int cloudBytes = 4000;
+            int taskBytes = 5000;
+            int textureBytes = 6000;
+            int assetBytes = 7000;
+
+            SetThrottles(
+                udpClient, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
+
+            // We expect this to be lower because of the minimum bound set by MTU
+            int totalBytes = LLUDPServer.MTU + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes;
+
+            AssertThrottles(
+                udpClient, 
+                LLUDPServer.MTU, landBytes, windBytes, cloudBytes, taskBytes, 
+                textureBytes, assetBytes, totalBytes, 0, 0);
+        }
+
+        [Test]
+        public void TestClientThrottleAdaptiveNoLimit()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            Scene scene = new SceneHelpers().SetupScene();
+
+            IniConfigSource ics = new IniConfigSource();
+            IConfig config = ics.AddConfig("ClientStack.LindenUDP");
+            config.Set("enable_adaptive_throttles", true);
+            config.Set("adaptive_throttle_min_bps", 32000);
+
+            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene, ics);
+
+            ScenePresence sp 
+                = ClientStackHelpers.AddChildClient(
+                    scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
+
+            LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+
+            udpServer.Throttle.DebugLevel = 1;
+            udpClient.ThrottleDebugLevel = 1;
+
+            // Total is 275000
+            int resendBytes = 5000; // this is set low to test the minimum throttle override
+            int landBytes = 20000;
+            int windBytes = 30000;
+            int cloudBytes = 40000;
+            int taskBytes = 50000;
+            int textureBytes = 60000;
+            int assetBytes = 70000;
+            int totalBytes = resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes;
+
+            SetThrottles(
+                udpClient, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
+
+            // Ratio of current adaptive drip rate to requested bytes, minimum rate is 32000
+            double commitRatio = 32000.0 / totalBytes;
+
+            AssertThrottles(
+                udpClient, 
+                LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio,
+                textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0);
+
+            // Test an increase in target throttle, ack of 20 packets adds 20 * LLUDPServer.MTU bytes
+            // to the throttle, recompute commitratio from those numbers
+            udpClient.FlowThrottle.AcknowledgePackets(20);
+            commitRatio = (32000.0 + 20.0 * LLUDPServer.MTU) / totalBytes;
+
+            AssertThrottles(
+                udpClient, 
+                LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio,
+                textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0);
+
+            // Test a decrease in target throttle, adaptive throttle should cut the rate by 50% with a floor
+            // set by the minimum adaptive rate
+            udpClient.FlowThrottle.ExpirePackets(1);
+            commitRatio = (32000.0 + (20.0 * LLUDPServer.MTU)/Math.Pow(2,1)) / totalBytes;
+
+            AssertThrottles(
+                udpClient, 
+                LLUDPServer.MTU, landBytes * commitRatio, windBytes * commitRatio, cloudBytes * commitRatio, taskBytes * commitRatio,
+                textureBytes * commitRatio, assetBytes * commitRatio, udpClient.FlowThrottle.AdjustedDripRate, totalBytes, 0);
+        }
+
+        /// <summary>
+        /// Test throttle setttings where max client throttle has been limited server side.
+        /// </summary>
+        [Test]
+        public void TestSingleClientThrottleRegionLimited()
+        {
+            TestHelpers.InMethod();
+            //            TestHelpers.EnableLogging();
+
+            int resendBytes = 6000;
+            int landBytes = 8000;
+            int windBytes = 10000;
+            int cloudBytes = 12000;
+            int taskBytes = 14000;
+            int textureBytes = 16000;
+            int assetBytes = 18000;
+            int totalBytes 
+                = (int)((resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes) / 2);
+
+            Scene scene = new SceneHelpers().SetupScene();
+            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene);
+            udpServer.Throttle.RequestedDripRate = totalBytes;
+
+            ScenePresence sp1 
+                = ClientStackHelpers.AddChildClient(
+                    scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
+
+            LLUDPClient udpClient1 = ((LLClientView)sp1.ControllingClient).UDPClient;
+
+            SetThrottles(
+                udpClient1, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
+
+            AssertThrottles(
+                udpClient1, 
+                resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2, 
+                textureBytes / 2, assetBytes / 2, totalBytes, 0, 0);
+
+            // Test: Now add another client
+            ScenePresence sp2
+                = ClientStackHelpers.AddChildClient(
+                    scene, udpServer, TestHelpers.ParseTail(0x10), TestHelpers.ParseTail(0x20), 123457);
+
+            LLUDPClient udpClient2 = ((LLClientView)sp2.ControllingClient).UDPClient;
+            //            udpClient.ThrottleDebugLevel = 1;
+
+            SetThrottles(
+                udpClient2, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
+
+            AssertThrottles(
+                udpClient1, 
+                resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4, 
+                textureBytes / 4, assetBytes / 4, totalBytes / 2, 0, 0);
+
+            AssertThrottles(
+                udpClient2, 
+                resendBytes / 4, landBytes / 4, windBytes / 4, cloudBytes / 4, taskBytes / 4, 
+                textureBytes / 4, assetBytes / 4, totalBytes / 2, 0, 0);
+        }
+
+        /// <summary>
+        /// Test throttle setttings where max client throttle has been limited server side.
+        /// </summary>
+        [Test]
+        public void TestClientThrottlePerClientLimited()
+        {
+            TestHelpers.InMethod();
+            //            TestHelpers.EnableLogging();
+
+            int resendBytes = 4000;
+            int landBytes = 6000;
+            int windBytes = 8000;
+            int cloudBytes = 10000;
+            int taskBytes = 12000;
+            int textureBytes = 14000;
+            int assetBytes = 16000;
+            int totalBytes 
+                = (int)((resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes) / 2);
+
+            Scene scene = new SceneHelpers().SetupScene();
+            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene);
+            udpServer.ThrottleRates.Total = totalBytes;
+
+            ScenePresence sp 
+                = ClientStackHelpers.AddChildClient(
+                    scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
+
+            LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+            //            udpClient.ThrottleDebugLevel = 1;
+
+            SetThrottles(
+                udpClient, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
+
+            AssertThrottles(
+                udpClient, 
+                resendBytes / 2, landBytes / 2, windBytes / 2, cloudBytes / 2, taskBytes / 2, 
+                textureBytes / 2, assetBytes / 2, totalBytes, 0, totalBytes);
+        }
+
+        [Test]
+        public void TestClientThrottlePerClientAndRegionLimited()
+        {
+            TestHelpers.InMethod();
+            //TestHelpers.EnableLogging();
+
+            int resendBytes = 4000;
+            int landBytes = 6000;
+            int windBytes = 8000;
+            int cloudBytes = 10000;
+            int taskBytes = 12000;
+            int textureBytes = 14000;
+            int assetBytes = 16000;
+
+            // current total 70000
+            int totalBytes = resendBytes + landBytes + windBytes + cloudBytes + taskBytes + textureBytes + assetBytes;
+
+            Scene scene = new SceneHelpers().SetupScene();
+            TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(scene);
+            udpServer.ThrottleRates.Total = (int)(totalBytes * 1.1);
+            udpServer.Throttle.RequestedDripRate = (int)(totalBytes * 1.5);
+
+            ScenePresence sp1 
+                = ClientStackHelpers.AddChildClient(
+                    scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
+
+            LLUDPClient udpClient1 = ((LLClientView)sp1.ControllingClient).UDPClient;
+            udpClient1.ThrottleDebugLevel = 1;
+
+            SetThrottles(
+                udpClient1, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
+
+            AssertThrottles(
+                udpClient1, 
+                resendBytes, landBytes, windBytes, cloudBytes, taskBytes, 
+                textureBytes, assetBytes, totalBytes, 0, totalBytes * 1.1);
+
+            // Now add another client
+            ScenePresence sp2
+                = ClientStackHelpers.AddChildClient(
+                    scene, udpServer, TestHelpers.ParseTail(0x10), TestHelpers.ParseTail(0x20), 123457);
+
+            LLUDPClient udpClient2 = ((LLClientView)sp2.ControllingClient).UDPClient;
+            udpClient2.ThrottleDebugLevel = 1;
+
+            SetThrottles(
+                udpClient2, resendBytes, landBytes, windBytes, cloudBytes, taskBytes, textureBytes, assetBytes);
+
+            AssertThrottles(
+                udpClient1, 
+                resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75, 
+                textureBytes * 0.75, assetBytes * 0.75, totalBytes * 0.75, 0, totalBytes * 1.1);
+
+            AssertThrottles(
+                udpClient2, 
+                resendBytes * 0.75, landBytes * 0.75, windBytes * 0.75, cloudBytes * 0.75, taskBytes * 0.75, 
+                textureBytes * 0.75, assetBytes * 0.75, totalBytes * 0.75, 0, totalBytes * 1.1);
+        }
+
+        private void AssertThrottles(
+            LLUDPClient udpClient, 
+            double resendBytes, double landBytes, double windBytes, double cloudBytes, double taskBytes, double textureBytes, double assetBytes,
+            double totalBytes, double targetBytes, double maxBytes)
+        {
+            ClientInfo ci = udpClient.GetClientInfo();
+
+//                            Console.WriteLine(
+//                                "Resend={0}, Land={1}, Wind={2}, Cloud={3}, Task={4}, Texture={5}, Asset={6}, TOTAL = {7}", 
+//                                ci.resendThrottle, ci.landThrottle, ci.windThrottle, ci.cloudThrottle, ci.taskThrottle, ci.textureThrottle, ci.assetThrottle, ci.totalThrottle);
+
+            Assert.AreEqual((int)resendBytes, ci.resendThrottle, "Resend");
+            Assert.AreEqual((int)landBytes, ci.landThrottle, "Land");
+            Assert.AreEqual((int)windBytes, ci.windThrottle, "Wind");
+            Assert.AreEqual((int)cloudBytes, ci.cloudThrottle, "Cloud");
+            Assert.AreEqual((int)taskBytes, ci.taskThrottle, "Task");
+            Assert.AreEqual((int)textureBytes, ci.textureThrottle, "Texture");
+            Assert.AreEqual((int)assetBytes, ci.assetThrottle, "Asset");
+            Assert.AreEqual((int)totalBytes, ci.totalThrottle, "Total");
+            Assert.AreEqual((int)targetBytes, ci.targetThrottle, "Target");
+            Assert.AreEqual((int)maxBytes, ci.maxThrottle, "Max");
+        }
+
+        private void SetThrottles(
+            LLUDPClient udpClient, int resendBytes, int landBytes, int windBytes, int cloudBytes, int taskBytes, int textureBytes, int assetBytes)
+        {
+            byte[] throttles = new byte[28];
+
+            Array.Copy(BitConverter.GetBytes((float)resendBytes * 8), 0, throttles, 0, 4);
+            Array.Copy(BitConverter.GetBytes((float)landBytes * 8), 0, throttles, 4, 4);
+            Array.Copy(BitConverter.GetBytes((float)windBytes * 8), 0, throttles, 8, 4);
+            Array.Copy(BitConverter.GetBytes((float)cloudBytes * 8), 0, throttles, 12, 4);
+            Array.Copy(BitConverter.GetBytes((float)taskBytes * 8), 0, throttles, 16, 4);
+            Array.Copy(BitConverter.GetBytes((float)textureBytes * 8), 0, throttles, 20, 4);
+            Array.Copy(BitConverter.GetBytes((float)assetBytes * 8), 0, throttles, 24, 4);
+
+            udpClient.SetThrottles(throttles);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
index 451dee5..076551f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
@@ -58,7 +58,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         /// <summary>Flag used to enable adaptive throttles</summary>
         public bool AdaptiveThrottlesEnabled;
-        
+ 
+        /// <summary>
+        /// Set the minimum rate that the adaptive throttles can set. The viewer
+        /// can still throttle lower than this, but the adaptive throttles will
+        /// never decrease rates below this no matter how many packets are dropped
+        /// </summary>
+        public Int64 MinimumAdaptiveThrottleRate;
+ 
         /// <summary>Amount of the texture throttle to steal for the task throttle</summary>
         public double CannibalizeTextureRate;
 
@@ -75,6 +82,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 IConfig throttleConfig = config.Configs["ClientStack.LindenUDP"];
 
+                // Current default total is 66750
                 Resend = throttleConfig.GetInt("resend_default", 6625);
                 Land = throttleConfig.GetInt("land_default", 9125);
                 Wind = throttleConfig.GetInt("wind_default", 1750);
@@ -93,7 +101,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 BrustTime *= 1e-3f;
 
                 AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false);
-                
+                MinimumAdaptiveThrottleRate = throttleConfig.GetInt("adaptive_throttle_min_bps", 32000);
+
                 CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f);
                 CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9);
             }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
index 1877cf0..7a42d82 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -42,11 +42,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
     public class TokenBucket
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+<<<<<<< HEAD
+
+        public string Identifier { get; private set; }
+
+        public int DebugLevel { get; set; }
+        
+        /// <summary>
+        /// Number of ticks (ms) per quantum, drip rate and max burst
+        /// are defined over this interval.
+        /// </summary>
+        protected const Int32 m_ticksPerQuantum = 1000;
+=======
         private static Int32 m_counter = 0;
         
 //        private Int32 m_identifier;      
   
         protected const float m_timeScale = 1e-3f;
+>>>>>>> avn/ubitvar
 
         /// <summary>
         /// This is the number of m_minimumDripRate bytes 
@@ -59,7 +72,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 
         /// <summary>
         /// </summary>
+<<<<<<< HEAD
+        protected const Int32 m_minimumDripRate = LLUDPServer.MTU;
+=======
         protected const float m_minimumDripRate = 1400;
+>>>>>>> avn/ubitvar
         
         /// <summary>Time of the last drip, in system ticks</summary>
         protected Int32 m_lastDrip;
@@ -73,21 +90,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>
         /// Map of children buckets and their requested maximum burst rate
         /// </summary>
+<<<<<<< HEAD
+        protected Dictionary<TokenBucket,Int64> m_children = new Dictionary<TokenBucket,Int64>();
+=======
         protected Dictionary<TokenBucket, float> m_children = new Dictionary<TokenBucket, float>();
         
 #region Properties
+>>>>>>> avn/ubitvar
 
         /// <summary>
         /// The parent bucket of this bucket, or null if this bucket has no
         /// parent. The parent bucket will limit the aggregate bandwidth of all
         /// of its children buckets
         /// </summary>
-        protected TokenBucket m_parent;
-        public TokenBucket Parent
-        {
-            get { return m_parent; }
-            set { m_parent = value; }
-        }
+        public TokenBucket Parent { get; protected set; }
 
         /// <summary>
         /// This is the maximum number
@@ -120,11 +136,68 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
                
         /// <summary>
-        /// The speed limit of this bucket in bytes per second. This is the
-        /// number of tokens that are added to the bucket per quantum
+        /// The requested drip rate for this particular bucket.
         /// </summary>
-        /// <remarks>Tokens are added to the bucket any time 
+        /// <remarks>
+        /// 0 then TotalDripRequest is used instead.
+        /// Can never be above MaxDripRate.
+        /// Tokens are added to the bucket at any time 
         /// <seealso cref="RemoveTokens"/> is called, at the granularity of
+<<<<<<< HEAD
+        /// the system tick interval (typically around 15-22ms)
+        /// FIXME: It is extremely confusing to be able to set a RequestedDripRate of 0 and then receive a positive
+        /// number on get if TotalDripRequest is set.  This also stops us being able to retrieve the fact that
+        /// RequestedDripRate is set to 0.  Really, this should always return m_dripRate and then we can get
+        /// (m_dripRate == 0 ? TotalDripRequest : m_dripRate) on some other properties.
+        /// </remarks>
+        public virtual Int64 RequestedDripRate
+        {
+            get { return (m_dripRate == 0 ? TotalDripRequest : m_dripRate); }
+            set 
+            {
+                if (value <= 0)
+                    m_dripRate = 0;
+                else if (MaxDripRate > 0 && value > MaxDripRate)
+                    m_dripRate = MaxDripRate;
+                else
+                    m_dripRate = value;
+
+                m_burstRate = (Int64)((double)m_dripRate * m_quantumsPerBurst);
+
+                if (Parent != null)
+                    Parent.RegisterRequest(this, m_dripRate);
+            }
+        }
+
+        /// <summary>
+        /// Gets the drip rate.
+        /// </summary>
+        /// <value>
+        /// DripRate can never be above max drip rate or below min drip rate.
+        /// If we are a child bucket then the drip rate return is modifed by the total load on the capacity of the
+        /// parent bucket.
+        /// </value>
+        public virtual Int64 DripRate
+        {
+            get 
+            {
+                double rate;
+
+                // FIXME: This doesn't properly work if we have a parent and children and a requested drip rate set
+                // on ourselves which is not equal to the child drip rates.
+                if (Parent == null)
+                {
+                    if (TotalDripRequest > 0)
+                        rate = Math.Min(RequestedDripRate, TotalDripRequest);
+                    else
+                        rate = RequestedDripRate;
+                }   
+                else
+                {
+                    rate = (double)RequestedDripRate * Parent.DripRateModifier();
+                }
+
+=======
         /// the system tick interval (typically around 15-22ms)</remarks>
         protected float m_dripRate;
         public virtual float RequestedDripRate
@@ -147,17 +220,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     return rate;
 
                 rate *= m_parent.DripRateModifier();
+>>>>>>> avn/ubitvar
                 if (rate < m_minimumDripRate)
                     rate = m_minimumDripRate;
+                else if (MaxDripRate > 0 && rate > MaxDripRate)
+                    rate = MaxDripRate;
 
                 return (float)rate;
             }
         }
+        protected Int64 m_dripRate;
+
+        // <summary>
+        // The maximum rate for flow control. Drip rate can never be greater than this.
+        // </summary>
+        public Int64 MaxDripRate { get; set; }
 
         /// <summary>
-        /// The current total of the requested maximum burst rates of 
-        /// this bucket's children buckets.
+        /// The current total of the requested maximum burst rates of children buckets.
         /// </summary>
+<<<<<<< HEAD
+        public Int64 TotalDripRequest { get; protected set; }
+=======
         protected float m_totalDripRequest;
         public float TotalDripRequest 
             {
@@ -168,31 +252,44 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 #endregion Properties
 
 #region Constructor
+>>>>>>> avn/ubitvar
 
         /// <summary>
         /// Default constructor
         /// </summary>
+        /// <param name="identifier">Identifier for this token bucket</param>
         /// <param name="parent">Parent bucket if this is a child bucket, or
         /// null if this is a root bucket</param>
+<<<<<<< HEAD
+        /// <param name="requestedDripRate">
+        /// Requested rate that the bucket fills, in bytes per
+        /// second. If zero, the bucket always remains full.
+        /// </param>
+        public TokenBucket(string identifier, TokenBucket parent, Int64 requestedDripRate, Int64 maxDripRate) 
+=======
         /// <param name="maxBurst">Maximum size of the bucket in bytes, or
         /// zero if this bucket has no maximum capacity</param>
         /// <param name="dripRate">Rate that the bucket fills, in bytes per
         /// second. If zero, the bucket always remains full</param>
         public TokenBucket(TokenBucket parent, float dripRate, float MaxBurst) 
+>>>>>>> avn/ubitvar
         {
-//            m_identifier = m_counter++;
-            m_counter++;
+            Identifier = identifier;
 
             Parent = parent;
+<<<<<<< HEAD
+            RequestedDripRate = requestedDripRate;
+            MaxDripRate = maxDripRate;
+            m_lastDrip = Util.EnvironmentTickCount();
+=======
             RequestedDripRate = dripRate;
             RequestedBurst = MaxBurst;
             // TotalDripRequest = dripRate; // this will be overwritten when a child node registers
             // MaxBurst = (Int64)((double)dripRate * m_quantumsPerBurst);
             m_lastDrip = Util.EnvironmentTickCount() + 100000;
+>>>>>>> avn/ubitvar
         }
 
-#endregion Constructor
-
         /// <summary>
         /// Compute a modifier for the MaxBurst rate. This is 1.0, meaning
         /// no modification if the requested bandwidth is less than the
@@ -202,8 +299,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         protected float DripRateModifier()
         {
+<<<<<<< HEAD
+            Int64 driprate = DripRate;
+            double modifier = driprate >= TotalDripRequest ? 1.0 : (double)driprate / (double)TotalDripRequest;
+
+//            if (DebugLevel > 0)
+//                m_log.DebugFormat(
+//                    "[TOKEN BUCKET]: Returning drip modifier {0}/{1} = {2} from {3}", 
+//                    driprate, TotalDripRequest, modifier, Identifier);
+
+            return modifier;
+=======
             float driprate = DripRate;
             return driprate >= TotalDripRequest ? 1.0f : driprate / TotalDripRequest;
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -225,16 +334,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             lock (m_children)
             {
                 m_children[child] = request;
-                // m_totalDripRequest = m_children.Values.Sum();
 
+<<<<<<< HEAD
+                TotalDripRequest = 0;
+                foreach (KeyValuePair<TokenBucket, Int64> cref in m_children)
+                    TotalDripRequest += cref.Value;
+=======
                 m_totalDripRequest = 0;
                 foreach (KeyValuePair<TokenBucket, float> cref in m_children)
                     m_totalDripRequest += cref.Value;
+>>>>>>> avn/ubitvar
             }
             
             // Pass the new values up to the parent
-            if (m_parent != null)
-                m_parent.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest));
+            if (Parent != null)
+            {
+                Int64 effectiveDripRate;
+
+                if (RequestedDripRate > 0)
+                    effectiveDripRate = Math.Min(RequestedDripRate, TotalDripRequest);
+                else
+                    effectiveDripRate = TotalDripRequest;
+
+                Parent.RegisterRequest(this, effectiveDripRate);
+            }
         }
 
         /// <summary>
@@ -246,17 +369,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             lock (m_children)
             {
                 m_children.Remove(child);
-                // m_totalDripRequest = m_children.Values.Sum();
 
+<<<<<<< HEAD
+                TotalDripRequest = 0;
+                foreach (KeyValuePair<TokenBucket, Int64> cref in m_children)
+                    TotalDripRequest += cref.Value;
+=======
                 m_totalDripRequest = 0;
                 foreach (KeyValuePair<TokenBucket, float> cref in m_children)
                     m_totalDripRequest += cref.Value;
+>>>>>>> avn/ubitvar
             }
-            
 
             // Pass the new values up to the parent
-            if (m_parent != null)
-                m_parent.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest));
+            if (Parent != null)
+                Parent.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest));
         }
         
         /// <summary>
@@ -300,7 +427,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // with no drip rate...
             if (DripRate == 0)
             {
-                m_log.WarnFormat("[TOKENBUCKET] something odd is happening and drip rate is 0");
+                m_log.WarnFormat("[TOKENBUCKET] something odd is happening and drip rate is 0 for {0}", Identifier);
                 return;
             }
             
@@ -321,9 +448,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
     public class AdaptiveTokenBucket : TokenBucket
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);               
+
+        public bool AdaptiveEnabled { get; set; }
 
         /// <summary>
+<<<<<<< HEAD
+        /// Target drip rate for this bucket.
+        /// </summary>
+        /// <remarks>Usually set by the client.  If adaptive is enabled then throttles will increase until we reach this.</remarks>
+        public Int64 TargetDripRate 
+        { 
+            get { return m_targetDripRate; }
+            set 
+            {
+                m_targetDripRate = Math.Max(value, m_minimumFlow);
+=======
         /// The minimum rate for flow control. Minimum drip rate is one
         /// packet per second. 
         /// </summary>
@@ -342,25 +482,62 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             set 
             {
                 m_maxDripRate = (value == 0 ? m_totalDripRequest : Math.Max(value, m_minimumFlow));
+>>>>>>> avn/ubitvar
             }
         }
-        
-        private bool m_enabled = false;
-        
+        protected Int64 m_targetDripRate;
+
         // <summary>
-        // 
+        // Adjust drip rate in response to network conditions. 
         // </summary>
         public virtual float AdjustedDripRate
         {
             get { return m_dripRate; }
+<<<<<<< HEAD
+            set 
+            {
+                m_dripRate = OpenSim.Framework.Util.Clamp<Int64>(value, m_minimumFlow, TargetDripRate);
+                m_burstRate = (Int64)((double)m_dripRate * m_quantumsPerBurst);
+
+                if (Parent != null)
+                    Parent.RegisterRequest(this, m_dripRate);
+=======
             set {
                 m_dripRate = OpenSim.Framework.Util.Clamp<float>(value,m_minimumFlow,MaxDripRate);
 
                 if (m_parent != null)
                     m_parent.RegisterRequest(this,m_dripRate);
+>>>>>>> avn/ubitvar
             }
         }
+                
+        /// <summary>
+        /// The minimum rate for adaptive flow control. 
+        /// </summary>
+        protected Int64 m_minimumFlow = 32000;
 
+<<<<<<< HEAD
+        /// <summary>
+        /// Constructor for the AdaptiveTokenBucket class
+        /// <param name="identifier">Unique identifier for the client</param>
+        /// <param name="parent">Parent bucket in the hierarchy</param>
+        /// <param name="requestedDripRate"></param>
+        /// <param name="maxDripRate">The ceiling rate for adaptation</param>
+        /// <param name="minDripRate">The floor rate for adaptation</param>
+        /// </summary>
+        public AdaptiveTokenBucket(string identifier, TokenBucket parent, Int64 requestedDripRate, Int64 maxDripRate, Int64 minDripRate, bool enabled) 
+            : base(identifier, parent, requestedDripRate, maxDripRate)
+        {
+            AdaptiveEnabled = enabled;
+
+            if (AdaptiveEnabled)
+            {
+//                m_log.DebugFormat("[TOKENBUCKET]: Adaptive throttle enabled");
+                m_minimumFlow = minDripRate;
+                TargetDripRate = m_minimumFlow;
+                AdjustedDripRate = m_minimumFlow;
+            }
+=======
         // <summary>
         // 
         // </summary>
@@ -375,25 +552,50 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 AdjustedDripRate = m_maxDripRate * .5f;
             else
                 AdjustedDripRate = m_maxDripRate;
+>>>>>>> avn/ubitvar
         }
                 
-        // <summary>
-        // 
-        // </summary>
-        public void ExpirePackets(Int32 count)
+        /// <summary>
+        /// Reliable packets sent to the client for which we never received an ack adjust the drip rate down.
+        /// <param name="packets">Number of packets that expired without successful delivery</param>
+        /// </summary>
+        public void ExpirePackets(Int32 packets)
         {
-            // m_log.WarnFormat("[ADAPTIVEBUCKET] drop {0} by {1} expired packets",AdjustedDripRate,count);
-            if (m_enabled)
-                AdjustedDripRate = (Int64) (AdjustedDripRate / Math.Pow(2,count));
+            if (AdaptiveEnabled)
+            {
+                if (DebugLevel > 0)
+                    m_log.WarnFormat(
+                        "[ADAPTIVEBUCKET] drop {0} by {1} expired packets for {2}", 
+                        AdjustedDripRate, packets, Identifier);
+
+                // AdjustedDripRate = (Int64) (AdjustedDripRate / Math.Pow(2,packets));
+
+                // Compute the fallback solely on the rate allocated beyond the minimum, this
+                // should smooth out the fallback to the minimum rate
+                AdjustedDripRate = m_minimumFlow + (Int64) ((AdjustedDripRate - m_minimumFlow) / Math.Pow(2, packets));
+            }
         }
 
-        // <summary>
-        // 
-        // </summary>
-        public void AcknowledgePackets(Int32 count)
+        /// <summary>
+        /// Reliable packets acked by the client adjust the drip rate up.
+        /// <param name="packets">Number of packets successfully acknowledged</param>
+        /// </summary>
+        public void AcknowledgePackets(Int32 packets)
+        {
+            if (AdaptiveEnabled)
+                AdjustedDripRate = AdjustedDripRate + packets * LLUDPServer.MTU;
+        }
+
+        /// <summary>
+        /// Adjust the minimum flow level for the adaptive throttle, this will drop adjusted
+        /// throttles back to the minimum levels
+        /// <param>minDripRate--the new minimum flow</param>
+        /// </summary>
+        public void ResetMinimumAdaptiveFlow(Int64 minDripRate)
         {
-            if (m_enabled)
-                AdjustedDripRate = AdjustedDripRate + count;
+            m_minimumFlow = minDripRate;
+            TargetDripRate = m_minimumFlow;
+            AdjustedDripRate = m_minimumFlow;
         }
     }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
index 9d6c09e..b546a99 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
@@ -31,6 +31,9 @@ using System.Net;
 using System.Threading;
 using OpenMetaverse;
 
+//using System.Reflection;
+//using log4net;
+
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
     /// <summary>
@@ -60,6 +63,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
+        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>Holds the actual unacked packet data, sorted by sequence number</summary>
         private Dictionary<uint, OutgoingPacket> m_packets = new Dictionary<uint, OutgoingPacket>();
         /// <summary>Holds packets that need to be added to the unacknowledged list</summary>
@@ -164,8 +169,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
             }
 
-                //if (expiredPackets != null)
-                //   m_log.DebugFormat("[UNACKED PACKET COLLECTION]: Found {0} expired packets on timeout of {1}", expiredPackets.Count, timeoutMS);
+            // if (expiredPackets != null)
+            //     m_log.DebugFormat("[UNACKED PACKET COLLECTION]: Found {0} expired packets on timeout of {1}", expiredPackets.Count, timeoutMS);
 
             return expiredPackets;
         }
@@ -192,7 +197,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                         // As with other network applications, assume that an acknowledged packet is an
                         // indication that the network can handle a little more load, speed up the transmission
-                        ackedPacket.Client.FlowThrottle.AcknowledgePackets(ackedPacket.Buffer.DataLength);
+                        ackedPacket.Client.FlowThrottle.AcknowledgePackets(1);
 
                         // Update stats
                         Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength);
@@ -207,9 +212,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     else
                     {
-                         //m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack", pendingAcknowledgement.SequenceNumber);
+                        // m_log.WarnFormat("[UNACKED PACKET COLLECTION]: found null packet for sequence number {0} to ack",
+                        //                  pendingAcknowledgement.SequenceNumber);
                     }
                 }
+                else
+                {
+                    // m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack",
+                    //                  pendingAcknowledgement.SequenceNumber);                    
+                }
             }
 
             uint pendingRemove;
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 982646e..d58ab94 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -39,6 +39,7 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.ClientStack
 {
@@ -140,7 +141,11 @@ namespace OpenSim.Region.ClientStack
             PhysicsPluginManager physicsPluginManager;
             physicsPluginManager = new PhysicsPluginManager();
             physicsPluginManager.LoadPluginsFromAssemblies("Physics");
+<<<<<<< HEAD
+            
+=======
 
+>>>>>>> avn/ubitvar
             return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier, regionExtent);
         }
     }
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index fe60c90..345b53d 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -32,6 +32,7 @@ using System.Collections.Generic;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using PermissionMask = OpenSim.Framework.PermissionMask;
@@ -400,6 +401,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             }
 
             m_transactions.RemoveXferUploader(m_transactionID);
+
+            m_Scene.EventManager.TriggerOnNewInventoryItemUploadComplete(ourClient.AgentId, (AssetType)type, m_asset.FullID, m_asset.Name, 0);
         }
 
         /// <summary>
@@ -452,6 +455,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             m_transactions.RemoveXferUploader(m_transactionID);
         }
 
+<<<<<<< HEAD
+=======
         private void ValidateAssets()
         {
             if (m_asset.Type == (sbyte)CustomAssetType.AnimationSet)
@@ -594,5 +599,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
             return result;
         }
+>>>>>>> avn/ubitvar
     }
 }
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index d9b0eff..47dcbcd 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Reflection;
 using System.Text;
@@ -166,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
 
                 // Do Decode!
                 if (decode)
-                    Util.FireAndForget(delegate { Decode(assetID, j2kData); });
+                    Util.FireAndForget(delegate { Decode(assetID, j2kData); }, null, "J2KDecoderModule.BeginDecode");
             }
         }
 
@@ -182,6 +183,25 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
             return DoJ2KDecode(assetID, j2kData, out layers, out components);
         }
 
+        public Image DecodeToImage(byte[] j2kData)
+        {
+            if (m_useCSJ2K)
+                return J2kImage.FromBytes(j2kData);
+            else
+            {
+                ManagedImage mimage;
+                Image image;
+                if (OpenJPEG.DecodeToImage(j2kData, out mimage, out image))
+                {
+                    mimage = null;
+                    return image;
+                }
+                else
+                    return null;
+            }
+        }
+
+
         #endregion IJ2KDecoder
 
         /// <summary>
@@ -211,7 +231,11 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                 {
                     try
                     {
-                        List<int> layerStarts = CSJ2K.J2kImage.GetLayerBoundaries(new MemoryStream(j2kData));
+                        List<int> layerStarts;
+                        using (MemoryStream ms = new MemoryStream(j2kData))
+                        {
+                            layerStarts = CSJ2K.J2kImage.GetLayerBoundaries(ms);
+                        }
 
                         if (layerStarts != null && layerStarts.Count > 0)
                         {
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index 9b0e1f4..ebec9d2 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -316,9 +316,12 @@ namespace OpenSim.Region.CoreModules.Asset
         /// </summary>
         public void Close()
         {
-            m_enabled = false;
-            m_cache.Clear();
-            m_cache = null;
+            if (m_enabled)
+            {
+                m_enabled = false;
+                m_cache.Clear();
+                m_cache = null;
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 5468cdc..c4abc99 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -43,13 +43,14 @@ using Mono.Addins;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 
 
 //[assembly: Addin("FlotsamAssetCache", "1.1")]
-//[assembly: AddinDependency("OpenSim", "0.5")]
+//[assembly: AddinDependency("OpenSim", "0.8.1")]
 
 namespace OpenSim.Region.CoreModules.Asset
 {
@@ -255,20 +256,7 @@ namespace OpenSim.Region.CoreModules.Asset
                 // If the file is already cached, don't cache it, just touch it so access time is updated
                 if (File.Exists(filename))
                 {
-                    // We don't really want to know about sharing
-                    // violations here. If the file is locked, then
-                    // the other thread has updated the time for us.
-                    try
-                    {
-                        lock (m_CurrentlyWriting)
-                        {
-                            if (!m_CurrentlyWriting.Contains(filename))
-                                File.SetLastAccessTime(filename, DateTime.Now);
-                        }
-                    }
-                    catch
-                    {
-                    }
+                    UpdateFileLastAccessTime(filename);
                 } 
                 else 
                 {
@@ -301,7 +289,7 @@ namespace OpenSim.Region.CoreModules.Asset
                     }
 
                     Util.FireAndForget(
-                        delegate { WriteFileCache(filename, asset); });
+                        delegate { WriteFileCache(filename, asset); }, null, "FlotsamAssetCache.UpdateFileCache");
                 }
             }
             catch (Exception e)
@@ -328,6 +316,24 @@ namespace OpenSim.Region.CoreModules.Asset
         }
 
         /// <summary>
+        /// Updates the cached file with the current time.
+        /// </summary>
+        /// <param name="filename">Filename.</param>
+        /// <returns><c>true</c>, if the update was successful, false otherwise.</returns>
+        private bool UpdateFileLastAccessTime(string filename)
+        {
+            try
+            {
+                File.SetLastAccessTime(filename, DateTime.Now);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
         /// Try to get an asset from the in-memory cache.
         /// </summary>
         /// <param name="id"></param>
@@ -775,43 +781,49 @@ namespace OpenSim.Region.CoreModules.Asset
         {
             UuidGatherer gatherer = new UuidGatherer(m_AssetService);
 
-            HashSet<UUID> uniqueUuids = new HashSet<UUID>();
-            Dictionary<UUID, sbyte> assets = new Dictionary<UUID, sbyte>();
+            Dictionary<UUID, bool> assetsFound = new Dictionary<UUID, bool>();
 
             foreach (Scene s in m_Scenes)
             {
                 StampRegionStatusFile(s.RegionInfo.RegionID);
 
                 s.ForEachSOG(delegate(SceneObjectGroup e)
-                {                   
-                    gatherer.GatherAssetUuids(e, assets);
+                {            
+                    gatherer.AddForInspection(e);
+                    gatherer.GatherAll();
 
-                    foreach (UUID assetID in assets.Keys)
+                    foreach (UUID assetID in gatherer.GatheredUuids.Keys)
                     {
-                        uniqueUuids.Add(assetID);
-
-                        string filename = GetFileName(assetID.ToString());
-
-                        if (File.Exists(filename))
+                        if (!assetsFound.ContainsKey(assetID))
                         {
-                            File.SetLastAccessTime(filename, DateTime.Now);
+                            string filename = GetFileName(assetID.ToString());
+
+                            if (File.Exists(filename))
+                            {
+                                UpdateFileLastAccessTime(filename);
+                            }
+                            else if (storeUncached)
+                            {
+                                AssetBase cachedAsset = m_AssetService.Get(assetID.ToString());
+                                if (cachedAsset == null && gatherer.GatheredUuids[assetID] != (sbyte)AssetType.Unknown)
+                                    assetsFound[assetID] = false;
+                                else
+                                    assetsFound[assetID] = true;
+                            }
                         }
-                        else if (storeUncached)
+                        else if (!assetsFound[assetID])
                         {
-                            AssetBase cachedAsset = m_AssetService.Get(assetID.ToString());
-                            if (cachedAsset == null && assets[assetID] != (sbyte)AssetType.Unknown)
-                                m_log.DebugFormat(
+                            m_log.DebugFormat(
                                 "[FLOTSAM ASSET CACHE]: Could not find asset {0}, type {1} referenced by object {2} at {3} in scene {4} when pre-caching all scene assets",
-                                    assetID, assets[assetID], e.Name, e.AbsolutePosition, s.Name);
+                                assetID, gatherer.GatheredUuids[assetID], e.Name, e.AbsolutePosition, s.Name);
                         }
                     }
 
-                    assets.Clear();
+                    gatherer.GatheredUuids.Clear();
                 });
             }
 
-
-            return uniqueUuids.Count;
+            return assetsFound.Count;
         }
 
         /// <summary>
@@ -968,10 +980,11 @@ namespace OpenSim.Region.CoreModules.Asset
                     case "assets":
                         con.Output("Ensuring assets are cached for all scenes.");
 
-                        Util.FireAndForget(delegate {
+                        WorkManager.RunInThread(delegate 
+                        {
                             int assetReferenceTotal = TouchAllSceneAssets(true);
                             con.OutputFormat("Completed check with {0} assets.", assetReferenceTotal);
-                        });
+                        }, null, "TouchAllSceneAssets");
 
                         break;
 
@@ -1043,6 +1056,18 @@ namespace OpenSim.Region.CoreModules.Asset
             return true;
         }
 
+        public bool[] AssetsExist(string[] ids)
+        {
+            bool[] exist = new bool[ids.Length];
+            
+            for (int i = 0; i < ids.Length; i++)
+            {
+                exist[i] = Check(ids[i]);
+            }
+            
+            return exist;
+        }
+
         public string Store(AssetBase asset)
         {
             if (asset.FullID == UUID.Zero)
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
index fd02b08..73e4431 100644
--- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
+++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
@@ -39,7 +39,6 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Asset.Tests
 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 3ae0dea..b24dc0c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             {
                 DebugLevel = debugLevel;
                 MainConsole.Instance.OutputFormat(
-                    "Set event queue debug level to {0} in {1}", DebugLevel, m_scene.Name);
+                    "Set attachments debug level to {0} in {1}", DebugLevel, m_scene.Name);
             }
         }
 
@@ -246,8 +246,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         string state = sog.GetStateSnapshot();
                         ad.AttachmentObjectStates.Add(state);
                         sp.InTransitScriptStates.Add(state);
-                        // Let's remove the scripts of the original object here
-                        sog.RemoveScriptInstances(true);
+
+                        // Scripts of the originals will be removed when the Agent is successfully removed.
+                        // sog.RemoveScriptInstances(true);
                     }
                 }
             }
@@ -255,6 +256,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         public void CopyAttachments(AgentData ad, IScenePresence sp)
         {
+//            m_log.DebugFormat("[ATTACHMENTS MODULE]: Copying attachment data into {0} in {1}", sp.Name, m_scene.Name);
+
             if (ad.AttachmentObjects != null && ad.AttachmentObjects.Count > 0)
             {
                 lock (sp.AttachmentsSyncLock)
@@ -265,6 +268,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 {
                     ((SceneObjectGroup)so).LocalId = 0;
                     ((SceneObjectGroup)so).RootPart.ClearUpdateSchedule();
+
+//                    m_log.DebugFormat(
+//                        "[ATTACHMENTS MODULE]: Copying script state with {0} bytes for object {1} for {2} in {3}", 
+//                        ad.AttachmentObjectStates[i].Length, so.Name, sp.Name, m_scene.Name);
+
                     so.SetState(ad.AttachmentObjectStates[i++], m_scene);
                     m_scene.IncomingCreateObject(Vector3.Zero, so);
                 }
@@ -331,6 +339,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
 
             List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
+
+            // Let's get all items at once, so they get cached
+            UUID[] items = new UUID[attachments.Count];
+            int i = 0;
+            foreach (AvatarAttachment attach in attachments)
+                items[i++] = attach.ItemID;
+            m_scene.InventoryService.GetMultipleItems(sp.UUID, items);
+
             foreach (AvatarAttachment attach in attachments)
             {
                 uint attachmentPt = (uint)attach.AttachPoint;
@@ -378,17 +394,37 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             if (!Enabled)
                 return;
 
-            if (DebugLevel > 0)
-                m_log.DebugFormat("[ATTACHMENTS MODULE]: Saving changed attachments for {0}", sp.Name);
-
             List<SceneObjectGroup> attachments = sp.GetAttachments();
 
+            if (DebugLevel > 0)
+                m_log.DebugFormat(
+                    "[ATTACHMENTS MODULE]: Saving for {0} attachments for {1} in {2}",
+                    attachments.Count, sp.Name, m_scene.Name);
+
             if (attachments.Count <= 0)
                 return;
 
             Dictionary<SceneObjectGroup, string> scriptStates = new Dictionary<SceneObjectGroup, string>();
 
+<<<<<<< HEAD
+            foreach (SceneObjectGroup so in attachments)
+            {
+                // Scripts MUST be snapshotted before the object is
+                // removed from the scene because doing otherwise will
+                // clobber the run flag
+                // This must be done outside the sp.AttachmentSyncLock so that there is no risk of a deadlock from
+                // scripts performing attachment operations at the same time.  Getting object states stops the scripts.
+                scriptStates[so] = PrepareScriptInstanceForSave(so, false);
+
+//                m_log.DebugFormat(
+//                    "[ATTACHMENTS MODULE]: For object {0} for {1} in {2} got saved state {3}", 
+//                    so.Name, sp.Name, m_scene.Name, scriptStates[so]);
+            }
+
+            lock (sp.AttachmentsSyncLock)
+=======
             if (sp.PresenceType != PresenceType.Npc)
+>>>>>>> avn/ubitvar
             {
                 foreach (SceneObjectGroup so in attachments)
                 {
@@ -441,7 +477,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             if (!Enabled)
                 return false;
 
+<<<<<<< HEAD
+            group.DetachFromBackup();
+
+            bool success = AttachObjectInternal(sp, group, attachmentPt, silent, addToInventory, false, append);
+
+            if (!success)
+                group.AttachToBackup();
+
+            return success;
+=======
             return AttachObjectInternal(sp, group, attachmentPt, silent, useAttachData, addToInventory, false, append);
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -864,15 +911,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         (sbyte)AssetType.Object,
                         Utils.StringToBytes(sceneObjectXml),
                         sp.UUID);
-                    m_scene.AssetService.Store(asset);
 
-                    item.AssetID = asset.FullID;
-                    item.Description = asset.Description;
-                    item.Name = asset.Name;
-                    item.AssetType = asset.Type;
-                    item.InvType = (int)InventoryType.Object;
-
-                    m_scene.InventoryService.UpdateItem(item);
+                    if (m_invAccessModule != null)
+                        m_invAccessModule.UpdateInventoryItemAsset(sp.UUID, item, asset);
 
                     // If the name of the object has been changed whilst attached then we want to update the inventory
                     // item in the viewer.
@@ -907,10 +948,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         {
             if (DebugLevel > 0)
                 m_log.DebugFormat(
-                    "[ATTACHMENTS MODULE]: Adding attachment {0} to avatar {1} in pt {2} pos {3} {4}",
-                    so.Name, sp.Name, attachmentpoint, attachOffset, so.RootPart.AttachedPos);
-
-            so.DetachFromBackup();
+                    "[ATTACHMENTS MODULE]: Adding attachment {0} to avatar {1} at pt {2} pos {3} {4} in {5}",
+                    so.Name, sp.Name, attachmentpoint, attachOffset, so.RootPart.AttachedPos, m_scene.Name);
 
             // Remove from database and parcel prim count
             m_scene.DeleteFromStorage(so.UUID);
@@ -986,7 +1025,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             InventoryItemBase newItem
                 = m_invAccessModule.CopyToInventory(
                     DeRezAction.TakeCopy,
-                    m_scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object).ID,
+                    m_scene.InventoryService.GetFolderForType(sp.UUID, FolderType.Object).ID,
                     new List<SceneObjectGroup> { grp },
                     sp.ControllingClient, true)[0];
 
@@ -1015,8 +1054,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         private string PrepareScriptInstanceForSave(SceneObjectGroup grp, bool fireDetachEvent)
         {
             if (fireDetachEvent)
+            {
                 m_scene.EventManager.TriggerOnAttach(grp.LocalId, grp.FromItemID, UUID.Zero);
 
+                // Allow detach event time to do some work before stopping the script
+                Thread.Sleep(2);
+            }
+
             using (StringWriter sw = new StringWriter())
             {
                 using (XmlTextWriter writer = new XmlTextWriter(sw))
@@ -1090,6 +1134,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 return null;
             }
+            else if (itemID == UUID.Zero)
+            {
+                // We need to have a FromItemID for multiple attachments on a single attach point to appear.  This is 
+                // true on Singularity 1.8.5 and quite possibly other viewers as well.  As NPCs don't have an inventory
+                // we will satisfy this requirement by inserting a random UUID.
+                objatt.FromItemID = UUID.Random();
+            }
 
             if (DebugLevel > 0)
                 m_log.DebugFormat(
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index f023e77..b632774 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -53,7 +53,6 @@ using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.XEngine;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 {
@@ -199,6 +198,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             string attName = "att";
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, sp.UUID);
+            Assert.That(so.Backup, Is.True);
 
             m_numberOfAttachEventsFired = 0;
             scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false, false);
@@ -213,6 +213,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(attSo.IsAttachment);
             Assert.That(attSo.UsesPhysics, Is.False);
             Assert.That(attSo.IsTemporary, Is.False);
+            Assert.That(attSo.Backup, Is.False);
 
             // Check item status
             Assert.That(
@@ -223,7 +224,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(attachmentItem, Is.Not.Null);
             Assert.That(attachmentItem.Name, Is.EqualTo(attName));
 
-            InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object);
+            InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, FolderType.Object);
             Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID));
 
             Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
@@ -270,7 +271,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
                 Assert.That(attachmentItem, Is.Not.Null);
                 Assert.That(attachmentItem.Name, Is.EqualTo(so.Name));
 
-                InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object);
+                InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, FolderType.Object);
                 Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID));
 
                 Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(2));
@@ -303,7 +304,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
                 Assert.That(attachmentItem, Is.Not.Null);
                 Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name));
 
-                InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object);
+                InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, FolderType.Object);
                 Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID));
 
                 Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
@@ -336,7 +337,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
                 Assert.That(attachmentItem, Is.Not.Null);
                 Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name));
 
-                InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object);
+                InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, FolderType.Object);
                 Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID));
 
                 Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
@@ -385,7 +386,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
         public void TestRezAttachmentFromInventory()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
 
             Scene scene = CreateTestScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
@@ -407,6 +408,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
                 Assert.That(attSo.IsAttachment);
                 Assert.That(attSo.UsesPhysics, Is.False);
                 Assert.That(attSo.IsTemporary, Is.False);
+                Assert.IsFalse(attSo.Backup);
 
                 // Check appearance status
                 Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1));
@@ -544,7 +546,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10);
             TaskInventoryItem scriptItem
                 = TaskInventoryHelpers.AddScript(
-                    scene,
+                    scene.AssetService,
                     so.RootPart,
                     "scriptItem",
                     "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }");
@@ -601,7 +603,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(scene.InventoryService.GetItem(new InventoryItemBase(attItem.ID)), Is.Null);
 
             // Check object in scene
-            Assert.That(scene.GetSceneObjectGroup("att"), Is.Not.Null);
+            SceneObjectGroup soInScene = scene.GetSceneObjectGroup("att");
+            Assert.That(soInScene, Is.Not.Null);
+            Assert.IsTrue(soInScene.Backup);
 
             // Check events
             Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(1));
@@ -655,7 +659,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10);
             TaskInventoryItem scriptTaskItem
                 = TaskInventoryHelpers.AddScript(
-                    scene,
+                    scene.AssetService,
                     so.RootPart,
                     "scriptItem",
                     "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }");
@@ -755,6 +759,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(attSo.IsAttachment);
             Assert.That(attSo.UsesPhysics, Is.False);
             Assert.That(attSo.IsTemporary, Is.False);
+            Assert.IsFalse(attSo.Backup);
 
             // Check appearance status
             List<AvatarAttachment> retreivedAttachments = presence.Appearance.GetAttachments();
@@ -884,6 +889,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             SceneObjectGroup actualSceneBAtt = actualSceneBAttachments[0];
             Assert.That(actualSceneBAtt.Name, Is.EqualTo(attItem.Name));
             Assert.That(actualSceneBAtt.AttachmentPoint, Is.EqualTo((uint)AttachmentPoint.Chest));
+            Assert.IsFalse(actualSceneBAtt.Backup);
 
             Assert.That(sceneB.GetSceneObjectGroups().Count, Is.EqualTo(1));
 
@@ -994,6 +1000,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             SceneObjectGroup actualSceneBAtt = actualSceneBAttachments[0];
             Assert.That(actualSceneBAtt.Name, Is.EqualTo(attItem.Name));
             Assert.That(actualSceneBAtt.AttachmentPoint, Is.EqualTo((uint)AttachmentPoint.Chest));
+            Assert.IsFalse(actualSceneBAtt.Backup);
 
             Assert.That(sceneB.GetSceneObjectGroups().Count, Is.EqualTo(1));
 
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 22f0366..1e9cfba 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         private void SendAppearance(ScenePresence sp)
         {
             // Send the appearance to everyone in the scene
-            sp.SendAppearanceToAllOtherAgents();
+            sp.SendAppearanceToAllOtherClients();
 
             // Send animations back to the avatar as well
             sp.Animator.SendAnimPack();
@@ -529,6 +529,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                                 );
                     }
                 }
+<<<<<<< HEAD
+                    
+//                m_log.DebugFormat(
+//                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
+//                    face.TextureID, idx, client.Name, client.AgentId);
+=======
 */
                 bool wearableCacheValid = false;
                 if (wearableCache == null)
@@ -571,9 +577,15 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     if (wearableCacheValid)
                         m_log.Debug("[ValidateBakedCache] have valid local cache");
                 }
+>>>>>>> avn/ubitvar
 
                 bool checkExternal = false;
 
+<<<<<<< HEAD
+                if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
+                    return false;
+            }
+=======
                 if (!wearableCacheValid)
                 {
                     // only use external bake module on login condition check                  
@@ -646,6 +658,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                         }
                     }
                 }
+>>>>>>> avn/ubitvar
 
                 sp.Appearance.WearableCacheItems = wearableCache;
 
@@ -672,7 +685,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 return 0;
 
             int texturesRebaked = 0;
-            IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
+//            IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
 
             for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
             {
@@ -688,36 +701,21 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                 if (missingTexturesOnly)
                 {
-                    if (cache != null)
+                    if (m_scene.AssetService.Get(face.TextureID.ToString()) != null)
                     {
-                        if (cache.Check(face.TextureID.ToString()))
-                            continue;
-                        else
-                        {
-                            m_log.DebugFormat(
-                                "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
-                                face.TextureID, idx, sp.Name);
-                        }
+                        continue;
                     }
                     else
                     {
-                        if (m_scene.AssetService.Get(face.TextureID.ToString()) != null)
-                        {
-                            continue;
-                        }
-
-                        else
-                        {
-                            // On inter-simulator teleports, this occurs if baked textures are not being stored by the
-                            // grid asset service (which means that they are not available to the new region and so have
-                            // to be re-requested from the client).
-                            //
-                            // The only available core OpenSimulator behaviour right now
-                            // is not to store these textures, temporarily or otherwise.
-                            m_log.DebugFormat(
-                                "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
-                                face.TextureID, idx, sp.Name);
-                        }
+                        // On inter-simulator teleports, this occurs if baked textures are not being stored by the
+                        // grid asset service (which means that they are not available to the new region and so have
+                        // to be re-requested from the client).
+                        //
+                        // The only available core OpenSimulator behaviour right now
+                        // is not to store these textures, temporarily or otherwise.
+                        m_log.DebugFormat(
+                            "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
+                            face.TextureID, idx, sp.Name);
                     }
                 }
                 else
@@ -786,7 +784,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                     if (sendTime < now)
                     {
-                        Util.FireAndForget(o => SendAppearance(avatarID));
+                        Util.FireAndForget(o => SendAppearance(avatarID), null, "AvatarFactoryModule.SendAppearance");
                         m_sendqueue.Remove(avatarID);
                     }
                 }
@@ -804,7 +802,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                     if (sendTime < now)
                     {
-                        Util.FireAndForget(o => SaveAppearance(avatarID));
+                        Util.FireAndForget(o => SaveAppearance(avatarID), null, "AvatarFactoryModule.SaveAppearance");
                         m_savequeue.Remove(avatarID);
                     }
                 }
@@ -856,187 +854,238 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             m_scene.EventManager.TriggerAvatarAppearanceChanged(sp);
         }
 
+        /// <summary>
+        /// For a given set of appearance items, check whether the items are valid and add their asset IDs to 
+        /// appearance data.
+        /// </summary>
+        /// <param name='userID'></param>
+        /// <param name='appearance'></param>
         private void SetAppearanceAssets(UUID userID, AvatarAppearance appearance)
         {
             IInventoryService invService = m_scene.InventoryService;
-            bool resetwearable = false;
+
             if (invService.GetRootFolder(userID) != null)
             {
                 for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
                 {
                     for (int j = 0; j < appearance.Wearables[i].Count; j++)
                     {
-                        // Check if the default wearables are not set
                         if (appearance.Wearables[i][j].ItemID == UUID.Zero)
                         {
-                            switch ((WearableType) i)
-                            {
-                                case WearableType.Eyes:
-                                case WearableType.Hair:
-                                case WearableType.Shape:
-                                case WearableType.Skin:
-                                //case WearableType.Underpants:
-                                    TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
-                                    resetwearable = true;
-                                    m_log.Warn("[AVFACTORY]: UUID.Zero Wearables, passing fake values.");
-                                    resetwearable = true;
-                                    break;
+                            m_log.WarnFormat(
+                                "[AVFACTORY]: Wearable item {0}:{1} for user {2} unexpectedly UUID.Zero.  Ignoring.", 
+                                i, j, userID);
 
-                            }
                             continue;
                         }
 
-                        // Ignore ruth's assets except for the body parts! missing body parts fail avatar appearance on V1
+                        // Ignore ruth's assets
                         if (appearance.Wearables[i][j].ItemID == AvatarWearable.DefaultWearables[i][0].ItemID)
-                        {
-                            switch ((WearableType)i)
-                            {
-                                case WearableType.Eyes:
-                                case WearableType.Hair:
-                                case WearableType.Shape:
-                                case WearableType.Skin:
-                                //case WearableType.Underpants:
-                                    TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
-                            
-                                    m_log.WarnFormat("[AVFACTORY]: {0} Default Wearables, passing existing values.", (WearableType)i);
-                                    resetwearable = true;
-                                    break;
-
-                            }
                             continue;
-                        }
-                        
+
                         InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i][j].ItemID, userID);
                         baseItem = invService.GetItem(baseItem);
 
                         if (baseItem != null)
                         {
                             appearance.Wearables[i].Add(appearance.Wearables[i][j].ItemID, baseItem.AssetID);
-                            int unmodifiedWearableIndexForClosure = i;
-                            m_scene.AssetService.Get(baseItem.AssetID.ToString(), this,
-                                                                      delegate(string x, object y, AssetBase z)
-                                                                      {
-                                                                          if (z == null)
-                                                                          {
-                                                                              TryAndRepairBrokenWearable(
-                                                                                  (WearableType)unmodifiedWearableIndexForClosure, invService,
-                                                                                  userID, appearance);
-                                                                          }
-                                                                      });
                         }
                         else
                         {
-                            m_log.ErrorFormat(
+                            m_log.WarnFormat(
                                 "[AVFACTORY]: Can't find inventory item {0} for {1}, setting to default",
                                 appearance.Wearables[i][j].ItemID, (WearableType)i);
 
-                            TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
-                            resetwearable = true;
-                            
+                            appearance.Wearables[i].RemoveItem(appearance.Wearables[i][j].ItemID);
                         }
                     }
                 }
-
-                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
-                if (appearance.Wearables[(int) WearableType.Eyes] == null)
-                {
-                    m_log.WarnFormat("[AVFACTORY]: {0} Eyes are Null, passing existing values.", (WearableType.Eyes));
-                    
-                    TryAndRepairBrokenWearable(WearableType.Eyes, invService, userID, appearance);
-                    resetwearable = true;
-                }
-                else
-                {
-                    if (appearance.Wearables[(int) WearableType.Eyes][0].ItemID == UUID.Zero)
-                    {
-                        m_log.WarnFormat("[AVFACTORY]: Eyes are UUID.Zero are broken, {0} {1}",
-                                         appearance.Wearables[(int) WearableType.Eyes][0].ItemID,
-                                         appearance.Wearables[(int) WearableType.Eyes][0].AssetID);
-                        TryAndRepairBrokenWearable(WearableType.Eyes, invService, userID, appearance);
-                        resetwearable = true;
-
-                    }
-
-                }
-                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
-                if (appearance.Wearables[(int)WearableType.Shape] == null)
-                {
-                    m_log.WarnFormat("[AVFACTORY]: {0} shape is Null, passing existing values.", (WearableType.Shape));
-
-                    TryAndRepairBrokenWearable(WearableType.Shape, invService, userID, appearance);
-                    resetwearable = true;
-                }
-                else
-                {
-                    if (appearance.Wearables[(int)WearableType.Shape][0].ItemID == UUID.Zero)
-                    {
-                        m_log.WarnFormat("[AVFACTORY]: Shape is UUID.Zero and broken, {0} {1}",
-                                         appearance.Wearables[(int)WearableType.Shape][0].ItemID,
-                                         appearance.Wearables[(int)WearableType.Shape][0].AssetID);
-                        TryAndRepairBrokenWearable(WearableType.Shape, invService, userID, appearance);
-                        resetwearable = true;
-
-                    }
-
-                }
-                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
-                if (appearance.Wearables[(int)WearableType.Hair] == null)
-                {
-                    m_log.WarnFormat("[AVFACTORY]: {0} Hair is Null, passing existing values.", (WearableType.Hair));
-
-                    TryAndRepairBrokenWearable(WearableType.Hair, invService, userID, appearance);
-                    resetwearable = true;
-                }
-                else
-                {
-                    if (appearance.Wearables[(int)WearableType.Hair][0].ItemID == UUID.Zero)
-                    {
-                        m_log.WarnFormat("[AVFACTORY]: Hair is UUID.Zero and broken, {0} {1}",
-                                         appearance.Wearables[(int)WearableType.Hair][0].ItemID,
-                                         appearance.Wearables[(int)WearableType.Hair][0].AssetID);
-                        TryAndRepairBrokenWearable(WearableType.Hair, invService, userID, appearance);
-                        resetwearable = true;
-
-                    }
-
-                }
-                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
-                if (appearance.Wearables[(int)WearableType.Skin] == null)
-                {
-                    m_log.WarnFormat("[AVFACTORY]: {0} Skin is Null, passing existing values.", (WearableType.Skin));
-
-                    TryAndRepairBrokenWearable(WearableType.Skin, invService, userID, appearance);
-                    resetwearable = true;
-                }
-                else
-                {
-                    if (appearance.Wearables[(int)WearableType.Skin][0].ItemID == UUID.Zero)
-                    {
-                        m_log.WarnFormat("[AVFACTORY]: Skin is UUID.Zero and broken, {0} {1}",
-                                         appearance.Wearables[(int)WearableType.Skin][0].ItemID,
-                                         appearance.Wearables[(int)WearableType.Skin][0].AssetID);
-                        TryAndRepairBrokenWearable(WearableType.Skin, invService, userID, appearance);
-                        resetwearable = true;
-
-                    }
-
-                }
-                if (resetwearable)
-                {
-                    ScenePresence presence = null;
-                    if (m_scene.TryGetScenePresence(userID, out presence))
-                    {
-                        presence.ControllingClient.SendWearables(presence.Appearance.Wearables,
-                                                                 presence.Appearance.Serial++);
-                    }
-                }
-
             }
             else
             {
                 m_log.WarnFormat("[AVFACTORY]: user {0} has no inventory, appearance isn't going to work", userID);
             }
+
+//            IInventoryService invService = m_scene.InventoryService;
+//            bool resetwearable = false;
+//            if (invService.GetRootFolder(userID) != null)
+//            {
+//                for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
+//                {
+//                    for (int j = 0; j < appearance.Wearables[i].Count; j++)
+//                    {
+//                        // Check if the default wearables are not set
+//                        if (appearance.Wearables[i][j].ItemID == UUID.Zero)
+//                        {
+//                            switch ((WearableType) i)
+//                            {
+//                                case WearableType.Eyes:
+//                                case WearableType.Hair:
+//                                case WearableType.Shape:
+//                                case WearableType.Skin:
+//                                //case WearableType.Underpants:
+//                                    TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
+//                                    resetwearable = true;
+//                                    m_log.Warn("[AVFACTORY]: UUID.Zero Wearables, passing fake values.");
+//                                    resetwearable = true;
+//                                    break;
+//
+//                            }
+//                            continue;
+//                        }
+//
+//                        // Ignore ruth's assets except for the body parts! missing body parts fail avatar appearance on V1
+//                        if (appearance.Wearables[i][j].ItemID == AvatarWearable.DefaultWearables[i][0].ItemID)
+//                        {
+//                            switch ((WearableType)i)
+//                            {
+//                                case WearableType.Eyes:
+//                                case WearableType.Hair:
+//                                case WearableType.Shape:
+//                                case WearableType.Skin:
+//                                //case WearableType.Underpants:
+//                                    TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
+//                            
+//                                    m_log.WarnFormat("[AVFACTORY]: {0} Default Wearables, passing existing values.", (WearableType)i);
+//                                    resetwearable = true;
+//                                    break;
+//
+//                            }
+//                            continue;
+//                        }
+//                        
+//                        InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i][j].ItemID, userID);
+//                        baseItem = invService.GetItem(baseItem);
+//
+//                        if (baseItem != null)
+//                        {
+//                            appearance.Wearables[i].Add(appearance.Wearables[i][j].ItemID, baseItem.AssetID);
+//                            int unmodifiedWearableIndexForClosure = i;
+//                            m_scene.AssetService.Get(baseItem.AssetID.ToString(), this,
+//                                                                      delegate(string x, object y, AssetBase z)
+//                                                                      {
+//                                                                          if (z == null)
+//                                                                          {
+//                                                                              TryAndRepairBrokenWearable(
+//                                                                                  (WearableType)unmodifiedWearableIndexForClosure, invService,
+//                                                                                  userID, appearance);
+//                                                                          }
+//                                                                      });
+//                        }
+//                        else
+//                        {
+//                            m_log.ErrorFormat(
+//                                "[AVFACTORY]: Can't find inventory item {0} for {1}, setting to default",
+//                                appearance.Wearables[i][j].ItemID, (WearableType)i);
+//
+//                            TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
+//                            resetwearable = true;
+//                            
+//                        }
+//                    }
+//                }
+//
+//                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+//                if (appearance.Wearables[(int) WearableType.Eyes] == null)
+//                {
+//                    m_log.WarnFormat("[AVFACTORY]: {0} Eyes are Null, passing existing values.", (WearableType.Eyes));
+//                    
+//                    TryAndRepairBrokenWearable(WearableType.Eyes, invService, userID, appearance);
+//                    resetwearable = true;
+//                }
+//                else
+//                {
+//                    if (appearance.Wearables[(int) WearableType.Eyes][0].ItemID == UUID.Zero)
+//                    {
+//                        m_log.WarnFormat("[AVFACTORY]: Eyes are UUID.Zero are broken, {0} {1}",
+//                                         appearance.Wearables[(int) WearableType.Eyes][0].ItemID,
+//                                         appearance.Wearables[(int) WearableType.Eyes][0].AssetID);
+//                        TryAndRepairBrokenWearable(WearableType.Eyes, invService, userID, appearance);
+//                        resetwearable = true;
+//
+//                    }
+//
+//                }
+//                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+//                if (appearance.Wearables[(int)WearableType.Shape] == null)
+//                {
+//                    m_log.WarnFormat("[AVFACTORY]: {0} shape is Null, passing existing values.", (WearableType.Shape));
+//
+//                    TryAndRepairBrokenWearable(WearableType.Shape, invService, userID, appearance);
+//                    resetwearable = true;
+//                }
+//                else
+//                {
+//                    if (appearance.Wearables[(int)WearableType.Shape][0].ItemID == UUID.Zero)
+//                    {
+//                        m_log.WarnFormat("[AVFACTORY]: Shape is UUID.Zero and broken, {0} {1}",
+//                                         appearance.Wearables[(int)WearableType.Shape][0].ItemID,
+//                                         appearance.Wearables[(int)WearableType.Shape][0].AssetID);
+//                        TryAndRepairBrokenWearable(WearableType.Shape, invService, userID, appearance);
+//                        resetwearable = true;
+//
+//                    }
+//
+//                }
+//                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+//                if (appearance.Wearables[(int)WearableType.Hair] == null)
+//                {
+//                    m_log.WarnFormat("[AVFACTORY]: {0} Hair is Null, passing existing values.", (WearableType.Hair));
+//
+//                    TryAndRepairBrokenWearable(WearableType.Hair, invService, userID, appearance);
+//                    resetwearable = true;
+//                }
+//                else
+//                {
+//                    if (appearance.Wearables[(int)WearableType.Hair][0].ItemID == UUID.Zero)
+//                    {
+//                        m_log.WarnFormat("[AVFACTORY]: Hair is UUID.Zero and broken, {0} {1}",
+//                                         appearance.Wearables[(int)WearableType.Hair][0].ItemID,
+//                                         appearance.Wearables[(int)WearableType.Hair][0].AssetID);
+//                        TryAndRepairBrokenWearable(WearableType.Hair, invService, userID, appearance);
+//                        resetwearable = true;
+//
+//                    }
+//
+//                }
+//                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+//                if (appearance.Wearables[(int)WearableType.Skin] == null)
+//                {
+//                    m_log.WarnFormat("[AVFACTORY]: {0} Skin is Null, passing existing values.", (WearableType.Skin));
+//
+//                    TryAndRepairBrokenWearable(WearableType.Skin, invService, userID, appearance);
+//                    resetwearable = true;
+//                }
+//                else
+//                {
+//                    if (appearance.Wearables[(int)WearableType.Skin][0].ItemID == UUID.Zero)
+//                    {
+//                        m_log.WarnFormat("[AVFACTORY]: Skin is UUID.Zero and broken, {0} {1}",
+//                                         appearance.Wearables[(int)WearableType.Skin][0].ItemID,
+//                                         appearance.Wearables[(int)WearableType.Skin][0].AssetID);
+//                        TryAndRepairBrokenWearable(WearableType.Skin, invService, userID, appearance);
+//                        resetwearable = true;
+//
+//                    }
+//
+//                }
+//                if (resetwearable)
+//                {
+//                    ScenePresence presence = null;
+//                    if (m_scene.TryGetScenePresence(userID, out presence))
+//                    {
+//                        presence.ControllingClient.SendWearables(presence.Appearance.Wearables,
+//                                                                 presence.Appearance.Serial++);
+//                    }
+//                }
+//
+//            }
+//            else
+//            {
+//                m_log.WarnFormat("[AVFACTORY]: user {0} has no inventory, appearance isn't going to work", userID);
+//            }
         }
+
         private void TryAndRepairBrokenWearable(WearableType type, IInventoryService invService, UUID userID,AvatarAppearance appearance)
         {
             UUID defaultwearable = GetDefaultItem(type);
@@ -1050,8 +1099,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                                                      AssetType
                                                          =
                                                          (int)
-                                                         AssetType
-                                                             .Bodypart,
+                                                         FolderType
+                                                             .BodyPart,
                                                      CreatorId
                                                          =
                                                          userID
@@ -1066,8 +1115,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                                                          invService
                                                          .GetFolderForType
                                                          (userID,
-                                                          AssetType
-                                                              .Bodypart)
+                                                          FolderType
+                                                              .BodyPart)
                                                          .ID,
                                                      Flags = (uint) type,
                                                      Name = Enum.GetName(typeof (WearableType), type),
@@ -1102,8 +1151,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                                        invService
                                        .GetFolderForType
                                        (userID,
-                                        AssetType
-                                            .CurrentOutfitFolder)
+                                        FolderType
+                                            .CurrentOutfit)
                                        .ID,
                                    Flags = (uint) type,
                                    Name = Enum.GetName(typeof (WearableType), type),
@@ -1120,12 +1169,13 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 {
                     m_scene.SendInventoryUpdate(presence.ControllingClient,
                                                 invService.GetFolderForType(userID,
-                                                                            AssetType
-                                                                                .CurrentOutfitFolder),
+                                                                            FolderType
+                                                                                .CurrentOutfit),
                                                 false, true);
                 }
             }
         }
+
         private UUID GetDefaultItem(WearableType wearable)
         {
             // These are ruth
@@ -1179,7 +1229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++);
                 else
                     m_log.WarnFormat("[AVFACTORY]: Client_OnRequestWearables unable to find presence for {0}", client.AgentId);
-            });
+            }, null, "AvatarFactoryModule.OnClientRequestWearables");
         }
         
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index f090e15..b7ff4e0 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -34,7 +34,6 @@ using OpenSim.Framework;
 using OpenSim.Region.CoreModules.Asset;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 {
@@ -48,23 +47,110 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         public void TestSetAppearance()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+            UUID bakedTextureID = TestHelpers.ParseTail(0x2);
+
+            // We need an asset cache because otherwise the LocalAssetServiceConnector will short-circuit directly
+            // to the AssetService, which will then store temporary and local assets permanently
+            CoreAssetCache assetCache = new CoreAssetCache();
+            
+            AvatarFactoryModule afm = new AvatarFactoryModule();
+            TestScene scene = new SceneHelpers(assetCache).SetupScene();
+            SceneHelpers.SetupSceneModules(scene, afm);
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
+
+            // TODO: Use the actual BunchOfCaps functionality once we slot in the CapabilitiesModules
+            AssetBase bakedTextureAsset;
+            bakedTextureAsset 
+                = new AssetBase(
+                    bakedTextureID, "Test Baked Texture", (sbyte)AssetType.Texture, userId.ToString());
+            bakedTextureAsset.Data = new byte[] { 2 }; // Not necessary to have a genuine JPEG2000 asset here yet
+            bakedTextureAsset.Temporary = true;
+            bakedTextureAsset.Local = true;
+            scene.AssetService.Store(bakedTextureAsset);
+
+            byte[] visualParams = new byte[AvatarAppearance.VISUALPARAM_COUNT];
+            for (byte i = 0; i < visualParams.Length; i++)
+                visualParams[i] = i;
+
+            Primitive.TextureEntry bakedTextureEntry = new Primitive.TextureEntry(TestHelpers.ParseTail(0x10));
+            uint eyesFaceIndex = (uint)AppearanceManager.BakeTypeToAgentTextureIndex(BakeType.Eyes);
+            Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex);
+
+            int rebakeRequestsReceived = 0;
+            ((TestClient)sp.ControllingClient).OnReceivedSendRebakeAvatarTextures += id => rebakeRequestsReceived++;
+
+            // This is the alpha texture
+            eyesFace.TextureID = bakedTextureID;
+            afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
+    
+            Assert.That(rebakeRequestsReceived, Is.EqualTo(0));
+
+            AssetBase eyesBake = scene.AssetService.Get(bakedTextureID.ToString());
+            Assert.That(eyesBake, Is.Not.Null);
+            Assert.That(eyesBake.Temporary, Is.True);
+            Assert.That(eyesBake.Local, Is.True);
+        }
+
+        /// <summary>
+        /// Test appearance setting where the baked texture UUID are library alpha textures.
+        /// </summary>
+        /// <remarks>
+        /// For a mesh avatar, it appears these 'baked textures' are used.  So these should not trigger a request to 
+        /// rebake.
+        /// </remarks>
+        [Test]
+        public void TestSetAppearanceAlphaBakedTextures()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
 
             UUID userId = TestHelpers.ParseTail(0x1);
+            UUID alphaTextureID = new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3");
 
+            // We need an asset cache because otherwise the LocalAssetServiceConnector will short-circuit directly
+            // to the AssetService, which will then store temporary and local assets permanently
+            CoreAssetCache assetCache = new CoreAssetCache();
+            
             AvatarFactoryModule afm = new AvatarFactoryModule();
-            TestScene scene = new SceneHelpers().SetupScene();
+            TestScene scene = new SceneHelpers(assetCache).SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
 
+            AssetBase libraryAsset;
+            libraryAsset 
+                = new AssetBase(
+                    alphaTextureID, "Default Alpha Layer Texture", (sbyte)AssetType.Texture, userId.ToString());
+            libraryAsset.Data = new byte[] { 2 }; // Not necessary to have a genuine JPEG2000 asset here yet
+            libraryAsset.Temporary = false;
+            libraryAsset.Local = false;
+            scene.AssetService.Store(libraryAsset);
+
             byte[] visualParams = new byte[AvatarAppearance.VISUALPARAM_COUNT];
             for (byte i = 0; i < visualParams.Length; i++)
                 visualParams[i] = i;
 
+<<<<<<< HEAD
+            Primitive.TextureEntry bakedTextureEntry = new Primitive.TextureEntry(TestHelpers.ParseTail(0x10));
+            uint eyesFaceIndex = (uint)AppearanceManager.BakeTypeToAgentTextureIndex(BakeType.Eyes);
+            Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex);
+
+            int rebakeRequestsReceived = 0;
+            ((TestClient)sp.ControllingClient).OnReceivedSendRebakeAvatarTextures += id => rebakeRequestsReceived++;
+
+            // This is the alpha texture
+            eyesFace.TextureID = alphaTextureID;
+            afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
+    
+            Assert.That(rebakeRequestsReceived, Is.EqualTo(0));
+=======
             afm.SetAppearance(sp, new Primitive.TextureEntry(TestHelpers.ParseTail(0x10)), visualParams, new WearableCacheItem[0]);
 
             // TODO: Check baked texture
             Assert.AreEqual(visualParams, sp.Appearance.VisualParams);
+>>>>>>> avn/ubitvar
         }
 
         [Test]
@@ -102,7 +188,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex);
             eyesFace.TextureID = eyesTextureId;
 
+<<<<<<< HEAD
+            afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
+=======
             afm.SetAppearance(sp, bakedTextureEntry, visualParams, new WearableCacheItem[0]);
+>>>>>>> avn/ubitvar
             afm.SaveBakedTextures(userId);
 //            Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = afm.GetBakedTextureFaces(userId);
 
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
new file mode 100644
index 0000000..7d2cad6
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
@@ -0,0 +1,201 @@
+/*
+ * 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 OpenMetaverse;
+using Nini.Config;
+using System;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Serialization;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using OpenSim.Framework;
+using OpenSim.Framework.ServiceAuth;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using Mono.Addins;
+
+namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XBakes.Module")]
+    public class XBakesModule : INonSharedRegionModule, IBakedTextureModule
+    {
+        protected Scene m_Scene;
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private UTF8Encoding enc = new UTF8Encoding();
+        private string m_URL = String.Empty;
+        private static XmlSerializer m_serializer = new XmlSerializer(typeof(AssetBase));
+
+        private static IServiceAuth m_Auth;
+
+        public void Initialise(IConfigSource configSource)
+        {
+            IConfig config = configSource.Configs["XBakes"];
+            if (config == null)
+                return;
+
+            m_URL = config.GetString("URL", String.Empty);
+            m_Auth = ServiceAuth.Create(configSource, "XBakes");
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            // m_log.InfoFormat("[XBakes]: Enabled for region {0}", scene.RegionInfo.RegionName);
+            m_Scene = scene;
+
+            scene.RegisterModuleInterface<IBakedTextureModule>(this);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "XBakes.Module"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public WearableCacheItem[] Get(UUID id)
+        {
+            if (m_URL == String.Empty)
+                return null;
+
+            int size = 0;
+
+            using (RestClient rc = new RestClient(m_URL))
+            {
+                List<WearableCacheItem> ret = new List<WearableCacheItem>();
+                rc.AddResourcePath("bakes");
+                rc.AddResourcePath(id.ToString());
+
+                rc.RequestMethod = "GET";
+
+                try
+                {
+                    Stream s = rc.Request(m_Auth);
+
+                    using (XmlTextReader sr = new XmlTextReader(s))
+                    {
+                        sr.ReadStartElement("BakedAppearance");
+                        while (sr.LocalName == "BakedTexture")
+                        {
+                            string sTextureIndex = sr.GetAttribute("TextureIndex");
+                            int lTextureIndex = Convert.ToInt32(sTextureIndex);
+                            string sCacheId = sr.GetAttribute("CacheId");
+                            UUID lCacheId = UUID.Zero;
+                            if (!(UUID.TryParse(sCacheId, out lCacheId)))
+                            {
+                                // ??  Nothing here
+                            }
+
+                            ++size;
+
+                            sr.ReadStartElement("BakedTexture");
+                            AssetBase a = (AssetBase)m_serializer.Deserialize(sr);
+                            ret.Add(new WearableCacheItem() { CacheId = lCacheId, TextureIndex = (uint)lTextureIndex, TextureAsset = a, TextureID = a.FullID });
+
+                            sr.ReadEndElement();
+                        }
+
+                        m_log.DebugFormat("[XBakes]: read {0} textures for user {1}", ret.Count, id);
+                    }
+
+                    return ret.ToArray();
+                }
+                catch (XmlException)
+                {
+                    return null;
+                }
+            }
+        }
+
+        public void Store(UUID agentId, WearableCacheItem[] data)
+        {
+            if (m_URL == String.Empty)
+                return;
+
+            MemoryStream reqStream;
+
+            using (MemoryStream bakeStream = new MemoryStream())
+            using (XmlTextWriter bakeWriter = new XmlTextWriter(bakeStream, null))
+            {
+                bakeWriter.WriteStartElement(String.Empty, "BakedAppearance", String.Empty);
+
+                for (int i = 0; i < data.Length; i++)
+                {
+                    if (data[i] != null)
+                    {
+                        bakeWriter.WriteStartElement(String.Empty, "BakedTexture", String.Empty);
+                        bakeWriter.WriteAttributeString(String.Empty, "TextureIndex", String.Empty, data[i].TextureIndex.ToString());
+                        bakeWriter.WriteAttributeString(String.Empty, "CacheId", String.Empty, data[i].CacheId.ToString());
+                        if (data[i].TextureAsset != null)
+                            m_serializer.Serialize(bakeWriter, data[i].TextureAsset);
+
+                        bakeWriter.WriteEndElement();
+                    }
+                }
+
+                bakeWriter.WriteEndElement();
+                bakeWriter.Flush();
+
+                reqStream = new MemoryStream(bakeStream.ToArray());
+            }
+
+            RestClient rc = new RestClient(m_URL);
+            rc.AddResourcePath("bakes");
+            rc.AddResourcePath(agentId.ToString());
+
+            rc.RequestMethod = "POST";
+
+            Util.FireAndForget(
+                delegate
+                {
+                    rc.Request(reqStream, m_Auth);
+                    m_log.DebugFormat("[XBakes]: stored {0} textures for user {1}", data.Length, agentId);
+                }, null, "XBakesModule.Store"
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 9d70063..2801ef0 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -214,10 +214,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             UUID destination = c.Destination;
             Vector3 fromPos = c.Position;
             Vector3 regionPos = new Vector3(scene.RegionInfo.WorldLocX, scene.RegionInfo.WorldLocY, 0);
+<<<<<<< HEAD
+=======
 
             bool checkParcelHide = false;
             UUID sourceParcelID = UUID.Zero;
             Vector3 hidePos = fromPos;
+>>>>>>> avn/ubitvar
 
             if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel;
 
@@ -355,22 +358,46 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             string fromName = c.From;
             
             UUID fromID = UUID.Zero;
+            UUID ownerID = UUID.Zero;
             ChatSourceType sourceType = ChatSourceType.Object;
             if (null != c.Sender)
             {
                 ScenePresence avatar = (c.Scene as Scene).GetScenePresence(c.Sender.AgentId);
                 fromID = c.Sender.AgentId;
                 fromName = avatar.Name;
+                ownerID = c.Sender.AgentId;
                 sourceType = ChatSourceType.Agent;
             }
             else if (c.SenderUUID != UUID.Zero) 
             {
-                fromID = c.SenderUUID; 
+                fromID = c.SenderUUID;
+                ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
             }
             
             // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
             
+<<<<<<< HEAD
+            ((Scene)c.Scene).ForEachRootClient(
+                delegate(IClientAPI client)
+                {   
+                    // don't forward SayOwner chat from objects to
+                    // non-owner agents
+                    if ((c.Type == ChatTypeEnum.Owner) &&
+                        (null != c.SenderObject) &&
+                        (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
+                        return;
+
+                    client.SendChatMessage(
+                        c.Message, (byte)cType, CenterOfRegion, fromName, fromID, ownerID,
+                        (byte)sourceType, (byte)ChatAudibleLevel.Fully);
+
+                    receiverIDs.Add(client.AgentId);
+                });
+            
+            (c.Scene as Scene).EventManager.TriggerOnChatToClients(
+                fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
+=======
             if (c.Scene != null)
             {
                 ((Scene)c.Scene).ForEachRootClient
@@ -392,6 +419,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 (c.Scene as Scene).EventManager.TriggerOnChatToClients(
                     fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
              }
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
new file mode 100644
index 0000000..3018d94
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
@@ -0,0 +1,285 @@
+/*
+ * 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 log4net.Config;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.CoreModules.Avatar.Chat;
+using OpenSim.Region.CoreModules.Framework;
+using OpenSim.Region.CoreModules.Framework.EntityTransfer;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
+{
+    [TestFixture]
+    public class ChatModuleTests : OpenSimTestCase
+    {  
+        [TestFixtureSetUp]
+        public void FixtureInit()
+        {
+            // Don't allow tests to be bamboozled by asynchronous events.  Execute everything on the same thread.
+            // We must do this here so that child agent positions are updated in a predictable manner.
+            Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest;
+        }
+
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+            // threads.  Possibly, later tests should be rewritten so none of them require async stuff (which regression
+            // tests really shouldn't).
+            Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+        }
+
+        private void SetupNeighbourRegions(TestScene sceneA, TestScene sceneB)
+        {            
+            // XXX: HTTP server is not (and should not be) necessary for this test, though it's absence makes the 
+            // CapabilitiesModule complain when it can't set up HTTP endpoints.
+            //            BaseHttpServer httpServer = new BaseHttpServer(99999);
+            //            MainServer.AddHttpServer(httpServer);
+            //            MainServer.Instance = httpServer;
+
+            // We need entity transfer modules so that when sp2 logs into the east region, the region calls 
+            // EntityTransferModuleto set up a child agent on the west region.
+            // XXX: However, this is not an entity transfer so is misleading.
+            EntityTransferModule etmA = new EntityTransferModule();
+            EntityTransferModule etmB = new EntityTransferModule();
+            LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Chat");
+            IConfig modulesConfig = config.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etmA.Name);
+            modulesConfig.Set("SimulationServices", lscm.Name);
+
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
+            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA, new ChatModule());           
+            SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB, new ChatModule());
+        }
+
+        /// <summary>
+        /// Tests chat between neighbour regions on the east-west axis
+        /// </summary>
+        /// <remarks>
+        /// Really, this is a combination of a child agent position update test and a chat range test.  These need
+        /// to be separated later on.
+        /// </remarks>
+        [Test]
+        public void TestInterRegionChatDistanceEastWest()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID sp1Uuid = TestHelpers.ParseTail(0x11);
+            UUID sp2Uuid = TestHelpers.ParseTail(0x12);
+
+            Vector3 sp1Position = new Vector3(6, 128, 20);
+            Vector3 sp2Position = new Vector3(250, 128, 20);
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneWest = sh.SetupScene("sceneWest", TestHelpers.ParseTail(0x1), 1000, 1000);            
+            TestScene sceneEast = sh.SetupScene("sceneEast", TestHelpers.ParseTail(0x2), 1001, 1000);            
+
+            SetupNeighbourRegions(sceneWest, sceneEast);
+
+            ScenePresence sp1 = SceneHelpers.AddScenePresence(sceneEast, sp1Uuid);
+            TestClient sp1Client = (TestClient)sp1.ControllingClient;
+
+            // If we don't set agents to flying, test will go wrong as they instantly fall to z = 0.
+            // TODO: May need to create special complete no-op test physics module rather than basic physics, since
+            // physics is irrelevant to this test.
+            sp1.Flying = true;
+
+            // When sp1 logs in to sceneEast, it sets up a child agent in sceneWest and informs the sp2 client to 
+            // make the connection.  For this test, will simplify this chain by making the connection directly.
+            ScenePresence sp1Child = SceneHelpers.AddChildScenePresence(sceneWest, sp1Uuid);
+            TestClient sp1ChildClient = (TestClient)sp1Child.ControllingClient;
+
+            sp1.AbsolutePosition = sp1Position;                
+
+            ScenePresence sp2 = SceneHelpers.AddScenePresence(sceneWest, sp2Uuid);
+            TestClient sp2Client = (TestClient)sp2.ControllingClient;
+            sp2.Flying = true;
+
+            ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneEast, sp2Uuid);
+            TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient;
+
+            sp2.AbsolutePosition = sp2Position;           
+
+            // We must update the scenes in order to make the root new root agents trigger position updates in their
+            // children.
+            sceneWest.Update(1);
+            sceneEast.Update(1);
+
+            // Check child positions are correct.
+            Assert.AreEqual(
+                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), 
+                sp1ChildClient.SceneAgent.AbsolutePosition);
+
+            Assert.AreEqual(
+                new Vector3(sp2Position.X - sceneWest.RegionInfo.RegionSizeX, sp2Position.Y, sp2Position.Z), 
+                sp2ChildClient.SceneAgent.AbsolutePosition);
+
+            string receivedSp1ChatMessage = "";
+            string receivedSp2ChatMessage = "";
+
+            sp1ChildClient.OnReceivedChatMessage 
+                += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp1ChatMessage = message;
+            sp2ChildClient.OnReceivedChatMessage 
+                += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp2ChatMessage = message;
+
+            TestUserInRange(sp1Client, "ello darling", ref receivedSp2ChatMessage);
+            TestUserInRange(sp2Client, "fantastic cats", ref receivedSp1ChatMessage);
+
+            sp1Position = new Vector3(30, 128, 20);
+            sp1.AbsolutePosition = sp1Position;
+            sceneEast.Update(1);
+
+            // Check child position is correct.
+            Assert.AreEqual(
+                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), 
+                sp1ChildClient.SceneAgent.AbsolutePosition);
+
+            TestUserOutOfRange(sp1Client, "beef", ref receivedSp2ChatMessage);
+            TestUserOutOfRange(sp2Client, "lentils", ref receivedSp1ChatMessage);
+        }
+
+        /// <summary>
+        /// Tests chat between neighbour regions on the north-south axis
+        /// </summary>
+        /// <remarks>
+        /// Really, this is a combination of a child agent position update test and a chat range test.  These need
+        /// to be separated later on.
+        /// </remarks>
+        [Test]
+        public void TestInterRegionChatDistanceNorthSouth()
+        {
+            TestHelpers.InMethod();
+            //            TestHelpers.EnableLogging();
+
+            UUID sp1Uuid = TestHelpers.ParseTail(0x11);
+            UUID sp2Uuid = TestHelpers.ParseTail(0x12);
+
+            Vector3 sp1Position = new Vector3(128, 250, 20);
+            Vector3 sp2Position = new Vector3(128, 6, 20);
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneNorth = sh.SetupScene("sceneNorth", TestHelpers.ParseTail(0x1), 1000, 1000);            
+            TestScene sceneSouth = sh.SetupScene("sceneSouth", TestHelpers.ParseTail(0x2), 1000, 1001);            
+
+            SetupNeighbourRegions(sceneNorth, sceneSouth);
+
+            ScenePresence sp1 = SceneHelpers.AddScenePresence(sceneNorth, sp1Uuid);
+            TestClient sp1Client = (TestClient)sp1.ControllingClient;
+
+            // If we don't set agents to flying, test will go wrong as they instantly fall to z = 0.
+            // TODO: May need to create special complete no-op test physics module rather than basic physics, since
+            // physics is irrelevant to this test.
+            sp1.Flying = true;
+
+            // When sp1 logs in to sceneEast, it sets up a child agent in sceneNorth and informs the sp2 client to 
+            // make the connection.  For this test, will simplify this chain by making the connection directly.
+            ScenePresence sp1Child = SceneHelpers.AddChildScenePresence(sceneSouth, sp1Uuid);
+            TestClient sp1ChildClient = (TestClient)sp1Child.ControllingClient;
+
+            sp1.AbsolutePosition = sp1Position;                
+
+            ScenePresence sp2 = SceneHelpers.AddScenePresence(sceneSouth, sp2Uuid);
+            TestClient sp2Client = (TestClient)sp2.ControllingClient;
+            sp2.Flying = true;
+
+            ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneNorth, sp2Uuid);
+            TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient;
+
+            sp2.AbsolutePosition = sp2Position;           
+
+            // We must update the scenes in order to make the root new root agents trigger position updates in their
+            // children.
+            sceneNorth.Update(1);
+            sceneSouth.Update(1);
+
+            // Check child positions are correct.
+            Assert.AreEqual(
+                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z), 
+                sp1ChildClient.SceneAgent.AbsolutePosition);
+
+            Assert.AreEqual(
+                new Vector3(sp2Position.X, sp2Position.Y + sceneSouth.RegionInfo.RegionSizeY, sp2Position.Z), 
+                sp2ChildClient.SceneAgent.AbsolutePosition);
+
+            string receivedSp1ChatMessage = "";
+            string receivedSp2ChatMessage = "";
+
+            sp1ChildClient.OnReceivedChatMessage 
+                += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp1ChatMessage = message;
+            sp2ChildClient.OnReceivedChatMessage 
+                += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp2ChatMessage = message;
+
+            TestUserInRange(sp1Client, "ello darling", ref receivedSp2ChatMessage);
+            TestUserInRange(sp2Client, "fantastic cats", ref receivedSp1ChatMessage);
+
+            sp1Position = new Vector3(30, 128, 20);
+            sp1.AbsolutePosition = sp1Position;
+            sceneNorth.Update(1);
+
+            // Check child position is correct.
+            Assert.AreEqual(
+                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z), 
+                sp1ChildClient.SceneAgent.AbsolutePosition);
+
+            TestUserOutOfRange(sp1Client, "beef", ref receivedSp2ChatMessage);
+            TestUserOutOfRange(sp2Client, "lentils", ref receivedSp1ChatMessage);
+        }
+    
+        private void TestUserInRange(TestClient speakClient, string testMessage, ref string receivedMessage)
+        {
+            receivedMessage = "";
+
+            speakClient.Chat(0, ChatTypeEnum.Say, testMessage);
+
+            Assert.AreEqual(testMessage, receivedMessage);
+        }
+
+        private void TestUserOutOfRange(TestClient speakClient, string testMessage, ref string receivedMessage)
+        {
+            receivedMessage = "";
+
+            speakClient.Chat(0, ChatTypeEnum.Say, testMessage);
+
+            Assert.AreNotEqual(testMessage, receivedMessage);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index c52d586..b0b7054 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -31,6 +31,7 @@ using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 using OpenMetaverse;
 
 using Mono.Addins;
@@ -182,8 +183,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
             try
             {
                 ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+<<<<<<< HEAD
+
+                if (obj == null)
+                    return;
+
+=======
                 if (obj == null)
                     return;
+>>>>>>> avn/ubitvar
                 if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0
                     || avatar.Scene.RegionInfo.RegionSettings.AllowDamage)
                 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 4fdcd01..56819fa 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -133,13 +133,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                 UUID objectID, UUID ownerID, string message, UUID textureID,
                 int ch, string[] buttonlabels)
         {
-            UserAccount account = m_scene.UserAccountService.GetUserAccount(
-                    m_scene.RegionInfo.ScopeID, ownerID);
-            string ownerFirstName, ownerLastName;
-            if (account != null)
+            string username = m_scene.UserManagementModule.GetUserName(ownerID);
+            string ownerFirstName, ownerLastName = String.Empty;
+            if (!String.IsNullOrEmpty(username))
             {
-                ownerFirstName = account.FirstName;
-                ownerLastName = account.LastName;
+                string[] parts = username.Split(' ');
+                ownerFirstName = parts[0];
+                if (parts.Length > 1)
+                    ownerLastName = username.Split(' ')[1];
             }
             else
             {
@@ -170,17 +171,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         }
 
         public void SendTextBoxToUser(UUID avatarid, string message,
-                int chatChannel, string name, UUID objectid, UUID ownerid)
+                int chatChannel, string name, UUID objectid, UUID ownerID)
         {
-            UserAccount account = m_scene.UserAccountService.GetUserAccount(
-                    m_scene.RegionInfo.ScopeID, ownerid);
-            string ownerFirstName, ownerLastName;
-            UUID ownerID = UUID.Zero;
-            if (account != null)
+            string username = m_scene.UserManagementModule.GetUserName(ownerID);
+            string ownerFirstName, ownerLastName = String.Empty;
+            if (!String.IsNullOrEmpty(username))
             {
-                ownerFirstName = account.FirstName;
-                ownerLastName = account.LastName;
-                ownerID = account.PrincipalID;
+                string[] parts = username.Split(' ');
+                ownerFirstName = parts[0];
+                if (parts.Length > 1)
+                    ownerLastName = username.Split(' ')[1];
             }
             else
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
index b44a5c9..eb23e83 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             if (folderID == UUID.Zero)
             {
                 InventoryFolderBase folder = inv.GetFolderForType(userID,
-                        AssetType.CallingCard);
+                        FolderType.CallingCard);
 
                 if (folder == null) // Nowhere to put it
                     return UUID.Zero;
@@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             IInventoryService invService = m_Scenes[0].InventoryService;
 
             InventoryFolderBase trashFolder =
-                    invService.GetFolderForType(client.AgentId, AssetType.TrashFolder);
+                    invService.GetFolderForType(client.AgentId, FolderType.Trash);
 
             InventoryItemBase item = new InventoryItemBase(transactionID, client.AgentId);
             item = invService.GetItem(item);
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index b693f2d..7ab568e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -94,6 +94,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         protected Dictionary<UUID, UserFriendData> m_Friends = new Dictionary<UUID, UserFriendData>();
 
         /// <summary>
+        /// Maintain a record of clients that need to notify about their online status. This only
+        /// needs to be done on login.  Subsequent online/offline friend changes are sent by a different mechanism.
+        /// </summary>
+        protected HashSet<UUID> m_NeedsToNotifyStatus = new HashSet<UUID>();
+
+        /// <summary>
         /// Maintain a record of viewers that need to be sent notifications for friends that are online.  This only
         /// needs to be done on login.  Subsequent online/offline friend changes are sent by a different mechanism.
         /// </summary>
@@ -324,6 +330,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         private void OnMakeRootAgent(ScenePresence sp)
         {
             RecacheFriends(sp.ControllingClient);
+
+            lock (m_NeedsToNotifyStatus)
+            {
+                if (m_NeedsToNotifyStatus.Remove(sp.UUID))
+                {
+                    // Inform the friends that this user is online. This can only be done once the client is a Root Agent.
+                    StatusChange(sp.UUID, true);
+                }
+            }
         }
 
         private void OnClientLogin(IClientAPI client)
@@ -331,8 +346,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             UUID agentID = client.AgentId;
 
             //m_log.DebugFormat("[XXX]: OnClientLogin!");
-            // Inform the friends that this user is online
-            StatusChange(agentID, true);
+
+            // Register that we need to send this user's status to friends. This can only be done
+            // once the client becomes a Root Agent, because as part of sending out the presence
+            // we also get back the presence of the HG friends, and we need to send that to the
+            // client, but that can only be done when the client is a Root Agent.
+            lock (m_NeedsToNotifyStatus)
+                m_NeedsToNotifyStatus.Add(agentID);
 
             // Register that we need to send the list of online friends to this user
             lock (m_NeedsListOfOnlineFriends)
@@ -491,7 +511,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
                         // Notify about this user status
                         StatusNotify(friendList, agentID, online);
-                    }
+                    }, null, "FriendsModule.StatusChange"
                 );
             }
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index ff87ece..13512a2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -289,18 +289,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             rootElement.AppendChild(result);
 
-            return DocToBytes(doc);
-        }
-
-        private byte[] DocToBytes(XmlDocument doc)
-        {
-            MemoryStream ms = new MemoryStream();
-            XmlTextWriter xw = new XmlTextWriter(ms, null);
-            xw.Formatting = Formatting.Indented;
-            doc.WriteTo(xw);
-            xw.Flush();
-
-            return ms.ToArray();
+            return Util.DocToBytes(doc);
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index d00945e..27b7376 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -239,6 +239,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     fList.Add(s.Substring(0, 36));
             }
 
+            // FIXME: also query the presence status of friends in other grids (like in HGStatusNotifier.Notify())
+
             PresenceInfo[] presence = PresenceService.GetAgents(fList.ToArray());
             foreach (PresenceInfo pi in presence)
             {
@@ -658,7 +660,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     FriendsService.Delete(friendUUI, agentID.ToString());
 
                     // notify the exfriend's service
-                    Util.FireAndForget(delegate { Delete(exfriendID, agentID, friendUUI); });
+                    Util.FireAndForget(
+                        delegate { Delete(exfriendID, agentID, friendUUI); }, null, "HGFriendsModule.DeleteFriendshipForeignFriend");
 
                     m_log.DebugFormat("[HGFRIENDS MODULE]: {0} terminated {1}", agentID, friendUUI);
                     return true;
@@ -676,7 +679,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     FriendsService.Delete(agentUUI, exfriendID.ToString());
 
                     // notify the agent's service?
-                    Util.FireAndForget(delegate { Delete(agentID, exfriendID, agentUUI); });
+                    Util.FireAndForget(
+                        delegate { Delete(agentID, exfriendID, agentUUI); }, null, "HGFriendsModule.DeleteFriendshipLocalFriend");
 
                     m_log.DebugFormat("[HGFRIENDS MODULE]: {0} terminated {1}", agentUUI, exfriendID);
                     return true;
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
index 961117e..e6fd54e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework;
 using OpenSim.Region.CoreModules.Avatar.Friends;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests
 {
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index 7bf19c2..a1b918a 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -210,10 +210,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     success = m_IMService.OutgoingInstantMessage(im, url, foreigner);
 
                 if (!success && !foreigner)
-                    HandleUndeliveredMessage(im, result);
+                    HandleUndeliverableMessage(im, result);
                 else
                     result(success);
-            });
+            }, null, "HGMessageTransferModule.SendInstantMessage");
 
             return;
         }
@@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             return successful;
         }
 
-        protected void HandleUndeliveredMessage(GridInstantMessage im, MessageResultNotification result)
+        public void HandleUndeliverableMessage(GridInstantMessage im, MessageResultNotification result)
         {
             UndeliveredMessage handlerUndeliveredMessage = OnUndeliveredMessage;
 
@@ -282,7 +282,17 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         string uasURL = circuit.ServiceURLs["HomeURI"].ToString();
                         m_log.DebugFormat("[HG MESSAGE TRANSFER]: getting UUI of user {0} from {1}", toAgent, uasURL);
                         UserAgentServiceConnector uasConn = new UserAgentServiceConnector(uasURL);
-                        return uasConn.GetUUI(fromAgent, toAgent);
+
+                        string agentUUI = string.Empty;
+                        try
+                        {
+                            agentUUI = uasConn.GetUUI(fromAgent, toAgent);
+                        }
+                        catch (Exception e) {
+                            m_log.Debug("[HG MESSAGE TRANSFER]: GetUUI call failed ", e);
+                        }
+
+                        return agentUUI;
                     }
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index b321adb..5573c94 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -188,7 +188,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             SendGridInstantMessageViaXMLRPC(im, result);
         }
 
-        private void HandleUndeliveredMessage(GridInstantMessage im, MessageResultNotification result)
+        public void HandleUndeliverableMessage(GridInstantMessage im, MessageResultNotification result)
         {
             UndeliveredMessage handlerUndeliveredMessage = OnUndeliveredMessage;
 
@@ -445,7 +445,14 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             return resp;
         }
 
+<<<<<<< HEAD
+        /// <summary>
+        /// delegate for sending a grid instant message asynchronously
+        /// </summary>
+        public delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result);
+=======
         private delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result);
+>>>>>>> avn/ubitvar
 
         private class GIM {
             public GridInstantMessage im;
@@ -472,25 +479,31 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             }
         }
 
+<<<<<<< HEAD
+            d.BeginInvoke(im, result, GridInstantMessageCompleted, d);
+=======
         private void GridInstantMessageCompleted(IAsyncResult iar)
         {
             GridInstantMessageDelegate d = (GridInstantMessageDelegate)iar.AsyncState;
             d.EndInvoke(iar);
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
-        /// Recursive SendGridInstantMessage over XMLRPC method.
-        /// This is called from within a dedicated thread.
-        /// The first time this is called, prevRegionHandle will be 0 Subsequent times this is called from 
-        /// itself, prevRegionHandle will be the last region handle that we tried to send.
-        /// If the handles are the same, we look up the user's location using the grid.
-        /// If the handles are still the same, we end.  The send failed.
+        /// Internal SendGridInstantMessage over XMLRPC method.
         /// </summary>
+<<<<<<< HEAD
+        /// <remarks>
+        /// This is called from within a dedicated thread.
+        /// </remarks>
+        private void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result)
+=======
         /// <param name="prevRegionHandle">
         /// Pass in 0 the first time this method is called.  It will be called recursively with the last 
         /// regionhandle tried
         /// </param>
         private void SendGridInstantMessageViaXMLRPCAsyncMain(GridInstantMessage im, MessageResultNotification result)
+>>>>>>> avn/ubitvar
         {
             GIM gim;
             do {
@@ -516,120 +529,83 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
 
             UUID toAgentID = new UUID(im.toAgentID);
-
-            PresenceInfo upd = null;
-
-            bool lookupAgent = false;
+            UUID regionID;
+            bool needToLookupAgent;
 
             lock (m_UserRegionMap)
+                needToLookupAgent = !m_UserRegionMap.TryGetValue(toAgentID, out regionID);
+
+            while (true)
             {
-                if (m_UserRegionMap.ContainsKey(toAgentID))
+                if (needToLookupAgent)
                 {
-                    upd = new PresenceInfo();
-                    upd.RegionID = m_UserRegionMap[toAgentID];
+                    PresenceInfo[] presences = PresenceService.GetAgents(new string[] { toAgentID.ToString() }); 
 
-                    // We need to compare the current regionhandle with the previous region handle
-                    // or the recursive loop will never end because it will never try to lookup the agent again
-                    if (prevRegionID == upd.RegionID)
-                    {
-                        lookupAgent = true;
-                    }
-                }
-                else
-                {
-                    lookupAgent = true;
-                }
-            }
-            
+                    UUID foundRegionID = UUID.Zero;
 
-            // Are we needing to look-up an agent?
-            if (lookupAgent)
-            {
-                // Non-cached user agent lookup.
-                PresenceInfo[] presences = PresenceService.GetAgents(new string[] { toAgentID.ToString() }); 
-                if (presences != null && presences.Length > 0)
-                {
-                    foreach (PresenceInfo p in presences)
+                    if (presences != null)
                     {
-                        if (p.RegionID != UUID.Zero)
+                        foreach (PresenceInfo p in presences)
                         {
-                            upd = p;
-                            break;
+                            if (p.RegionID != UUID.Zero)
+                            {
+                                foundRegionID = p.RegionID;
+                                break;
+                            }
                         }
                     }
+
+                    // If not found or the found region is the same as the last lookup, then message is undeliverable
+                    if (foundRegionID == UUID.Zero || foundRegionID == regionID)
+                        break;
+                    else
+                        regionID = foundRegionID;
                 }
 
-                if (upd != null)
+                GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, regionID);
+                if (reginfo == null)
                 {
-                    // check if we've tried this before..
-                    // This is one way to end the recursive loop
-                    //
-                    if (upd.RegionID == prevRegionID)
-                    {
-                        // m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
-                        HandleUndeliveredMessage(im, result);
-                        return;
-                    }
+                    m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find region {0}", regionID);
+                    break;
                 }
-                else
-                {
-                    // m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
-                    HandleUndeliveredMessage(im, result);
-                    return;
-                }
-            }
 
+<<<<<<< HEAD
+                // Try to send the message to the agent via the retrieved region.
+                Hashtable msgdata = ConvertGridInstantMessageToXMLRPC(im);
+                msgdata["region_handle"] = 0;
+                bool imresult = doIMSending(reginfo, msgdata);
+
+                // If the message delivery was successful, then cache the entry.
+                if (imresult)
+=======
             if (upd != null)
             {
                 GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(UUID.Zero,
                     upd.RegionID);
                 if (reginfo != null)
+>>>>>>> avn/ubitvar
                 {
-                    Hashtable msgdata = ConvertGridInstantMessageToXMLRPC(im);
-                    // Not actually used anymore, left in for compatibility
-                    // Remove at next interface change
-                    //
-                    msgdata["region_handle"] = 0;
-                    bool imresult = doIMSending(reginfo, msgdata);
-                    if (imresult)
-                    {
-                        // IM delivery successful, so store the Agent's location in our local cache.
-                        lock (m_UserRegionMap)
-                        {
-                            if (m_UserRegionMap.ContainsKey(toAgentID))
-                            {
-                                m_UserRegionMap[toAgentID] = upd.RegionID;
-                            }
-                            else
-                            {
-                                m_UserRegionMap.Add(toAgentID, upd.RegionID);
-                            }
-                        }
-                        result(true);
-                    }
-                    else
+                    lock (m_UserRegionMap)
                     {
-                        // try again, but lookup user this time.
-                        // Warning, this must call the Async version
-                        // of this method or we'll be making thousands of threads
-                        // The version within the spawned thread is SendGridInstantMessageViaXMLRPCAsync
-                        // The version that spawns the thread is SendGridInstantMessageViaXMLRPC
-
-                        // This is recursive!!!!!
-                        SendGridInstantMessageViaXMLRPCAsync(im, result,
-                                upd.RegionID);
+                        m_UserRegionMap[toAgentID] = regionID;
                     }
+                    result(true);
+                    return;
                 }
-                else
-                {
-                    m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find region {0}", upd.RegionID);
-                    HandleUndeliveredMessage(im, result);
-                }
-            }
-            else
-            {
-                HandleUndeliveredMessage(im, result);
+
+                // If we reach this point in the first iteration of the while, then we may have unsuccessfully tried
+                // to use a locally cached region ID.  All subsequent attempts need to lookup agent details from
+                // the presence service.
+                needToLookupAgent = true;
             }
+
+            // If we reached this point then the message was not deliverable.  Remove the bad cache entry and 
+            // signal the delivery failure.
+            lock (m_UserRegionMap)
+                m_UserRegionMap.Remove(toAgentID);
+
+            // m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
+            HandleUndeliverableMessage(im, result);
         }
 
         /// <summary>
@@ -640,7 +616,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         /// <returns>Bool if the message was successfully delivered at the other side.</returns>
         protected virtual bool doIMSending(GridRegion reginfo, Hashtable xmlrpcdata)
         {
-
             ArrayList SendParams = new ArrayList();
             SendParams.Add(xmlrpcdata);
             XmlRpcRequest GridReq = new XmlRpcRequest("grid_instant_message", SendParams);
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 41958b3..76023bd 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -238,6 +238,17 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
             }
 
+<<<<<<< HEAD
+            if (!m_ForwardOfflineGroupMessages)
+            {
+                if (im.dialog == (byte)InstantMessageDialog.GroupNotice ||
+                    im.dialog == (byte)InstantMessageDialog.GroupInvitation)
+                    return;
+            }
+
+            bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>(
+                    "POST", m_RestURL+"/SaveMessage/", im, 10000);
+=======
             Scene scene = FindScene(new UUID(im.fromAgentID));
             if (scene == null)
                 scene = m_SceneList[0];
@@ -245,6 +256,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>(
                     "POST", m_RestURL+"/SaveMessage/?scope=" +
                     scene.RegionInfo.ScopeID.ToString(), im);
+>>>>>>> avn/ubitvar
 
             if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index 4c678c2..c2440d8 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -49,8 +49,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         private static readonly ILog m_log = LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
+#pragma warning disable 0067
         public event PresenceChange OnPresenceChange;
         public event BulkPresenceData OnBulkPresenceData;
+#pragma warning restore 0067
 
         protected List<Scene> m_Scenes = new List<Scene>();
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 5a8544e..4a06fd1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -61,6 +61,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
         private UserAccount m_userInfo;
         private string m_invPath;
+
+        /// <value>
+        /// ID of this request
+        /// </value>
+        protected UUID m_id;
         
         /// <summary>
         /// Do we want to merge this load with existing inventory?
@@ -71,6 +76,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         protected IAssetService m_AssetService;
         protected IUserAccountService m_UserAccountService;
 
+        private InventoryArchiverModule m_module;
+
         /// <value>
         /// The stream from which the inventory archive will be loaded.
         /// </value>
@@ -114,11 +121,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Record the creator id that should be associated with an asset.  This is used to adjust asset creator ids
         /// after OSP resolution (since OSP creators are only stored in the item
         /// </summary>
-        protected Dictionary<UUID, UUID> m_creatorIdForAssetId = new Dictionary<UUID, UUID>();        
+        protected Dictionary<UUID, UUID> m_creatorIdForAssetId = new Dictionary<UUID, UUID>();
 
         public InventoryArchiveReadRequest(
             IInventoryService inv, IAssetService assets, IUserAccountService uacc, UserAccount userInfo, string invPath, string loadPath, bool merge)
+            : this(UUID.Zero, null,
+                            inv,
+                assets,
+                uacc,
+                userInfo,
+                invPath,
+                loadPath,
+                merge)
+        {
+        }
+
+        public InventoryArchiveReadRequest(
+            UUID id, InventoryArchiverModule module, IInventoryService inv, IAssetService assets, IUserAccountService uacc, UserAccount userInfo, string invPath, string loadPath, bool merge)
             : this(
+                id,
+                module,
                 inv,
                 assets,
                 uacc,
@@ -130,8 +152,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
 
         public InventoryArchiveReadRequest(
-            IInventoryService inv, IAssetService assets, IUserAccountService uacc, UserAccount userInfo, string invPath, Stream loadStream, bool merge)
+            UUID id, InventoryArchiverModule module, IInventoryService inv, IAssetService assets, IUserAccountService uacc, UserAccount userInfo, string invPath, Stream loadStream, bool merge)
         {
+            m_id = id;
             m_InventoryService = inv;
             m_AssetService = assets;
             m_UserAccountService = uacc;
@@ -139,6 +162,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             m_userInfo = userInfo;
             m_invPath = invPath;
             m_loadStream = loadStream;
+            m_module = module;
             
             // FIXME: Do not perform this check since older versions of OpenSim do save the control file after other things
             // (I thought they weren't).  We will need to bump the version number and perform this check on all 
@@ -161,6 +185,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             try
             {
+                Exception reportedException = null;
+
                 string filePath = "ERROR";
                
                 List<InventoryFolderBase> folderCandidates
@@ -197,14 +223,25 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 }
                 
                 archive.Close();
-                
+
                 m_log.DebugFormat(
                     "[INVENTORY ARCHIVER]: Successfully loaded {0} assets with {1} failures", 
                     m_successfulAssetRestores, m_failedAssetRestores);
-                m_log.InfoFormat("[INVENTORY ARCHIVER]: Successfully loaded {0} items", m_successfulItemRestores);
+
+                //Alicia: When this is called by LibraryModule or Tests, m_module will be null as event is not required
+                if(m_module != null)
+                    m_module.TriggerInventoryArchiveLoaded(m_id, true, m_userInfo, m_invPath, m_loadStream, reportedException, m_successfulItemRestores);
                 
                 return m_loadedNodes;
             }
+            catch(Exception Ex)
+            {
+                // Trigger saved event with failed result and exception data
+                if (m_module != null)
+                    m_module.TriggerInventoryArchiveLoaded(m_id, false, m_userInfo, m_invPath, m_loadStream, Ex, 0);
+
+                return m_loadedNodes;
+            }
             finally
             {
                 m_loadStream.Close();
@@ -375,14 +412,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 newFolderName = InventoryArchiveUtils.UnescapeArchivePath(newFolderName);
                 UUID newFolderId = UUID.Random();
 
-                // Asset type has to be Unknown here rather than Folder, otherwise the created folder can't be
-                // deleted once the client has relogged.
-                // The root folder appears to be labelled AssetType.Folder (shows up as "Category" in the client)
-                // even though there is a AssetType.RootCategory
                 destFolder 
                     = new InventoryFolderBase(
-                        newFolderId, newFolderName, m_userInfo.PrincipalID, 
-                        (short)AssetType.Unknown, destFolder.ID, 1);
+                        newFolderId, newFolderName, m_userInfo.PrincipalID,
+                        (short)FolderType.None, destFolder.ID, 1);
                 m_InventoryService.AddFolder(destFolder);
 
                 // Record that we have now created this folder
@@ -483,52 +516,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 {
                     if (m_creatorIdForAssetId.ContainsKey(assetId))
                     {
-                        string xmlData = Utils.BytesToString(data);
-                        List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
+                        data = SceneObjectSerializer.ModifySerializedObject(assetId, data,
+                            sog => {
+                                bool modified = false;
+                                
+                                foreach (SceneObjectPart sop in sog.Parts)
+                                {
+                                    if (string.IsNullOrEmpty(sop.CreatorData))
+                                    {
+                                        sop.CreatorID = m_creatorIdForAssetId[assetId];
+                                        modified = true;
+                                    }
+                                }
+                                
+                                return modified;
+                            });
                         
-                        CoalescedSceneObjects coa = null;
-                        if (CoalescedSceneObjectsSerializer.TryFromXml(xmlData, out coa))
-                        {
-//                            m_log.DebugFormat(
-//                                "[INVENTORY ARCHIVER]: Loaded coalescence {0} has {1} objects", assetId, coa.Count);
-
-                            if (coa.Objects.Count == 0)
-                            {
-                                m_log.WarnFormat(
-                                    "[INVENTORY ARCHIVE READ REQUEST]: Aborting load of coalesced object from asset {0} as it has zero loaded components", 
-                                    assetId);
-                                return false;
-                            }
-                            
-                            sceneObjects.AddRange(coa.Objects);
-                        }
-                        else
-                        {
-                            SceneObjectGroup deserializedObject = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-
-                            if (deserializedObject != null)
-                            {
-                                sceneObjects.Add(deserializedObject);
-                            }
-                            else
-                            {
-                                m_log.WarnFormat(
-                                    "[INVENTORY ARCHIVE READ REQUEST]: Aborting load of object from asset {0} as deserialization failed", 
-                                    assetId);
-
-                                return false;
-                            }
-                        }
-                        
-                        foreach (SceneObjectGroup sog in sceneObjects)
-                            foreach (SceneObjectPart sop in sog.Parts)
-                                if (string.IsNullOrEmpty(sop.CreatorData))
-                                    sop.CreatorID = m_creatorIdForAssetId[assetId];
-
-                        if (coa != null)
-                            data = Utils.StringToBytes(CoalescedSceneObjectsSerializer.ToXml(coa));
-                        else
-                            data = Utils.StringToBytes(SceneObjectSerializer.ToOriginalXmlFormat(sceneObjects[0]));
+                        if (data == null)
+                            return false;
                     }
                 }
 
@@ -550,7 +555,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 return false;
             }
         }
-        
+
         /// <summary>
         /// Load control file
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 4292719..f002ad7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -34,6 +34,7 @@ using System.Xml;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Serialization.External;
 using OpenSim.Region.CoreModules.World.Archiver;
@@ -42,6 +43,8 @@ using OpenSim.Services.Interfaces;
 using Ionic.Zlib;
 using GZipStream = Ionic.Zlib.GZipStream;
 using CompressionMode = Ionic.Zlib.CompressionMode;
+using CompressionLevel = Ionic.Zlib.CompressionLevel;
+using PermissionMask = OpenSim.Framework.PermissionMask;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {
@@ -54,6 +57,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// </summary>
         public bool SaveAssets { get; set; }
 
+        /// <summary>
+        /// Determines which items will be included in the archive, according to their permissions.
+        /// Default is null, meaning no permission checks.
+        /// </summary>
+        public string FilterContent { get; set; }
+
+        /// <summary>
+        /// Counter for inventory items saved to archive for passing to compltion event
+        /// </summary>
+        public int CountItems { get; set; }
+
+        /// <summary>
+        /// Counter for inventory items skipped due to permission filter option for passing to compltion event
+        /// </summary>
+        public int CountFiltered { get; set; }
+
         /// <value>
         /// Used to select all inventory nodes in a folder but not the folder itself
         /// </value>
@@ -73,12 +92,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <value>
         /// ID of this request
         /// </value>
-        protected Guid m_id;
-
-        /// <value>
-        /// Used to collect the uuids of the assets that we need to save into the archive
-        /// </value>
-        protected Dictionary<UUID, sbyte> m_assetUuids = new Dictionary<UUID, sbyte>();
+        protected UUID m_id;
 
         /// <value>
         /// Used to collect the uuids of the users that we need to save into the archive
@@ -94,7 +108,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Constructor
         /// </summary>
         public InventoryArchiveWriteRequest(
-            Guid id, InventoryArchiverModule module, Scene scene,
+            UUID id, InventoryArchiverModule module, Scene scene,
             UserAccount userInfo, string invPath, string savePath)
             : this(
                 id,
@@ -110,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Constructor
         /// </summary>
         public InventoryArchiveWriteRequest(
-            Guid id, InventoryArchiverModule module, Scene scene,
+            UUID id, InventoryArchiverModule module, Scene scene,
             UserAccount userInfo, string invPath, Stream saveStream)
         {
             m_id = id;
@@ -122,6 +136,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             m_assetGatherer = new UuidGatherer(m_scene.AssetService);
 
             SaveAssets = true;
+            FilterContent = null;
         }
 
         protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids, bool timedOut)
@@ -150,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             }
 
             m_module.TriggerInventoryArchiveSaved(
-                m_id, succeeded, m_userInfo, m_invPath, m_saveStream, reportedException);
+                m_id, succeeded, m_userInfo, m_invPath, m_saveStream, reportedException, CountItems, CountFiltered);
         }
 
         protected void SaveInvItem(InventoryItemBase inventoryItem, string path, Dictionary<string, object> options, IUserAccountService userAccountService)
@@ -166,10 +181,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                             "[INVENTORY ARCHIVER]: Skipping inventory item {0} {1} at {2}",
                             inventoryItem.Name, inventoryItem.ID, path);
                     }
+
+                    CountFiltered++;
+
                     return;
                 }
             }
 
+            // Check For Permissions Filter Flags
+            if (!CanUserArchiveObject(m_userInfo.PrincipalID, inventoryItem))
+            {
+                m_log.InfoFormat(
+                            "[INVENTORY ARCHIVER]: Insufficient permissions, skipping inventory item {0} {1} at {2}",
+                            inventoryItem.Name, inventoryItem.ID, path);
+
+                // Count Items Excluded
+                CountFiltered++;
+
+                return;
+            }
+
             if (options.ContainsKey("verbose"))
                 m_log.InfoFormat(
                     "[INVENTORY ARCHIVER]: Saving item {0} {1} (asset UUID {2})",
@@ -185,9 +216,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             AssetType itemAssetType = (AssetType)inventoryItem.AssetType;
 
+            // Count inventory items (different to asset count)
+            CountItems++;
+
             // Don't chase down link asset items as they actually point to their target item IDs rather than an asset
             if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder)
-                m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (sbyte)inventoryItem.AssetType, m_assetUuids);
+                m_assetGatherer.AddForInspection(inventoryItem.AssetID);
         }
 
         /// <summary>
@@ -243,6 +277,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
 
         /// <summary>
+        /// Checks whether the user has permission to export an inventory item to an IAR.
+        /// </summary>
+        /// <param name="UserID">The user</param>
+        /// <param name="InvItem">The inventory item</param>
+        /// <returns>Whether the user is allowed to export the object to an IAR</returns>
+        private bool CanUserArchiveObject(UUID UserID, InventoryItemBase InvItem)
+        {
+            if (FilterContent == null)
+                return true;// Default To Allow Export
+
+            bool permitted = true;
+
+            bool canCopy = (InvItem.CurrentPermissions & (uint)PermissionMask.Copy) != 0;
+            bool canTransfer = (InvItem.CurrentPermissions & (uint)PermissionMask.Transfer) != 0;
+            bool canMod = (InvItem.CurrentPermissions & (uint)PermissionMask.Modify) != 0;
+
+            if (FilterContent.Contains("C") && !canCopy)
+                permitted = false;
+
+            if (FilterContent.Contains("T") && !canTransfer)
+                permitted = false;
+
+            if (FilterContent.Contains("M") && !canMod)
+                permitted = false;
+
+            return permitted;
+        }
+
+        /// <summary>
         /// Execute the inventory write request
         /// </summary>
         public void Execute(Dictionary<string, object> options, IUserAccountService userAccountService)
@@ -250,6 +313,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             if (options.ContainsKey("noassets") && (bool)options["noassets"])
                 SaveAssets = false;
 
+            // Set Permission filter if flag is set
+            if (options.ContainsKey("checkPermissions"))
+            {
+                Object temp;
+                if (options.TryGetValue("checkPermissions", out temp))
+                    FilterContent = temp.ToString().ToUpper();
+            }
+
             try
             {
                 InventoryFolderBase inventoryFolder = null;
@@ -309,7 +380,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     // We couldn't find the path indicated
                     string errorMessage = string.Format("Aborted save.  Could not find inventory path {0}", m_invPath);
                     Exception e = new InventoryArchiverException(errorMessage);
-                    m_module.TriggerInventoryArchiveSaved(m_id, false, m_userInfo, m_invPath, m_saveStream, e);
+                    m_module.TriggerInventoryArchiveSaved(m_id, false, m_userInfo, m_invPath, m_saveStream, e, 0, 0);
                     throw e;
                 }
 
@@ -347,16 +418,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                 if (SaveAssets)
                 {
-                    m_log.DebugFormat("[INVENTORY ARCHIVER]: Saving {0} assets for items", m_assetUuids.Count);
+                    m_assetGatherer.GatherAll();
+
+                    m_log.DebugFormat(
+                        "[INVENTORY ARCHIVER]: Saving {0} assets for items", m_assetGatherer.GatheredUuids.Count);
 
                     AssetsRequest ar
                         = new AssetsRequest(
                             new AssetsArchiver(m_archiveWriter),
-                            m_assetUuids, m_scene.AssetService,
+                            m_assetGatherer.GatheredUuids, m_scene.AssetService,
                             m_scene.UserAccountService, m_scene.RegionInfo.ScopeID,
                             options, ReceivedAllAssets);
 
-                    Util.FireAndForget(o => ar.Execute());
+                    WorkManager.RunInThread(o => ar.Execute(), null, string.Format("AssetsRequest ({0})", m_scene.Name));
                 }
                 else
                 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index ea660bd..5295ba3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -57,6 +57,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //        public bool DisablePresenceChecks { get; set; }
 
         public event InventoryArchiveSaved OnInventoryArchiveSaved;
+        public event InventoryArchiveLoaded OnInventoryArchiveLoaded;
 
         /// <summary>
         /// The file to load and save inventory if no filename has been specified
@@ -64,9 +65,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         protected const string DEFAULT_INV_BACKUP_FILENAME = "user-inventory.iar";
 
         /// <value>
-        /// Pending save completions initiated from the console
+        /// Pending save and load completions initiated from the console
         /// </value>
-        protected List<Guid> m_pendingConsoleSaves = new List<Guid>();
+        protected List<UUID> m_pendingConsoleTasks = new List<UUID>();
 
         /// <value>
         /// All scenes that this module knows about
@@ -111,6 +112,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             {
                 scene.RegisterModuleInterface<IInventoryArchiverModule>(this);
                 OnInventoryArchiveSaved += SaveInvConsoleCommandCompleted;
+                OnInventoryArchiveLoaded += LoadInvConsoleCommandCompleted;
 
                 scene.AddCommand(
                     "Archiving", this, "load iar",
@@ -139,7 +141,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     + "-e|--exclude=<name/uuid> don't save the inventory item in archive" + Environment.NewLine
                     + "-f|--excludefolder=<folder/uuid> don't save contents of the folder in archive" + Environment.NewLine
                     + "-v|--verbose extra debug messages.\n"
-                    + "--noassets stops assets being saved to the IAR.",
+                    + "--noassets stops assets being saved to the IAR."
+                    + "--perm=<permissions> stops items with insufficient permissions from being saved to the IAR.\n"
+                    + "   <permissions> can contain one or more of these characters: \"C\" = Copy, \"T\" = Transfer, \"M\" = Modify.\n",
                     HandleSaveInvConsoleCommand);
 
                 m_aScene = scene;
@@ -175,22 +179,34 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Trigger the inventory archive saved event.
         /// </summary>
         protected internal void TriggerInventoryArchiveSaved(
-            Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
-            Exception reportedException)
+            UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
+            Exception reportedException, int SaveCount, int FilterCount)
         {
             InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved;
             if (handlerInventoryArchiveSaved != null)
-                handlerInventoryArchiveSaved(id, succeeded, userInfo, invPath, saveStream, reportedException);
+                handlerInventoryArchiveSaved(id, succeeded, userInfo, invPath, saveStream, reportedException, SaveCount , FilterCount);
+        }
+
+        /// <summary>
+        /// Trigger the inventory archive loaded event.
+        /// </summary>
+        protected internal void TriggerInventoryArchiveLoaded(
+            UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream loadStream,
+            Exception reportedException, int LoadCount)
+        {
+            InventoryArchiveLoaded handlerInventoryArchiveLoaded = OnInventoryArchiveLoaded;
+            if (handlerInventoryArchiveLoaded != null)
+                handlerInventoryArchiveLoaded(id, succeeded, userInfo, invPath, loadStream, reportedException, LoadCount);
         }
 
         public bool ArchiveInventory(
-             Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream)
+             UUID id, string firstName, string lastName, string invPath, string pass, Stream saveStream)
         {
             return ArchiveInventory(id, firstName, lastName, invPath, pass, saveStream, new Dictionary<string, object>());
         }
 
         public bool ArchiveInventory(
-            Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream,
+            UUID id, string firstName, string lastName, string invPath, string pass, Stream saveStream,
             Dictionary<string, object> options)
         {
             if (m_scenes.Count > 0)
@@ -230,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
 
         public bool ArchiveInventory(
-            Guid id, string firstName, string lastName, string invPath, string pass, string savePath,
+            UUID id, string firstName, string lastName, string invPath, string pass, string savePath,
             Dictionary<string, object> options)
         {
 //            if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath))
@@ -272,13 +288,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             return false;
         }
 
-        public bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, Stream loadStream)
+        public bool DearchiveInventory(UUID id, string firstName, string lastName, string invPath, string pass, Stream loadStream)
         {
-            return DearchiveInventory(firstName, lastName, invPath, pass, loadStream, new Dictionary<string, object>());
+            return DearchiveInventory(id, firstName, lastName, invPath, pass, loadStream, new Dictionary<string, object>());
         }
 
         public bool DearchiveInventory(
-            string firstName, string lastName, string invPath, string pass, Stream loadStream,
+            UUID id, string firstName, string lastName, string invPath, string pass, Stream loadStream,
             Dictionary<string, object> options)
         {
             if (m_scenes.Count > 0)
@@ -294,7 +310,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                         try
                         {
-                            request = new InventoryArchiveReadRequest(m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadStream, merge);
+                            request = new InventoryArchiveReadRequest(id, this, m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadStream, merge);
                         }
                         catch (EntryPointNotFoundException e)
                         {
@@ -326,7 +342,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
 
         public bool DearchiveInventory(
-             string firstName, string lastName, string invPath, string pass, string loadPath,
+             UUID id, string firstName, string lastName, string invPath, string pass, string loadPath,
              Dictionary<string, object> options)
         {
             if (m_scenes.Count > 0)
@@ -342,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                         try
                         {
-                            request = new InventoryArchiveReadRequest(m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadPath, merge);
+                            request = new InventoryArchiveReadRequest(id, this, m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadPath, merge);
                         }
                         catch (EntryPointNotFoundException e)
                         {
@@ -378,6 +394,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             try
             {
+                UUID id = UUID.Random();
+
                 Dictionary<string, object> options = new Dictionary<string, object>();
                 OptionSet optionSet = new OptionSet().Add("m|merge", delegate (string v) { options["merge"] = v != null; });
 
@@ -400,10 +418,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     "[INVENTORY ARCHIVER]: Loading archive {0} to inventory path {1} for {2} {3}",
                     loadPath, invPath, firstName, lastName);
 
-                if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath, options))
-                    m_log.InfoFormat(
-                        "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}",
-                        loadPath, firstName, lastName);
+                lock (m_pendingConsoleTasks)
+                    m_pendingConsoleTasks.Add(id);
+
+                DearchiveInventory(id, firstName, lastName, invPath, pass, loadPath, options);
             }
             catch (InventoryArchiverException e)
             {
@@ -417,7 +435,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <param name="cmdparams"></param>
         protected void HandleSaveInvConsoleCommand(string module, string[] cmdparams)
         {
-            Guid id = Guid.NewGuid();
+            UUID id = UUID.Random();
 
             Dictionary<string, object> options = new Dictionary<string, object>();
 
@@ -439,6 +457,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         options["excludefolders"] = new List<String>();
                     ((List<String>)options["excludefolders"]).Add(v);
                 });
+            ops.Add("perm=", delegate(string v) { options["checkPermissions"] = v; });
 
             List<string> mainParams = ops.Parse(cmdparams);
 
@@ -464,8 +483,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     "[INVENTORY ARCHIVER]: Saving archive {0} using inventory path {1} for {2} {3}",
                     savePath, invPath, firstName, lastName);
 
-                lock (m_pendingConsoleSaves)
-                    m_pendingConsoleSaves.Add(id);
+                lock (m_pendingConsoleTasks)
+                    m_pendingConsoleTasks.Add(id);
 
                 ArchiveInventory(id, firstName, lastName, invPath, pass, savePath, options);
             }
@@ -476,20 +495,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
 
         private void SaveInvConsoleCommandCompleted(
-            Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
-            Exception reportedException)
+            UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
+            Exception reportedException, int SaveCount, int FilterCount)
         {
-            lock (m_pendingConsoleSaves)
+            lock (m_pendingConsoleTasks)
             {
-                if (m_pendingConsoleSaves.Contains(id))
-                    m_pendingConsoleSaves.Remove(id);
+                if (m_pendingConsoleTasks.Contains(id))
+                    m_pendingConsoleTasks.Remove(id);
                 else
                     return;
             }
 
             if (succeeded)
             {
-                m_log.InfoFormat("[INVENTORY ARCHIVER]: Saved archive for {0} {1}", userInfo.FirstName, userInfo.LastName);
+                // Report success and include item count and filter count (Skipped items due to --perm or --exclude switches)
+                if(FilterCount == 0)
+                    m_log.InfoFormat("[INVENTORY ARCHIVER]: Saved archive with {0} items for {1} {2}", SaveCount, userInfo.FirstName, userInfo.LastName);
+                else
+                    m_log.InfoFormat("[INVENTORY ARCHIVER]: Saved archive with {0} items for {1} {2}. Skipped {3} items due to exclude and/or perm switches", SaveCount, userInfo.FirstName, userInfo.LastName, FilterCount);
             }
             else
             {
@@ -499,6 +522,30 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             }
         }
 
+        private void LoadInvConsoleCommandCompleted(
+            UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream loadStream,
+            Exception reportedException, int LoadCount)
+        {
+            lock (m_pendingConsoleTasks)
+            {
+                if (m_pendingConsoleTasks.Contains(id))
+                    m_pendingConsoleTasks.Remove(id);
+                else
+                    return;
+            }
+
+            if (succeeded)
+            {
+                m_log.InfoFormat("[INVENTORY ARCHIVER]: Loaded {0} items from archive {1} for {2} {3}", LoadCount, invPath, userInfo.FirstName, userInfo.LastName);
+            }
+            else
+            {
+                m_log.ErrorFormat(
+                    "[INVENTORY ARCHIVER]: Archive load for {0} {1} failed - {2}",
+                    userInfo.FirstName, userInfo.LastName, reportedException.Message);
+            }
+        }
+
         /// <summary>
         /// Get user information for the given name.
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
index 08f199a..84f9f3f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 {
@@ -69,8 +68,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "meowfood");
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire");
-            
-            archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);            
+
+            archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);            
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
             
@@ -79,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             // Now try loading to a root child folder
             UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xA", false);
             MemoryStream archiveReadStream = new MemoryStream(m_iarStream.ToArray());
-            archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xA", "meowfood", archiveReadStream);
+            archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "xA", "meowfood", archiveReadStream);
 
             InventoryItemBase foundItem2
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xA/" + m_item1Name);
@@ -88,7 +87,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             // Now try loading to a more deeply nested folder
             UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC", false);
             archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
-            archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xB/xC", "meowfood", archiveReadStream);
+            archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "xB/xC", "meowfood", archiveReadStream);
 
             InventoryItemBase foundItem3
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC/" + m_item1Name);
@@ -110,7 +109,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
             
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "password");
-            archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/Objects", "password", m_iarStream);
+            archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "/Objects", "password", m_iarStream);
 
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(
@@ -180,13 +179,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             mre.Reset();
             archiverModule.ArchiveInventory(
-                Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream);
+                UUID.Random(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream);
             mre.WaitOne(60000, false);
 
             // LOAD ITEM
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
-            
-            archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", userPassword, archiveReadStream);
+
+            archiverModule.DearchiveInventory(UUID.Random(), userFirstName, userLastName, "Scripts", userPassword, archiveReadStream);
 
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(
@@ -229,7 +228,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             {
                 // Test replication of path1
-                new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
+                new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                     .ReplicateArchivePathToUserInventory(
                         iarPath1, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
                         foldersCreated, nodesLoaded);
@@ -246,7 +245,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             
             {
                 // Test replication of path2
-                new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
+                new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                     .ReplicateArchivePathToUserInventory(
                         iarPath2, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
                         foldersCreated, nodesLoaded);
@@ -292,7 +291,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             
             string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
 
-            new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
+            new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                 .ReplicateArchivePathToUserInventory(
                     itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
                     new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>());
@@ -343,7 +342,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             
             string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
 
-            new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, folder1ExistingName, (Stream)null, true)
+            new InventoryArchiveReadRequest(UUID.Random(), null, scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, folder1ExistingName, (Stream)null, true)
                 .ReplicateArchivePathToUserInventory(
                     itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
                     new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>());
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
index 1b521fc..d5f3a22 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 {
@@ -72,7 +71,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //            TestHelpers.EnableLogging();
             
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "password");
-            m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream);            
+            m_archiverModule.DearchiveInventory(UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream);            
             
             InventoryItemBase coaItem
                 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_coaItemName);
@@ -106,8 +105,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //            log4net.Config.XmlConfigurator.Configure();
 
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "meowfood");
-            
-            m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "meowfood", m_iarStream);            
+
+            m_archiverModule.DearchiveInventory(UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/", "meowfood", m_iarStream);            
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_item1Name);
 
@@ -171,7 +170,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //            log4net.Config.XmlConfigurator.Configure();
             
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "password");
-            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "password", m_iarStream);
+            m_archiverModule.DearchiveInventory(UUID.Random(), m_uaMT.FirstName, m_uaMT.LastName, "/", "password", m_iarStream);
 
             InventoryItemBase foundItem1
                 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
index b85739e..b614c18 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 {
@@ -85,8 +84,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
             
-            InventoryArchiveReadRequest iarr 
-                = new InventoryArchiveReadRequest(null, null, null, null, null, (Stream)null, false);
+            InventoryArchiveReadRequest iarr
+                = new InventoryArchiveReadRequest(UUID.Random(), null, null, null, null, null, null, (Stream)null, false);
             iarr.LoadControlFile(filePath, data);
             
             Assert.That(iarr.ControlFileLoaded, Is.True);
@@ -110,7 +109,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             mre.Reset();
             m_archiverModule.ArchiveInventory(
-                Guid.NewGuid(), userFirstName, userLastName, "/", userPassword, archiveWriteStream);
+                UUID.Random(), userFirstName, userLastName, "/", userPassword, archiveWriteStream);
             mre.WaitOne(60000, false);
 
             // Test created iar
@@ -179,7 +178,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             mre.Reset();
             m_archiverModule.ArchiveInventory(
-                Guid.NewGuid(), userFirstName, userLastName, "f1", userPassword, archiveWriteStream);
+                UUID.Random(), userFirstName, userLastName, "f1", userPassword, archiveWriteStream);
             mre.WaitOne(60000, false);
 
             // Test created iar
@@ -267,7 +266,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             mre.Reset();
             m_archiverModule.ArchiveInventory(
-                Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream);
+                UUID.Random(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream);
             mre.WaitOne(60000, false);
 
             byte[] archive = archiveWriteStream.ToArray();
@@ -364,7 +363,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             // When we're not saving assets, archiving is being done synchronously.
             m_archiverModule.ArchiveInventory(
-                Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream, options);
+                UUID.Random(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream, options);
 
             byte[] archive = archiveWriteStream.ToArray();
             MemoryStream archiveReadStream = new MemoryStream(archive);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
index db78da9..4b015d7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 {
@@ -163,14 +162,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             scene.AddInventoryItem(coaItem);            
             
             archiverModule.ArchiveInventory(
-                Guid.NewGuid(), m_uaLL1.FirstName, m_uaLL1.LastName, "/*", "hampshire", archiveWriteStream);            
+                UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/*", "hampshire", archiveWriteStream);            
             
             m_iarStreamBytes = archiveWriteStream.ToArray();
         }
         
         protected void SaveCompleted(
-            Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, 
-            Exception reportedException)
+            UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, 
+            Exception reportedException, int SaveCount, int FilterCount)
         {
             mre.Set();
         }        
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 3815c71..18e18a9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -180,8 +180,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         "[INVENTORY TRANSFER]: Inserting original folder {0} into agent {1}'s inventory",
                         folderID, new UUID(im.toAgentID));
                     
+<<<<<<< HEAD
+                    InventoryFolderBase folderCopy
+                        = scene.GiveInventoryFolder(client, receipientID, client.AgentId, folderID, UUID.Zero);
+=======
                     InventoryFolderBase folderCopy 
                         = scene.GiveInventoryFolder(recipientID, client.AgentId, folderID, UUID.Zero);
+>>>>>>> avn/ubitvar
                     
                     if (folderCopy == null)
                     {
@@ -217,13 +222,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                             "into agent {1}'s inventory",
                             itemID, new UUID(im.toAgentID));
 
-                    InventoryItemBase itemCopy = scene.GiveInventoryItem(
-                            new UUID(im.toAgentID),
-                            client.AgentId, itemID);
+                    string message;
+                    InventoryItemBase itemCopy = scene.GiveInventoryItem(new UUID(im.toAgentID), client.AgentId, itemID, out message);
 
                     if (itemCopy == null)
                     {
-                        client.SendAgentAlertMessage("Can't find item to give. Nothing given.", false);
+                        client.SendAgentAlertMessage(message, false);
                         return;
                     }
                     
@@ -389,7 +393,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 IInventoryService invService = scene.InventoryService;
 
                 InventoryFolderBase trashFolder =
-                    invService.GetFolderForType(client.AgentId, AssetType.TrashFolder);
+                    invService.GetFolderForType(client.AgentId, FolderType.Trash);
 
                 UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
 
@@ -471,6 +475,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
         /// <param name="im"></param>
         private void OnGridInstantMessage(GridInstantMessage im)
         {
+<<<<<<< HEAD
+            // Check if it's a type of message that we should handle
+            if (!((im.dialog == (byte) InstantMessageDialog.InventoryOffered)
+                || (im.dialog == (byte) InstantMessageDialog.TaskInventoryOffered)
+                || (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
+                || (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
+                || (im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined)))
+                return;
+
+            m_log.DebugFormat(
+                "[INVENTORY TRANSFER]: {0} IM type received from grid. From={1} ({2}), To={3}",
+                (InstantMessageDialog)im.dialog, im.fromAgentID, im.fromAgentName, im.toAgentID);
+
+=======
+>>>>>>> avn/ubitvar
             // Check if this is ours to handle
             //
             Scene scene = FindClientScene(new UUID(im.toAgentID));
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
index 162a0c3..7ddc396 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
@@ -39,7 +39,6 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
 {
@@ -237,8 +236,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             InventoryItemBase receivedItem 
                 = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, receiverSp.UUID, "Trash/givenObj");
 
-            InventoryFolderBase trashFolder 
-                = m_scene.InventoryService.GetFolderForType(receiverSp.UUID, AssetType.TrashFolder);
+            InventoryFolderBase trashFolder
+                = m_scene.InventoryService.GetFolderForType(receiverSp.UUID, FolderType.Trash);
 
             Assert.That(receivedItem, Is.Not.Null);
             Assert.That(receivedItem.ID, Is.Not.EqualTo(originalItem.ID));
@@ -430,8 +429,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
             InventoryFolderBase receivedFolder 
                 = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, receiverSp.UUID, "Trash/f1");
 
-            InventoryFolderBase trashFolder 
-                = m_scene.InventoryService.GetFolderForType(receiverSp.UUID, AssetType.TrashFolder);
+            InventoryFolderBase trashFolder
+                = m_scene.InventoryService.GetFolderForType(receiverSp.UUID, FolderType.Trash);
 
             Assert.That(receivedFolder, Is.Not.Null);
             Assert.That(receivedFolder.ID, Is.Not.EqualTo(originalFolder.ID));
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
index a34f2d2..24286a4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
@@ -239,16 +239,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                         GatekeeperServiceConnector gConn = new GatekeeperServiceConnector();
                         GridRegion gatekeeper = new GridRegion();
                         gatekeeper.ServerURI = url;
-                        GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(im.RegionID));
+                        string homeURI = scene.GetAgentHomeURI(client.AgentId);
+
+                        string message;
+                        GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(im.RegionID), client.AgentId, homeURI, out message);
                         if (finalDestination != null)
                         {
                             ScenePresence sp = scene.GetScenePresence(client.AgentId);
                             IEntityTransferModule transferMod = scene.RequestModuleInterface<IEntityTransferModule>();
 
                             if (transferMod != null && sp != null)
+                            {
+                                if (message != null)
+                                    sp.ControllingClient.SendAgentAlertMessage(message, true);
+
                                 transferMod.DoTeleport(
                                     sp, gatekeeper, finalDestination, im.Position + new Vector3(0.5f, 0.5f, 0f),
                                     Vector3.UnitX, teleportflags);
+                            }
+                        }
+                        else
+                        {
+                            m_log.InfoFormat("[HG LURE MODULE]: Lure failed: {0}", message);
+                            client.SendAgentAlertMessage(message, true);
                         }
                     }
                 }
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 7177d9b..bea2834 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -46,8 +46,12 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using Mono.Addins;
 using OpenSim.Services.Connectors.Hypergrid;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.UserProfilesService;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using Microsoft.CSharp;
 
-namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
+namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UserProfilesModule")]
     public class UserProfileModule : IProfileModule, INonSharedRegionModule
@@ -63,6 +67,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         Dictionary<UUID, UUID> m_classifiedCache = new Dictionary<UUID, UUID>();
         Dictionary<UUID, int> m_classifiedInterest = new Dictionary<UUID, int>();
 
+        private JsonRpcRequestManager rpc = new JsonRpcRequestManager();
+
         public Scene Scene
         {
             get; private set;
@@ -74,7 +80,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         /// <value>
         /// The configuration
         /// </value>
-        public IConfigSource Config {
+        public IConfigSource Config 
+        {
             get;
             set;
         }
@@ -85,7 +92,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         /// <value>
         /// The profile server URI.
         /// </value>
-        public string ProfileServerUri {
+        public string ProfileServerUri 
+        {
             get;
             set;
         }
@@ -107,11 +115,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         /// <value>
         /// <c>true</c> if enabled; otherwise, <c>false</c>.
         /// </value>
-        public bool Enabled {
+        public bool Enabled 
+        {
             get;
             set;
         }
 
+        public string MyGatekeeper 
+        {
+            get; private set;
+        }
+
+
         #region IRegionModuleBase implementation
         /// <summary>
         ///  This is called to initialize the region module. For shared modules, this is called exactly once, after
@@ -147,6 +162,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             m_log.Debug("[PROFILES]: Full Profiles Enabled");
             ReplaceableInterface = null;
             Enabled = true;
+
+            MyGatekeeper = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI",
+                new string[] { "Startup", "Hypergrid", "UserProfiles" }, String.Empty);
         }
 
         /// <summary>
@@ -176,7 +194,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             Util.FireAndForget(delegate
             {
                 GetImageAssets(((IScenePresence)obj).UUID);
-            });
+            }, null, "UserProfileModule.GetImageAssets");
         }
 
         /// <summary>
@@ -315,7 +333,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             UUID.TryParse(args[0], out creatorId);
             parameters.Add("creatorId", OSD.FromUUID(creatorId));
             OSD Params = (OSD)parameters;
-            if(!JsonRpcRequest(ref Params, "avatarclassifiedsrequest", serverURI, UUID.Random().ToString()))
+            if(!rpc.JsonRpcRequest(ref Params, "avatarclassifiedsrequest", serverURI, UUID.Random().ToString()))
             {
                 remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds);
                 return;
@@ -375,7 +393,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             GetUserProfileServerURI(target, out serverURI);
 
             object Ad = (object)ad;
-            if(!JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString()))
+            if(!rpc.JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString()))
             {
                 remoteClient.SendAgentAlertMessage(
                         "Error getting classified info", false);
@@ -435,9 +453,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                                          uint queryParentEstate, UUID querySnapshotID, Vector3 queryGlobalPos, byte queryclassifiedFlags,
                                          int queryclassifiedPrice, IClientAPI remoteClient)
         {
+            Scene s = (Scene)remoteClient.Scene;
+            IMoneyModule money = s.RequestModuleInterface<IMoneyModule>();
+
+            if (money != null)
+            {
+                if (!money.AmountCovered(remoteClient.AgentId, queryclassifiedPrice))
+                {
+                    remoteClient.SendAgentAlertMessage("You do not have enough money to create requested classified.", false);
+                    return;
+                }
+                money.ApplyCharge(remoteClient.AgentId, queryclassifiedPrice, MoneyTransactionType.ClassifiedCharge);
+            }
+
             UserClassifiedAdd ad = new UserClassifiedAdd();
 
-            Scene s = (Scene) remoteClient.Scene;
             Vector3 pos = remoteClient.SceneAgent.AbsolutePosition;
             ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y);
             ScenePresence p = FindPresence(remoteClient.AgentId);
@@ -471,10 +501,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
             OSD.SerializeMembers(Ad);
 
-            if(!JsonRpcRequest(ref Ad, "classified_update", serverURI, UUID.Random().ToString()))
+            if(!rpc.JsonRpcRequest(ref Ad, "classified_update", serverURI, UUID.Random().ToString()))
             {
                 remoteClient.SendAgentAlertMessage(
                         "Error updating classified", false);
+                return;
             }
         }
 
@@ -497,10 +528,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             UUID.TryParse(queryClassifiedID.ToString(), out classifiedId);
             parameters.Add("classifiedId", OSD.FromUUID(classifiedId));
             OSD Params = (OSD)parameters;
-            if(!JsonRpcRequest(ref Params, "classified_delete", serverURI, UUID.Random().ToString()))
+            if(!rpc.JsonRpcRequest(ref Params, "classified_delete", serverURI, UUID.Random().ToString()))
             {
                 remoteClient.SendAgentAlertMessage(
                         "Error classified delete", false);
+                return;
             }
 
             parameters = (OSDMap)Params;
@@ -547,7 +579,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             OSDMap parameters= new OSDMap();
             parameters.Add("creatorId", OSD.FromUUID(targetId));
             OSD Params = (OSD)parameters;
-            if(!JsonRpcRequest(ref Params, "avatarpicksrequest", serverURI, UUID.Random().ToString()))
+            if(!rpc.JsonRpcRequest(ref Params, "avatarpicksrequest", serverURI, UUID.Random().ToString()))
             {
                 remoteClient.SendAvatarPicksReply(new UUID(args[0]), picks);
                 return;
@@ -588,37 +620,66 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 return;
 
             UUID targetID;
-            UUID.TryParse(args[0], out targetID);
+            UUID.TryParse (args [0], out targetID);
             string serverURI = string.Empty;
-            GetUserProfileServerURI(targetID, out serverURI);
+            GetUserProfileServerURI (targetID, out serverURI);
+
+            string theirGatekeeperURI;
+            GetUserGatekeeperURI (targetID, out theirGatekeeperURI);
+
             IClientAPI remoteClient = (IClientAPI)sender;
 
-            UserProfilePick pick = new UserProfilePick();
-            UUID.TryParse(args[0], out pick.CreatorId);
-            UUID.TryParse(args[1], out pick.PickId);
+            UserProfilePick pick = new UserProfilePick ();
+            UUID.TryParse (args [0], out pick.CreatorId);
+            UUID.TryParse (args [1], out pick.PickId);
 
                 
             object Pick = (object)pick;
-            if(!JsonRpcRequest(ref Pick, "pickinforequest", serverURI, UUID.Random().ToString()))
-            {
-                remoteClient.SendAgentAlertMessage(
+            if (!rpc.JsonRpcRequest (ref Pick, "pickinforequest", serverURI, UUID.Random ().ToString ())) {
+                remoteClient.SendAgentAlertMessage (
                         "Error selecting pick", false);
+                return;
             }
-            pick = (UserProfilePick) Pick;
-            if(pick.SnapshotId == UUID.Zero)
+            pick = (UserProfilePick)Pick;
+            
+            Vector3 globalPos = new Vector3(Vector3.Zero);
+            
+            // Smoke and mirrors
+            if (pick.Gatekeeper == MyGatekeeper) 
             {
-                // In case of a new UserPick, the data may not be ready and we would send wrong data, skip it...
-                m_log.DebugFormat("[PROFILES]: PickInfoRequest: SnapshotID is {0}", UUID.Zero.ToString());
-                return;
+                Vector3.TryParse(pick.GlobalPos,out globalPos);
+            } 
+            else 
+            {
+                // Setup the illusion
+                string region = string.Format("{0} {1}",pick.Gatekeeper,pick.SimName);
+                GridRegion target = Scene.GridService.GetRegionByName(Scene.RegionInfo.ScopeID, region);
+
+                if(target == null)
+                {
+                    // This is a dead or unreachable region
+                }
+                else
+                {
+                    // Work our slight of hand
+                    int x = target.RegionLocX;
+                    int y = target.RegionLocY;
+
+                    dynamic synthX = globalPos.X - (globalPos.X/Constants.RegionSize) * Constants.RegionSize;
+                    synthX += x;
+                    globalPos.X = synthX;
+
+                    dynamic synthY = globalPos.Y - (globalPos.Y/Constants.RegionSize) * Constants.RegionSize;
+                    synthY += y;
+                    globalPos.Y = synthY;
+                }
             }
-             
-            Vector3 globalPos;
-            Vector3.TryParse(pick.GlobalPos,out globalPos);
 
             m_log.DebugFormat("[PROFILES]: PickInfoRequest: {0} : {1}", pick.Name.ToString(), pick.SnapshotId.ToString());
 
+            // Pull the rabbit out of the hat
             remoteClient.SendPickInfoReply(pick.PickId,pick.CreatorId,pick.TopPick,pick.ParcelId,pick.Name,
-                                           pick.Desc,pick.SnapshotId,pick.User,pick.OriginalName,pick.SimName,
+                                           pick.Desc,pick.SnapshotId,pick.ParcelName,pick.OriginalName,pick.SimName,
                                            globalPos,pick.SortOrder,pick.Enabled);
         }
 
@@ -653,9 +714,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         /// Enabled.
         /// </param>
         public void PickInfoUpdate(IClientAPI remoteClient, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled)
-        {
-            
+        {        
+            //TODO: See how this works with NPC, May need to test
             m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString());
+
             UserProfilePick pick = new UserProfilePick();
             string serverURI = string.Empty;
             GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
@@ -667,40 +729,45 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                                             remoteClient.Scene.RegionInfo.WorldLocY + avaPos.Y,
                                             avaPos.Z);
 
-            string landOwnerName = string.Empty;
-            ILandObject land =  p.Scene.LandChannel.GetLandObject(avaPos.X, avaPos.Y);
-            if(land.LandData.IsGroupOwned)
+            string  landParcelName  = "My Parcel";
+            UUID    landParcelID    = p.currentParcelUUID;
+
+            ILandObject land = p.Scene.LandChannel.GetLandObject(avaPos.X, avaPos.Y);
+
+            if (land != null)
             {
-                IGroupsModule groupMod = p.Scene.RequestModuleInterface<IGroupsModule>();
-                UUID groupId = land.LandData.GroupID;
-                GroupRecord groupRecord = groupMod.GetGroupRecord(groupId);
-                landOwnerName = groupRecord.GroupName;
+                // If land found, use parcel uuid from here because the value from SP will be blank if the avatar hasnt moved
+                landParcelName  = land.LandData.Name;
+                landParcelID    = land.LandData.GlobalID;
             }
             else
             {
-                IUserAccountService accounts = p.Scene.RequestModuleInterface<IUserAccountService>();
-                UserAccount user = accounts.GetUserAccount(p.Scene.RegionInfo.ScopeID, land.LandData.OwnerID);
-                landOwnerName = user.Name;
+                m_log.WarnFormat(
+                    "[PROFILES]: PickInfoUpdate found no parcel info at {0},{1} in {2}", 
+                    avaPos.X, avaPos.Y, p.Scene.Name);
             }
 
+
             pick.PickId = pickID;
             pick.CreatorId = creatorID;
             pick.TopPick = topPick;
             pick.Name = name;
             pick.Desc = desc;
-            pick.ParcelId = p.currentParcelUUID;
+            pick.ParcelId = landParcelID;
             pick.SnapshotId = snapshotID;
-            pick.User = landOwnerName;
+            pick.ParcelName = landParcelName;
             pick.SimName = remoteClient.Scene.RegionInfo.RegionName;
+            pick.Gatekeeper = MyGatekeeper;
             pick.GlobalPos = posGlobal.ToString();
             pick.SortOrder = sortOrder;
             pick.Enabled = enabled;
 
             object Pick = (object)pick;
-            if(!JsonRpcRequest(ref Pick, "picks_update", serverURI, UUID.Random().ToString()))
+            if(!rpc.JsonRpcRequest(ref Pick, "picks_update", serverURI, UUID.Random().ToString()))
             {
                 remoteClient.SendAgentAlertMessage(
                         "Error updating pick", false);
+                return;
             }
 
             m_log.DebugFormat("[PROFILES]: Finish PickInfoUpdate {0} {1}", pick.Name, pick.PickId.ToString());
@@ -723,10 +790,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             OSDMap parameters= new OSDMap();
             parameters.Add("pickId", OSD.FromUUID(queryPickID));
             OSD Params = (OSD)parameters;
-            if(!JsonRpcRequest(ref Params, "picks_delete", serverURI, UUID.Random().ToString()))
+            if(!rpc.JsonRpcRequest(ref Params, "picks_delete", serverURI, UUID.Random().ToString()))
             {
                 remoteClient.SendAgentAlertMessage(
                         "Error picks delete", false);
+                return;
             }
         }
         #endregion Picks
@@ -758,7 +826,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             UUID.TryParse(args[0], out note.TargetId);
 
             object Note = (object)note;
-            if(!JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString()))
+            if(!rpc.JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString()))
             {
                 remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes);
                 return;
@@ -792,13 +860,81 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             object Note = note;
-            if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString()))
+            if(!rpc.JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString()))
             {
+                remoteClient.SendAgentAlertMessage(
+                        "Error updating note", false);
                 return;
             }
         }
         #endregion Notes
 
+<<<<<<< HEAD
+        #region User Preferences
+        /// <summary>
+        /// Updates the user preferences.
+        /// </summary>
+        /// <param name='imViaEmail'>
+        /// Im via email.
+        /// </param>
+        /// <param name='visible'>
+        /// Visible.
+        /// </param>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        public void UpdateUserPreferences(bool imViaEmail, bool visible, IClientAPI remoteClient)
+        {
+            UserPreferences pref = new UserPreferences();
+
+            pref.UserId = remoteClient.AgentId;
+            pref.IMViaEmail = imViaEmail;
+            pref.Visible = visible;
+
+            string serverURI = string.Empty;
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+
+            object Pref = pref;
+            if(!rpc.JsonRpcRequest(ref Pref, "user_preferences_update", serverURI, UUID.Random().ToString()))
+            {
+                m_log.InfoFormat("[PROFILES]: UserPreferences update error");
+                remoteClient.SendAgentAlertMessage("Error updating preferences", false);
+                return;   
+            }
+        }
+        
+        /// <summary>
+        /// Users the preferences request.
+        /// </summary>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        public void UserPreferencesRequest(IClientAPI remoteClient)
+        {
+            UserPreferences pref = new UserPreferences();
+
+            pref.UserId = remoteClient.AgentId;
+
+            string serverURI = string.Empty;
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+
+
+            object Pref = (object)pref;
+            if(!rpc.JsonRpcRequest(ref Pref, "user_preferences_request", serverURI, UUID.Random().ToString()))
+            {
+//                m_log.InfoFormat("[PROFILES]: UserPreferences request error");
+//                remoteClient.SendAgentAlertMessage("Error requesting preferences", false);
+                return;
+            }
+            pref = (UserPreferences) Pref;
+
+            remoteClient.SendUserInfoReply(pref.IMViaEmail, pref.Visible, pref.EMail);
+       
+        }
+        #endregion User Preferences
+
+=======
+>>>>>>> avn/ubitvar
         #region Avatar Properties
         /// <summary>
         /// Update the avatars interests .
@@ -836,16 +972,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             object Param = prop;
-            if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString()))
+            if(!rpc.JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString()))
             {
                 remoteClient.SendAgentAlertMessage(
                         "Error updating interests", false);
+                return;
             }
         }
 
         public void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID)
         {
-            if ( String.IsNullOrEmpty(avatarID.ToString()) || String.IsNullOrEmpty(remoteClient.AgentId.ToString()))
+            if (String.IsNullOrEmpty(avatarID.ToString()) || String.IsNullOrEmpty(remoteClient.AgentId.ToString()))
             {
                 // Looking for a reason that some viewers are sending null Id's
                 m_log.DebugFormat("[PROFILES]: This should not happen remoteClient.AgentId {0} - avatarID {1}", remoteClient.AgentId, avatarID);
@@ -922,7 +1059,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             string result = string.Empty;
 
             props.UserId = avatarID;
-            GetProfileData(ref props, out result);
+
+            if (!GetProfileData(ref props, foreign, out result))
+            {
+//                m_log.DebugFormat("Error getting profile for {0}: {1}", avatarID, result);
+                return;
+            }
 
             remoteClient.SendAvatarProperties(props.UserId, props.AboutText, born, charterMember , props.FirstLifeText, flags,
                                               props.FirstLifeImageId, props.ImageId, props.WebUrl, props.PartnerId);
@@ -959,10 +1101,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
                 object Prop = prop;
 
-                if(!JsonRpcRequest(ref Prop, "avatar_properties_update", serverURI, UUID.Random().ToString()))
+                if(!rpc.JsonRpcRequest(ref Prop, "avatar_properties_update", serverURI, UUID.Random().ToString()))
                 {
                     remoteClient.SendAgentAlertMessage(
                             "Error updating properties", false);
+                    return;
                 }
 
                 RequestAvatarProperties(remoteClient, newProfile.ID);
@@ -975,10 +1118,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         /// <returns>
         /// The profile data.
         /// </returns>
-        /// <param name='userID'>
-        /// User I.
-        /// </param>
-        bool GetProfileData(ref UserProfileProperties properties, out string message)
+        bool GetProfileData(ref UserProfileProperties properties, bool foreign, out string message)
         {
             // Can't handle NPC yet...
             ScenePresence p = FindPresence(properties.UserId);
@@ -997,14 +1137,49 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
             // This is checking a friend on the home grid
             // Not HG friend
-            if ( String.IsNullOrEmpty(serverURI))
+            if (String.IsNullOrEmpty(serverURI))
             {
                 message = "No Presence - foreign friend";
                 return false;
             }
 
             object Prop = (object)properties;
-            JsonRpcRequest(ref Prop, "avatar_properties_request", serverURI, UUID.Random().ToString());
+            if (!rpc.JsonRpcRequest(ref Prop, "avatar_properties_request", serverURI, UUID.Random().ToString()))
+            {
+                // If it's a foreign user then try again using OpenProfile, in case that's what the grid is using
+                bool secondChanceSuccess = false;
+                if (foreign)
+                {
+                    try
+                    {
+                        OpenProfileClient client = new OpenProfileClient(serverURI);
+                        if (client.RequestAvatarPropertiesUsingOpenProfile(ref properties))
+                            secondChanceSuccess = true;
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Debug(
+                            string.Format(
+                                "[PROFILES]: Request using the OpenProfile API for user {0} to {1} failed", 
+                                properties.UserId, serverURI),
+                            e);
+
+                        // Allow the return 'message' to say "JsonRpcRequest" and not "OpenProfile", because
+                        // the most likely reason that OpenProfile failed is that the remote server
+                        // doesn't support OpenProfile, and that's not very interesting.
+                    }
+                }
+
+                if (!secondChanceSuccess)
+                {
+                    message = string.Format("JsonRpcRequest for user {0} to {1} failed", properties.UserId, serverURI);
+                    m_log.DebugFormat("[PROFILES]: {0}", message);
+
+                    return false;
+                }
+                // else, continue below
+            }
+            
             properties = (UserProfileProperties)Prop;
 
             message = "Success";
@@ -1025,25 +1200,36 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
             assetServerURI = UserManagementModule.GetUserServerURL(avatarId, "AssetServerURI");
 
+            if(string.IsNullOrEmpty(profileServerURI) || string.IsNullOrEmpty(assetServerURI))
+                return false;
+
             OSDMap parameters= new OSDMap();
             parameters.Add("avatarId", OSD.FromUUID(avatarId));
             OSD Params = (OSD)parameters;
-            if(!JsonRpcRequest(ref Params, "image_assets_request", profileServerURI, UUID.Random().ToString()))
+            if(!rpc.JsonRpcRequest(ref Params, "image_assets_request", profileServerURI, UUID.Random().ToString()))
             {
                 return false;
             }
             
             parameters = (OSDMap)Params;
-            
-            OSDArray list = (OSDArray)parameters["result"];
-            
-            foreach(OSD asset in list)
+
+            if (parameters.ContainsKey("result"))
             {
-                OSDString assetId = (OSDString)asset;
+                OSDArray list = (OSDArray)parameters["result"];
+
+                foreach (OSD asset in list)
+                {
+                    OSDString assetId = (OSDString)asset;
 
-                Scene.AssetService.Get(string.Format("{0}/{1}",assetServerURI, assetId.AsString()));
+                    Scene.AssetService.Get(string.Format("{0}/{1}", assetServerURI, assetId.AsString()));
+                }
+                return true;
+            }
+            else
+            {
+                m_log.ErrorFormat("[PROFILES]: Problematic response for image_assets_request from {0}", profileServerURI);
+                return false;
             }
-            return true;
         }
 
         /// <summary>
@@ -1097,7 +1283,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
                 UserAgentServiceConnector uConn = new UserAgentServiceConnector(home_url);
 
-                Dictionary<string, object> account = uConn.GetUserInfo(userID);
+                Dictionary<string, object> account;
+                try
+                {
+                    account = uConn.GetUserInfo(userID);
+                }
+                catch (Exception e)
+                {
+                    m_log.Debug("[PROFILES]: GetUserInfo call failed ", e);
+                    account = new Dictionary<string, object>();
+                }
 
                 if (account.Count > 0)
                 {
@@ -1125,6 +1320,37 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         }
 
         /// <summary>
+        /// Gets the user gatekeeper server URI.
+        /// </summary>
+        /// <returns>
+        /// The user gatekeeper server URI.
+        /// </returns>
+        /// <param name='userID'>
+        /// If set to <c>true</c> user URI.
+        /// </param>
+        /// <param name='serverURI'>
+        /// If set to <c>true</c> server URI.
+        /// </param>
+        bool GetUserGatekeeperURI(UUID userID, out string serverURI)
+        {
+            bool local;
+            local = UserManagementModule.IsLocalGridUser(userID);
+            
+            if (!local)
+            {
+                serverURI = UserManagementModule.GetUserServerURL(userID, "GatekeeperURI");
+                // Is Foreign
+                return true;
+            }
+            else
+            {
+                serverURI = MyGatekeeper;
+                // Is local
+                return false;
+            }
+        }
+
+        /// <summary>
         /// Gets the user profile server UR.
         /// </summary>
         /// <returns>
@@ -1175,6 +1401,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             return null;
         }
         #endregion Util
+<<<<<<< HEAD
+=======
 
         #region Web Util
         /// <summary>
@@ -1352,5 +1580,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             return true;
         }
         #endregion Web Util
+>>>>>>> avn/ubitvar
     }
 }
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index f615c6b..44eee89 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -160,6 +160,10 @@ namespace OpenSim.Region.CoreModules.Framework
                     }
                 }
 
+//                m_log.DebugFormat(
+//                    "[CAPS]: Adding capabilities for agent {0} in {1} with path {2}",
+//                    agentId, m_scene.RegionInfo.RegionName, capsObjectPath);
+
                 caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
                         (MainServer.Instance == null) ? 0: MainServer.Instance.Port,
                         capsObjectPath, agentId, m_scene.RegionInfo.RegionName);
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index efee080..7937383 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -111,6 +111,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// </remarks>
         private Stat m_interRegionTeleportFailures;
 
+        protected string m_ThisHomeURI;
+        protected string m_GatekeeperURI;
+
         protected bool m_Enabled = false;
 
         public Scene Scene { get; private set; }
@@ -151,6 +154,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Add this agent in this region as a banned person
             public void Add(ulong pRegionHandle, UUID pAgentID)
             {
+<<<<<<< HEAD
+                if (!m_bannedRegions.TryGetValue(pAgentID, out m_idCache))
+                {
+                    m_idCache = new ExpiringCache<ulong, DateTime>();
+                    m_bannedRegions.Add(pAgentID, m_idCache, TimeSpan.FromSeconds(45));
+                }
+                m_idCache.Add(pRegionHandle, DateTime.Now + TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(15));
+=======
                 this.Add(pRegionHandle, pAgentID, 45, 15);
             }
             public void Add(ulong pRegionHandle, UUID pAgentID, double newTime, double extendTime)
@@ -161,6 +172,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     m_bannedRegions.Add(pAgentID, m_idCache, TimeSpan.FromSeconds(newTime));
                 }
                 m_idCache.Add(pRegionHandle, DateTime.Now + TimeSpan.FromSeconds(extendTime), TimeSpan.FromSeconds(extendTime));
+>>>>>>> avn/ubitvar
             }
             // Remove the agent from the region's banned list
             public void Remove(ulong pRegionHandle, UUID pAgentID)
@@ -210,6 +222,21 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         {
             string transferVersionName = "SIMULATION";
             float maxTransferVersion = 0.3f;
+<<<<<<< HEAD
+
+            IConfig hypergridConfig = source.Configs["Hypergrid"];
+            if (hypergridConfig != null)
+            {
+                m_ThisHomeURI = hypergridConfig.GetString("HomeURI", string.Empty);
+                if (m_ThisHomeURI != string.Empty && !m_ThisHomeURI.EndsWith("/"))
+                    m_ThisHomeURI += '/';
+
+                m_GatekeeperURI = hypergridConfig.GetString("GatekeeperURI", string.Empty);
+                if (m_GatekeeperURI != string.Empty && !m_GatekeeperURI.EndsWith("/"))
+                    m_GatekeeperURI += '/';
+            }
+=======
+>>>>>>> avn/ubitvar
 
             IConfig transferConfig = source.Configs["EntityTransfer"];
             if (transferConfig != null)
@@ -488,8 +515,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             // TODO: Check other Scene HeightField
             posZLimit = (float)sp.Scene.Heightmap[(int)position.X, (int)position.Y];
+<<<<<<< HEAD
+=======
 
             posZLimit += localHalfAVHeight + 0.1f;
+>>>>>>> avn/ubitvar
 
             if ((position.Z < posZLimit) && !(Single.IsInfinity(posZLimit) || Single.IsNaN(posZLimit)))
             {
@@ -537,15 +567,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (reg != null)
             {
-                finalDestination = GetFinalDestination(reg);
+                string homeURI = Scene.GetAgentHomeURI(sp.ControllingClient.AgentId);
+
+                string message;
+                finalDestination = GetFinalDestination(reg, sp.ControllingClient.AgentId, homeURI, out message);
 
                 if (finalDestination == null)
                 {
-                    m_log.WarnFormat(
-                        "[ENTITY TRANSFER MODULE]: Final destination is having problems. Unable to teleport {0} {1}",
-                        sp.Name, sp.UUID);
+                    m_log.WarnFormat( "{0} Final destination is having problems. Unable to teleport {1} {2}: {3}",
+                                            LogHeader, sp.Name, sp.UUID, message);
 
-                    sp.ControllingClient.SendTeleportFailed("Problem at destination");
+                    sp.ControllingClient.SendTeleportFailed(message);
                     return;
                 }
 
@@ -566,6 +598,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     return;
                 }
 
+                if (message != null)
+                    sp.ControllingClient.SendAgentAlertMessage(message, true);
+
                 //
                 // This is it
                 //
@@ -587,9 +622,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 Util.RegionHandleToRegionLoc(regionHandle, out regX, out regY);
 
                 MapBlockData block = new MapBlockData();
+<<<<<<< HEAD
+                block.X = (ushort)regX;
+                block.Y = (ushort)regY;
+                block.Access = (byte)SimAccess.Down;
+=======
                 block.X = (ushort)(regX);
                 block.Y = (ushort)(regY);
                 block.Access = (byte)SimAccess.Down; // == not there
+>>>>>>> avn/ubitvar
 
                 List<MapBlockData> blocks = new List<MapBlockData>();
                 blocks.Add(block);
@@ -666,7 +707,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2} ({3}) {4}/{5} - agent is already in transit.",
                     sp.Name, sp.UUID, reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position);
-
+                sp.ControllingClient.SendTeleportFailed("Agent is already in transit.");
                 return;
             }
             
@@ -724,6 +765,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 return;
             }
 
+<<<<<<< HEAD
+            uint newRegionX, newRegionY, oldRegionX, oldRegionY;
+            Util.RegionHandleToRegionLoc(reg.RegionHandle, out newRegionX, out newRegionY);
+            Util.RegionHandleToRegionLoc(sp.Scene.RegionInfo.RegionHandle, out oldRegionX, out oldRegionY);
+
+=======
+>>>>>>> avn/ubitvar
             ulong destinationHandle = finalDestination.RegionHandle;
 
             // Let's do DNS resolution only once in this process, please!
@@ -746,12 +794,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             string version;
             string myversion = string.Format("{0}/{1}", OutgoingTransferVersionName, MaxOutgoingTransferVersion);
             if (!Scene.SimulationService.QueryAccess(
+<<<<<<< HEAD
+                finalDestination, sp.ControllingClient.AgentId, homeURI, true, position, myversion, sp.Scene.GetFormatsOffered(), out version, out reason))
+=======
                  finalDestination, sp.ControllingClient.AgentId, homeURI, true, position, myversion, out version, out reason))
+>>>>>>> avn/ubitvar
             {
                 sp.ControllingClient.SendTeleportFailed(reason);
 
                 m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: {0} was stopped from teleporting from {1} to {2} because {3}",
+                    "[ENTITY TRANSFER MODULE]: {0} was stopped from teleporting from {1} to {2} because: {3}",
                     sp.Name, sp.Scene.Name, finalDestination.RegionName, reason);
 
                 return;
@@ -788,8 +840,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // once we reach here...
             //avatar.Scene.RemoveCapsHandler(avatar.UUID);
 
-            string capsPath = String.Empty;
-
             AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
             AgentCircuitData agentCircuit = sp.ControllingClient.RequestClientInfo();
             agentCircuit.startpos = position;
@@ -810,6 +860,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agentCircuit.Id0 = currentAgentCircuit.Id0;
             }
 
+<<<<<<< HEAD
+            // if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
+            float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance,
+                (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
+            if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
+=======
             IClientIPEndpoint ipepClient;
        
             uint newRegionX, newRegionY, oldRegionX, oldRegionY;
@@ -824,6 +880,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 oldSizeX, oldSizeY, newSizeX, newSizeY);
 
             if (OutSideViewRange)
+>>>>>>> avn/ubitvar
             {
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for agent {3} from {4}",
@@ -854,7 +911,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 float.TryParse(versionComponents[1], out versionNumber);
 
             if (versionNumber >= 0.2f && MaxOutgoingTransferVersion >= versionNumber)
+<<<<<<< HEAD
+                TransferAgent_V2(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, oldRegionX, newRegionX, oldRegionY, newRegionY, version, out reason);
+=======
                 TransferAgent_V2(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange , version, out reason);
+>>>>>>> avn/ubitvar
             else
                 TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange, version, out reason);           
         }
@@ -878,12 +939,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 m_interRegionTeleportFailures.Value++;
 
-                sp.ControllingClient.SendTeleportFailed(String.Format("Teleport refused: {0}", reason));
-
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}",
                     sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason);
 
+                sp.ControllingClient.SendTeleportFailed(reason);
+
                 return;
             }
 
@@ -912,6 +973,20 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
 
             // OK, it got this agent. Let's close some child agents
+<<<<<<< HEAD
+            sp.CloseChildAgents(newRegionX, newRegionY);
+
+            IClientIPEndpoint ipepClient;
+            string capsPath = String.Empty;
+            float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance,
+                (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
+            if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
+            {
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for incoming agent {3} from {4}",
+                    finalDestination.RegionName, newRegionX, newRegionY, sp.Name, Scene.Name);
+=======
+>>>>>>> avn/ubitvar
 
 
             if (OutSideViewRange)
@@ -1082,7 +1157,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
 
+<<<<<<< HEAD
+            if (NeedsClosing(sp.Scene.DefaultDrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
+=======
             if (OutSideViewRange)
+>>>>>>> avn/ubitvar
             {
                 if (!sp.Scene.IncomingPreCloseClient(sp))
                     return;
@@ -1114,12 +1193,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 m_interRegionTeleportFailures.Value++;
 
-                sp.ControllingClient.SendTeleportFailed(String.Format("Teleport refused: {0}", reason));
-
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}",
                     sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason);
 
+                sp.ControllingClient.SendTeleportFailed(reason);
+
                 return;
             }
 
@@ -1147,6 +1226,35 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Past this point we have to attempt clean up if the teleport fails, so update transfer state.
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
 
+<<<<<<< HEAD
+            IClientIPEndpoint ipepClient;
+            string capsPath = String.Empty;
+            float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance, 
+                (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
+            if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
+            {
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for agent {3} from {4}",
+                    finalDestination.RegionName, newRegionX, newRegionY, sp.Name, Scene.Name);
+
+                //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent...");
+                #region IP Translation for NAT
+                // Uses ipepClient above
+                if (sp.ClientView.TryGet(out ipepClient))
+                {
+                    endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);
+                }
+                #endregion
+                capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
+            }
+            else
+            {
+                agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle);
+                capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
+            }
+
+=======
+>>>>>>> avn/ubitvar
             // We need to set this here to avoid an unlikely race condition when teleporting to a neighbour simulator,
             // where that neighbour simulator could otherwise request a child agent create on the source which then 
             // closes our existing agent which is still signalled as root.
@@ -1225,7 +1333,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             sp.MakeChildAgent(destinationHandle);
 
             // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
+<<<<<<< HEAD
+            if (NeedsClosing(sp.Scene.DefaultDrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
+=======
             if (OutSideViewRange)
+>>>>>>> avn/ubitvar
             {
                 if (!sp.Scene.IncomingPreCloseClient(sp))
                     return;
@@ -1302,8 +1414,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected virtual bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout)
         {
+            GridRegion source = new GridRegion(Scene.RegionInfo);
+            source.RawServerURI = m_GatekeeperURI;
+
             logout = false;
-            bool success = Scene.SimulationService.CreateAgent(finalDestination, agentCircuit, teleportFlags, out reason);
+            bool success = Scene.SimulationService.CreateAgent(source, finalDestination, agentCircuit, teleportFlags, out reason);
 
             if (success)
                 sp.Scene.EventManager.TriggerTeleportStart(sp.ControllingClient, reg, finalDestination, teleportFlags, logout);
@@ -1341,16 +1456,21 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             scene.SendKillObject(new List<uint> { localID });
         }
 
-        protected virtual GridRegion GetFinalDestination(GridRegion region)
+        protected virtual GridRegion GetFinalDestination(GridRegion region, UUID agentID, string agentHomeURI, out string message)
         {
+            message = null;
             return region;
         }
 
         // This returns 'true' if the new region already has a child agent for our
         //    incoming agent. The implication is that, if 'false', we have to create  the
         //    child and then teleport into the region.
+<<<<<<< HEAD
+        protected virtual bool NeedsNewAgent(float drawdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY)
+=======
         protected virtual bool NeedsNewAgent(float drawdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY,
             int oldsizeX, int oldsizeY, int newsizeX, int newsizeY)
+>>>>>>> avn/ubitvar
         {
             if (m_regionCombinerModule != null && m_regionCombinerModule.IsRootForMegaregion(Scene.RegionInfo.RegionID))
             {
@@ -1367,6 +1487,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return Util.IsOutsideView(drawdist, oldRegionX, newRegionX, oldRegionY, newRegionY,
                     oldsizeX, oldsizeY, newsizeX, newsizeY);
         }
+<<<<<<< HEAD
+
+=======
 /*
         protected virtual bool NeedsClosing(float drawdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY,
             uint oldsizeX, uint oldsizeY, uint newsizeX, uint newsizeY, GridRegion reg)
@@ -1376,6 +1499,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 oldsizeX, oldsizeY, newsizeX, newsizeY);
         }
 */
+>>>>>>> avn/ubitvar
         #endregion
 
         #region Landmark Teleport
@@ -1421,6 +1545,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (uinfo.HomeRegionID == UUID.Zero)
                 {
                     // can't find the Home region: Tell viewer and abort
+                    m_log.ErrorFormat("{0} No grid user info found for {1} {2}. Cannot send home.",
+                                    LogHeader, client.Name, client.AgentId);
                     client.SendTeleportFailed("You don't have a home position set.");
                     return false;
                 }
@@ -1454,10 +1580,82 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         #region Agent Crossings
 
+<<<<<<< HEAD
+        // Given a position relative to the current region (which has previously been tested to
+        //    see that it is actually outside the current region), find the new region that the
+        //    point is actually in.
+        // Returns the coordinates and information of the new region or 'null' of it doesn't exist.
+        public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos,
+                                            out string version, out Vector3 newpos, out string failureReason)
+=======
         public bool checkAgentAccessToRegion(ScenePresence agent, GridRegion destiny, Vector3 position, out string version, out string reason)
+>>>>>>> avn/ubitvar
         {
             reason = String.Empty;
             version = String.Empty;
+<<<<<<< HEAD
+            newpos = pos;
+            failureReason = string.Empty;
+            string homeURI = scene.GetAgentHomeURI(agentID);
+
+//            m_log.DebugFormat(
+//                "[ENTITY TRANSFER MODULE]: Crossing agent {0} at pos {1} in {2}", agent.Name, pos, scene.Name);
+
+            // Compute world location of the object's position
+            double presenceWorldX = (double)scene.RegionInfo.WorldLocX + pos.X;
+            double presenceWorldY = (double)scene.RegionInfo.WorldLocY + pos.Y;
+
+            // Call the grid service to lookup the region containing the new position.
+            GridRegion neighbourRegion = GetRegionContainingWorldLocation(scene.GridService, scene.RegionInfo.ScopeID,
+                                                        presenceWorldX, presenceWorldY, 
+                                                        Math.Max(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY));
+
+            if (neighbourRegion != null)
+            {
+                // Compute the entity's position relative to the new region
+                newpos = new Vector3((float)(presenceWorldX - (double)neighbourRegion.RegionLocX),
+                                      (float)(presenceWorldY - (double)neighbourRegion.RegionLocY),
+                                      pos.Z);
+
+                if (m_bannedRegionCache.IfBanned(neighbourRegion.RegionHandle, agentID))
+                {
+                    failureReason = "Cannot region cross into banned parcel";
+                    neighbourRegion = null;
+                }
+                else
+                {
+                    // If not banned, make sure this agent is not in the list.
+                    m_bannedRegionCache.Remove(neighbourRegion.RegionHandle, agentID);
+                }
+
+                // Check to see if we have access to the target region.
+                string myversion = string.Format("{0}/{1}", OutgoingTransferVersionName, MaxOutgoingTransferVersion);
+                if (neighbourRegion != null
+                    && !scene.SimulationService.QueryAccess(neighbourRegion, agentID, homeURI, false, newpos, myversion, scene.GetFormatsOffered(), out version, out failureReason))
+                {
+                    // remember banned
+                    m_bannedRegionCache.Add(neighbourRegion.RegionHandle, agentID);
+                    neighbourRegion = null;
+                }
+            }
+            else
+            {
+                // The destination region just doesn't exist
+                failureReason = "Cannot cross into non-existent region";
+            }
+
+            if (neighbourRegion == null)
+                m_log.DebugFormat("{0} GetDestination: region not found. Old region name={1} at <{2},{3}> of size <{4},{5}>. Old pos={6}",
+                    LogHeader, scene.RegionInfo.RegionName,
+                    scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY,
+                    scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY,
+                    pos);
+            else
+                m_log.DebugFormat("{0} GetDestination: new region={1} at <{2},{3}> of size <{4},{5}>, newpos=<{6},{7}>",
+                    LogHeader, neighbourRegion.RegionName,
+                    neighbourRegion.RegionLocX, neighbourRegion.RegionLocY, neighbourRegion.RegionSizeX, neighbourRegion.RegionSizeY,
+                    newpos.X, newpos.Y);
+=======
 
             UUID agentID = agent.UUID;
             ulong destinyHandle = destiny.RegionHandle;
@@ -1549,6 +1747,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // The destination region just doesn't exist
                 failureReason = "Cannot cross into non-existent region";
             }
+>>>>>>> avn/ubitvar
 
             if (neighbourRegion == null)
                 m_log.DebugFormat("{0} GetDestination: region not found. Old region name={1} at <{2},{3}> of size <{4},{5}>. Old pos={6}",
@@ -1567,6 +1766,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         public bool Cross(ScenePresence agent, bool isFlying)
         {
+<<<<<<< HEAD
+=======
             agent.IsInTransit = true;
             CrossAsyncDelegate d = CrossAsync;
             d.BeginInvoke(agent, isFlying, CrossCompleted, d);
@@ -1592,10 +1793,19 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         {
             uint x;
             uint y;
+>>>>>>> avn/ubitvar
             Vector3 newpos;
             string version;
             string failureReason;
 
+<<<<<<< HEAD
+            GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, agent.AbsolutePosition,
+                                                            out version, out newpos, out failureReason);
+            if (neighbourRegion == null)
+            {
+                agent.ControllingClient.SendAlertMessage(failureReason);
+                return false;
+=======
             Vector3 pos = agent.AbsolutePosition + agent.Velocity;
 
             GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, pos,
@@ -1605,13 +1815,20 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (failureReason != String.Empty)
                     agent.ControllingClient.SendAlertMessage(failureReason);
                 return agent;
+>>>>>>> avn/ubitvar
             }
 
 //            agent.IsInTransit = true;
 
+<<<<<<< HEAD
+            Scene.EventManager.TriggerCrossAgentToNewRegion(agent, isFlying, neighbourRegion);
+
+            return true;
+=======
             CrossAgentToNewRegionAsync(agent, newpos, neighbourRegion, isFlying, version);
             agent.IsInTransit = false;
             return agent;
+>>>>>>> avn/ubitvar
         }
 
 
@@ -1707,19 +1924,30 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                 ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
                                 bool isFlying, string version)
         {
-            if (!CrossAgentToNewRegionPrep(agent, neighbourRegion))
+            try
             {
-                m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
-                return agent;
-            }
+                m_log.DebugFormat("{0}: CrossAgentToNewRegionAsync: new region={1} at <{2},{3}>. newpos={4}",
+                            LogHeader, neighbourRegion.RegionName, neighbourRegion.RegionLocX, neighbourRegion.RegionLocY, pos);
+
+                if (!CrossAgentToNewRegionPrep(agent, neighbourRegion))
+                {
+                    m_log.DebugFormat("{0}: CrossAgentToNewRegionAsync: prep failed. Resetting transfer state", LogHeader);
+                    m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
+                }
+
+                if (!CrossAgentIntoNewRegionMain(agent, pos, neighbourRegion, isFlying))
+                {
+                    m_log.DebugFormat("{0}: CrossAgentToNewRegionAsync: cross main failed. Resetting transfer state", LogHeader);
+                    m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
+                }
 
-            if (!CrossAgentIntoNewRegionMain(agent, pos, neighbourRegion, isFlying))
+                CrossAgentToNewRegionPost(agent, pos, neighbourRegion, isFlying, version);
+            }
+            catch (Exception e)
             {
-                m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
-                return agent;
+                m_log.Error(string.Format("{0}: CrossAgentToNewRegionAsync: failed with exception  ", LogHeader), e);
             }
 
-            CrossAgentToNewRegionPost(agent, pos, neighbourRegion, isFlying, version);
             return agent;
         }
 
@@ -1730,6 +1958,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 AgentData cAgent = new AgentData(); 
                 agent.CopyTo(cAgent);
+<<<<<<< HEAD
+                cAgent.Position = pos;
+
+=======
 
 //                agent.Appearance.WearableCacheItems = null;
 
@@ -1737,6 +1969,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 cAgent.ChildrenCapSeeds = agent.KnownRegions;
 
+>>>>>>> avn/ubitvar
                 if (isFlying)
                     cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
 
@@ -1815,6 +2048,25 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                             capsPath);
             }
 
+<<<<<<< HEAD
+            // SUCCESS!
+            m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination);
+
+            // Unlike a teleport, here we do not wait for the destination region to confirm the receipt.
+            m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
+
+            agent.MakeChildAgent();
+
+            // FIXME: Possibly this should occur lower down after other commands to close other agents,
+            // but not sure yet what the side effects would be.
+            m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
+
+            // now we have a child agent in this region. Request all interesting data about other (root) agents
+            agent.SendOtherAgentsAvatarDataToClient();
+            agent.SendOtherAgentsAppearanceToClient();
+
+=======
+>>>>>>> avn/ubitvar
             // Backwards compatibility. Best effort
             if (version == "Unknown" || version == string.Empty)
             {
@@ -1823,6 +2075,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
             }
 
+<<<<<<< HEAD
+            // Next, let's close the child agent connections that are too far away.
+            uint neighbourx;
+            uint neighboury;
+            Util.RegionHandleToRegionLoc(neighbourRegion.RegionHandle, out neighbourx, out neighboury);
+=======
             // SUCCESS!
             m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination);
 
@@ -1838,6 +2096,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // FIXME: Possibly this should occur lower down after other commands to close other agents,
             // but not sure yet what the side effects would be.
             m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
+>>>>>>> avn/ubitvar
 
             agent.CloseChildAgents(neighbourRegion.RegionHandle, neighbourRegion.RegionSizeX, neighbourRegion.RegionSizeY);
 
@@ -1918,8 +2177,24 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             seeds.Add(regionhandler, agent.CapsPath);
 
+<<<<<<< HEAD
+            sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath);
+            //foreach (ulong h in agent.ChildrenCapSeeds.Keys)
+            //    m_log.DebugFormat("[XXX] --> {0}", h);
+            //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle);
+            if (agent.ChildrenCapSeeds.ContainsKey(region.RegionHandle))
+            {
+                m_log.WarnFormat(
+                    "[ENTITY TRANSFER]: Overwriting caps seed {0} with {1} for region {2} (handle {3}) for {4} in {5}", 
+                    agent.ChildrenCapSeeds[region.RegionHandle], agent.CapsPath, 
+                    region.RegionName, region.RegionHandle, sp.Name, Scene.Name);
+            }
+
+            agent.ChildrenCapSeeds[region.RegionHandle] = agent.CapsPath;
+=======
 //            agent.ChildrenCapSeeds = new Dictionary<ulong, string>(seeds);
             agent.ChildrenCapSeeds = null;
+>>>>>>> avn/ubitvar
 
             if (sp.Scene.CapsModule != null)
             {
@@ -2003,7 +2278,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (m_regionInfo != null)
             {
+<<<<<<< HEAD
+                neighbours = GetNeighbours(sp, m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
+=======
                 neighbours = GetNeighbors(sp, m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
+>>>>>>> avn/ubitvar
             }
             else
             {
@@ -2252,6 +2531,127 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         #endregion // NotFoundLocationCache class
         private NotFoundLocationCache m_notFoundLocationCache = new NotFoundLocationCache();
 
+<<<<<<< HEAD
+        // Computes the difference between two region bases.
+        // Returns a vector of world coordinates (meters) from base of first region to the second.
+        // The first region is the home region of the passed scene presence.
+        Vector3 CalculateOffset(ScenePresence sp, GridRegion neighbour)
+        {
+            /*
+            int rRegionX = (int)sp.Scene.RegionInfo.LegacyRegionLocX;
+            int rRegionY = (int)sp.Scene.RegionInfo.LegacyRegionLocY;
+            int tRegionX = neighbour.RegionLocX / (int)Constants.RegionSize;
+            int tRegionY = neighbour.RegionLocY / (int)Constants.RegionSize;
+            int shiftx = (rRegionX - tRegionX) * (int)Constants.RegionSize;
+            int shifty = (rRegionY - tRegionY) * (int)Constants.RegionSize;
+            return new Vector3(shiftx, shifty, 0f);
+             */
+            return new Vector3( sp.Scene.RegionInfo.WorldLocX - neighbour.RegionLocX,
+                                sp.Scene.RegionInfo.WorldLocY - neighbour.RegionLocY,
+                                0f);
+        }
+
+        public GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py)
+        {
+            // Since we don't know how big the regions could be, we have to search a very large area
+            //    to find possible regions.
+            return GetRegionContainingWorldLocation(pGridService, pScopeID, px, py, Constants.MaximumRegionSize);
+        }
+
+        #region NotFoundLocationCache class
+        // A collection of not found locations to make future lookups 'not found' lookups quick.
+        // A simple expiring cache that keeps not found locations for some number of seconds.
+        // A 'not found' location is presumed to be anywhere in the minimum sized region that
+        //    contains that point. A conservitive estimate.
+        private class NotFoundLocationCache
+        {
+            private struct NotFoundLocation
+            {
+                public double minX, maxX, minY, maxY;
+                public DateTime expireTime;
+            }
+            private List<NotFoundLocation> m_notFoundLocations = new List<NotFoundLocation>();
+            public NotFoundLocationCache()
+            {
+            }
+            // Add an area to the list of 'not found' places. The area is the snapped region
+            //    area around the added point.
+            public void Add(double pX, double pY)
+            {
+                lock (m_notFoundLocations)
+                {
+                    if (!LockedContains(pX, pY))
+                    {
+                        NotFoundLocation nfl = new NotFoundLocation();
+                        // A not found location is not found for at least a whole region sized area
+                        nfl.minX = pX - (pX % (double)Constants.RegionSize);
+                        nfl.minY = pY - (pY % (double)Constants.RegionSize);
+                        nfl.maxX = nfl.minX + (double)Constants.RegionSize;
+                        nfl.maxY = nfl.minY + (double)Constants.RegionSize;
+                        nfl.expireTime = DateTime.Now + TimeSpan.FromSeconds(30);
+                        m_notFoundLocations.Add(nfl);
+                    }
+                }
+                
+            }
+            // Test to see of this point is in any of the 'not found' areas.
+            // Return 'true' if the point is found inside the 'not found' areas.
+            public bool Contains(double pX, double pY)
+            {
+                bool ret = false;
+                lock (m_notFoundLocations)
+                    ret = LockedContains(pX, pY);
+                return ret;
+            }
+            private bool LockedContains(double pX, double pY)
+            {
+                bool ret = false;
+                this.DoExpiration();
+                foreach (NotFoundLocation nfl in m_notFoundLocations)
+                {
+                    if (pX >= nfl.minX && pX < nfl.maxX && pY >= nfl.minY && pY < nfl.maxY)
+                    {
+                        ret = true;
+                        break;
+                    }
+                }
+                return ret;
+            }
+            private void DoExpiration()
+            {
+                List<NotFoundLocation> m_toRemove = null;
+                DateTime now = DateTime.Now;
+                foreach (NotFoundLocation nfl in m_notFoundLocations)
+                {
+                    if (nfl.expireTime < now)
+                    {
+                        if (m_toRemove == null)
+                            m_toRemove = new List<NotFoundLocation>();
+                        m_toRemove.Add(nfl);
+                    }
+                }
+                if (m_toRemove != null)
+                {
+                    foreach (NotFoundLocation nfl in m_toRemove)
+                        m_notFoundLocations.Remove(nfl);
+                    m_toRemove.Clear();
+                }
+            }
+        }
+        #endregion // NotFoundLocationCache class
+        private NotFoundLocationCache m_notFoundLocationCache = new NotFoundLocationCache();
+
+        // Given a world position (fractional meter coordinate), get the GridRegion info for
+        //   the region containing that point.
+        // Someday this should be a method on GridService.
+        // 'pSizeHint' is the size of the source region but since the destination point can be anywhere
+        //     the size of the target region is unknown thus the search area might have to be very large.
+        // Return 'null' if no such region exists.
+        public GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID,
+                            double px, double py, uint pSizeHint)
+        {
+            m_log.DebugFormat("{0} GetRegionContainingWorldLocation: query, loc=<{1},{2}>", LogHeader, px, py);
+=======
 // needed for current OSG or old grid code
  
         public GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py)
@@ -2271,6 +2671,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                             double px, double py, uint pSizeHint)
         {
             m_log.DebugFormat("{0} GetRegionContainingWorldLocation: call, XY=<{1},{2}>", LogHeader, px, py);
+>>>>>>> avn/ubitvar
             GridRegion ret = null;
             const double fudge = 2.0;
 
@@ -2364,6 +2765,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                                   IPEndPoint endPoint, bool newAgent)
         {
 
+<<<<<<< HEAD
+            Scene scene = sp.Scene;
+            
+            m_log.DebugFormat(
+                "[ENTITY TRANSFER MODULE]: Informing {0} {1} about neighbour {2} {3} at ({4},{5})",
+                sp.Name, sp.UUID, reg.RegionName, endPoint, reg.RegionCoordX, reg.RegionCoordY);
+=======
             if (newAgent)
             {
                 Scene scene = sp.Scene;
@@ -2371,12 +2779,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Informing {0} {1} about neighbour {2} {3} at ({4},{5})",
                     sp.Name, sp.UUID, reg.RegionName, endPoint, reg.RegionCoordX, reg.RegionCoordY);
+>>>>>>> avn/ubitvar
 
                 string capsPath = reg.ServerURI + CapsUtil.GetCapsSeedPath(a.CapsPath);
 
                 string reason = String.Empty;
 
+<<<<<<< HEAD
+            bool regionAccepted = scene.SimulationService.CreateAgent(null, reg, a, (uint)TeleportFlags.Default, out reason);
+=======
                 bool regionAccepted = scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason);
+>>>>>>> avn/ubitvar
 
                 if (regionAccepted)
                 {
@@ -2435,7 +2848,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 extent.Y = (float)Util.WorldToRegionLoc((uint)megaRegionSize.Y);
             }
 
+<<<<<<< HEAD
+=======
 
+>>>>>>> avn/ubitvar
             swCorner.X = Scene.RegionInfo.RegionLocX - 1;
             swCorner.Y = Scene.RegionInfo.RegionLocY - 1;
             neCorner.X = Scene.RegionInfo.RegionLocX + extent.X;
@@ -2443,13 +2859,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         }
 
         /// <summary>
-        /// Return the list of regions that are considered to be neighbours to the given scene.
+        /// Return the list of online regions that are considered to be neighbours to the given scene.
         /// </summary>
-        /// <param name="pScene"></param>
+        /// <param name="avatar"></param>
         /// <param name="pRegionLocX"></param>
         /// <param name="pRegionLocY"></param>
         /// <returns></returns>        
+<<<<<<< HEAD
+        protected List<GridRegion> GetNeighbours(ScenePresence avatar, uint pRegionLocX, uint pRegionLocY)
+=======
         protected List<GridRegion> GetNeighbors(ScenePresence avatar, uint pRegionLocX, uint pRegionLocY)
+>>>>>>> avn/ubitvar
         {
             Scene pScene = avatar.Scene;
             RegionInfo m_regionInfo = pScene.RegionInfo;
@@ -2460,6 +2880,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // view to include everything in the megaregion
             if (m_regionCombinerModule == null || !m_regionCombinerModule.IsRootForMegaregion(Scene.RegionInfo.RegionID))
             {
+<<<<<<< HEAD
+                // The area to check is as big as the current region.
+                // We presume all adjacent regions are the same size as this region.
+                uint dd = Math.Max((uint)avatar.Scene.DefaultDrawDistance, 
+                                Math.Max(Scene.RegionInfo.RegionSizeX, Scene.RegionInfo.RegionSizeY));
+
+                uint startX = Util.RegionToWorldLoc(pRegionLocX) - dd + Constants.RegionSize/2;
+                uint startY = Util.RegionToWorldLoc(pRegionLocY) - dd + Constants.RegionSize/2;
+
+                uint endX = Util.RegionToWorldLoc(pRegionLocX) + dd + Constants.RegionSize/2;
+                uint endY = Util.RegionToWorldLoc(pRegionLocY) + dd + Constants.RegionSize/2;
+
+                neighbours 
+                    = avatar.Scene.GridService.GetRegionRange(
+                        m_regionInfo.ScopeID, (int)startX, (int)endX, (int)startY, (int)endY);
+=======
                 uint dd = (uint)avatar.DrawDistance;
 
                 // until avatar movement updates client connections, we need to seend at least this current region imediate Neighbors
@@ -2484,6 +2920,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     = avatar.Scene.GridService.GetRegionRange(
                         m_regionInfo.ScopeID, (int)startX, (int)endX, (int)startY, (int)endY);
 
+>>>>>>> avn/ubitvar
             }
             else
             {
@@ -2497,9 +2934,24 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         (int)Util.RegionToWorldLoc((uint)swCorner.Y), (int)Util.RegionToWorldLoc((uint)neCorner.Y));
             }
 
+<<<<<<< HEAD
+//            neighbours.ForEach(
+//                n => 
+//                    m_log.DebugFormat(
+//                        "[ENTITY TRANSFER MODULE]: Region flags for {0} as seen by {1} are {2}", 
+//                        n.RegionName, Scene.Name, n.RegionFlags != null ? n.RegionFlags.ToString() : "not present"));
+
+            // The r.RegionFlags == null check only needs to be made for simulators before 2015-01-14 (pre 0.8.1).
+            neighbours.RemoveAll(
+                r => 
+                    r.RegionID == m_regionInfo.RegionID 
+                        || (r.RegionFlags != null && (r.RegionFlags & OpenSim.Framework.RegionFlags.RegionOnline) == 0));
+
+=======
             // The r.RegionFlags == null check only needs to be made for simulators before 2015-01-14 (pre 0.8.1).
             neighbours.RemoveAll( r => r.RegionID == m_regionInfo.RegionID );
 
+>>>>>>> avn/ubitvar
             return neighbours;
         }
         #endregion
@@ -2566,7 +3018,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// Move the given scene object into a new region depending on which region its absolute position has moved
         /// into.
         ///
-        /// This method locates the new region handle and offsets the prim position for the new region
+        /// Using the objects new world location, ask the grid service for a the new region and adjust the prim
+        /// position to be relative to the new region.
         /// </summary>
         /// <param name="grp">the scene object that we're crossing</param>
         /// <param name="attemptedPosition">the attempted out of region position of the scene object. This position is
@@ -2583,6 +3036,23 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (scene == null)
                 return;
 
+<<<<<<< HEAD
+            if (grp.RootPart.DIE_AT_EDGE)
+            {
+                // We remove the object here
+                try
+                {
+                    scene.DeleteSceneObject(grp, false);
+                }
+                catch (Exception)
+                {
+                    m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border.");
+                }
+                return;
+            }
+
+=======
+>>>>>>> avn/ubitvar
             // Remember the old group position in case the region lookup fails so position can be restored.
             Vector3 oldGroupPosition = grp.RootPart.GroupPosition;
 
@@ -2759,5 +3229,69 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         }
         #endregion
 
+        public virtual bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition)
+        {
+            // If the user is banned, we won't let any of their objects
+            // enter. Period.
+            //
+            if (Scene.RegionInfo.EstateSettings.IsBanned(so.OwnerID))
+            {
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Denied prim crossing of {0} {1} into {2} for banned avatar {3}", 
+                    so.Name, so.UUID, Scene.Name, so.OwnerID);
+
+                return false;
+            }
+
+            if (newPosition != Vector3.Zero)
+                so.RootPart.GroupPosition = newPosition;
+
+            if (!Scene.AddSceneObject(so))
+            {
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Problem adding scene object {0} {1} into {2} ", 
+                    so.Name, so.UUID, Scene.Name);
+
+                return false;
+            }
+
+            if (!so.IsAttachment)
+            {
+                // FIXME: It would be better to never add the scene object at all rather than add it and then delete
+                // it
+                if (!Scene.Permissions.CanObjectEntry(so.UUID, true, so.AbsolutePosition))
+                {
+                    // Deny non attachments based on parcel settings
+                    //
+                    m_log.Info("[ENTITY TRANSFER MODULE]: Denied prim crossing because of parcel settings");
+
+                    Scene.DeleteSceneObject(so, false);
+
+                    return false;
+                }
+
+                // For attachments, we need to wait until the agent is root
+                // before we restart the scripts, or else some functions won't work.
+                so.RootPart.ParentGroup.CreateScriptInstances(
+                    0, false, Scene.DefaultScriptEngine, GetStateSource(so));
+
+                so.ResumeScripts();
+
+                if (so.RootPart.KeyframeMotion != null)
+                    so.RootPart.KeyframeMotion.UpdateSceneObject(so);
+            }
+
+            return true;
+        }
+
+        private int GetStateSource(SceneObjectGroup sog)
+        {
+            ScenePresence sp = Scene.GetScenePresence(sog.OwnerID);
+
+            if (sp != null)
+                return sp.GetStateSource();
+
+            return 2; // StateSource.PrimCrossing
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
index e903383..54ec751 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
@@ -77,6 +77,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
     public class EntityTransferStateMachine
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly string LogHeader = "[ENTITY TRANSFER STATE MACHINE]";
 
         /// <summary>
         /// If true then on a teleport, the source region waits for a callback from the destination region.  If
@@ -100,6 +101,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <returns>true if the agent was not already in transit, false if it was</returns>
         internal bool SetInTransit(UUID id)
         {
+            m_log.DebugFormat("{0} SetInTransit. agent={1}, newState=Preparing", LogHeader, id);
             lock (m_agentsInTransit)
             {
                 if (!m_agentsInTransit.ContainsKey(id))
@@ -121,6 +123,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <exception cref='Exception'>Illegal transitions will throw an Exception</exception>
         internal bool UpdateInTransit(UUID id, AgentTransferState newState)
         {
+            m_log.DebugFormat("{0} UpdateInTransit. agent={1}, newState={2}", LogHeader, id, newState);
+
             bool transitionOkay = false;
 
             // We don't want to throw an exception on cancel since this can come it at any time.
@@ -193,6 +197,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 }
                 else if (failIfNotOkay)
                 {
+                    m_log.DebugFormat("{0} UpdateInTransit. Throwing transition failure = {1}", LogHeader, failureMessage);
                     throw new Exception(failureMessage);
                 }
 //                else
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 4ef2fa9..233b251 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -31,6 +31,7 @@ using System.Reflection;
 
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Connectors.Hypergrid;
@@ -53,7 +54,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private int m_levelHGTeleport = 0;
-        private string m_ThisHomeURI;
 
         private GatekeeperServiceConnector m_GatekeeperConnector;
         private IUserAgentService m_UAS;
@@ -111,6 +111,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
         }
 
+        /// <summary>
+        /// Used for processing analysis of incoming attachments in a controlled fashion.
+        /// </summary>
+        private JobEngine m_incomingSceneObjectEngine;
+
         #region ISharedRegionModule
 
         public override string Name
@@ -145,14 +150,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: {0} enabled.", Name);
                 }
             }
-
-            moduleConfig = source.Configs["Hypergrid"];
-            if (moduleConfig != null)
-            {
-                m_ThisHomeURI = moduleConfig.GetString("HomeURI", string.Empty);
-                if (m_ThisHomeURI != string.Empty && !m_ThisHomeURI.EndsWith("/"))
-                    m_ThisHomeURI += '/';
-            }
         }
 
         public override void AddRegion(Scene scene)
@@ -162,33 +159,27 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (m_Enabled)
             {
                 scene.RegisterModuleInterface<IUserAgentVerificationModule>(this);
-                scene.EventManager.OnIncomingSceneObject += OnIncomingSceneObject;
-            }
-        }
-
-        void OnIncomingSceneObject(SceneObjectGroup so)
-        {
-            if (!so.IsAttachment)
-                return;
-
-            if (so.AttachedAvatar == UUID.Zero || Scene.UserManagementModule.IsLocalGridUser(so.AttachedAvatar))
-                return;
-
-            // foreign user
-            AgentCircuitData aCircuit = Scene.AuthenticateHandler.GetAgentCircuitData(so.AttachedAvatar);
-            if (aCircuit != null && (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0)
-            {
-                if (aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
-                {
-                    string url = aCircuit.ServiceURLs["AssetServerURI"].ToString();
-                    m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Incoming attachment {0} for HG user {1} with asset server {2}", so.Name, so.AttachedAvatar, url);
-                    Dictionary<UUID, sbyte> ids = new Dictionary<UUID, sbyte>();
-                    HGUuidGatherer uuidGatherer = new HGUuidGatherer(Scene.AssetService, url);
-                    uuidGatherer.GatherAssetUuids(so, ids);
-
-                    foreach (KeyValuePair<UUID, sbyte> kvp in ids)
-                        uuidGatherer.FetchAsset(kvp.Key);
-                }
+                //scene.EventManager.OnIncomingSceneObject += OnIncomingSceneObject;
+
+                m_incomingSceneObjectEngine 
+                    = new JobEngine(
+                        string.Format("HG Incoming Scene Object Engine ({0})", scene.Name), 
+                        "HG INCOMING SCENE OBJECT ENGINE");
+
+                StatsManager.RegisterStat(
+                    new Stat(
+                        "HGIncomingAttachmentsWaiting",
+                        "Number of incoming attachments waiting for processing.",
+                        "",
+                        "",
+                        "entitytransfer",
+                        Name,
+                        StatType.Pull,
+                        MeasuresOfInterest.None,
+                        stat => stat.Value = m_incomingSceneObjectEngine.JobsWaiting,
+                        StatVerbosity.Debug));
+
+                m_incomingSceneObjectEngine.Start();
             }
         }
 
@@ -218,26 +209,30 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             base.RemoveRegion(scene);
 
             if (m_Enabled)
+            {
                 scene.UnregisterModuleInterface<IUserAgentVerificationModule>(this);
+                m_incomingSceneObjectEngine.Stop();
+            }
         }
 
         #endregion
 
-        #region HG overrides of IEntiryTransferModule
+        #region HG overrides of IEntityTransferModule
 
-        protected override GridRegion GetFinalDestination(GridRegion region)
+        protected override GridRegion GetFinalDestination(GridRegion region, UUID agentID, string agentHomeURI, out string message)
         {
             int flags = Scene.GridService.GetRegionFlags(Scene.RegionInfo.ScopeID, region.RegionID);
             m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: region {0} flags: {1}", region.RegionName, flags);
+            message = null;
 
             if ((flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0)
             {
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region is hyperlink");
-                GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID);
+                GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID, agentID, agentHomeURI, out message);
                 if (real_destination != null)
-                    m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: GetFinalDestination serveruri -> {0}", real_destination.ServerURI);
+                    m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: GetFinalDestination: ServerURI={0}", real_destination.ServerURI);
                 else
-                    m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: GetHyperlinkRegion to Gatekeeper {0} failed", region.ServerURI);
+                    m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: GetHyperlinkRegion of region {0} from Gatekeeper {1} failed: {2}", region.RegionID, region.ServerURI, message);
                 return real_destination;
             }
 
@@ -295,11 +290,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     else
                         connector = new UserAgentServiceConnector(userAgentDriver);
 
-                    bool success = connector.LoginAgentToGrid(agentCircuit, reg, finalDestination, false, out reason);
+                    GridRegion source = new GridRegion(Scene.RegionInfo);
+                    source.RawServerURI = m_GatekeeperURI;
+                    
+                    bool success = connector.LoginAgentToGrid(source, agentCircuit, reg, finalDestination, false, out reason);
                     logout = success; // flag for later logout from this grid; this is an HG TP
 
                     if (success)
-                        sp.Scene.EventManager.TriggerTeleportStart(sp.ControllingClient, reg, finalDestination, teleportFlags, logout);
+                        Scene.EventManager.TriggerTeleportStart(sp.ControllingClient, reg, finalDestination, teleportFlags, logout);
 
                     return success;
                 }
@@ -436,6 +434,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         //    return base.UpdateAgent(reg, finalDestination, agentData, sp);
         //}
 
+<<<<<<< HEAD
+        public override void TriggerTeleportHome(UUID id, IClientAPI client)     
+        {                                                                       
+            TeleportHome(id, client);                                           
+        }                                                                       
+                          
+=======
+>>>>>>> avn/ubitvar
         public override bool TeleportHome(UUID id, IClientAPI client)
         {
             m_log.DebugFormat(
@@ -462,7 +468,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             IUserAgentService userAgentService = new UserAgentServiceConnector(aCircuit.ServiceURLs["HomeURI"].ToString());
             Vector3 position = Vector3.UnitY, lookAt = Vector3.UnitY;
-            GridRegion finalDestination = userAgentService.GetHomeRegion(aCircuit.AgentID, out position, out lookAt);
+
+            GridRegion finalDestination = null;
+            try
+            {
+                finalDestination = userAgentService.GetHomeRegion(aCircuit.AgentID, out position, out lookAt);
+            }
+            catch (Exception e)
+            {
+                m_log.Debug("[HG ENTITY TRANSFER MODULE]: GetHomeRegion call failed ", e);
+            }
+            
             if (finalDestination == null)
             {
                 client.SendTeleportFailed("Your home region could not be found");
@@ -509,35 +525,174 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Local region?
             if (info != null)
             {
-                ((Scene)(remoteClient.Scene)).RequestTeleportLocation(remoteClient, info.RegionHandle, lm.Position,
+                Scene.RequestTeleportLocation(
+                    remoteClient, info.RegionHandle, lm.Position,
                     Vector3.Zero, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark));
-
-                return;
             }
             else 
             {
                 // Foreign region
-                Scene scene = (Scene)(remoteClient.Scene);
                 GatekeeperServiceConnector gConn = new GatekeeperServiceConnector();
                 GridRegion gatekeeper = new GridRegion();
                 gatekeeper.ServerURI = lm.Gatekeeper;
-                GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(lm.RegionID));
+                string homeURI = Scene.GetAgentHomeURI(remoteClient.AgentId);
+
+                string message;
+                GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(lm.RegionID), remoteClient.AgentId, homeURI, out message);
 
                 if (finalDestination != null)
                 {
-                    ScenePresence sp = scene.GetScenePresence(remoteClient.AgentId);
-                    IEntityTransferModule transferMod = scene.RequestModuleInterface<IEntityTransferModule>();
+                    ScenePresence sp = Scene.GetScenePresence(remoteClient.AgentId);
+
+                    if (sp != null)
+                    {
+                        if (message != null)
+                            sp.ControllingClient.SendAgentAlertMessage(message, true);
+
+                        // Validate assorted conditions
+                        string reason = string.Empty;
+                        if (!ValidateGenericConditions(sp, gatekeeper, finalDestination, 0, out reason))
+                        {
+                            sp.ControllingClient.SendTeleportFailed(reason);
+                            return;
+                        }
 
-                    if (transferMod != null && sp != null)
-                        transferMod.DoTeleport(
+                        DoTeleport(
                             sp, gatekeeper, finalDestination, lm.Position, Vector3.UnitX,
                             (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark));
+                    }
+                }
+                else
+                {
+                    remoteClient.SendTeleportFailed(message);
+                }
+
+            }
+        }
+
+        private void RemoveIncomingSceneObjectJobs(string commonIdToRemove)
+        {
+            List<JobEngine.Job> jobsToReinsert = new List<JobEngine.Job>();
+            int jobsRemoved = 0;
+
+            JobEngine.Job job;
+            while ((job = m_incomingSceneObjectEngine.RemoveNextJob()) != null)
+            {
+                if (job.CommonId != commonIdToRemove)
+                    jobsToReinsert.Add(job);
+                else
+                    jobsRemoved++;
+            }
+
+            m_log.DebugFormat(
+                "[HG ENTITY TRANSFER]: Removing {0} jobs with common ID {1} and reinserting {2} other jobs",
+                jobsRemoved, commonIdToRemove, jobsToReinsert.Count);
+
+            if (jobsToReinsert.Count > 0)
+            {                                        
+                foreach (JobEngine.Job jobToReinsert in jobsToReinsert)
+                    m_incomingSceneObjectEngine.QueueJob(jobToReinsert);
+            }
+        }
+
+        public override bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition)
+        {
+            // FIXME: We must make it so that we can use SOG.IsAttachment here.  At the moment it is always null!
+            if (!so.IsAttachmentCheckFull())
+                return base.HandleIncomingSceneObject(so, newPosition);
+
+            // Equally, we can't use so.AttachedAvatar here.
+            if (so.OwnerID == UUID.Zero || Scene.UserManagementModule.IsLocalGridUser(so.OwnerID))
+                return base.HandleIncomingSceneObject(so, newPosition);
+
+            // foreign user
+            AgentCircuitData aCircuit = Scene.AuthenticateHandler.GetAgentCircuitData(so.OwnerID);
+            if (aCircuit != null)
+            {
+                if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) == 0)
+                {
+                    // We have already pulled the necessary attachments from the source grid.
+                    base.HandleIncomingSceneObject(so, newPosition);
                 }
+                else
+                {
+                    if (aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
+                    {
+                        m_incomingSceneObjectEngine.QueueJob(
+                            string.Format("HG UUID Gather for attachment {0} for {1}", so.Name, aCircuit.Name), 
+                            () => 
+                            {
+                                string url = aCircuit.ServiceURLs["AssetServerURI"].ToString();
+    //                            m_log.DebugFormat(
+    //                                "[HG ENTITY TRANSFER MODULE]: Incoming attachment {0} for HG user {1} with asset service {2}", 
+    //                                so.Name, so.AttachedAvatar, url);
+
+                                IDictionary<UUID, sbyte> ids = new Dictionary<UUID, sbyte>();
+                                HGUuidGatherer uuidGatherer 
+                                    = new HGUuidGatherer(Scene.AssetService, url, ids);
+                                uuidGatherer.AddForInspection(so);
 
+                                while (!uuidGatherer.Complete)
+                                {
+                                    int tickStart = Util.EnvironmentTickCount();
+
+                                    UUID? nextUuid = uuidGatherer.NextUuidToInspect;
+                                    uuidGatherer.GatherNext();
+
+    //                                m_log.DebugFormat(
+    //                                    "[HG ENTITY TRANSFER]: Gathered attachment asset uuid {0} for object {1} for HG user {2} took {3} ms with asset service {4}",
+    //                                    nextUuid, so.Name, so.OwnerID, Util.EnvironmentTickCountSubtract(tickStart), url);
+
+                                    int ticksElapsed = Util.EnvironmentTickCountSubtract(tickStart);
+
+                                    if (ticksElapsed > 30000)
+                                    {
+                                        m_log.WarnFormat(
+                                            "[HG ENTITY TRANSFER]: Removing incoming scene object jobs for HG user {0} as gather of {1} from {2} took {3} ms to respond (> {4} ms)",
+                                            so.OwnerID, so.Name, url, ticksElapsed, 30000);
+
+                                        RemoveIncomingSceneObjectJobs(so.OwnerID.ToString());
+
+                                        return;
+                                    }                                                           
+                                }
+
+    //                            m_log.DebugFormat(
+    //                                "[HG ENTITY TRANSFER]: Fetching {0} assets for attachment {1} for HG user {2} with asset service {3}",
+    //                                ids.Count, so.Name, so.OwnerID, url);
+
+                                foreach (KeyValuePair<UUID, sbyte> kvp in ids)
+                                {
+                                    int tickStart = Util.EnvironmentTickCount();
+
+                                    uuidGatherer.FetchAsset(kvp.Key);   
+
+                                    int ticksElapsed = Util.EnvironmentTickCountSubtract(tickStart);
+
+                                    if (ticksElapsed > 30000)
+                                    {
+                                        m_log.WarnFormat(
+                                            "[HG ENTITY TRANSFER]: Removing incoming scene object jobs for HG user {0} as fetch of {1} from {2} took {3} ms to respond (> {4} ms)",
+                                            so.OwnerID, kvp.Key, url, ticksElapsed, 30000);
+
+                                        RemoveIncomingSceneObjectJobs(so.OwnerID.ToString());
+
+                                        return;
+                                    }   
+                                }
+
+                                base.HandleIncomingSceneObject(so, newPosition);
+
+    //                            m_log.DebugFormat(
+    //                                "[HG ENTITY TRANSFER MODULE]: Completed incoming attachment {0} for HG user {1} with asset server {2}", 
+    //                                so.Name, so.OwnerID, url);
+                            },                             
+                            so.OwnerID.ToString());
+                    }
+                }
             }
 
-            // can't find the region: Tell viewer and abort
-            remoteClient.SendTeleportFailed("The teleport destination could not be found.");
+            return true;
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index d4fb1ba..f54298c 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -35,6 +35,7 @@ using System.Xml;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Serialization.External;
 
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
@@ -118,45 +119,44 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             if (string.IsNullOrEmpty(url))
                 return false;
 
-            if (asset != null)
-            {
-                if (!url.EndsWith("/") && !url.EndsWith("="))
-                    url = url + "/";
-
-                bool success = true;
-                // See long comment in AssetCache.AddAsset
-                if (!asset.Temporary || asset.Local)
-                {
-                    // We need to copy the asset into a new asset, because
-                    // we need to set its ID to be URL+UUID, so that the
-                    // HGAssetService dispatches it to the remote grid.
-                    // It's not pretty, but the best that can be done while
-                    // not having a global naming infrastructure
-                    AssetBase asset1 = new AssetBase(asset.FullID, asset.Name, asset.Type, asset.Metadata.CreatorID);
-                    Copy(asset, asset1);
-                    asset1.ID = url + asset.ID;
-
-                    AdjustIdentifiers(asset1.Metadata);
-                    if (asset1.Metadata.Type == (sbyte)AssetType.Object)
-                        asset1.Data = AdjustIdentifiers(asset.Data);
-                    else
-                        asset1.Data = asset.Data;
+            if (!url.EndsWith("/") && !url.EndsWith("="))
+                url = url + "/";
 
-                    string id = m_scene.AssetService.Store(asset1);
-                    if (id == string.Empty)
-                    {
-                        m_log.DebugFormat("[HG ASSET MAPPER]: Asset server {0} did not accept {1}", url, asset.ID);
-                        success = false;
-                    }
-                    else
-                        m_log.DebugFormat("[HG ASSET MAPPER]: Posted copy of asset {0} from local asset server to {1}", asset1.ID, url);
-                }
-                return success;
+            if (asset == null)
+            {
+                m_log.Warn("[HG ASSET MAPPER]: Tried to post asset to remote server, but asset not in local cache.");
+                return false;
             }
+
+            // See long comment in AssetCache.AddAsset
+            if (asset.Temporary || asset.Local)
+                return true;
+
+            // We need to copy the asset into a new asset, because
+            // we need to set its ID to be URL+UUID, so that the
+            // HGAssetService dispatches it to the remote grid.
+            // It's not pretty, but the best that can be done while
+            // not having a global naming infrastructure
+            AssetBase asset1 = new AssetBase(asset.FullID, asset.Name, asset.Type, asset.Metadata.CreatorID);
+            Copy(asset, asset1);
+            asset1.ID = url + asset.ID;
+
+            AdjustIdentifiers(asset1.Metadata);
+            if (asset1.Metadata.Type == (sbyte)AssetType.Object)
+                asset1.Data = AdjustIdentifiers(asset.Data);
             else
-                m_log.Warn("[HG ASSET MAPPER]: Tried to post asset to remote server, but asset not in local cache.");
+                asset1.Data = asset.Data;
 
-            return false;
+            string id = m_scene.AssetService.Store(asset1);
+            if (String.IsNullOrEmpty(id))
+            {
+                m_log.DebugFormat("[HG ASSET MAPPER]: Asset server {0} did not accept {1}", url, asset.ID);
+                return false;
+            }
+            else {
+                m_log.DebugFormat("[HG ASSET MAPPER]: Posted copy of asset {0} from local asset server to {1}", asset1.ID, url);
+                return true;
+            }
         }
 
         private void Copy(AssetBase from, AssetBase to)
@@ -190,49 +190,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             return Utils.StringToBytes(RewriteSOP(xml));
         }
 
-        protected string RewriteSOP(string xml)
+        protected string RewriteSOP(string xmlData)
         {
-            XmlDocument doc = new XmlDocument();
-            doc.LoadXml(xml);
-            XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart");
-
-            foreach (XmlNode sop in sops)
-            {
-                UserAccount creator = null;
-                bool hasCreatorData = false;
-                XmlNodeList nodes = sop.ChildNodes;
-                foreach (XmlNode node in nodes)
-                {
-                    if (node.Name == "CreatorID")
-                    {
-                        UUID uuid = UUID.Zero;
-                        UUID.TryParse(node.InnerText, out uuid);
-                        creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid);
-                    }
-                    if (node.Name == "CreatorData" && node.InnerText != null && node.InnerText != string.Empty)
-                        hasCreatorData = true;
-
-                    //if (node.Name == "OwnerID")
-                    //{
-                    //    UserAccount owner = GetUser(node.InnerText);
-                    //    if (owner != null)
-                    //        node.InnerText = m_ProfileServiceURL + "/" + node.InnerText + "/" + owner.FirstName + " " + owner.LastName;
-                    //}
-                }
-
-                if (!hasCreatorData && creator != null)
-                {
-                    XmlElement creatorData = doc.CreateElement("CreatorData");
-                    creatorData.InnerText = m_HomeURI + ";" + creator.FirstName + " " + creator.LastName;
-                    sop.AppendChild(creatorData);
-                }
-            }
-
-            using (StringWriter wr = new StringWriter())
-            {
-                doc.Save(wr);
-                return wr.ToString();
-            }
+//            Console.WriteLine("Input XML [{0}]", xmlData);
+            return ExternalRepresentationUtils.RewriteSOP(xmlData, m_scene.Name, m_HomeURI, m_scene.UserAccountService, m_scene.RegionInfo.ScopeID);
 
         }
 
@@ -260,12 +221,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             // The act of gathering UUIDs downloads some assets from the remote server
             // but not all...
-            Dictionary<UUID, sbyte> ids = new Dictionary<UUID, sbyte>();
             HGUuidGatherer uuidGatherer = new HGUuidGatherer(m_scene.AssetService, userAssetURL);
-            uuidGatherer.GatherAssetUuids(assetID, meta.Type, ids);
-            m_log.DebugFormat("[HG ASSET MAPPER]: Preparing to get {0} assets", ids.Count);
+            uuidGatherer.AddForInspection(assetID);
+            uuidGatherer.GatherAll();
+
+            m_log.DebugFormat("[HG ASSET MAPPER]: Preparing to get {0} assets", uuidGatherer.GatheredUuids.Count);
             bool success = true;
-            foreach (UUID uuid in ids.Keys)
+            foreach (UUID uuid in uuidGatherer.GatheredUuids.Keys)
                 if (FetchAsset(userAssetURL, uuid) == null)
                     success = false;
 
@@ -276,39 +238,92 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 m_log.DebugFormat("[HG ASSET MAPPER]: Successfully got item {0} from asset server {1}", assetID, userAssetURL);
         }
 
-
         public void Post(UUID assetID, UUID ownerID, string userAssetURL)
         {
-                // Post the item from the local AssetCache onto the remote asset server
-                // and place an entry in m_assetMap
+            m_log.DebugFormat("[HG ASSET MAPPER]: Starting to send asset {0} with children to asset server {1}", assetID, userAssetURL);
+
+            // Find all the embedded assets
 
-            m_log.Debug("[HG ASSET MAPPER]: Posting object " + assetID + " to asset server " + userAssetURL);
             AssetBase asset = m_scene.AssetService.Get(assetID.ToString());
-            if (asset != null)
+            if (asset == null)
+            {
+                m_log.DebugFormat("[HG ASSET MAPPER]: Something wrong with asset {0}, it could not be found", assetID);
+                return;
+            }
+
+            HGUuidGatherer uuidGatherer = new HGUuidGatherer(m_scene.AssetService, string.Empty);
+            uuidGatherer.AddForInspection(asset.FullID);
+            uuidGatherer.GatherAll();
+
+            // Check which assets already exist in the destination server
+
+            string url = userAssetURL;
+            if (!url.EndsWith("/") && !url.EndsWith("="))
+                url = url + "/";
+
+            string[] remoteAssetIDs = new string[uuidGatherer.GatheredUuids.Count];
+            int i = 0;
+            foreach (UUID id in uuidGatherer.GatheredUuids.Keys)
+                remoteAssetIDs[i++] = url + id.ToString();
+
+            bool[] exist = m_scene.AssetService.AssetsExist(remoteAssetIDs);
+
+            var existSet = new HashSet<string>();
+            i = 0;
+            foreach (UUID id in uuidGatherer.GatheredUuids.Keys)
+            {
+                if (exist[i])
+                    existSet.Add(id.ToString());
+                ++i;
+            }
+
+            // Send only those assets which don't already exist in the destination server
+
+            bool success = true;
+
+            foreach (UUID uuid in uuidGatherer.GatheredUuids.Keys)
             {
-                Dictionary<UUID, sbyte> ids = new Dictionary<UUID, sbyte>();
-                HGUuidGatherer uuidGatherer = new HGUuidGatherer(m_scene.AssetService, string.Empty);
-                uuidGatherer.GatherAssetUuids(asset.FullID, asset.Type, ids);
-                bool success = false;
-                foreach (UUID uuid in ids.Keys)
+                if (!existSet.Contains(uuid.ToString()))
                 {
                     asset = m_scene.AssetService.Get(uuid.ToString());
                     if (asset == null)
+                    {
                         m_log.DebugFormat("[HG ASSET MAPPER]: Could not find asset {0}", uuid);
+                    }
                     else
-                        success = PostAsset(userAssetURL, asset);
+                    {
+                        try
+                        {
+                            success &= PostAsset(userAssetURL, asset);
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.Error(
+                                string.Format(
+                                    "[HG ASSET MAPPER]: Failed to post asset {0} (type {1}, length {2}) referenced from {3} to {4} with exception  ", 
+                                    asset.ID, asset.Type, asset.Data.Length, assetID, userAssetURL), 
+                                e);
+
+                            // For debugging purposes for now we will continue to throw the exception up the stack as was already happening.  However, after
+                            // debugging we may want to simply report the failure if we can tell this is due to a failure
+                            // with a particular asset and not a destination network failure where all asset posts will fail (and
+                            // generate large amounts of log spam).
+                            throw e;
+                        }
+                    }
                 }
-
-                // maybe all pieces got there...
-                if (!success)
-                    m_log.DebugFormat("[HG ASSET MAPPER]: Problems posting item {0} to asset server {1}", assetID, userAssetURL);
                 else
-                    m_log.DebugFormat("[HG ASSET MAPPER]: Successfully posted item {0} to asset server {1}", assetID, userAssetURL);
-
+                {
+                    m_log.DebugFormat(
+                        "[HG ASSET MAPPER]: Didn't post asset {0} referenced from {1} because it already exists in asset server {2}", 
+                        uuid, assetID, userAssetURL);
+                }
             }
-            else
-                m_log.DebugFormat("[HG ASSET MAPPER]: Something wrong with asset {0}, it could not be found", assetID);
 
+            if (!success)
+                m_log.DebugFormat("[HG ASSET MAPPER]: Problems sending asset {0} with children to asset server {1}", assetID, userAssetURL);
+            else
+                m_log.DebugFormat("[HG ASSET MAPPER]: Successfully sent asset {0} with children to asset server {1}", assetID, userAssetURL);
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index ce7ed26..582b267 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -64,6 +64,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         private bool m_bypassPermissions = true;
 
+        // This simple check makes it possible to support grids in which all the simulators
+        // share all central services of the Robust server EXCEPT assets. In other words,
+        // grids where the simulators' assets are kept in one DB and the users' inventory assets
+        // are kept on another. When users rez items from inventory or take objects from world,
+        // an HG-like asset copy takes place between the 2 servers, the world asset server and
+        // the user's asset server.
+        private bool m_CheckSeparateAssets = false;
+        private string m_LocalAssetsURL = string.Empty;
+
 //        private bool m_Initialized = false;
 
         #region INonSharedRegionModule
@@ -99,6 +108,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                         m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true);
                         m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true);
+                        m_CheckSeparateAssets = thisModuleConfig.GetBoolean("CheckSeparateAssets", false);
+                        m_LocalAssetsURL = thisModuleConfig.GetString("RegionHGAssetServerURI", string.Empty);
+                        m_LocalAssetsURL = m_LocalAssetsURL.Trim(new char[] { '/' });
+
                     }
                     else
                         m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!");
@@ -117,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             base.AddRegion(scene);
             m_assMapper = new HGAssetMapper(scene, m_HomeURI);
-            scene.EventManager.OnNewInventoryItemUploadComplete += UploadInventoryItem;
+            scene.EventManager.OnNewInventoryItemUploadComplete += PostInventoryAsset;
             scene.EventManager.OnTeleportStart += TeleportStart;
             scene.EventManager.OnTeleportFail += TeleportFail;
 
@@ -196,7 +209,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             }
         }
 
-        public void UploadInventoryItem(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel)
+        public void PostInventoryAsset(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel)
         {
             if (type == AssetType.Link)
                 return;
@@ -235,18 +248,32 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         {
             UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data);
 
-            UploadInventoryItem(remoteClient.AgentId, AssetType.Unknown, newAssetID, "", 0);
+            PostInventoryAsset(remoteClient.AgentId, AssetType.Unknown, newAssetID, "", 0);
 
             return newAssetID;
         }
 
+        /// 
+        /// UpdateInventoryItemAsset
+        ///
+        public override bool UpdateInventoryItemAsset(UUID ownerID, InventoryItemBase item, AssetBase asset)
+        {
+            if (base.UpdateInventoryItemAsset(ownerID, item, asset))
+            {
+                PostInventoryAsset(ownerID, (AssetType)asset.Type, asset.FullID, asset.Name, 0);
+                return true;
+            }
+
+            return false;
+        }
+
         ///
         /// Used in DeleteToInventory
         ///
         protected override void ExportAsset(UUID agentID, UUID assetID)
         {
             if (!assetID.Equals(UUID.Zero))
-                UploadInventoryItem(agentID, AssetType.Unknown, assetID, "", 0);
+                PostInventoryAsset(agentID, AssetType.Unknown, assetID, "", 0);
             else
                 m_log.Debug("[HGScene]: Scene.Inventory did not create asset");
         }
@@ -284,50 +311,98 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             SceneObjectGroup sog = base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
                                    RezSelected, RemoveItem, fromTaskID, attachment);
 
-            if (sog == null)
-                remoteClient.SendAgentAlertMessage("Unable to rez: problem accessing inventory or locating assets", false);
-
             return sog;
 
         }
 
         public override void TransferInventoryAssets(InventoryItemBase item, UUID sender, UUID receiver)
         {
-            string userAssetServer = string.Empty;
-            if (IsForeignUser(sender, out userAssetServer) && userAssetServer != string.Empty)
-                m_assMapper.Get(item.AssetID, sender, userAssetServer);
+            string senderAssetServer = string.Empty;
+            string receiverAssetServer = string.Empty;
+            bool isForeignSender, isForeignReceiver;
+            isForeignSender = IsForeignUser(sender, out senderAssetServer);
+            isForeignReceiver = IsForeignUser(receiver, out receiverAssetServer);
+
+            // They're both local. Nothing to do.
+            if (!isForeignSender && !isForeignReceiver)
+                return;
 
-            if (IsForeignUser(receiver, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission)
-                m_assMapper.Post(item.AssetID, receiver, userAssetServer);
+            // At least one of them is foreign.
+            // If both users have the same asset server, no need to transfer the asset
+            if (senderAssetServer.Equals(receiverAssetServer))
+            {
+                m_log.DebugFormat("[HGScene]: Asset transfer between foreign users, but they have the same server. No transfer.");
+                return;
+            }
+
+            if (isForeignSender && senderAssetServer != string.Empty)
+                m_assMapper.Get(item.AssetID, sender, senderAssetServer);
+
+            if (isForeignReceiver && receiverAssetServer != string.Empty && m_OutboundPermission)
+                m_assMapper.Post(item.AssetID, receiver, receiverAssetServer);
         }
 
         public override bool IsForeignUser(UUID userID, out string assetServerURL)
         {
             assetServerURL = string.Empty;
 
-            if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(userID))
-            { // foreign 
-                ScenePresence sp = null;
-                if (m_Scene.TryGetScenePresence(userID, out sp))
+            if (UserManagementModule != null)
+            {
+                if (!m_CheckSeparateAssets)
                 {
-                    AgentCircuitData aCircuit = m_Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
-                    if (aCircuit != null && aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
-                    {
-                        assetServerURL = aCircuit.ServiceURLs["AssetServerURI"].ToString();
-                        assetServerURL = assetServerURL.Trim(new char[] { '/' }); 
+                    if (!UserManagementModule.IsLocalGridUser(userID))
+                    { // foreign 
+                        ScenePresence sp = null;
+                        if (m_Scene.TryGetScenePresence(userID, out sp))
+                        {
+                            AgentCircuitData aCircuit = m_Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
+                            if (aCircuit != null && aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
+                            {
+                                assetServerURL = aCircuit.ServiceURLs["AssetServerURI"].ToString();
+                                assetServerURL = assetServerURL.Trim(new char[] { '/' });
+                            }
+                        }
+                        else
+                        {
+                            assetServerURL = UserManagementModule.GetUserServerURL(userID, "AssetServerURI");
+                            assetServerURL = assetServerURL.Trim(new char[] { '/' });
+                        }
+                        return true;
                     }
                 }
                 else
                 {
-                    assetServerURL = UserManagementModule.GetUserServerURL(userID, "AssetServerURI");
-                    assetServerURL = assetServerURL.Trim(new char[] { '/' });
+                    if (IsLocalInventoryAssetsUser(userID, out assetServerURL))
+                    {
+                        m_log.DebugFormat("[HGScene]: user {0} has local assets {1}", userID, assetServerURL);
+                        return false;
+                    }
+                    else
+                    {
+                        m_log.DebugFormat("[HGScene]: user {0} has foreign assets {1}", userID, assetServerURL);
+                        return true;
+                    }
                 }
-                return true;
             }
-
             return false;
         }
 
+        private bool IsLocalInventoryAssetsUser(UUID uuid, out string assetsURL)
+        {
+            assetsURL = UserManagementModule.GetUserServerURL(uuid, "AssetServerURI");
+            if (assetsURL == string.Empty)
+            {
+                AgentCircuitData agent = m_Scene.AuthenticateHandler.GetAgentCircuitData(uuid);
+                if (agent != null)
+                {
+                    assetsURL = agent.ServiceURLs["AssetServerURI"].ToString();
+                    assetsURL = assetsURL.Trim(new char[] { '/' });
+                }
+            }
+            return m_LocalAssetsURL.Equals(assetsURL);
+        }
+
+
         protected override InventoryItemBase GetItem(UUID agentID, UUID itemID)
         {
             InventoryItemBase item = base.GetItem(agentID, itemID);
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 15718d2..dff9126 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -207,7 +207,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             {
                 byte[] data = null;
 
+<<<<<<< HEAD
+                    AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId);
+                    m_Scene.AssetService.Store(asset);
+                    m_Scene.CreateNewInventoryItem(
+                        remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
+                        name, description, 0, callbackID, asset.FullID, asset.Type, invType, nextOwnerMask, creationDate);
+                }
+                else
+=======
                 if (invType == (sbyte)InventoryType.Landmark && presence != null)
+>>>>>>> avn/ubitvar
                 {
                     string suffix = string.Empty, prefix = string.Empty;
                     string strdata = GenerateLandmark(presence, out prefix, out suffix);
@@ -312,7 +322,34 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             return UUID.Zero;
         }
-        
+
+        public virtual bool UpdateInventoryItemAsset(UUID ownerID, InventoryItemBase item, AssetBase asset)
+        {
+            if (item != null && item.Owner == ownerID && asset != null)
+            {
+//                m_log.DebugFormat(
+//                    "[INVENTORY ACCESS MODULE]: Updating item {0} {1} with new asset {2}", 
+//                    item.Name, item.ID, asset.ID);
+
+                item.AssetID = asset.FullID;
+                item.Description = asset.Description;
+                item.Name = asset.Name;
+                item.AssetType = asset.Type;
+                item.InvType = (int)InventoryType.Object;
+
+                m_Scene.AssetService.Store(asset);
+                m_Scene.InventoryService.UpdateItem(item);
+
+                return true;
+            }
+            else
+            {
+                m_log.ErrorFormat("[INVENTORY ACCESS MODULE]: Given invalid item for inventory update: {0}",
+                    (item == null || asset == null? "null item or asset" : "wrong owner"));
+                return false;
+            }
+        }
+
         public virtual List<InventoryItemBase> CopyToInventory(
             DeRezAction action, UUID folderID,
             List<SceneObjectGroup> objectGroups, IClientAPI remoteClient, bool asAttachment)
@@ -377,10 +414,32 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             // this possible is not needed if keyframes are saved
             Dictionary<UUID, KeyframeMotion> originalKeyframes = new Dictionary<UUID, KeyframeMotion>();
 
+            Dictionary<SceneObjectGroup, KeyframeMotion> group2Keyframe = new Dictionary<SceneObjectGroup, KeyframeMotion>();
+
             foreach (SceneObjectGroup objectGroup in objlist)
             {
                 if (objectGroup.RootPart.KeyframeMotion != null)
                 {
+<<<<<<< HEAD
+                    objectGroup.RootPart.KeyframeMotion.Pause();
+                    group2Keyframe.Add(objectGroup, objectGroup.RootPart.KeyframeMotion);
+                    objectGroup.RootPart.KeyframeMotion = null;
+                }
+
+//                Vector3 inventoryStoredPosition = new Vector3
+//                            (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
+//                                  ? 250
+//                                  : objectGroup.AbsolutePosition.X)
+//                             ,
+//                             (objectGroup.AbsolutePosition.Y > (int)Constants.RegionSize)
+//                                 ? 250
+//                                 : objectGroup.AbsolutePosition.Y,
+//                             objectGroup.AbsolutePosition.Z);
+//
+//                originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
+//
+//                objectGroup.AbsolutePosition = inventoryStoredPosition;
+=======
                     objectGroup.RootPart.KeyframeMotion.Suspend();
                 }
                 objectGroup.RootPart.SetForce(Vector3.Zero);
@@ -421,6 +480,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 objectGroup.AbsolutePosition = inventoryStoredPosition;
                 objectGroup.RootPart.RotationOffset = inventoryStoredRotation;
+>>>>>>> avn/ubitvar
 
                 // Make sure all bits but the ones we want are clear
                 // on take.
@@ -534,6 +594,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 }
             }
 
+            // Restore KeyframeMotion
+            foreach (SceneObjectGroup objectGroup in group2Keyframe.Keys)
+            {
+                objectGroup.RootPart.KeyframeMotion = group2Keyframe[objectGroup];
+                objectGroup.RootPart.KeyframeMotion.Start();
+            }
+
             // This is a hook to do some per-asset post-processing for subclasses that need that
             if (remoteClient != null)
                 ExportAsset(remoteClient.AgentId, asset.FullID);
@@ -576,6 +643,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             if (remoteClient != null && (remoteClient.AgentId != so.RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions())
             {
+                // Changing ownership, so apply the "Next Owner" permissions to all of the
+                // inventory item's permissions.
+
                 uint perms = effectivePerms;
                 PermissionsUtil.ApplyFoldedPermissions(effectivePerms, ref perms);
 
@@ -590,6 +660,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             }
             else
             {
+                // Not changing ownership.
+                // In this case we apply the permissions in the object's items ONLY to the inventory
+                // item's "Next Owner" permissions, but NOT to its "Current", "Base", etc. permissions.
+                // E.g., if the object contains a No-Transfer item then the item's "Next Owner"
+                // permissions are also No-Transfer.
+                PermissionsUtil.ApplyFoldedPermissions(effectivePerms, ref allObjectsNextOwnerPerms);
+
                 item.BasePermissions = effectivePerms;
                 item.CurrentPermissions = effectivePerms;
                 item.NextPermissions = so.RootPart.NextOwnerMask & effectivePerms;
@@ -621,6 +698,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         protected InventoryItemBase CreateItemForObject(
             DeRezAction action, IClientAPI remoteClient, SceneObjectGroup so, UUID folderID)
         {
+//            m_log.DebugFormat(
+//                "[BASIC INVENTORY ACCESS MODULE]: Creating item for object {0} {1} for folder {2}, action {3}", 
+//                so.Name, so.UUID, folderID, action);
+//
             // Get the user info of the item destination
             //
             UUID userID = UUID.Zero;
@@ -698,18 +779,18 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     if (remoteClient == null ||
                         so.OwnerID != remoteClient.AgentId)
                     {
-                        folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
+                        folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.LostAndFound);
                     }
                     else
                     {
-                        folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
+                        folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.Trash);
                     }
                 }
                 else if (action == DeRezAction.Return)
                 {
                     // Dump to lost + found unconditionally
                     //
-                    folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
+                    folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.LostAndFound);
                 }
 
                 if (folderID == UUID.Zero && folder == null)
@@ -718,7 +799,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     {
                         // Deletes go to trash by default
                         //
-                        folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
+                        folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.Trash);
                     }
                     else
                     {
@@ -726,14 +807,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         {
                             // Taking copy of another person's item. Take to
                             // Objects folder.
-                            folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
+                            folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.Object);
                             so.FromFolderID = UUID.Zero;
                         }
                         else
                         {
                             // Catch all. Use lost & found
                             //
-                            folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
+                            folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.LostAndFound);
                         }
                     }
                 }
@@ -752,7 +833,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         if(folder.Type == 14 || folder.Type == 16)
                         {
                             // folder.Type = 6;
-                            folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
+                            folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.Object);
                         }
                     }
                 }
@@ -804,7 +885,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
             bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
         {
-            AssetBase rezAsset = m_Scene.AssetService.Get(assetID.ToString());
+            AssetBase rezAsset = m_Scene.AssetService.Get(assetID.ToString());           
 
             if (rezAsset == null)
             {
@@ -813,12 +894,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     m_log.WarnFormat(
                         "[InventoryAccessModule]: Could not find asset {0} for item {1} {2} for {3} in RezObject()",
                         assetID, item.Name, item.ID, remoteClient.Name);
+                    remoteClient.SendAgentAlertMessage(string.Format("Unable to rez: could not find asset {0} for item {1}.", assetID, item.Name), false);
                 }
                 else
                 {
                     m_log.WarnFormat(
                         "[INVENTORY ACCESS MODULE]: Could not find asset {0} for {1} in RezObject()",
                         assetID, remoteClient.Name);
+                    remoteClient.SendAgentAlertMessage(string.Format("Unable to rez: could not find asset {0}.", assetID), false);
                 }
 
                 return null;
@@ -833,7 +916,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
             Vector3 pos;
 
-            bool single = m_Scene.GetObjectsToRez(rezAsset.Data, attachment, out objlist, out veclist, out bbox, out offsetHeight);
+            bool single 
+                = m_Scene.GetObjectsToRez(
+                    rezAsset.Data, attachment, out objlist, out veclist, out bbox, out offsetHeight);
 
             if (single)
             {
@@ -937,7 +1022,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 // one full update during the attachment
                 // process causes some clients to fail to display the
                 // attachment properly.
-                m_Scene.AddNewSceneObject(group, true, false);
+                m_Scene.AddNewSceneObject(group, !attachment, false);
 
                 // if attachment we set it's asset id so object updates
                 // can reflect that, if not, we set it's position in world.
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
new file mode 100644
index 0000000..007ff63
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
@@ -0,0 +1,146 @@
+/*
+ * 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.Threading;
+using System.Xml;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Framework.InventoryAccess;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.XEngine;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
+{
+    [TestFixture]
+    public class HGAssetMapperTests : OpenSimTestCase
+    {
+        [Test]
+        public void TestPostAssetRewrite()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            XEngine xengine = new OpenSim.Region.ScriptEngine.XEngine.XEngine();
+            xengine.DebugLevel = 1;
+
+            IniConfigSource configSource = new IniConfigSource();
+
+            IConfig startupConfig = configSource.AddConfig("Startup");
+            startupConfig.Set("DefaultScriptEngine", "XEngine");
+
+            IConfig xEngineConfig = configSource.AddConfig("XEngine");
+            xEngineConfig.Set("Enabled", "true");
+            xEngineConfig.Set("StartDelay", "0");
+            xEngineConfig.Set("AppDomainLoading", "false");
+
+            string homeUrl = "http://hg.HomeTestPostAssetRewriteGrid.com";
+            string foreignUrl = "http://hg.ForeignTestPostAssetRewriteGrid.com";
+            int soIdTail = 0x1;
+            UUID assetId = TestHelpers.ParseTail(0x10);
+            UUID userId = TestHelpers.ParseTail(0x100);
+            UUID sceneId = TestHelpers.ParseTail(0x1000);
+            string userFirstName = "TestPostAsset";
+            string userLastName = "Rewrite";
+            int soPartsCount = 3;
+
+            Scene scene = new SceneHelpers().SetupScene("TestPostAssetRewriteScene", sceneId, 1000, 1000, configSource);
+            SceneHelpers.SetupSceneModules(scene, configSource, xengine);
+            scene.StartScripts();
+
+            HGAssetMapper hgam = new HGAssetMapper(scene, homeUrl);
+            UserAccount ua 
+                = UserAccountHelpers.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "password");
+
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, soPartsCount, ua.PrincipalID, "part", soIdTail);
+            RezScript(
+                scene, so.UUID, "default { state_entry() { llSay(0, \"Hello World\"); } }", "item1", ua.PrincipalID);
+
+            AssetBase asset = AssetHelpers.CreateAsset(assetId, so);
+            asset.CreatorID = foreignUrl;
+            hgam.PostAsset(foreignUrl, asset);
+
+            // Check transformed asset.
+            AssetBase ncAssetGet = scene.AssetService.Get(assetId.ToString());
+            Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID);
+            string xmlData = Utils.BytesToString(ncAssetGet.Data);
+            XmlDocument ncAssetGetXmlDoc = new XmlDocument();
+            ncAssetGetXmlDoc.LoadXml(xmlData);
+
+//            Console.WriteLine(ncAssetGetXmlDoc.OuterXml);
+
+            XmlNodeList creatorDataNodes = ncAssetGetXmlDoc.GetElementsByTagName("CreatorData");
+
+            Assert.AreEqual(soPartsCount, creatorDataNodes.Count);
+            //Console.WriteLine("creatorDataNodes {0}", creatorDataNodes.Count);
+
+            foreach (XmlNode creatorDataNode in creatorDataNodes)
+            {
+                Assert.AreEqual(
+                    string.Format("{0};{1} {2}", homeUrl, ua.FirstName, ua.LastName), creatorDataNode.InnerText);
+            }
+
+            // Check that saved script nodes have attributes
+            XmlNodeList savedScriptStateNodes = ncAssetGetXmlDoc.GetElementsByTagName("SavedScriptState");
+
+            Assert.AreEqual(1, savedScriptStateNodes.Count);
+            Assert.AreEqual(1, savedScriptStateNodes[0].Attributes.Count);
+            XmlNode uuidAttribute = savedScriptStateNodes[0].Attributes.GetNamedItem("UUID");
+            Assert.NotNull(uuidAttribute);
+            // XXX: To check the actual UUID attribute we would have to do some work to retreive the UUID of the task
+            // item created earlier. 
+        }
+
+        private void RezScript(Scene scene, UUID soId, string script, string itemName, UUID userId)
+        {
+            InventoryItemBase itemTemplate = new InventoryItemBase();
+            //            itemTemplate.ID = itemId;
+            itemTemplate.Name = itemName;
+            itemTemplate.Folder = soId;
+            itemTemplate.InvType = (int)InventoryType.LSL;
+
+            // XXX: Ultimately it would be better to be able to directly manipulate the script engine to rez a script
+            // immediately for tests rather than chunter through it's threaded mechanisms.
+            AutoResetEvent chatEvent = new AutoResetEvent(false);
+
+            scene.EventManager.OnChatFromWorld += (s, c) => 
+            {
+//                Console.WriteLine("Got chat [{0}]", c.Message);           
+                chatEvent.Set();
+            };
+
+            scene.RezNewScript(userId, itemTemplate, script);
+
+//            Console.WriteLine("HERE");
+            Assert.IsTrue(chatEvent.WaitOne(60000), "Chat event in HGAssetMapperTests.RezScript not received");
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
index ad1a0e1..c64ab44 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
@@ -44,7 +44,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
 {
@@ -111,6 +110,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             InventoryFolderBase objsFolder 
                 = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, m_userId, "Objects")[0];
             item1.Folder = objsFolder.ID;
+            item1.Flags |= (uint)InventoryItemFlags.ObjectHasMultipleItems;
             m_scene.AddInventoryItem(item1);
             
             SceneObjectGroup so 
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
index 69d7e16..d10c9b4 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library
             }
 
             RegionInfo regInfo = new RegionInfo();
-            Scene m_MockScene = new Scene(regInfo);
+            Scene m_MockScene = new Scene(regInfo, null);
             LocalInventoryService invService = new LocalInventoryService(lib);
             m_MockScene.RegisterModuleInterface<IInventoryService>(invService);
             m_MockScene.RegisterModuleInterface<IAssetService>(m_Scene.AssetService);
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
index 49589fd..e1e1838 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library
         {
             InventoryFolderImpl folder = null;
             InventoryCollection inv = new InventoryCollection();
-            inv.UserID = m_Library.Owner;
+            inv.OwnerID = m_Library.Owner;
 
             if (folderID != m_Library.ID)
             {
@@ -87,6 +87,34 @@ namespace OpenSim.Region.CoreModules.Framework.Library
             return inv;
         }
 
+        public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs)
+        {
+            InventoryCollection[] invColl = new InventoryCollection[folderIDs.Length];
+            int i = 0;
+            foreach (UUID fid in folderIDs)
+            {
+                invColl[i++] = GetFolderContent(principalID, fid);
+            }
+
+            return invColl;
+        }
+
+        public virtual InventoryItemBase[] GetMultipleItems(UUID principalID, UUID[] itemIDs)
+        {
+            InventoryItemBase[] itemColl = new InventoryItemBase[itemIDs.Length];
+            int i = 0;
+            InventoryItemBase item = new InventoryItemBase();
+            item.Owner = principalID;
+            foreach (UUID fid in itemIDs)
+            {
+                item.ID = fid;
+                itemColl[i++] = GetItem(item);
+            }
+
+            return itemColl;
+        }
+
+
         /// <summary>
         /// Add a new folder to the user's inventory
         /// </summary>
@@ -142,28 +170,12 @@ namespace OpenSim.Region.CoreModules.Framework.Library
         public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) { return null; }
 
         /// <summary>
-        /// Synchronous inventory fetch.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns></returns>
-        public InventoryCollection GetUserInventory(UUID userID) { return null; }
-
-        /// <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 void GetUserInventory(UUID userID, InventoryReceiptCallback callback) { }
-
-
-        /// <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 null; }
+        public InventoryFolderBase GetFolderForType(UUID userID, FolderType type) { return null; }
 
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
index 8838612..3849996 100644
--- a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
@@ -150,6 +150,8 @@ namespace OpenSim.Region.CoreModules.Framework.Search
 
         void OnDirFindQuery(IClientAPI remoteClient, UUID queryID, string queryText, uint queryFlags, int queryStart)
         {
+            queryText = queryText.Trim();
+
             if (((DirFindFlags)queryFlags & DirFindFlags.People) == DirFindFlags.People)
             {
                 if (string.IsNullOrEmpty(queryText))
@@ -194,4 +196,4 @@ namespace OpenSim.Region.CoreModules.Framework.Search
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
index a70261e..3abacbd 100644
--- a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.Framework
             m_timer.Elapsed += ProcessQueue;
             m_timer.Start();
 
-            //Watchdog.StartThread(
+            //WorkManager.StartThread(
             //    ProcessQueue,
             //    "GridServiceRequestThread",
             //    ThreadPriority.BelowNormal,
diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
index 2fe9026..a176958 100755
--- a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
+++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -151,7 +151,7 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
                         string path = (m_logDirectory.Length > 0 ? m_logDirectory
                                     + System.IO.Path.DirectorySeparatorChar.ToString() : "")
                                 + String.Format("{0}{1}.log", LogFileHeader, now.ToString("yyyyMMddHHmmss"));
-                        m_logFile = new StreamWriter(File.Open(path, FileMode.Append, FileAccess.Write));
+                        m_logFile = new StreamWriter(File.Open(path, FileMode.Append, FileAccess.Write, FileShare.ReadWrite));
                     }
                     if (m_logFile != null)
                     {
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index 245c808..7b89c2c 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -130,7 +130,17 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         }
 
                         UserAgentServiceConnector uasConn = new UserAgentServiceConnector(uriStr);
-                        UUID userID = uasConn.GetUUID(names[0], names[1]);
+                        
+                        UUID userID = UUID.Zero;
+                        try
+                        {
+                            userID = uasConn.GetUUID(names[0], names[1]);
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.Debug("[USER MANAGEMENT MODULE]: GetUUID call failed ", e);
+                        }
+                        
                         if (!userID.Equals(UUID.Zero))
                         {
                             UserData ud = new UserData();
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
index 9d36aa5..4e3b7e5 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
@@ -32,7 +32,6 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules.Framework.UserManagement;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Framework.UserManagement.Tests
 {
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index e571c62..a536757 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -62,6 +62,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         // The cache
         protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
 
+        protected bool m_DisplayChangingHomeURI = false;
+
         #region ISharedRegionModule
 
         public void Initialise(IConfigSource config)
@@ -73,6 +75,17 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 Init();
                 m_log.DebugFormat("[USER MANAGEMENT MODULE]: {0} is enabled", Name);
             }
+
+            if(!m_Enabled)
+            {
+                return;
+            }
+
+            IConfig userManagementConfig = config.Configs["UserManagement"];
+            if (userManagementConfig == null)
+                return;
+
+            m_DisplayChangingHomeURI = userManagementConfig.GetBoolean("DisplayChangingHomeURI", false);
         }
 
         public bool IsSharedModule
@@ -94,7 +107,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         {
             if (m_Enabled)
             {
-                m_Scenes.Add(scene);
+                lock (m_Scenes)
+                {
+                    m_Scenes.Add(scene);
+                }
 
                 scene.RegisterModuleInterface<IUserManagement>(this);
                 scene.RegisterModuleInterface<IPeople>(this);
@@ -108,7 +124,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             if (m_Enabled)
             {
                 scene.UnregisterModuleInterface<IUserManagement>(this);
-                m_Scenes.Remove(scene);
+                lock (m_Scenes)
+                {
+                    m_Scenes.Remove(scene);
+                }
             }
         }
 
@@ -124,7 +143,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public void Close()
         {
-            m_Scenes.Clear();
+            lock (m_Scenes)
+            {
+                m_Scenes.Clear();
+            }
 
             lock (m_UserCache)
                 m_UserCache.Clear();
@@ -132,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         #endregion ISharedRegionModule
 
- 
+
         #region Event Handlers
 
         void EventManager_OnPrimsLoaded(Scene s)
@@ -158,7 +180,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         void HandleUUIDNameRequest(UUID uuid, IClientAPI client)
         {
 //            m_log.DebugFormat(
-//                "[USER MANAGEMENT MODULE]: Handling request for name binding of UUID {0} from {1}", 
+//                "[USER MANAGEMENT MODULE]: Handling request for name binding of UUID {0} from {1}",
 //                uuid, remote_client.Name);
 
             if (m_Scenes[0].LibraryService != null && (m_Scenes[0].LibraryService.LibraryRootFolder.Owner == uuid))
@@ -167,11 +189,18 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
             else
             {
-                string[] names = new string[2];
-                if (TryGetUserNamesFromCache(uuid, names))
+                UserData user;
+                /* bypass that continuation here when entry is already available */
+                lock (m_UserCache)
                 {
-                    client.SendNameReply(uuid, names[0], names[1]);
-                    return;
+                    if (m_UserCache.TryGetValue(uuid, out user))
+                    {
+                        if (!user.IsUnknownUser && user.HasGridUserTried)
+                        {
+                            client.SendNameReply(uuid, user.FirstName, user.LastName);
+                            return;
+                        }
+                    }
                 }
 
                 // Not found in cache, queue continuation
@@ -183,13 +212,15 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     // appear to clear this when the user asks it to clear the cache, but others may not.
                     //
                     // So to avoid clients
-                    // (particularly Hypergrid clients) permanently binding "Unknown User" to a given UUID, we will 
+                    // (particularly Hypergrid clients) permanently binding "Unknown User" to a given UUID, we will
                     // instead drop the request entirely.
-                    if (TryGetUserNames(uuid, names))
-                        client.SendNameReply(uuid, names[0], names[1]);
+                    if (GetUser(uuid, out user))
+                    {
+                        client.SendNameReply(uuid, user.FirstName, user.LastName);
+                    }
 //                    else
 //                        m_log.DebugFormat(
-//                            "[USER MANAGEMENT MODULE]: No bound name for {0} found, ignoring request from {1}", 
+//                            "[USER MANAGEMENT MODULE]: No bound name for {0} found, ignoring request from {1}",
 //                            uuid, client.Name);
                 });
             }
@@ -269,19 +300,19 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     ud.FirstName = acc.FirstName;
                     ud.LastName = acc.LastName;
                     ud.Id = acc.PrincipalID;
+                    ud.HasGridUserTried = true;
+                    ud.IsUnknownUser = false;
                     users.Add(ud);
                 }
             }
 
             // search the local cache
-            lock (m_UserCache)
+            foreach (UserData data in m_UserCache.Values)
             {
-                foreach (UserData data in m_UserCache.Values)
-                {
-                    if (users.Find(delegate(UserData d) { return d.Id == data.Id; }) == null &&
-                        (data.FirstName.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower())))
-                        users.Add(data);
-                }
+                if (data.Id != UUID.Zero && !data.IsUnknownUser &&
+                    users.Find(delegate(UserData d) { return d.Id == data.Id; }) == null &&
+                    (data.FirstName.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower())))
+                    users.Add(data);
             }
 
             AddAdditionalUsers(query, users);
@@ -305,6 +336,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
         }
 
+<<<<<<< HEAD
+=======
         /// <summary>
         /// 
         /// </summary>
@@ -400,6 +433,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
         }
 
+>>>>>>> avn/ubitvar
         #region IUserManagement
 
         public UUID GetUserIdByName(string name)
@@ -433,50 +467,56 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public string GetUserName(UUID uuid)
         {
-            string[] names = new string[2];
-            TryGetUserNames(uuid, names);
-
-            return names[0] + " " + names[1];
-
+            UserData user;
+            GetUser(uuid, out user);
+            return user.FirstName + " " + user.LastName;
         }
 
         public string GetUserHomeURL(UUID userID)
         {
-            lock (m_UserCache)
+            UserData user;
+            if(GetUser(userID, out user))
             {
-                if (m_UserCache.ContainsKey(userID))
-                    return m_UserCache[userID].HomeURL;
+                return user.HomeURL;
             }
-
             return string.Empty;
         }
 
         public string GetUserServerURL(UUID userID, string serverType)
         {
             UserData userdata;
-            lock (m_UserCache)
-                m_UserCache.TryGetValue(userID, out userdata);
+            if(!GetUser(userID, out userdata))
+            {
+                return string.Empty;
+            }
 
-            if (userdata != null)
+            if (userdata.ServerURLs != null && userdata.ServerURLs.ContainsKey(serverType) && userdata.ServerURLs[serverType] != null)
+            {
+                return userdata.ServerURLs[serverType].ToString();
+            }
+
+            if (!string.IsNullOrEmpty(userdata.HomeURL))
             {
 //                m_log.DebugFormat("[USER MANAGEMENT MODULE]: Requested url type {0} for {1}", serverType, userID);
 
-                if (userdata.ServerURLs != null && userdata.ServerURLs.ContainsKey(serverType) && userdata.ServerURLs[serverType] != null)
+                UserAgentServiceConnector uConn = new UserAgentServiceConnector(userdata.HomeURL);
+                try
                 {
-                    return userdata.ServerURLs[serverType].ToString();
+                    userdata.ServerURLs = uConn.GetServerURLs(userID);
                 }
-
-                if (!string.IsNullOrEmpty(userdata.HomeURL))
+                catch(System.Net.WebException e)
                 {
-                    //m_log.DebugFormat(
-                    //    "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}",
-                    //    serverType, userdata.HomeURL, userID);
-
-                    UserAgentServiceConnector uConn = new UserAgentServiceConnector(userdata.HomeURL);
-                    userdata.ServerURLs = uConn.GetServerURLs(userID);
-                    if (userdata.ServerURLs != null && userdata.ServerURLs.ContainsKey(serverType) && userdata.ServerURLs[serverType] != null)
-                        return userdata.ServerURLs[serverType].ToString();
+                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: GetServerURLs call failed {0}", e.Message);
+                    userdata.ServerURLs = new Dictionary<string, object>();
+                }
+                catch (Exception e)
+                {
+                    m_log.Debug("[USER MANAGEMENT MODULE]: GetServerURLs call failed ", e);
+                    userdata.ServerURLs = new Dictionary<string, object>();
                 }
+
+                if (userdata.ServerURLs != null && userdata.ServerURLs.ContainsKey(serverType) && userdata.ServerURLs[serverType] != null)
+                    return userdata.ServerURLs[serverType].ToString();
             }
 
             return string.Empty;
@@ -484,19 +524,15 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public string GetUserUUI(UUID userID)
         {
-            UserData ud;
-            lock (m_UserCache)
-                m_UserCache.TryGetValue(userID, out ud);
+            string uui;
+            GetUserUUI(userID, out uui);
+            return uui;
+        }
 
-            if (ud == null) // It's not in the cache
-            {
-                string[] names = new string[2];
-                // This will pull the data from either UserAccounts or GridUser
-                // and stick it into the cache
-                TryGetUserNamesFromServices(userID, names);
-                lock (m_UserCache)
-                    m_UserCache.TryGetValue(userID, out ud);
-            }
+        public bool GetUserUUI(UUID userID, out string uui)
+        {
+            UserData ud;
+            bool result = GetUser(userID, out ud);
 
             if (ud != null)
             {
@@ -510,125 +546,251 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         first = parts[0];
                         last = parts[1];
                     }
-                    return userID + ";" + homeURL + ";" + first + " " + last;
+                    uui = userID + ";" + homeURL + ";" + first + " " + last;
                 }
             }
 
-            return userID.ToString();
+            uui = userID.ToString();
+            return result;
         }
 
-        public void AddUser(UUID uuid, string first, string last)
+        #region Cache Management
+        public bool GetUser(UUID uuid, out UserData userdata)
         {
             lock (m_UserCache)
             {
-                if (m_UserCache.ContainsKey(uuid))
-                    return;
+                if (m_UserCache.TryGetValue(uuid, out userdata))
+                {
+                    if (userdata.HasGridUserTried)
+                    {
+                        return true;
+                    }
+                }
+                else
+                {
+                    userdata = new UserData();
+                    userdata.HasGridUserTried = false;
+                    userdata.Id = uuid;
+                    userdata.FirstName = "Unknown";
+                    userdata.LastName = "UserUMMAU42";
+                    userdata.HomeURL = string.Empty;
+                    userdata.IsUnknownUser = true;
+                    userdata.HasGridUserTried = false;
+                }
             }
 
-            UserData user = new UserData();
-            user.Id = uuid;
-            user.FirstName = first;
-            user.LastName = last;
+            /* BEGIN: do not wrap this code in any lock here
+             * There are HTTP calls in here.
+             */
+            if (!userdata.HasGridUserTried)
+            {
+                /* rewrite here */
+                UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, uuid);
+                if (account != null)
+                {
+                    userdata.FirstName = account.FirstName;
+                    userdata.LastName = account.LastName;
+                    userdata.HomeURL = string.Empty;
+                    userdata.IsUnknownUser = false;
+                    userdata.HasGridUserTried = true;
+                }
+            }
 
-            AddUserInternal(user);
+            if (!userdata.HasGridUserTried)
+            {
+                GridUserInfo uInfo = null;
+                if (null != m_Scenes[0].GridUserService)
+                {
+                    uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString());
+                }
+                if (uInfo != null)
+                {
+                    string url, first, last, tmp;
+                    UUID u;
+                    if(uInfo.UserID.Length <= 36)
+                    {
+                        /* not a UUI */
+                    }
+                    else if (Util.ParseUniversalUserIdentifier(uInfo.UserID, out u, out url, out first, out last, out tmp))
+                    {
+                        if (url != string.Empty)
+                        {
+                            userdata.FirstName = first.Replace(" ", ".") + "." + last.Replace(" ", ".");
+                            userdata.HomeURL = url;
+                            try
+                            {
+                                userdata.LastName = "@" + new Uri(url).Authority;
+                                userdata.IsUnknownUser = false;
+                            }
+                            catch
+                            {
+                                userdata.LastName = "@unknown";
+                            }
+                            userdata.HasGridUserTried = true;
+                        }
+                    }
+                    else
+                        m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID);
+                }
+            }
+            /* END: do not wrap this code in any lock here */
+
+            lock (m_UserCache)
+            {
+                m_UserCache[uuid] = userdata;
+            }
+            return !userdata.IsUnknownUser;
         }
 
-        public void AddUser(UUID uuid, string first, string last, string homeURL)
+        public void AddUser(UUID uuid, string first, string last)
         {
-            //m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, first {1}, last {2}, url {3}", uuid, first, last, homeURL);
-            if (homeURL == string.Empty)
-                return;
-
-            AddUser(uuid, homeURL + ";" + first + " " + last);
+            lock(m_UserCache)
+            {
+                if(!m_UserCache.ContainsKey(uuid))
+                {
+                    UserData user = new UserData();
+                    user.Id = uuid;
+                    user.FirstName = first;
+                    user.LastName = last;
+                    user.IsUnknownUser = false;
+                    user.HasGridUserTried = false;
+                    m_UserCache.Add(uuid, user);
+                }
+            }
         }
 
-        public void AddUser(UUID id, string creatorData)
+        public void AddUser(UUID uuid, string first, string last, string homeURL)
         {
-            //m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData);
+            //m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, first {1}, last {2}, url {3}", uuid, first, last, homeURL);
 
             UserData oldUser;
             lock (m_UserCache)
-                m_UserCache.TryGetValue(id, out oldUser);
-
-            if (oldUser != null)
             {
-                if (string.IsNullOrEmpty(creatorData))
+                if (m_UserCache.TryGetValue(uuid, out oldUser))
                 {
-                    //ignore updates without creator data
-                    return;
-                }
-
-                //try update unknown users, but don't update anyone else
-                if (oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) 
-                {
-                    lock (m_UserCache)
-                        m_UserCache.Remove(id);
-                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: Re-adding user with id {0}, creatorData [{1}] and old HomeURL {2}", id, creatorData, oldUser.HomeURL);
+                    if (!oldUser.IsUnknownUser)
+                    {
+                        if (homeURL != oldUser.HomeURL && m_DisplayChangingHomeURI)
+                        {
+                            m_log.DebugFormat("[USER MANAGEMENT MODULE]: Different HomeURI for {0} {1} ({2}): {3} and {4}",
+                                first, last, uuid.ToString(), homeURL, oldUser.HomeURL);
+                        }
+                        /* no update needed */
+                        return;
+                    }
                 }
-                else
+                else if(!m_UserCache.ContainsKey(uuid))
                 {
-                    //we have already a valid user within the cache
-                    return;
+                    oldUser = new UserData();
+                    oldUser.HasGridUserTried = false;
+                    oldUser.IsUnknownUser = false;
+                    if (homeURL != string.Empty)
+                    {
+                        oldUser.FirstName = first.Replace(" ", ".") + "." + last.Replace(" ", ".");
+                        try
+                        {
+                            oldUser.LastName = "@" + new Uri(homeURL).Authority;
+                            oldUser.IsUnknownUser = false;
+                        }
+                        catch
+                        {
+                            oldUser.LastName = "@unknown";
+                        }
+                    }
+                    else
+                    {
+                        oldUser.FirstName = first;
+                        oldUser.LastName = last;
+                    }
+                    oldUser.HomeURL = homeURL;
+                    oldUser.Id = uuid;
+                    m_UserCache.Add(uuid, oldUser);
                 }
             }
+        }
 
-            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id);
+        public void AddUser(UUID id, string creatorData)
+        {
+            // m_log.InfoFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData);
 
-            if (account != null)
+            if(string.IsNullOrEmpty(creatorData))
             {
-                AddUser(id, account.FirstName, account.LastName);
+                AddUser(id, string.Empty, string.Empty, string.Empty);
             }
             else
             {
-                UserData user = new UserData();
-                user.Id = id;
+                string homeURL;
+                string firstname = string.Empty;
+                string lastname = string.Empty;
 
-                if (!string.IsNullOrEmpty(creatorData))
-                {
-                    //creatorData = <endpoint>;<name>
+                //creatorData = <endpoint>;<name>
 
-                    string[] parts = creatorData.Split(';');
-                    if (parts.Length >= 1)
+                string[] parts = creatorData.Split(';');
+                if(parts.Length > 1)
+                {
+                    string[] nameparts = parts[1].Split(' ');
+                    firstname = nameparts[0];
+                    for(int xi = 1; xi < nameparts.Length; ++xi)
                     {
-                        user.HomeURL = parts[0];
-                        try
+                        if(xi != 1)
                         {
-                            Uri uri = new Uri(parts[0]);
-                            user.LastName = "@" + uri.Authority;
+                            lastname += " ";
                         }
-                        catch (UriFormatException)
+                        lastname += nameparts[xi];
+                    }
+                }
+                else
+                {
+                    firstname = "Unknown";
+                    lastname = "UserUMMAU5";
+                }
+                if (parts.Length >= 1)
+                {
+                    homeURL = parts[0];
+                    if(Uri.IsWellFormedUriString(homeURL, UriKind.Absolute))
+                    {
+                        AddUser(id, firstname, lastname, homeURL);
+                    }
+                    else
+                    {
+                        m_log.DebugFormat("[SCENE]: Unable to parse Uri {0} for CreatorID {1}", parts[0], creatorData);
+
+                        lock (m_UserCache)
                         {
-                            m_log.DebugFormat("[SCENE]: Unable to parse Uri {0}", parts[0]);
-                            user.LastName = "@unknown";
+                            if(!m_UserCache.ContainsKey(id))
+                            {
+                                UserData newUser = new UserData();
+                                newUser.Id = id;
+                                newUser.FirstName = firstname + "." + lastname.Replace(' ', '.');
+                                newUser.LastName = "@unknown";
+                                newUser.HomeURL = string.Empty;
+                                newUser.HasGridUserTried = false;
+                                newUser.IsUnknownUser = true; /* we mark those users as Unknown user so a re-retrieve may be activated */
+                                m_UserCache.Add(id, newUser);
+                            }
                         }
                     }
-
-                    if (parts.Length >= 2)
-                        user.FirstName = parts[1].Replace(' ', '.');
                 }
                 else
                 {
-                    // Temporarily add unknown user entries of this type into the cache so that we can distinguish
-                    // this source from other recent (hopefully resolved) bugs that fail to retrieve a user name binding
-                    // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or
-                    // disappeared.
-                    user.FirstName = "Unknown";
-                    user.LastName = "UserUMMAU4";
+                    lock(m_UserCache)
+                    {
+                        if(!m_UserCache.ContainsKey(id))
+                        {
+                            UserData newUser = new UserData();
+                            newUser.Id = id;
+                            newUser.FirstName = "Unknown";
+                            newUser.LastName = "UserUMMAU4";
+                            newUser.HomeURL = string.Empty;
+                            newUser.IsUnknownUser = true;
+                            newUser.HasGridUserTried = false;
+                            m_UserCache.Add(id, newUser);
+                        }
+                    }
                 }
-                
-                AddUserInternal(user);
             }
         }
-
-        void AddUserInternal(UserData user)
-        {
-            lock (m_UserCache)
-                m_UserCache[user.Id] = user;
-
-            //m_log.DebugFormat(
-            //    "[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}",
-            //    user.Id, user.FirstName, user.LastName, user.HomeURL);
-        }
+        #endregion
 
         public bool IsLocalGridUser(UUID uuid)
         {
@@ -662,6 +824,21 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 "Show the bindings between user UUIDs and user names",
                 String.Empty,
                 HandleShowUsers);
+
+            MainConsole.Instance.Commands.AddCommand("Users", true,
+                "reset user cache",
+                "reset user cache",
+                "reset user cache to allow changed settings to be applied",
+                String.Empty,
+                HandleResetUserCache);
+        }
+
+        private void HandleResetUserCache(string module, string[] cmd)
+        {
+            lock(m_UserCache)
+            {
+                m_UserCache.Clear();
+            }
         }
 
         private void HandleShowUser(string module, string[] cmd)
@@ -676,17 +853,12 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             if (!ConsoleUtil.TryParseConsoleUuid(MainConsole.Instance, cmd[2], out userId))
                 return;
 
-            string[] names;
-
             UserData ud;
 
-            lock (m_UserCache)
+            if(!GetUser(userId, out ud))
             {
-                if (!m_UserCache.TryGetValue(userId, out ud))
-                {
-                    MainConsole.Instance.OutputFormat("No name known for user with id {0}", userId);
-                    return;
-                }
+                MainConsole.Instance.OutputFormat("No name known for user with id {0}", userId);
+                return;
             }
 
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
@@ -704,11 +876,17 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             cdt.AddColumn("UUID", 36);
             cdt.AddColumn("Name", 30);
             cdt.AddColumn("HomeURL", 40);
+            cdt.AddColumn("Checked", 10);
 
-            lock (m_UserCache)
+            Dictionary<UUID, UserData> copyDict;
+            lock(m_UserCache)
+            {
+                copyDict = new Dictionary<UUID, UserData>(m_UserCache);
+            }
+
+            foreach(KeyValuePair<UUID, UserData> kvp in copyDict)
             {
-                foreach (KeyValuePair<UUID, UserData> kvp in m_UserCache)
-                    cdt.AddRow(kvp.Key, string.Format("{0} {1}", kvp.Value.FirstName, kvp.Value.LastName), kvp.Value.HomeURL);
+                cdt.AddRow(kvp.Key, string.Format("{0} {1}", kvp.Value.FirstName, kvp.Value.LastName), kvp.Value.HomeURL, kvp.Value.HasGridUserTried ? "yes" : "no");
             }
 
             MainConsole.Instance.Output(cdt.ToString());
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 8946b5c..a5c7543 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -37,6 +37,7 @@ using OpenSim.Framework;
 using OpenSim.Region.CoreModules.World.WorldMap;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Hypergrid
@@ -126,7 +127,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
                     foreach (MapBlockData b in mapBlocks)
                     {
                         b.Name = string.Empty;
-                        b.Access = 254; // means 'simulator is offline'. We need this because the viewer ignores 255's
+                        // Set 'simulator is offline'. We need this because the viewer ignores SimAccess.Unknown (255)
+                        b.Access = (byte)SimAccess.Down;
                     }
 
                     m_log.DebugFormat("[HG MAP]: Resetting {0} blocks", mapBlocks.Count);
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
index 9809c86..64532df 100644
--- a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
@@ -30,9 +30,9 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
 
-[assembly: Addin("OpenSim.Region.CoreModules", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.5")]
+[assembly: Addin("OpenSim.Region.CoreModules", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
 
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 9d77b19..a686a4d 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -514,9 +514,11 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                         scene.RegionInfo.RegionID.ToString());
                 asset.Data = assetData;
                 asset.Description = String.Format("URL image : {0}", Url);
-                asset.Local = false;
+                if (asset.Description.Length > 128)
+                    asset.Description = asset.Description.Substring(0, 128);
+                asset.Local = true;     // dynamic images aren't saved in the assets server
                 asset.Temporary = ((Disp & DISP_TEMP) != 0);
-                scene.AssetService.Store(asset);
+                scene.AssetService.Store(asset);    // this will only save the asset in the local asset cache
 
                 IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>();
                 if (cacheLayerDecode != null)
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 6880f56..235fbbb 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -37,6 +37,7 @@ using System.Security.Cryptography.X509Certificates;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
@@ -92,10 +93,13 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HttpRequestModule")]
     public class HttpRequestModule : ISharedRegionModule, IHttpRequestModule
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private object HttpListLock = new object();
         private int httpTimeout = 30000;
         private string m_name = "HttpScriptRequests";
 
+        private OutboundUrlFilter m_outboundUrlFilter;
         private string m_proxyurl = "";
         private string m_proxyexcepts = "";
 
@@ -134,10 +138,12 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     return false;
 
                 // Check for policy and execute it if defined
+#pragma warning disable 0618
                 if (ServicePointManager.CertificatePolicy != null)
                 {
                     return ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, Request, 0);
                 }
+#pragma warning restore 0618
 
                 return true;
             }
@@ -155,7 +161,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             return UUID.Zero;
         }
 
-        public UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body)
+        public UUID StartHttpRequest(
+            uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body,
+            out HttpInitialRequestStatus status)
         {
             UUID reqID = UUID.Random();
             HttpRequestClass htc = new HttpRequestClass();
@@ -231,7 +239,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     }
                 }
             }
-
+                        
+            htc.RequestModule = this;
             htc.LocalID = localID;
             htc.ItemID = itemID;
             htc.Url = url;
@@ -242,14 +251,43 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             htc.proxyurl = m_proxyurl;
             htc.proxyexcepts = m_proxyexcepts;
 
+            // Same number as default HttpWebRequest.MaximumAutomaticRedirections
+            htc.MaxRedirects = 50;
+
+            if (StartHttpRequest(htc))
+            {
+                status = HttpInitialRequestStatus.OK;
+                return htc.ReqID;
+            }
+            else
+            {
+                status = HttpInitialRequestStatus.DISALLOWED_BY_FILTER;
+                return UUID.Zero;
+            }
+        }
+
+        /// <summary>
+        /// Would a caller to this module be allowed to make a request to the given URL?
+        /// </summary>
+        /// <returns></returns>
+        public bool CheckAllowed(Uri url)
+        {
+            return m_outboundUrlFilter.CheckAllowed(url);
+        }
+
+        public bool StartHttpRequest(HttpRequestClass req)
+        {          
+            if (!CheckAllowed(new Uri(req.Url)))
+                return false;
+
             lock (HttpListLock)
             {
-                m_pendingRequests.Add(reqID, htc);
+                m_pendingRequests.Add(req.ReqID, req);
             }
 
-            htc.Process();
+            req.Process();
 
-            return reqID;
+            return true;
         }
 
         public void StopHttpRequest(uint m_localID, UUID m_itemID)
@@ -320,6 +358,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
             m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
 
+<<<<<<< HEAD
+            m_outboundUrlFilter = new OutboundUrlFilter("Script HTTP request module", config);
+=======
             int maxThreads = 15;
 
             IConfig httpConfig = config.Configs["HttpRequestModule"];
@@ -327,6 +368,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             {
                 maxThreads = httpConfig.GetInt("MaxPoolThreads", maxThreads);
             }
+>>>>>>> avn/ubitvar
 
             m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
 
@@ -385,7 +427,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         #endregion
     }
 
-    public class HttpRequestClass: IServiceRequest
+    public class HttpRequestClass : IServiceRequest
     {
         // Constants for parameters
         // public const int HTTP_BODY_MAXLENGTH = 2;
@@ -395,6 +437,12 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         // public const int HTTP_VERBOSE_THROTTLE = 4;
         // public const int HTTP_CUSTOM_HEADER = 5;
         // public const int HTTP_PRAGMA_NO_CACHE = 6;
+
+        /// <summary>
+        /// Module that made this request.
+        /// </summary>
+        public HttpRequestModule RequestModule { get; set; }
+
         private bool _finished;
         public bool Finished
         {
@@ -429,6 +477,17 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         public DateTime Next;
         public string proxyurl;
         public string proxyexcepts;
+
+        /// <summary>
+        /// Number of HTTP redirects that this request has been through.
+        /// </summary>
+        public int Redirects { get; private set; }
+
+        /// <summary>
+        /// Maximum number of HTTP redirects allowed for this request.
+        /// </summary>
+        public int MaxRedirects { get; set; }
+
         public string OutboundBody;
         private UUID _reqID;
         public UUID ReqID
@@ -473,11 +532,16 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
             try
             {
+<<<<<<< HEAD
+                Request = (HttpWebRequest)WebRequest.Create(Url);
+                Request.AllowAutoRedirect = false;               
+=======
                 Request = (HttpWebRequest) WebRequest.Create(Url);
 
                 //This works around some buggy HTTP Servers like Lighttpd
                 Request.ServicePoint.Expect100Continue = false;
 
+>>>>>>> avn/ubitvar
                 Request.Method = HttpMethod;
                 Request.ContentType = HttpMIMEType;
 
@@ -491,16 +555,19 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 //                {
 //                    Request.ConnectionGroupName="Verify";
 //                }
+
                 if (!HttpPragmaNoCache)
                 {
                     Request.Headers.Add("Pragma", "no-cache");
                 }
+
                 if (HttpCustomHeaders != null)
                 {
                     for (int i = 0; i < HttpCustomHeaders.Count; i += 2)
                         Request.Headers.Add(HttpCustomHeaders[i],
                                             HttpCustomHeaders[i+1]);
                 }
+
                 if (!string.IsNullOrEmpty(proxyurl))
                 {
                     if (!string.IsNullOrEmpty(proxyexcepts))
@@ -526,9 +593,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     byte[] data = Util.UTF8.GetBytes(OutboundBody);
 
                     Request.ContentLength = data.Length;
-                    Stream bstream = Request.GetRequestStream();
-                    bstream.Write(data, 0, data.Length);
-                    bstream.Close();
+                    using (Stream bstream = Request.GetRequestStream())
+                        bstream.Write(data, 0, data.Length);
                 }
 
                 Request.Timeout = HttpTimeout;
@@ -610,6 +676,56 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     resStream.Close();
                 if (response != null)
                     response.Close();
+<<<<<<< HEAD
+
+                // We need to resubmit 
+                if (
+                    (Status == (int)HttpStatusCode.MovedPermanently
+                        || Status == (int)HttpStatusCode.Found
+                        || Status == (int)HttpStatusCode.SeeOther
+                        || Status == (int)HttpStatusCode.TemporaryRedirect))
+                {
+                    if (Redirects >= MaxRedirects)
+                    {
+                        Status = (int)OSHttpStatusCode.ClientErrorJoker;
+                        ResponseBody = "Number of redirects exceeded max redirects";
+                        _finished = true;
+                    }
+                    else
+                    {
+                        string location = response.Headers["Location"];
+
+                        if (location == null)
+                        {
+                            Status = (int)OSHttpStatusCode.ClientErrorJoker;
+                            ResponseBody = "HTTP redirect code but no location header";
+                            _finished = true;
+                        }
+                        else if (!RequestModule.CheckAllowed(new Uri(location)))
+                        {
+                            Status = (int)OSHttpStatusCode.ClientErrorJoker;
+                            ResponseBody = "URL from HTTP redirect blocked: " + location;
+                            _finished = true;
+                        }
+                        else
+                        {
+                            Status = 0;
+                            Url = response.Headers["Location"];
+                            Redirects++;
+                            ResponseBody = null;
+
+//                            m_log.DebugFormat("Redirecting to [{0}]", Url);
+
+                            Process();
+                        }
+                    }
+                }
+                else
+                {
+                    _finished = true;
+                }
+=======
+>>>>>>> avn/ubitvar
             }
 
             if (ResponseBody == null)
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
index e812d81..d22487e 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
@@ -41,7 +41,6 @@ using OpenSim.Framework;
 using OpenSim.Region.CoreModules.Scripting.HttpRequest;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
 {
@@ -97,8 +96,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
     {
         public string Response { get; set; }
 
+#pragma warning disable 0618
         public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) 
             : base(serializationInfo, streamingContext) {}
+#pragma warning restore 0618
 
         public override Stream GetResponseStream()
         {
@@ -147,11 +148,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
         /// <summary>
         /// Test what happens when we get a 404 response from a call.
         /// </summary>
-        [Test]
+//        [Test]
         public void Test404Response()
         {
             TestHelpers.InMethod();
-//            TestHelpers.EnableLogging();
+            TestHelpers.EnableLogging();
 
             if (!Util.IsPlatformMono)
                 Assert.Ignore("Ignoring test since can only currently run on Mono");           
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index baf9f2f..7462ebd 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -32,6 +32,7 @@ using System.Net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
+using OpenSim.Framework.Communications;
 using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -50,6 +51,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
         private Scene m_scene;
         private IDynamicTextureManager m_textureManager;
 
+        private OutboundUrlFilter m_outboundUrlFilter;
         private string m_proxyurl = "";
         private string m_proxyexcepts = "";
 
@@ -88,8 +90,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 
         public bool AsyncConvertUrl(UUID id, string url, string extraParams)
         {
-            MakeHttpRequest(url, id);
-            return true;
+            return MakeHttpRequest(url, id);
         }
 
         public bool AsyncConvertData(UUID id, string bodyData, string extraParams)
@@ -110,6 +111,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 
         public void Initialise(IConfigSource config)
         {
+            m_outboundUrlFilter = new OutboundUrlFilter("Script dynamic texture image module", config);
             m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
             m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
         }
@@ -157,9 +159,13 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 
         #endregion
 
-        private void MakeHttpRequest(string url, UUID requestID)
+        private bool MakeHttpRequest(string url, UUID requestID)
         {
-            WebRequest request = HttpWebRequest.Create(url);
+            if (!m_outboundUrlFilter.CheckAllowed(new Uri(url)))
+                return false;
+
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
+            request.AllowAutoRedirect = false;
             
             if (!string.IsNullOrEmpty(m_proxyurl)) 
             {
@@ -174,12 +180,14 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
                 }
             }
 
-            RequestState state = new RequestState((HttpWebRequest) request, requestID);
+            RequestState state = new RequestState(request, requestID);
             // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state);
             request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state);
 
             TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1));
             state.TimeOfRequest = (int) t.TotalSeconds;
+
+            return true;
         }
 
         private void HttpRequestReturn(IAsyncResult result)
@@ -195,10 +203,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             Stream stream = null;
             byte[] imageJ2000 = new byte[0];
             Size newSize = new Size(0, 0);
+            HttpWebResponse response = null;
 
             try
             {
-                HttpWebResponse response = (HttpWebResponse)request.EndGetResponse(result);
+                response = (HttpWebResponse)request.EndGetResponse(result);
                 if (response != null && response.StatusCode == HttpStatusCode.OK)
                 {
                     stream = response.GetResponseStream();
@@ -262,18 +271,32 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             finally
             {
                 if (stream != null)
-                {
                     stream.Close();
-                }
-            }
 
-            m_log.DebugFormat("[LOADIMAGEURLMODULE]: Returning {0} bytes of image data for request {1}",
-                                       imageJ2000.Length, state.RequestID);
+                if (response != null)
+                    response.Close();
 
-            m_textureManager.ReturnData(
-                state.RequestID,
-                new OpenSim.Region.CoreModules.Scripting.DynamicTexture.DynamicTexture(
-                    request.RequestUri, null, imageJ2000, newSize, false));
+                if (
+                    response.StatusCode == HttpStatusCode.MovedPermanently
+                        || response.StatusCode == HttpStatusCode.Found
+                        || response.StatusCode == HttpStatusCode.SeeOther
+                        || response.StatusCode == HttpStatusCode.TemporaryRedirect)
+                {
+                    string redirectedUrl = response.Headers["Location"];
+
+                    MakeHttpRequest(redirectedUrl, state.RequestID);
+                }
+                else
+                {
+                    m_log.DebugFormat("[LOADIMAGEURLMODULE]: Returning {0} bytes of image data for request {1}",
+                                      imageJ2000.Length, state.RequestID);
+
+                    m_textureManager.ReturnData(
+                        state.RequestID,
+                        new OpenSim.Region.CoreModules.Scripting.DynamicTexture.DynamicTexture(
+                        request.RequestUri, null, imageJ2000, newSize, false));
+                }
+            }
         }
 
         #region Nested type: RequestState
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
index 7119137..ed255bf 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
@@ -40,7 +40,6 @@ using OpenSim.Region.CoreModules.Scripting.VectorRender;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
 {
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 87a0537..1c3a714 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -380,6 +380,20 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
             if (sp != null)
             {
+<<<<<<< HEAD
+                // ignore if a child agent this is restricted to inside one
+                // region
+                if (sp.IsChildAgent)
+                    return;
+
+                // Channel zero only goes to the avatar
+                // non zero channel messages only go to the attachments of the avatar.
+                if (channel != 0)
+                {
+                    List<SceneObjectGroup> attachments = sp.GetAttachments();
+                    if (attachments.Count == 0)
+                        return;
+=======
                 // Send message to avatar
                 if (channel == 0)
                 {
@@ -387,6 +401,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                     m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false);
                     return true;
                 }
+>>>>>>> avn/ubitvar
 
                 List<SceneObjectGroup> attachments = sp.GetAttachments();
 
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index c6e05b1..87f4277 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -36,6 +36,7 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
@@ -656,12 +657,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
 
         public void Process()
         {
-            httpThread = new Thread(SendRequest);
-            httpThread.Name = "HttpRequestThread";
-            httpThread.Priority = ThreadPriority.BelowNormal;
-            httpThread.IsBackground = true;
             _finished = false;
-            httpThread.Start();
+            httpThread = WorkManager.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false);
         }
 
         /*
@@ -733,13 +730,19 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
             }
 
             _finished = true;
+
+            Watchdog.RemoveThread();
         }
 
         public void Stop()
         {
             try
             {
-                httpThread.Abort();
+                if (httpThread != null)
+                {
+                    Watchdog.AbortThread(httpThread.ManagedThreadId);
+                    httpThread = null;
+                }
             }
             catch (Exception)
             {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs
new file mode 100644
index 0000000..41ae53f
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs
@@ -0,0 +1,153 @@
+/*
+ * 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;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+
+using OpenMetaverse;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalAgentPreferencesServicesConnector")]
+    public class LocalAgentPreferencesServicesConnector : ISharedRegionModule, IAgentPreferencesService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IAgentPreferencesService m_AgentPreferencesService;
+        private bool m_Enabled = false;
+
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface 
+        {
+            get { return null; }
+        }
+
+        public string Name
+        {
+            get { return "LocalAgentPreferencesServicesConnector"; }
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("AgentPreferencesServices", "");
+                if (name == Name)
+                {
+                    IConfig userConfig = source.Configs["AgentPreferencesService"];
+                    if (userConfig == null)
+                    {
+                        m_log.Error("[AGENT PREFERENCES CONNECTOR]: AgentPreferencesService missing from OpenSim.ini");
+                        return;
+                    }
+
+                    string serviceDll = userConfig.GetString("LocalServiceModule", String.Empty);
+
+                    if (String.IsNullOrEmpty(serviceDll))
+                    {
+                        m_log.Error("[AGENT PREFERENCES CONNECTOR]: No AgentPreferencesModule named in section AgentPreferencesService");
+                        return;
+                    }
+
+                    Object[] args = new Object[] { source };
+                    m_AgentPreferencesService = ServerUtils.LoadPlugin<IAgentPreferencesService>(serviceDll, args);
+
+                    if (m_AgentPreferencesService == null)
+                    {
+                        m_log.Error("[AGENT PREFERENCES CONNECTOR]: Can't load agent preferences service");
+                        return;
+                    }
+                    m_Enabled = true;
+                    m_log.Info("[AGENT PREFERENCES CONNECTOR]: Local agent preferences connector enabled");
+                }
+            }
+        }
+
+        public void PostInitialise()
+        {
+            if (!m_Enabled)
+                return;
+        }
+
+        public void Close()
+        {
+            if (!m_Enabled)
+                return;
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            scene.RegisterModuleInterface<IAgentPreferencesService>(this);
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+        }
+
+        #endregion ISharedRegionModule
+
+        #region IAgentPreferencesService
+
+        public AgentPrefs GetAgentPreferences(UUID principalID)
+        {
+            return m_AgentPreferencesService.GetAgentPreferences(principalID);
+        }
+
+        public bool StoreAgentPreferences(AgentPrefs data)
+        {
+            return m_AgentPreferencesService.StoreAgentPreferences(data);
+        }
+
+        public string GetLang(UUID principalID)
+        {
+            return m_AgentPreferencesService.GetLang(principalID);
+        }
+
+        #endregion IAgentPreferencesService
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs
new file mode 100644
index 0000000..ad9544a
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs
@@ -0,0 +1,116 @@
+/*
+ * 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;
+
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors;
+
+using OpenMetaverse;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteAgentPreferencesServicesConnector")]
+    public class RemoteAgentPreferencesServicesConnector : AgentPreferencesServicesConnector, 
+            ISharedRegionModule, IAgentPreferencesService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private bool m_Enabled = false;
+
+        public Type ReplaceableInterface 
+        {
+            get { return null; }
+        }
+
+        public string Name
+        {
+            get { return "RemoteAgentPreferencesServicesConnector"; }
+        }
+
+        public override void Initialise(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("AgentPreferencesServices", "");
+                if (name == Name)
+                {
+                    IConfig userConfig = source.Configs["AgentPreferencesService"];
+                    if (userConfig == null)
+                    {
+                        m_log.Error("[AGENT PREFERENCES CONNECTOR]: AgentPreferencesService missing from OpenSim.ini");
+                        return;
+                    }
+
+                    m_Enabled = true;
+
+                    base.Initialise(source);
+
+                    m_log.Info("[AGENT PREFERENCES CONNECTOR]: Remote agent preferences enabled");
+                }
+            }
+        }
+
+        public void PostInitialise()
+        {
+            /* no op */
+        }
+
+        public void Close()
+        {
+            /* no op */
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            scene.RegisterModuleInterface<IAgentPreferencesService>(this);
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            /* no op */
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            /* no op */
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 9f58175..7fcfc74 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -69,6 +69,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
             get { return "HGAssetBroker"; }
         }
 
+        public HGAssetBroker() {}
+
+        public HGAssetBroker(IConfigSource config)
+        {
+            Initialise(config);
+        }
+
         public void Initialise(IConfigSource source)
         {
             IConfig moduleConfig = source.Configs["Modules"];
@@ -288,7 +295,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (asset != null)
             {
-                Util.FireAndForget(delegate { handler(id, sender, asset); });
+                Util.FireAndForget(delegate { handler(id, sender, asset); }, null, "HGAssetBroker.GotFromCache");
                 return true;
             }
 
@@ -312,6 +319,23 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
             }
         }
 
+        public virtual bool[] AssetsExist(string[] ids)
+        {
+            int numHG = 0;
+            foreach (string id in ids)
+            {
+                if (IsHG(id))
+                    ++numHG;
+            }
+
+            if (numHG == 0)
+                return m_GridService.AssetsExist(ids);
+            else if (numHG == ids.Length)
+                return m_HGService.AssetsExist(ids);
+            else
+                throw new Exception("[HG ASSET CONNECTOR]: AssetsExist: all the assets must be either local or foreign");
+        }
+
         public string Store(AssetBase asset)
         {
             bool isHG = IsHG(asset.ID);
@@ -329,7 +353,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
                 return asset.ID;
             }
 
-            string id = string.Empty;
+            string id;
             if (IsHG(asset.ID))
             {
                 if (m_AssetPerms.AllowedExport(asset.Type))
@@ -340,18 +364,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
             else
                 id = m_GridService.Store(asset);
 
-            if (id != String.Empty)
-            {
-                // Placing this here, so that this work with old asset servers that don't send any reply back
-                // SynchronousRestObjectRequester returns somethins that is not an empty string
-                if (id != null)
-                    asset.ID = id;
+            if (String.IsNullOrEmpty(id))
+                return string.Empty;
+            
+            asset.ID = id;
 
-                if (m_Cache != null)
-                    m_Cache.Cache(asset);
-            }
-            return id;
+            if (m_Cache != null)
+                m_Cache.Cache(asset);
 
+            return id;
         }
 
         public bool UpdateContent(string id, byte[] data)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index 52b1039..5f34450 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -236,7 +236,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
                 if (asset != null)
                 {
-                    Util.FireAndForget(delegate { handler(id, sender, asset); });
+                    Util.FireAndForget(
+                        o => handler(id, sender, asset), null, "LocalAssetServiceConnector.GotFromCacheCallback");
                     return true;
                 }
             }
@@ -249,10 +250,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 //                if (null == a)
 //                    m_log.WarnFormat("[LOCAL ASSET SERVICES CONNECTOR]: Could not asynchronously find asset with id {0}", id);
 
-                Util.FireAndForget(delegate { handler(assetID, s, a); });
+                Util.FireAndForget(
+                    o => handler(assetID, s, a), null, "LocalAssetServiceConnector.GotFromServiceCallback");
             });
         }
 
+        public bool[] AssetsExist(string[] ids)
+        {
+            return m_AssetService.AssetsExist(ids);
+        }
+
         public string Store(AssetBase asset)
         {
             if (m_Cache != null)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
index 4470799..93dff1f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
@@ -89,35 +89,43 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
         public bool IsAuthorizedForRegion(
             string user, string firstName, string lastName, string regionID, out string message)
         {
-            message = "authorized";
-
             // This should not happen
             if (m_Scene.RegionInfo.RegionID.ToString() != regionID)
             {
                 m_log.WarnFormat("[AuthorizationService]: Service for region {0} received request to authorize for region {1}",
                     m_Scene.RegionInfo.RegionID, regionID);
-                return true;
+                message = string.Format("Region {0} received request to authorize for region {1}", m_Scene.RegionInfo.RegionID, regionID);
+                return false;
             }
 
             if (m_accessValue == AccessFlags.None)
+            {
+                message = "Authorized";
                 return true;
+            }
 
             UUID userID = new UUID(user);
-            bool authorized = true;
-            if ((m_accessValue & AccessFlags.DisallowForeigners) == AccessFlags.DisallowForeigners)
+
+            if ((m_accessValue & AccessFlags.DisallowForeigners) != 0)
             {
-                authorized = m_UserManagement.IsLocalGridUser(userID);
-                if (!authorized)
-                    message = "no foreigner users allowed in this region";
+                if (!m_UserManagement.IsLocalGridUser(userID))
+                {
+                    message = "No foreign users allowed in this region";
+                    return false;
+                }
             }
-            if (authorized && (m_accessValue & AccessFlags.DisallowResidents) == AccessFlags.DisallowResidents)
+
+            if ((m_accessValue & AccessFlags.DisallowResidents) != 0)
             {
-                authorized = m_Scene.Permissions.IsGod(userID) | m_Scene.Permissions.IsAdministrator(userID);
-                if (!authorized)
-                    message = "only Admins and Managers allowed in this region";
+                if (!(m_Scene.Permissions.IsGod(userID) || m_Scene.Permissions.IsAdministrator(userID)))
+                {
+                    message = "Only Admins and Managers allowed in this region";
+                    return false;
+                }
             }
 
-            return authorized;
+            message = "Authorized";
+            return true;
         }
 
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 8ccad39..1f782f5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -48,6 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
+        private static string LogHeader = "[LOCAL GRID SERVICE CONNECTOR]";
 
         private IGridService m_GridService;
         private Dictionary<UUID, RegionCache> m_LocalCache = new Dictionary<UUID, RegionCache>();
@@ -56,12 +57,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         public LocalGridServicesConnector()
         {
-            m_log.Debug("[LOCAL GRID SERVICE CONNECTOR]: LocalGridServicesConnector no parms.");
+            m_log.DebugFormat("{0} LocalGridServicesConnector no parms.", LogHeader);
         }
 
         public LocalGridServicesConnector(IConfigSource source)
         {
-            m_log.Debug("[LOCAL GRID SERVICE CONNECTOR]: LocalGridServicesConnector instantiated directly.");
+            m_log.DebugFormat("{0} LocalGridServicesConnector instantiated directly.", LogHeader);
             InitialiseService(source);
         }
 
@@ -93,15 +94,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         private void InitialiseService(IConfigSource source)
         {
-            IConfig assetConfig = source.Configs["GridService"];
-            if (assetConfig == null)
+            IConfig config = source.Configs["GridService"];
+            if (config == null)
             {
                 m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: GridService missing from OpenSim.ini");
                 return;
             }
 
-            string serviceDll = assetConfig.GetString("LocalServiceModule",
-                    String.Empty);
+            string serviceDll = config.GetString("LocalServiceModule", String.Empty);
 
             if (serviceDll == String.Empty)
             {
@@ -192,9 +192,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return m_GridService.GetRegionByUUID(scopeID, regionID);
         }
 
+        // Get a region given its base coordinates.
+        // NOTE: this is NOT 'get a region by some point in the region'. The coordinate MUST
+        //     be the base coordinate of the region.
         public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
         {
             GridRegion region = null;
+            uint regionX = Util.WorldToRegionLoc((uint)x);
+            uint regionY = Util.WorldToRegionLoc((uint)y);
+
+            // Sanity check
+            if ((Util.RegionToWorldLoc(regionX) != (uint)x) || (Util.RegionToWorldLoc(regionY) != (uint)y))
+            {
+                m_log.WarnFormat("{0} GetRegionByPosition. Bad position requested: not the base of the region. Requested Pos=<{1},{2}>, Should Be=<{3},{4}>",
+                    LogHeader, x, y, Util.RegionToWorldLoc(regionX), Util.RegionToWorldLoc(regionY));
+            }
 
             // First see if it's a neighbour, even if it isn't on this sim.
             // Neighbour data is cached in memory, so this is fast
@@ -206,13 +218,33 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                     region = rcache.GetRegionByPosition(x, y);
                     if (region != null)
                     {
-                        return region;
+                        m_log.DebugFormat("{0} GetRegionByPosition. Found region {1} in cache (of region {2}). Pos=<{3},{4}>",
+                                         LogHeader, region.RegionName, rcache.RegionName,
+                                         Util.WorldToRegionLoc((uint)region.RegionLocX), Util.WorldToRegionLoc((uint)region.RegionLocY));
+                        break;
                     }
                 }
             }
 
             // Then try on this sim (may be a lookup in DB if this is using MySql).
-            return m_GridService.GetRegionByPosition(scopeID, x, y);
+            if (region == null)
+            {
+                region = m_GridService.GetRegionByPosition(scopeID, x, y);
+
+                if (region == null)
+                {
+                    m_log.DebugFormat("{0} GetRegionByPosition. Region not found by grid service. Pos=<{1},{2}>",
+                                      LogHeader, regionX, regionY);
+                }
+                else
+                {
+                    m_log.DebugFormat("{0} GetRegionByPosition. Got region {1} from grid service. Pos=<{2},{3}>",
+                                      LogHeader, region.RegionName,
+                                      Util.WorldToRegionLoc((uint)region.RegionLocX), Util.WorldToRegionLoc((uint)region.RegionLocY));
+                }
+            }
+
+            return region;
         }
 
         public GridRegion GetRegionByName(UUID scopeID, string regionName)
@@ -255,6 +287,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return m_GridService.GetRegionFlags(scopeID, regionID);
         }
 
+        public Dictionary<string, object> GetExtraFeatures()
+        {
+            return m_GridService.GetExtraFeatures();
+        }
+
         #endregion
 
         public void HandleShowNeighboursCommand(string module, string[] cmdparams)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 6a57d1f..68ae4fa 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -28,6 +28,7 @@
 using log4net;
 using Mono.Addins;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using Nini.Config;
@@ -186,18 +187,41 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return rinfo;
         }
 
+        // Get a region given its base world coordinates (in meters).
+        // NOTE: this is NOT 'get a region by some point in the region'. The coordinate MUST
+        //     be the base coordinate of the region.
+        // The coordinates are world coords (meters), NOT region units.
         public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
         {
+            ulong regionHandle = Util.RegionWorldLocToHandle((uint)x, (uint)y);
+            uint regionX = Util.WorldToRegionLoc((uint)x);
+            uint regionY = Util.WorldToRegionLoc((uint)y);
+            
+            // Sanity check
+            if ((Util.RegionToWorldLoc(regionX) != (uint)x) || (Util.RegionToWorldLoc(regionY) != (uint)y))
+            {
+                m_log.WarnFormat("[REMOTE GRID CONNECTOR]: GetRegionByPosition. Bad position requested: not the base of the region. Requested Pos=<{0},{1}>, Should Be=<{2},{3}>",
+                    x, y, Util.RegionToWorldLoc(regionX), Util.RegionToWorldLoc(regionY));
+            }
+
             bool inCache = false;
-            GridRegion rinfo = m_RegionInfoCache.Get(scopeID, Util.UIntsToLong((uint)x, (uint)y), out inCache);
+            GridRegion rinfo = m_RegionInfoCache.Get(scopeID, regionHandle, out inCache);
             if (inCache)
+            {
+                m_log.DebugFormat("[REMOTE GRID CONNECTOR]: GetRegionByPosition. Found region {0} in cache. Pos=<{1},{2}>, RegionHandle={3}",
+                    (rinfo == null) ? "<missing>" : rinfo.RegionName, regionX, regionY, (rinfo == null) ? regionHandle : rinfo.RegionHandle);
                 return rinfo;
+            }
 
             rinfo = m_LocalGridService.GetRegionByPosition(scopeID, x, y);
             if (rinfo == null)
                 rinfo = m_RemoteGridService.GetRegionByPosition(scopeID, x, y);
 
             m_RegionInfoCache.Cache(rinfo);
+            
+            m_log.DebugFormat("[REMOTE GRID CONNECTOR]: GetRegionByPosition. Added region {0} to the cache. Pos=<{1},{2}>, RegionHandle={3}",
+                (rinfo == null) ? "<missing>" : rinfo.RegionName, regionX, regionY, (rinfo == null) ? regionHandle : rinfo.RegionHandle);
+
             return rinfo;
         }
 
@@ -345,6 +369,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             return flags;
         }
+
+        public Dictionary<string, object> GetExtraFeatures()
+        {
+            Dictionary<string, object> extraFeatures;
+            extraFeatures = m_LocalGridService.GetExtraFeatures();
+
+            if (extraFeatures.Count == 0)
+                extraFeatures = m_RemoteGridService.GetExtraFeatures();
+
+            return extraFeatures;
+        }
         #endregion
     }
 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index 6a49ca7..8df30d4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -34,6 +34,7 @@ using log4net.Config;
 using Nini.Config;
 using NUnit.Framework;
 using OpenMetaverse;
+
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid;
 using OpenSim.Region.Framework.Scenes;
@@ -84,7 +85,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             r1.ExternalHostName = "127.0.0.1";
             r1.HttpPort = 9001;
             r1.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
-            Scene s = new Scene(new RegionInfo());
+            Scene s = new Scene(new RegionInfo(), null);
             s.RegionInfo.RegionID = r1.RegionID;
             m_LocalConnector.AddRegion(s);
             
@@ -96,7 +97,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             r2.ExternalHostName = "127.0.0.1";
             r2.HttpPort = 9002;
             r2.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
-            s = new Scene(new RegionInfo());
+            s = new Scene(new RegionInfo(), null);
             s.RegionInfo.RegionID = r2.RegionID;
             m_LocalConnector.AddRegion(s);
 
@@ -108,7 +109,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             r3.ExternalHostName = "127.0.0.1";
             r3.HttpPort = 9003;
             r3.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
-            s = new Scene(new RegionInfo());
+            s = new Scene(new RegionInfo(), null);
             s.RegionInfo.RegionID = r3.RegionID;
             m_LocalConnector.AddRegion(s);
 
@@ -120,7 +121,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             r4.ExternalHostName = "127.0.0.1";
             r4.HttpPort = 9004;
             r4.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
-            s = new Scene(new RegionInfo());
+            s = new Scene(new RegionInfo(), null);
             s.RegionInfo.RegionID = r4.RegionID;
             m_LocalConnector.AddRegion(s);
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
index e05d186..2238c90 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -67,10 +67,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
         {
             if (sp.PresenceType != PresenceType.Npc)
             {
-                string userid = sp.Scene.UserManagementModule.GetUserUUI(sp.UUID);
+                string userid;
                 //m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", userid, sp.Scene.RegionInfo.RegionName);
-                m_GridUserService.SetLastPosition(
-                    userid, UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+                if (sp.Scene.UserManagementModule.GetUserUUI(sp.UUID, out userid))
+                {
+                    /* we only setposition on known agents that have a valid lookup */
+                    m_GridUserService.SetLastPosition(
+                        userid, UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+                }
             }
         }
 
@@ -89,17 +93,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
             if (client.SceneAgent.IsChildAgent)
                 return;
 
-            string userId = client.AgentId.ToString();
+            string userId;
+            /* without scene we cannot logout correctly at all since we do not know how to send the loggedout message then */
             if (client.Scene is Scene)
             {
                 Scene s = (Scene)client.Scene;
                 userId = s.UserManagementModule.GetUserUUI(client.AgentId);
+                if(s.UserManagementModule.GetUserUUI(client.AgentId, out userId))
+                {
+                    m_GridUserService.LoggedOut(
+                        userId, client.SessionId, client.Scene.RegionInfo.RegionID,
+                        client.SceneAgent.AbsolutePosition, client.SceneAgent.Lookat);
+                }
             }
-            //m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected client logout {0} in {1}", userId, client.Scene.RegionInfo.RegionName);
 
-            m_GridUserService.LoggedOut(
-                userId, client.SessionId, client.Scene.RegionInfo.RegionID,
-                client.SceneAgent.AbsolutePosition, client.SceneAgent.Lookat);
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 77a3c82..48f228a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -62,6 +62,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         private InventoryCache m_Cache = new InventoryCache();
 
+        /// <summary>
+        /// Used to serialize inventory requests.
+        /// </summary>
+        private object m_Lock = new object();
+
         protected IUserManagement m_UserManagement;
         protected IUserManagement UserManagementModule
         {
@@ -244,7 +249,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                             if (inventoryURL != null && inventoryURL != string.Empty)
                             {
                                 inventoryURL = inventoryURL.Trim(new char[] { '/' });
-                                m_InventoryURLs.Add(userID, inventoryURL);
+                                m_InventoryURLs[userID] = inventoryURL;
                                 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Added {0} to the cache of inventory URLs", inventoryURL);
                                 return;
                             }
@@ -301,7 +306,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public bool CreateUserInventory(UUID userID)
         {
-            return m_LocalGridInventoryService.CreateUserInventory(userID);
+            lock (m_Lock)
+                return m_LocalGridInventoryService.CreateUserInventory(userID);
         }
 
         public List<InventoryFolderBase> GetInventorySkeleton(UUID userID)
@@ -309,36 +315,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(userID);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.GetInventorySkeleton(userID);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.GetInventorySkeleton(userID);
 
             IInventoryService connector = GetConnector(invURL);
 
             return connector.GetInventorySkeleton(userID);
         }
 
-        public InventoryCollection GetUserInventory(UUID userID)
-        {
-            string invURL = GetInventoryServiceURL(userID);
-            m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetUserInventory for {0} {1}", userID, invURL);
-
-            if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.GetUserInventory(userID);
-
-            InventoryCollection c = m_Cache.GetUserInventory(userID);
-            if (c != null)
-                return c;
-
-            IInventoryService connector = GetConnector(invURL);
-            c = connector.GetUserInventory(userID);
-
-            m_Cache.Cache(userID, c);
-            return c;
-        }
-
-        public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
-        {
-        }
-
         public InventoryFolderBase GetRootFolder(UUID userID)
         {
             //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetRootFolder for {0}", userID);
@@ -349,7 +333,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(userID);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.GetRootFolder(userID);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.GetRootFolder(userID);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -360,7 +345,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return root;
         }
 
-        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
+        public InventoryFolderBase GetFolderForType(UUID userID, FolderType type)
         {
             //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetFolderForType {0} type {1}", userID, type);
             InventoryFolderBase f = m_Cache.GetFolderForType(userID, type);
@@ -370,7 +355,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(userID);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.GetFolderForType(userID, type);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.GetFolderForType(userID, type);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -388,7 +374,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(userID);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.GetFolderContent(userID, folderID);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.GetFolderContent(userID, folderID);
 
             InventoryCollection c = m_Cache.GetFolderContent(userID, folderID);
             if (c != null)
@@ -398,8 +385,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
 
             IInventoryService connector = GetConnector(invURL);
+
             return connector.GetFolderContent(userID, folderID);
+        }
+
+        public InventoryCollection[] GetMultipleFoldersContent(UUID userID, UUID[] folderIDs)
+        {
+            string invURL = GetInventoryServiceURL(userID);
+
+            if (invURL == null) // not there, forward to local inventory connector to resolve
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.GetMultipleFoldersContent(userID, folderIDs);
+
+            else
+            {
+                InventoryCollection[] coll = new InventoryCollection[folderIDs.Length];
+                int i = 0;
+                foreach (UUID fid in folderIDs)
+                    coll[i++] = GetFolderContent(userID, fid);
 
+                return coll;
+            }
         }
 
         public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
@@ -409,7 +415,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(userID);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.GetFolderItems(userID, folderID);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.GetFolderItems(userID, folderID);
 
             List<InventoryItemBase> items = m_Cache.GetFolderItems(userID, folderID);
             if (items != null)
@@ -419,8 +426,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
 
             IInventoryService connector = GetConnector(invURL);
-            return connector.GetFolderItems(userID, folderID);
 
+            return connector.GetFolderItems(userID, folderID);
         }
 
         public bool AddFolder(InventoryFolderBase folder)
@@ -433,7 +440,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(folder.Owner);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.AddFolder(folder);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.AddFolder(folder);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -450,7 +458,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(folder.Owner);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.UpdateFolder(folder);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.UpdateFolder(folder);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -469,7 +478,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(ownerID);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.DeleteFolders(ownerID, folderIDs);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.DeleteFolders(ownerID, folderIDs);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -486,7 +496,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(folder.Owner);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.MoveFolder(folder);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.MoveFolder(folder);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -503,7 +514,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(folder.Owner);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.PurgeFolder(folder);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.PurgeFolder(folder);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -520,7 +532,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(item.Owner);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.AddItem(item);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.AddItem(item);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -537,7 +550,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(item.Owner);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.UpdateItem(item);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.UpdateItem(item);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -556,7 +570,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(ownerID);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.MoveItems(ownerID, items);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.MoveItems(ownerID, items);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -575,7 +590,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(ownerID);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.DeleteItems(ownerID, itemIDs);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.DeleteItems(ownerID, itemIDs);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -591,13 +607,31 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(item.Owner);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.GetItem(item);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.GetItem(item);
 
             IInventoryService connector = GetConnector(invURL);
 
             return connector.GetItem(item);
         }
 
+        public InventoryItemBase[] GetMultipleItems(UUID userID, UUID[] itemIDs)
+        {
+            if (itemIDs == null)
+                return new InventoryItemBase[0];
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: GetItem " + item.ID);
+
+            string invURL = GetInventoryServiceURL(userID);
+
+            if (invURL == null) // not there, forward to local inventory connector to resolve
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.GetMultipleItems(userID, itemIDs);
+
+            IInventoryService connector = GetConnector(invURL);
+
+            return connector.GetMultipleItems(userID, itemIDs);
+        }
+
         public InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             if (folder == null)
@@ -608,7 +642,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(folder.Owner);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.GetFolder(folder);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.GetFolder(folder);
 
             IInventoryService connector = GetConnector(invURL);
 
@@ -632,7 +667,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             string invURL = GetInventoryServiceURL(userID);
 
             if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.GetAssetPermissions(userID, assetID);
+                lock (m_Lock)
+                    return m_LocalGridInventoryService.GetAssetPermissions(userID, assetID);
 
             IInventoryService connector = GetConnector(invURL);
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index 2fc8ee3..3195e6b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -41,7 +41,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         private const double CACHE_EXPIRATION_SECONDS = 3600.0; // 1 hour
 
         private static ExpiringCache<UUID, InventoryFolderBase> m_RootFolders = new ExpiringCache<UUID, InventoryFolderBase>();
-        private static ExpiringCache<UUID, Dictionary<AssetType, InventoryFolderBase>> m_FolderTypes = new ExpiringCache<UUID, Dictionary<AssetType, InventoryFolderBase>>();
+        private static ExpiringCache<UUID, Dictionary<FolderType, InventoryFolderBase>> m_FolderTypes = new ExpiringCache<UUID, Dictionary<FolderType, InventoryFolderBase>>();
         private static ExpiringCache<UUID, InventoryCollection> m_Inventories = new ExpiringCache<UUID, InventoryCollection>();
 
         public void Cache(UUID userID, InventoryFolderBase root)
@@ -58,12 +58,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return null;
         }
 
-        public void Cache(UUID userID, AssetType type, InventoryFolderBase folder)
+        public void Cache(UUID userID, FolderType type, InventoryFolderBase folder)
         {
-            Dictionary<AssetType, InventoryFolderBase> ff = null;
+            Dictionary<FolderType, InventoryFolderBase> ff = null;
             if (!m_FolderTypes.TryGetValue(userID, out ff))
             {
-                ff = new Dictionary<AssetType, InventoryFolderBase>();
+                ff = new Dictionary<FolderType, InventoryFolderBase>();
                 m_FolderTypes.Add(userID, ff, CACHE_EXPIRATION_SECONDS);
             }
 
@@ -77,9 +77,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
+        public InventoryFolderBase GetFolderForType(UUID userID, FolderType type)
         {
-            Dictionary<AssetType, InventoryFolderBase> ff = null;
+            Dictionary<FolderType, InventoryFolderBase> ff = null;
             if (m_FolderTypes.TryGetValue(userID, out ff))
             {
                 InventoryFolderBase f = null;
@@ -99,14 +99,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             m_Inventories.AddOrUpdate(userID, inv, 120);
         }
 
-        public InventoryCollection GetUserInventory(UUID userID)
-        {
-            InventoryCollection inv = null;
-            if (m_Inventories.TryGetValue(userID, out inv))
-                return inv;
-            return null;
-        }
-
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
             InventoryCollection inv = null;
@@ -114,7 +106,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             if (m_Inventories.TryGetValue(userID, out inv))
             {
                 c = new InventoryCollection();
-                c.UserID = userID;
+                c.OwnerID = userID;
 
                 c.Folders = inv.Folders.FindAll(delegate(InventoryFolderBase f)
                 {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 99913a9..20d4e02 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -33,6 +33,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Data;
 using OpenSim.Server.Base;
 using OpenSim.Region.Framework.Interfaces;
@@ -164,22 +165,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_InventoryService.GetInventorySkeleton(userId);
         }
 
-        public InventoryCollection GetUserInventory(UUID id)
-        {
-            return m_InventoryService.GetUserInventory(id);
-        }
-
-        public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
-        {
-            m_InventoryService.GetUserInventory(userID, callback);
-        }
-
         public InventoryFolderBase GetRootFolder(UUID userID)
         {
             return m_InventoryService.GetRootFolder(userID);
         }
 
-        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
+        public InventoryFolderBase GetFolderForType(UUID userID, FolderType type)
         {
             return m_InventoryService.GetFolderForType(userID, type);
         }
@@ -193,17 +184,30 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 // Protect ourselves against the caller subsequently modifying the items list
                 List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items);
 
-                Util.FireAndForget(delegate
+                WorkManager.RunInThread(delegate
                 {
                     foreach (InventoryItemBase item in items)
                         if (!string.IsNullOrEmpty(item.CreatorData))
                             UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
-                });
+                }, null, string.Format("GetFolderContent (user {0}, folder {1})", userID, folderID));
             }
 
             return invCol;
         }
 
+        public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs)
+        {
+            InventoryCollection[] invColl = new InventoryCollection[folderIDs.Length];
+            int i = 0;
+            foreach (UUID fid in folderIDs)
+            {
+                invColl[i++] = GetFolderContent(principalID, fid);
+            }
+
+            return invColl;
+
+        }
+
         public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
         {
             return m_InventoryService.GetFolderItems(userID, folderID);
@@ -303,6 +307,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return item;
         }
 
+        public InventoryItemBase[] GetMultipleItems(UUID userID, UUID[] itemIDs)
+        {
+            return m_InventoryService.GetMultipleItems(userID, itemIDs);
+        }
+
         public InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             return m_InventoryService.GetFolder(folder);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 7f78076..978b9d9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -172,21 +172,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_RemoteConnector.GetInventorySkeleton(userId);
         }
 
-        public  InventoryCollection GetUserInventory(UUID userID)
-        {
-            return m_RemoteConnector.GetUserInventory(userID);
-        }
-
-        public  void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
-        {
-        }
-
         public InventoryFolderBase GetRootFolder(UUID userID)
         {
             return m_RemoteConnector.GetRootFolder(userID);
         }
 
-        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
+        public InventoryFolderBase GetFolderForType(UUID userID, FolderType type)
         {
             return m_RemoteConnector.GetFolderForType(userID, type);
         }
@@ -213,6 +204,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return invCol;
         }
 
+        public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs)
+        {
+            return m_RemoteConnector.GetMultipleFoldersContent(principalID, folderIDs);
+        }
+
         public  List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
         {
             return m_RemoteConnector.GetFolderItems(userID, folderID);
@@ -307,6 +303,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_RemoteConnector.GetItem(item);
         }
 
+        public InventoryItemBase[] GetMultipleItems(UUID userID, UUID[] itemIDs)
+        {
+            if (itemIDs == null)
+                return new InventoryItemBase[0];
+
+            return m_RemoteConnector.GetMultipleItems(userID, itemIDs);
+        }
+
         public  InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             //m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index 2c17e0e..d786c80 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -53,7 +53,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
     /// </remarks>
 
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageServiceModule")]
+<<<<<<< HEAD
+    public class MapImageServiceModule : IMapImageUploadModule, ISharedRegionModule
+=======
     public class MapImageServiceModule : ISharedRegionModule, IMapImageUploadModule
+>>>>>>> avn/ubitvar
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -66,7 +70,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
 
         private int m_refreshtime = 0;
         private int m_lastrefresh = 0;
-        private System.Timers.Timer m_refreshTimer = new System.Timers.Timer();
+        private System.Timers.Timer m_refreshTimer;
         
         #region ISharedRegionModule
         
@@ -93,15 +97,19 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             if (config == null)
                 return;
 
+<<<<<<< HEAD
+            int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime"));
+            
+            // if refresh is less than zero, disable the module
+=======
             int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime", "-1"));
+>>>>>>> avn/ubitvar
             if (refreshminutes < 0)
             {
-                m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: No refresh time given in config. Module disabled.");
+                m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Negative refresh time given in config. Module disabled.");
                 return;
             }
 
-            m_refreshtime = refreshminutes * 60 * 1000; // convert from minutes to ms
-
             string service = config.GetString("LocalServiceModule", string.Empty);
             if (service == string.Empty)
             {
@@ -116,7 +124,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
                 m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Unable to load LocalServiceModule from {0}. MapService module disabled. Please fix the configuration.", service);
                 return;
             }
+   
+            // we don't want the timer if the interval is zero, but we still want this module enables
+            if(refreshminutes > 0)
+            {
+                m_refreshtime = refreshminutes * 60 * 1000; // convert from minutes to ms
+   
+                m_refreshTimer = new System.Timers.Timer();
+                m_refreshTimer.Enabled = true;
+                m_refreshTimer.AutoReset = true;
+                m_refreshTimer.Interval = m_refreshtime;
+                m_refreshTimer.Elapsed += new ElapsedEventHandler(HandleMaptileRefresh);
 
+<<<<<<< HEAD
+                m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0} min and service object {1}",
+=======
             if (m_refreshtime > 0)
             {
                 m_refreshTimer.Enabled = true;
@@ -126,8 +148,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             }
 
             m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0} min and service object {1}",
+>>>>>>> avn/ubitvar
                              refreshminutes, service);
-
+            }
+            else 
+            {
+                m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with no refresh and service object {0}", service);
+            }
             m_enabled = true;
         }
 
@@ -147,6 +174,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             // v2 Map generation on startup is now handled by scene to allow bmp to be shared with
             // v1 service and not generate map tiles twice as was previous behavior
             //scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); };
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
             scene.RegisterModuleInterface<IMapImageUploadModule>(this);
         }
 
@@ -204,9 +235,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             // If the region/maptile is legacy sized, just upload the one tile like it has always been done
             if (mapTile.Width == Constants.RegionSize && mapTile.Height == Constants.RegionSize)
             {
+<<<<<<< HEAD
+                ConvertAndUploadMaptile(mapTile,
+                                        scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY,
+                                        scene.RegionInfo.RegionName);
+=======
                 ConvertAndUploadMaptile(mapTile, scene,
                                         scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY,
                                                                                 scene.RegionInfo.RegionName);
+>>>>>>> avn/ubitvar
             }
             else
             {
@@ -226,10 +263,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
                             (int)Constants.RegionSize, (int)Constants.RegionSize);
                         using (Bitmap subMapTile = mapTile.Clone(rect, mapTile.PixelFormat))
                         {
+<<<<<<< HEAD
+                            ConvertAndUploadMaptile(subMapTile,
+                                                    scene.RegionInfo.RegionLocX + (xx / Constants.RegionSize),
+                                                    scene.RegionInfo.RegionLocY + (yy / Constants.RegionSize),
+                                                    scene.Name);
+=======
                             ConvertAndUploadMaptile(subMapTile, scene,
                                                     scene.RegionInfo.RegionLocX + (xx / Constants.RegionSize),
                                                     scene.RegionInfo.RegionLocY + (yy / Constants.RegionSize),
                                                                                                         scene.Name);
+>>>>>>> avn/ubitvar
                         }
                     }
                 }
@@ -241,8 +285,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
         ///</summary>
         public void UploadMapTile(IScene scene)
         {
+<<<<<<< HEAD
+=======
             m_log.DebugFormat("{0}: upload maptile for {1}", LogHeader, scene.RegionInfo.RegionName);
 
+>>>>>>> avn/ubitvar
             // Create a JPG map tile and upload it to the AddMapTile API
             IMapImageGenerator tileGenerator = scene.RequestModuleInterface<IMapImageGenerator>();
             if (tileGenerator == null)
@@ -253,6 +300,23 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
 
             using (Bitmap mapTile = tileGenerator.CreateMapTile())
             {
+<<<<<<< HEAD
+                if (mapTile != null)
+                {
+                    UploadMapTile(scene, mapTile);
+                }
+                else
+                {
+                    m_log.WarnFormat("{0} Tile image generation failed", LogHeader);
+                }
+            }
+        }
+
+        private void ConvertAndUploadMaptile(Image tileImage, uint locX, uint locY, string regionName)
+        {
+            byte[] jpgData = Utils.EmptyBytes;
+
+=======
                 // XXX: The MapImageModule will return a null if the user has chosen not to create map tiles and there
                 // is no static map tile.
                 if (mapTile == null)
@@ -266,6 +330,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
         {
             byte[] jpgData = Utils.EmptyBytes;
 
+>>>>>>> avn/ubitvar
             using (MemoryStream stream = new MemoryStream())
             {
                 tileImage.Save(stream, ImageFormat.Jpeg);
@@ -274,7 +339,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             if (jpgData != Utils.EmptyBytes)
             {
                 string reason = string.Empty;
+<<<<<<< HEAD
+                if (!m_MapService.AddMapTile((int)locX, (int)locY, jpgData, out reason))
+=======
                 if (!m_MapService.AddMapTile((int)locX, (int)locY, jpgData, scene.RegionInfo.ScopeID, out reason))
+>>>>>>> avn/ubitvar
                 {
                     m_log.DebugFormat("{0} Unable to upload tile image for {1} at {2}-{3}: {4}", LogHeader,
                         regionName, locX, locY, reason);
@@ -282,7 +351,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             }
             else
             {
+<<<<<<< HEAD
+                m_log.WarnFormat("{0} Tile image generation failed for region {1}", LogHeader, regionName);
+=======
                 m_log.WarnFormat("{0} Tile image generation failed for region {1}", LogHeader, scene.RegionInfo.RegionName);
+>>>>>>> avn/ubitvar
             }
         }
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
index 516ad40..50c252c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
@@ -69,7 +69,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
         public void OnMakeRootAgent(ScenePresence sp)
         {
 //            m_log.DebugFormat("[PRESENCE DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName);
-            m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID);
+            if (sp.PresenceType != PresenceType.Npc)
+                m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID);
         }
 
         public void OnNewClient(IClientAPI client)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 81990d5..50238a5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         /// Currently valid versions are "SIMULATION/0.1" and "SIMULATION/0.2"
         /// </remarks>
         public string ServiceVersion { get; set; }
+        private float m_VersionNumber = 0.3f;
 
         /// <summary>
         /// Map region ID to scene.
@@ -93,6 +94,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 if (ServiceVersion != "SIMULATION/0.1" && ServiceVersion != "SIMULATION/0.2" && ServiceVersion != "SIMULATION/0.3")
                     throw new Exception(string.Format("Invalid ConnectorProtocolVersion {0}", ServiceVersion));
 
+                string[] versionComponents = ServiceVersion.Split(new char[] { '/' });
+                if (versionComponents.Length >= 2)
+                    float.TryParse(versionComponents[1], out m_VersionNumber);
+
                 m_log.InfoFormat(
                     "[LOCAL SIMULATION CONNECTOR]: Initialized with connector protocol version {0}", ServiceVersion);
             }
@@ -205,7 +210,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
          * Agent-related communications
          */
 
-        public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason)
+        public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason)
         {
             if (destination == null)
             {
@@ -217,7 +222,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             if (m_scenes.ContainsKey(destination.RegionID))
             {
 //                    m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Found region {0} to send SendCreateChildAgent", destination.RegionName);
-                return m_scenes[destination.RegionID].NewUserConnection(aCircuit, teleportFlags, out reason);
+                return m_scenes[destination.RegionID].NewUserConnection(aCircuit, teleportFlags, source, out reason);
             }
 
             reason = "Did not find region " + destination.RegionName;
@@ -264,7 +269,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return true;
         }
 
+<<<<<<< HEAD
+        public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string theirversion, List<UUID> features, out string version, out string reason)
+=======
         public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string theirversion, out string version, out string reason)
+>>>>>>> avn/ubitvar
         {
             reason = "Communications failure";
             version = ServiceVersion;
@@ -276,7 +285,26 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 //                    m_log.DebugFormat(
 //                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
 //                        s.RegionInfo.RegionName, destination.RegionHandle);
+                uint size = m_scenes[destination.RegionID].RegionInfo.RegionSizeX;
+
+                float theirVersionNumber = 0f;
+                string[] versionComponents = theirversion.Split(new char[] { '/' });
+                if (versionComponents.Length >= 2)
+                    float.TryParse(versionComponents[1], out theirVersionNumber);
+
+                // Var regions here, and the requesting simulator is in an older version.
+                // We will forbide this, because it crashes the viewers
+                if (theirVersionNumber < 0.3f && size > 256)
+                {
+                    reason = "Destination is a variable-sized region, and source is an old simulator. Consider upgrading.";
+                    m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Request to access this variable-sized region from {0} simulator was denied", theirVersionNumber);
+                    return false;
+                
+                }
 
+<<<<<<< HEAD
+                return m_scenes[destination.RegionID].QueryAccess(agentID, agentHomeURI, viaTeleport, position, features, out reason);
+=======
 
                 // not really need on a grid running var regions sims
 
@@ -296,6 +324,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                     return false;
                 }
                 return m_scenes[destination.RegionID].QueryAccess(agentID, position, out reason);
+>>>>>>> avn/ubitvar
             }
 
             //m_log.Debug("[LOCAL COMMS]: region not found for QueryAccess");
@@ -390,4 +419,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 580109e..7044d92 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Reflection;
@@ -60,7 +61,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         protected SimulationServiceConnector m_remoteConnector;
 
         protected bool m_safemode;
-        protected IPAddress m_thisIP;
 
         #region Region Module interface
 
@@ -141,7 +141,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         {            
             m_aScene = scene;
             //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService);
-            m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName);
         }
 
         #endregion
@@ -162,7 +161,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
          * Agent-related communications
          */
 
-        public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason)
+        public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason)
         {
             if (destination == null)
             {
@@ -172,13 +171,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             }
 
             // Try local first
-            if (m_localBackend.CreateAgent(destination, aCircuit, teleportFlags, out reason))
+            if (m_localBackend.CreateAgent(source, destination, aCircuit, teleportFlags, out reason))
                 return true;
 
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(destination.RegionID))
             {
-                return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason);
+                return m_remoteConnector.CreateAgent(source, destination, aCircuit, teleportFlags, out reason);
             }
             return false;
         }
@@ -207,7 +206,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return m_remoteConnector.UpdateAgent(destination, cAgentData);
         }
 
+<<<<<<< HEAD
+        public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason)
+=======
         public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, out string version, out string reason)
+>>>>>>> avn/ubitvar
         {
             reason = "Communications failure";
             version = "Unknown";
@@ -216,14 +219,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 return false;
 
             // Try local first
+<<<<<<< HEAD
+            if (m_localBackend.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, features, out version, out reason))
+=======
             if (m_localBackend.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, out version, out reason))
                 return true;
+>>>>>>> avn/ubitvar
                 return true;
 
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(destination.RegionID))
+<<<<<<< HEAD
+                return m_remoteConnector.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, features, out version, out reason);
+=======
                 return m_remoteConnector.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, out version, out reason);
 
+>>>>>>> avn/ubitvar
 
             return false;
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index ea4ade5..cf9a7b4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -196,7 +196,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         //
         public bool StoreUserAccount(UserAccount data)
         {
-            return UserAccountService.StoreUserAccount(data);
+            bool ret = UserAccountService.StoreUserAccount(data);
+            if (ret)
+                m_Cache.Cache(data.PrincipalID, data);
+            return ret;
+        }
+
+        public void InvalidateCache(UUID userID)
+        {
+            m_Cache.Invalidate(userID);
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index cbe2eaa..53610d9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -61,6 +61,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
             //m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
         }
 
+        public void Invalidate(UUID userID)
+        {
+            m_UUIDCache.Remove(userID);
+        }
+
         public UserAccount Get(UUID userID, out bool inCache)
         {
             UserAccount account = null;
diff --git a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
index 1599f15..f567cab 100644
--- a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
+++ b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
@@ -91,13 +91,17 @@ namespace OpenSim.Region.CoreModules.World
 
         public void AddRegion(Scene scene)
         {
-            if (!m_SceneList.Contains(scene))
-                m_SceneList.Add(scene);
+            lock (m_SceneList)
+            {
+                if (!m_SceneList.Contains(scene))
+                    m_SceneList.Add(scene);
+            }
         }
 
         public void RemoveRegion(Scene scene)
         {
-            m_SceneList.Remove(scene);
+            lock (m_SceneList)
+                m_SceneList.Remove(scene);
         }
 
         public void RegionLoaded(Scene scene)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 5d41125..f0b0f4a 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -36,6 +36,7 @@ using System.Xml;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Serialization.External;
 using OpenSim.Region.CoreModules.World.Terrain;
@@ -96,6 +97,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         /// <value>
         /// Should the archive being loaded be merged with what is already on the region?
+        /// Merging usually suppresses terrain and parcel loading
         /// </value>
         protected bool m_merge;
 
@@ -160,7 +162,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         private UUID m_defaultUser;
 
+<<<<<<< HEAD
+        private UUID m_defaultUser;
+
+        public ArchiveReadRequest(Scene scene, string loadPath, Guid requestId, Dictionary<string,object>options)
+=======
         public ArchiveReadRequest(Scene scene, string loadPath, Guid requestId, Dictionary<string, object> options)
+>>>>>>> avn/ubitvar
         {
             m_rootScene = scene;
 
@@ -169,7 +177,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 m_defaultUser = (UUID)options["default-user"];
                 m_log.InfoFormat("Using User {0} as default user", m_defaultUser.ToString());
             }
+<<<<<<< HEAD
+            else 
+=======
             else
+>>>>>>> avn/ubitvar
             {
                 m_defaultUser = scene.RegionInfo.EstateSettings.EstateOwner;
             }
@@ -188,7 +200,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
 
             m_errorMessage = String.Empty;
+<<<<<<< HEAD
+=======
 
+>>>>>>> avn/ubitvar
             m_merge = options.ContainsKey("merge");
             m_forceTerrain = options.ContainsKey("force-terrain");
             m_forceParcels = options.ContainsKey("force-parcels");
@@ -197,6 +212,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_requestId = requestId;
             m_displacement = options.ContainsKey("displacement") ? (Vector3)options["displacement"] : Vector3.Zero;
             m_rotation = options.ContainsKey("rotation") ? (float)options["rotation"] : 0f;
+<<<<<<< HEAD
+            m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"] 
+                                : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f);
+
+            // Zero can never be a valid user or group id
+            m_validUserUuids[UUID.Zero] = false;
+            m_validGroupUuids[UUID.Zero] = false;
+=======
             m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"]
                                 : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f);
 
@@ -206,12 +229,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_validUserUuids[UUID.Zero] = false;
             m_validGroupUuids[UUID.Zero] = false;
 
+>>>>>>> avn/ubitvar
 
             m_groupsModule = m_rootScene.RequestModuleInterface<IGroupsModule>();
             m_assetService = m_rootScene.AssetService;
         }
 
+<<<<<<< HEAD
+        public ArchiveReadRequest(Scene scene, Stream loadStream, Guid requestId, Dictionary<string, object>options)
+=======
         public ArchiveReadRequest(Scene scene, Stream loadStream, Guid requestId, Dictionary<string, object> options)
+>>>>>>> avn/ubitvar
         {
             m_rootScene = scene;
             m_loadPath = null;
@@ -221,7 +249,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_requestId = requestId;
 
             m_defaultUser = scene.RegionInfo.EstateSettings.EstateOwner;
+<<<<<<< HEAD
+     
+=======
 
+>>>>>>> avn/ubitvar
             // Zero can never be a valid user id
             m_validUserUuids[UUID.Zero] = false;
 
@@ -295,15 +327,24 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         if ((successfulAssetRestores + failedAssetRestores) % 250 == 0)
                             m_log.Debug("[ARCHIVER]: Loaded " + successfulAssetRestores + " assets and failed to load " + failedAssetRestores + " assets...");
                     }
+<<<<<<< HEAD
+                    else if (filePath.StartsWith(ArchiveConstants.TERRAINS_PATH) && (!m_merge || m_forceTerrain))
+=======
                     else if ((!m_merge || m_forceTerrain) && filePath.StartsWith(ArchiveConstants.TERRAINS_PATH))
+>>>>>>> avn/ubitvar
                     {
                         LoadTerrain(scene, filePath, data);
                     }
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.SETTINGS_PATH))
                     {
                         LoadRegionSettings(scene, filePath, data, dearchivedScenes);
+<<<<<<< HEAD
+                    } 
+                    else if (filePath.StartsWith(ArchiveConstants.LANDDATA_PATH) && (!m_merge || m_forceParcels))
+=======
                     }
                     else if ((!m_merge || m_forceParcels) && filePath.StartsWith(ArchiveConstants.LANDDATA_PATH))
+>>>>>>> avn/ubitvar
                     {
                         sceneContext.SerialisedParcels.Add(Encoding.UTF8.GetString(data));
                     } 
@@ -373,7 +414,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             // Start the scripts. We delayed this because we want the OAR to finish loading ASAP, so
             // that users can enter the scene. If we allow the scripts to start in the loop above
             // then they significantly increase the time until the OAR finishes loading.
-            Util.FireAndForget(delegate(object o)
+            WorkManager.RunInThread(o =>
             {
                 Thread.Sleep(15000);
                 m_log.Info("[ARCHIVER]: Starting scripts in scene objects");
@@ -388,7 +429,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                     sceneContext.SceneObjects.Clear();
                 }
-            });
+            }, null, string.Format("ReadArchiveStartScripts (request {0})", m_requestId));
 
             m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive");
 
@@ -524,6 +565,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     }
                 }
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
                 bool isTelehub = (sceneObject.UUID == oldTelehubUUID) && (oldTelehubUUID != UUID.Zero);
 
                 // For now, give all incoming scene objects new uuids.  This will allow scenes to be cloned
@@ -540,7 +585,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
 
                 ModifySceneObject(scene, sceneObject);
+<<<<<<< HEAD
+=======
 
+>>>>>>> avn/ubitvar
 
                 if (scene.AddRestoredSceneObject(sceneObject, true, false))
                 {
@@ -601,6 +649,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // being no copy/no mod for everyone
                 lock (part.TaskInventory)
                 {
+<<<<<<< HEAD
+=======
                     // And zap any troublesome sit target information
                     part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
                     part.SitTargetPosition = new Vector3(0, 0, 0);
@@ -609,6 +659,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     // Not doing so results in inventory items
                     // being no copy/no mod for everyone
                     part.TaskInventory.LockItemsForRead(true);
+>>>>>>> avn/ubitvar
                     TaskInventoryDictionary inv = part.TaskInventory;
                     foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
                     {
@@ -629,11 +680,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         if (!ResolveGroupUuid(kvp.Value.GroupID))
                             kvp.Value.GroupID = UUID.Zero;
                     }
+<<<<<<< HEAD
+=======
                     part.TaskInventory.LockItemsForRead(false);
+>>>>>>> avn/ubitvar
                 }
             }
         }
 
+<<<<<<< HEAD
+        
+=======
+>>>>>>> avn/ubitvar
         /// <summary>
         /// Load serialized parcels.
         /// </summary>
@@ -654,25 +712,45 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     parcel.AABBMin += parcelDisp;
                     parcel.AABBMax += parcelDisp;
                 }
+<<<<<<< HEAD
+                
+=======
                
+>>>>>>> avn/ubitvar
                 // Validate User and Group UUID's
 
+                if (!ResolveGroupUuid(parcel.GroupID))
+                    parcel.GroupID = UUID.Zero;
+
                 if (parcel.IsGroupOwned)
                 {
-                    if (!ResolveGroupUuid(parcel.GroupID))
+                    if (parcel.GroupID != UUID.Zero)
                     {
+                        // In group-owned parcels, OwnerID=GroupID. This should already be the case, but let's make sure.
+                        parcel.OwnerID = parcel.GroupID;
+                    }
+                    else
+                    {
+<<<<<<< HEAD
+                        parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner;
+=======
                         parcel.OwnerID = m_defaultUser;
                         parcel.GroupID = UUID.Zero;
+>>>>>>> avn/ubitvar
                         parcel.IsGroupOwned = false;
                     }
                 }
                 else
                 {
                     if (!ResolveUserUuid(scene, parcel.OwnerID))
+<<<<<<< HEAD
+                        parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner;
+=======
                         parcel.OwnerID = m_defaultUser;
 
                     if (!ResolveGroupUuid(parcel.GroupID))
                         parcel.GroupID = UUID.Zero;
+>>>>>>> avn/ubitvar
                 }
 
                 List<LandAccessEntry> accessList = new List<LandAccessEntry>();
@@ -730,9 +808,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <returns></returns>
         private bool ResolveGroupUuid(UUID uuid)
         {
-            if (uuid == UUID.Zero)
-                return true;    // this means the object has no group
-
             lock (m_validGroupUuids)
             {
                 if (!m_validGroupUuids.ContainsKey(uuid))
@@ -804,6 +879,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     if (data == null)
                         return false;
                 }
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
                 //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
 
                 AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType, UUID.Zero.ToString());
@@ -925,7 +1004,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         private bool LoadTerrain(Scene scene, string terrainPath, byte[] data)
         {
             ITerrainModule terrainModule = scene.RequestModuleInterface<ITerrainModule>();
+<<<<<<< HEAD
+
+=======
            
+>>>>>>> avn/ubitvar
             using (MemoryStream ms = new MemoryStream(data))
             {
                 if (m_displacement != Vector3.Zero || m_rotation != 0f)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
index cd95ee9..cb2c7f1 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -36,6 +36,7 @@ using System.Xml;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Serialization;
 using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
@@ -43,6 +44,7 @@ using OpenSim.Region.Framework.Scenes;
 using Ionic.Zlib;
 using GZipStream = Ionic.Zlib.GZipStream;
 using CompressionMode = Ionic.Zlib.CompressionMode;
+using CompressionLevel = Ionic.Zlib.CompressionLevel;
 using OpenSim.Framework.Serialization.External;
 using PermissionMask = OpenSim.Framework.PermissionMask;
 
@@ -79,7 +81,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// Determines which objects will be included in the archive, according to their permissions.
         /// Default is null, meaning no permission checks.
         /// </summary>
-        public string CheckPermissions { get; set; }
+        public string FilterContent { get; set; }
 
         protected Scene m_rootScene;
         protected Stream m_saveStream;
@@ -130,7 +132,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             MultiRegionFormat = false;
             SaveAssets = true;
-            CheckPermissions = null;
+            FilterContent = null;
         }
 
         /// <summary>
@@ -149,7 +151,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             Object temp;
             if (options.TryGetValue("checkPermissions", out temp))
-                CheckPermissions = (string)temp;
+                FilterContent = (string)temp;
 
 
             // Find the regions to archive
@@ -199,7 +201,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                             m_rootScene.AssetService, m_rootScene.UserAccountService,
                             m_rootScene.RegionInfo.ScopeID, options, ReceivedAllAssets);
 
-                    Util.FireAndForget(o => ar.Execute());
+                    WorkManager.RunInThread(o => ar.Execute(), null, "Archive Assets Request");
 
                     // CloseArchive() will be called from ReceivedAllAssets()
                 }
@@ -218,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         private void ArchiveOneRegion(Scene scene, string regionDir, Dictionary<UUID, sbyte> assetUuids)
         {
-            m_log.InfoFormat("[ARCHIVER]: Writing region {0}", scene.RegionInfo.RegionName);
+            m_log.InfoFormat("[ARCHIVER]: Writing region {0}", scene.Name);
 
             EntityBase[] entities = scene.GetEntities();
             List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
@@ -237,7 +239,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                     if (!sceneObject.IsDeleted && !sceneObject.IsAttachment)
                     {
-                        if (!CanUserArchiveObject(scene.RegionInfo.EstateSettings.EstateOwner, sceneObject, CheckPermissions, permissionsModule))
+                        if (!CanUserArchiveObject(scene.RegionInfo.EstateSettings.EstateOwner, sceneObject, FilterContent, permissionsModule))
                         {
                             // The user isn't allowed to copy/transfer this object, so it will not be included in the OAR.
                             ++numObjectsSkippedPermissions;
@@ -252,13 +254,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             if (SaveAssets)
             {
-                UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService);
+                UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService, assetUuids);
                 int prevAssets = assetUuids.Count;
                     
                 foreach (SceneObjectGroup sceneObject in sceneObjects)
-                {
-                    assetGatherer.GatherAssetUuids(sceneObject, assetUuids);
-                }
+                    assetGatherer.AddForInspection(sceneObject);
+
+                assetGatherer.GatherAll();
 
                 m_log.DebugFormat(
                     "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets",
@@ -295,12 +297,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </summary>
         /// <param name="user">The user</param>
         /// <param name="objGroup">The object group</param>
-        /// <param name="checkPermissions">Which permissions to check: "C" = Copy, "T" = Transfer</param>
+        /// <param name="filterContent">Which permissions to check: "C" = Copy, "T" = Transfer</param>
         /// <param name="permissionsModule">The scene's permissions module</param>
         /// <returns>Whether the user is allowed to export the object to an OAR</returns>
-        private bool CanUserArchiveObject(UUID user, SceneObjectGroup objGroup, string checkPermissions, IPermissionsModule permissionsModule)
+        private bool CanUserArchiveObject(UUID user, SceneObjectGroup objGroup, string filterContent, IPermissionsModule permissionsModule)
         {
-            if (checkPermissions == null)
+            if (filterContent == null)
                 return true;
 
             if (permissionsModule == null)
@@ -342,9 +344,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     canTransfer |= (obj.EveryoneMask & (uint)PermissionMask.Copy) != 0;
 
                 bool partPermitted = true;
-                if (checkPermissions.Contains("C") && !canCopy)
+                if (filterContent.Contains("C") && !canCopy)
                     partPermitted = false;
-                if (checkPermissions.Contains("T") && !canTransfer)
+                if (filterContent.Contains("T") && !canTransfer)
                     partPermitted = false;
 
                 // If the user is the Creator of the object then it can always be included in the OAR
@@ -569,10 +571,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             string terrainPath = String.Format("{0}{1}{2}.r32",
                 regionDir, ArchiveConstants.TERRAINS_PATH, scene.RegionInfo.RegionName);
 
-            MemoryStream ms = new MemoryStream();
-            scene.RequestModuleInterface<ITerrainModule>().SaveToStream(terrainPath, ms);
-            m_archiveWriter.WriteFile(terrainPath, ms.ToArray());
-            ms.Close();
+            using (MemoryStream ms = new MemoryStream())
+            {
+                scene.RequestModuleInterface<ITerrainModule>().SaveToStream(terrainPath, ms);
+                m_archiveWriter.WriteFile(terrainPath, ms.ToArray());
+            }
 
             m_log.InfoFormat("[ARCHIVER]: Adding scene objects to archive.");
 
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 8a8e392..0fb8a32 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -33,6 +33,7 @@ using log4net;
 using NDesk.Options;
 using Nini.Config;
 using Mono.Addins;
+
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Interfaces;
@@ -110,6 +111,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             String defaultUser = "";
             float rotation = 0f;
             Vector3 rotationCenter = new Vector3(Constants.RegionSize / 2f, Constants.RegionSize / 2f, 0);
+<<<<<<< HEAD
+            
+            OptionSet options = new OptionSet();
+            options.Add("m|merge", delegate (string v) { mergeOar = (v != null); });
+            options.Add("s|skip-assets", delegate (string v) { skipAssets = (v != null); });
+            options.Add("force-terrain", delegate (string v) { forceTerrain = (v != null); });
+            options.Add("forceterrain", delegate (string v) { forceTerrain = (v != null); });   // downward compatibility
+            options.Add("force-parcels", delegate (string v) { forceParcels = (v != null); });
+            options.Add("forceparcels", delegate (string v) { forceParcels = (v != null); });   // downward compatibility
+            options.Add("no-objects", delegate (string v) { noObjects = (v != null); });
+            options.Add("default-user=", delegate(string v) { defaultUser = (v == null) ? "" : v; });
+            options.Add("displacement=", delegate (string v) {
+=======
 
             OptionSet options = new OptionSet();
             options.Add("m|merge", delegate(string v) { mergeOar = (v != null); });
@@ -122,6 +136,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             options.Add("default-user=", delegate(string v) { defaultUser = (v == null) ? "" : v; });
             options.Add("displacement=", delegate(string v)
             {
+>>>>>>> avn/ubitvar
                 try
                 {
                     displacement = v == null ? Vector3.Zero : Vector3.Parse(v);
@@ -148,8 +163,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // Convert to radians for internals
                 rotation = Util.Clamp<float>(rotation, -359f, 359f) / 180f * (float)Math.PI;
             });
+<<<<<<< HEAD
+            options.Add("rotation-center=", delegate (string v) {
+=======
             options.Add("rotation-center=", delegate(string v)
             {
+>>>>>>> avn/ubitvar
                 try
                 {
                     rotationCenter = v == null ? Vector3.Zero : Vector3.Parse(v);
@@ -289,12 +308,21 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             DearchiveRegion(loadPath, Guid.Empty, archiveOptions);
         }
+<<<<<<< HEAD
+        
+        public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string,object> options)
+        {
+            m_log.InfoFormat(
+                "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath);
+            
+=======
 
         public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string, object> options)
         {
             m_log.InfoFormat(
                 "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath);
 
+>>>>>>> avn/ubitvar
             new ArchiveReadRequest(Scene, loadPath, requestId, options).DearchiveRegion();
         }
         
@@ -303,7 +331,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             DearchiveRegion(loadStream, Guid.Empty, archiveOptions);
         }
+<<<<<<< HEAD
+        
+=======
 
+>>>>>>> avn/ubitvar
         public void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options)
         {
             new ArchiveReadRequest(Scene, loadStream, requestId, options).DearchiveRegion();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 6c2a631..895b55d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -33,6 +33,7 @@ using System.Timers;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Serialization.External;
 using OpenSim.Services.Interfaces;
@@ -143,7 +144,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_requestState = RequestState.Running;
             
             m_log.DebugFormat("[ARCHIVER]: AssetsRequest executed looking for {0} possible assets", m_repliesRequired);
-            
+
             // We can stop here if there are no assets to fetch
             if (m_repliesRequired == 0)
             {
@@ -226,7 +227,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             finally
             {
                 if (timedOut)
-                    Util.FireAndForget(PerformAssetsRequestCallback, true);
+                    WorkManager.RunInThread(PerformAssetsRequestCallback, true, "Archive Assets Request Callback");
             }
         }
 
@@ -291,7 +292,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         
                         // We want to stop using the asset cache thread asap 
                         // as we now need to do the work of producing the rest of the archive
-                        Util.FireAndForget(PerformAssetsRequestCallback, false);
+                        WorkManager.RunInThread(PerformAssetsRequestCallback, false, "Archive Assets Request Callback");
                     }
                     else
                     {
@@ -330,7 +331,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             if (asset.Type == (sbyte)AssetType.Object && asset.Data != null && m_options.ContainsKey("home"))
             {
                 //m_log.DebugFormat("[ARCHIVER]: Rewriting object data for {0}", asset.ID);
-                string xml = ExternalRepresentationUtils.RewriteSOP(Utils.BytesToString(asset.Data), m_options["home"].ToString(), m_userAccountService, m_scopeID);
+                string xml = ExternalRepresentationUtils.RewriteSOP(Utils.BytesToString(asset.Data), string.Empty, m_options["home"].ToString(), m_userAccountService, m_scopeID);
                 asset.Data = Utils.StringToBytes(xml);
             }
             return asset;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 53f41f9..9f197f5 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -45,7 +45,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 using ArchiveConstants = OpenSim.Framework.Serialization.ArchiveConstants;
 using TarArchiveReader = OpenSim.Framework.Serialization.TarArchiveReader;
 using TarArchiveWriter = OpenSim.Framework.Serialization.TarArchiveWriter;
@@ -579,13 +578,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 ArchiveConstants.CONTROL_FILE_PATH,
                 new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
 
-            LandObject lo = new LandObject(groupID, true, null);
+            LandObject lo = new LandObject(groupID, true, m_scene);
             lo.SetLandBitmap(lo.BasicFullRegionLandBitmap());
             LandData ld = lo.LandData;
             ld.GlobalID = landID;
 
             string ldPath = ArchiveConstants.CreateOarLandDataPath(ld);
-            tar.WriteFile(ldPath, LandDataSerializer.Serialize(ld, null));
+            Dictionary<string, object> options = new Dictionary<string, object>();
+            tar.WriteFile(ldPath, LandDataSerializer.Serialize(ld, options));
             tar.Close();
 
             oarStream = new MemoryStream(oarStream.ToArray());
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
index 1659493..702b503 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
@@ -39,6 +39,7 @@ using OpenSim.Framework.Console;
 using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.World.Estate
 {
@@ -50,9 +51,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         protected EstateManagementModule m_module;
-        
-        protected Commander m_commander = new Commander("estate");
-        
+
         public EstateManagementCommands(EstateManagementModule module)
         {
             m_module = module;
@@ -82,13 +81,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                                "Specify -1 in <x> or <y> to wildcard that coordinate.",
                                consoleSetWaterHeight);
 
-
             m_module.Scene.AddCommand(
                 "Estates", m_module, "estate show", "estate show", "Shows all estates on the simulator.", ShowEstatesCommand);
-        }       
+        }
         
         public void Close() {}
-        
+
+        #region CommandHandlers
         protected void consoleSetTerrainTexture(string module, string[] args)
         {
             string num = args[3];
@@ -225,6 +224,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 es.EstateName, es.EstateID, m_module.UserManager.GetUserName(es.EstateOwner));
             
             MainConsole.Instance.Output(report.ToString());
-        }         
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 47390e7..e6e6485 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -40,6 +40,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 using RegionFlags = OpenMetaverse.RegionFlags;
 
 namespace OpenSim.Region.CoreModules.World.Estate
@@ -67,8 +68,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
         public event ChangeDelegate OnEstateInfoChange;
         public event MessageDelegate OnEstateMessage;
 
-        private int m_delayCount = 0;
-
         #region Region Module interface
         
         public string Name { get { return "EstateManagementModule"; } }
@@ -120,6 +119,274 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         #endregion
 
+        #region IEstateModule Functions
+        public uint GetRegionFlags()
+        {
+            RegionFlags flags = RegionFlags.None;
+
+            // Fully implemented
+            //
+            if (Scene.RegionInfo.RegionSettings.AllowDamage)
+                flags |= RegionFlags.AllowDamage;
+            if (Scene.RegionInfo.RegionSettings.BlockTerraform)
+                flags |= RegionFlags.BlockTerraform;
+            if (!Scene.RegionInfo.RegionSettings.AllowLandResell)
+                flags |= RegionFlags.BlockLandResell;
+            if (Scene.RegionInfo.RegionSettings.DisableCollisions)
+                flags |= RegionFlags.SkipCollisions;
+            if (Scene.RegionInfo.RegionSettings.DisableScripts)
+                flags |= RegionFlags.SkipScripts;
+            if (Scene.RegionInfo.RegionSettings.DisablePhysics)
+                flags |= RegionFlags.SkipPhysics;
+            if (Scene.RegionInfo.RegionSettings.BlockFly)
+                flags |= RegionFlags.NoFly;
+            if (Scene.RegionInfo.RegionSettings.RestrictPushing)
+                flags |= RegionFlags.RestrictPushObject;
+            if (Scene.RegionInfo.RegionSettings.AllowLandJoinDivide)
+                flags |= RegionFlags.AllowParcelChanges;
+            if (Scene.RegionInfo.RegionSettings.BlockShowInSearch)
+                flags |= RegionFlags.BlockParcelSearch;
+
+            if (Scene.RegionInfo.RegionSettings.FixedSun)
+                flags |= RegionFlags.SunFixed;
+            if (Scene.RegionInfo.RegionSettings.Sandbox)
+                flags |= RegionFlags.Sandbox;
+            if (Scene.RegionInfo.EstateSettings.AllowVoice)
+                flags |= RegionFlags.AllowVoice;
+            if (Scene.RegionInfo.EstateSettings.AllowLandmark)
+                flags |= RegionFlags.AllowLandmark;
+            if (Scene.RegionInfo.EstateSettings.AllowSetHome)
+                flags |= RegionFlags.AllowSetHome;
+            if (Scene.RegionInfo.EstateSettings.BlockDwell)
+                flags |= RegionFlags.BlockDwell;
+            if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
+                flags |= RegionFlags.ResetHomeOnTeleport;
+
+
+            // TODO: SkipUpdateInterestList
+
+            // Omitted
+            //
+            // Omitted: NullLayer (what is that?)
+            // Omitted: SkipAgentAction (what does it do?)
+
+            return (uint)flags;
+        }
+
+        public bool IsManager(UUID avatarID)
+        {
+            if (avatarID == Scene.RegionInfo.EstateSettings.EstateOwner)
+                return true;
+
+            List<UUID> ems = new List<UUID>(Scene.RegionInfo.EstateSettings.EstateManagers);
+            if (ems.Contains(avatarID))
+                return true;
+
+            return false;
+        }
+
+        public void sendRegionHandshakeToAll()
+        {
+            Scene.ForEachClient(sendRegionHandshake);
+        }
+
+        public void TriggerEstateInfoChange()
+        {
+            ChangeDelegate change = OnEstateInfoChange;
+
+            if (change != null)
+                change(Scene.RegionInfo.RegionID);
+        }
+
+        public void TriggerRegionInfoChange()
+        {
+            m_regionChangeTimer.Stop();
+            m_regionChangeTimer.Start();
+
+            ChangeDelegate change = OnRegionInfoChange;
+
+            if (change != null)
+                change(Scene.RegionInfo.RegionID);
+        }
+
+        public void setEstateTerrainBaseTexture(int level, UUID texture)
+        {
+            setEstateTerrainBaseTexture(null, level, texture);
+            sendRegionHandshakeToAll();
+        }
+
+        public void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue)
+        {
+            setEstateTerrainTextureHeights(null, corner, lowValue, highValue);
+        }
+
+        public bool IsTerrainXfer(ulong xferID)
+        {
+            lock (this)
+            {
+                if (TerrainUploader == null)
+                    return false;
+                else
+                    return TerrainUploader.XferID == xferID;
+            }
+        }
+
+        public string SetEstateOwner(int estateID, UserAccount account)
+        {
+            string response;
+
+            // get the current settings from DB
+            EstateSettings dbSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
+            if (dbSettings.EstateID == 0)
+            {
+                response = String.Format("No estate found with ID {0}", estateID);
+            }
+            else if (account.PrincipalID == dbSettings.EstateOwner)
+            {
+                response = String.Format("Estate already belongs to {0} ({1} {2})", account.PrincipalID, account.FirstName, account.LastName);
+            }
+            else
+            {
+                dbSettings.EstateOwner = account.PrincipalID;
+                Scene.EstateDataService.StoreEstateSettings(dbSettings);
+                response = String.Empty;
+
+                // make sure there's a log entry to document the change
+                m_log.InfoFormat("[ESTATE]: Estate Owner for {0} changed to {1} ({2} {3})", dbSettings.EstateName,
+                                 account.PrincipalID, account.FirstName, account.LastName);
+
+                // propagate the change
+                List<UUID> regions = Scene.GetEstateRegions(estateID);
+                UUID regionId = (regions.Count() > 0) ? regions.ElementAt(0) : UUID.Zero;
+                if (regionId != UUID.Zero)
+                {
+                    ChangeDelegate change = OnEstateInfoChange;
+
+                    if (change != null)
+                        change(regionId);
+                }
+
+            }
+            return response;
+        }
+
+        public string SetEstateName(int estateID, string newName)
+        {
+            string response;
+
+            // get the current settings from DB
+            EstateSettings dbSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
+
+            if (dbSettings.EstateID == 0)
+            {
+                response = String.Format("No estate found with ID {0}", estateID);
+            }
+            else if (newName == dbSettings.EstateName)
+            {
+                response = String.Format("Estate {0} is already named \"{1}\"", estateID, newName);
+            }
+            else
+            {
+                List<int> estates = Scene.EstateDataService.GetEstates(newName);
+                if (estates.Count() > 0)
+                {
+                    response = String.Format("An estate named \"{0}\" already exists.", newName);
+                }
+                else
+                {
+                    string oldName = dbSettings.EstateName;
+                    dbSettings.EstateName = newName;
+                    Scene.EstateDataService.StoreEstateSettings(dbSettings);
+                    response = String.Empty;
+
+                    // make sure there's a log entry to document the change
+                    m_log.InfoFormat("[ESTATE]: Estate {0} renamed from \"{1}\" to \"{2}\"", estateID, oldName, newName);
+
+                   // propagate the change
+                    List<UUID> regions = Scene.GetEstateRegions(estateID);
+                    UUID regionId = (regions.Count() > 0) ? regions.ElementAt(0) : UUID.Zero;
+                    if (regionId != UUID.Zero)
+                    {
+                        ChangeDelegate change = OnEstateInfoChange;
+
+                        if (change != null)
+                            change(regionId);
+                    }
+                }
+            }
+            return response;
+        }
+
+        public string SetRegionEstate(RegionInfo regionInfo, int estateID)
+        {
+            string response;
+
+            if (regionInfo.EstateSettings.EstateID == estateID)
+            {
+                response = String.Format("\"{0}\" is already part of estate {1}", regionInfo.RegionName, estateID);
+            }
+            else
+            {
+                // get the current settings from DB
+                EstateSettings dbSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
+                if (dbSettings.EstateID == 0)
+                {
+                    response = String.Format("No estate found with ID {0}", estateID);
+                }
+                else if (Scene.EstateDataService.LinkRegion(regionInfo.RegionID, estateID))
+                {
+                    // make sure there's a log entry to document the change
+                    m_log.InfoFormat("[ESTATE]: Region {0} ({1}) moved to Estate {2} ({3}).", regionInfo.RegionID, regionInfo.RegionName, estateID, dbSettings.EstateName);
+
+                   // propagate the change
+                    ChangeDelegate change = OnEstateInfoChange;
+
+                    if (change != null)
+                        change(regionInfo.RegionID);
+
+                    response = String.Empty;
+                }
+                else
+                {
+                    response = String.Format("Could not move \"{0}\" to estate {1}", regionInfo.RegionName, estateID);
+                }
+            }
+            return response;
+        }
+
+        public string CreateEstate(string estateName, UUID ownerID)
+        {
+            string response;
+            if (string.IsNullOrEmpty(estateName))
+            {
+                response = "No estate name specified.";
+            }
+            else
+            {
+                List<int> estates = Scene.EstateDataService.GetEstates(estateName);
+                if (estates.Count() > 0)
+                {
+                    response = String.Format("An estate named \"{0}\" already exists.", estateName);
+                }
+                else
+                {
+                    EstateSettings settings = Scene.EstateDataService.CreateNewEstate();
+                    if (settings == null)
+                        response = String.Format("Unable to create estate \"{0}\" at this simulator", estateName);
+                    else
+                    {
+                        settings.EstateOwner = ownerID;
+                        settings.EstateName = estateName;
+                        Scene.EstateDataService.StoreEstateSettings(settings);
+                        response = String.Empty;
+                    }
+                }
+            }
+            return response;
+        }
+
+        #endregion
+
         #region Packet Data Responders
 
         private void clientSendDetailedEstateData(IClientAPI remote_client, UUID invoice)
@@ -227,12 +494,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
             sendRegionInfoPacketToAll();
         }
 
-        public void setEstateTerrainBaseTexture(int level, UUID texture)
-        {
-            setEstateTerrainBaseTexture(null, level, texture);
-            sendRegionHandshakeToAll();
-        }
-
         public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int level, UUID texture)
         {
             if (texture == UUID.Zero)
@@ -259,11 +520,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
             sendRegionInfoPacketToAll();
         }
 
-        public void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue)
-        {
-            setEstateTerrainTextureHeights(null, corner, lowValue, highValue);
-        }
-
         public void setEstateTerrainTextureHeights(IClientAPI client, int corner, float lowValue, float highValue)
         {
             switch (corner)
@@ -399,13 +655,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             {
                                 estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
                                 estateSettings.AddEstateUser(user);
-                                estateSettings.Save();
+                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
                             }
                         }
                     }
 
                     Scene.RegionInfo.EstateSettings.AddEstateUser(user);
-                    Scene.RegionInfo.EstateSettings.Save();
+                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
 
                     TriggerEstateInfoChange();
                     remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AccessOptions, Scene.RegionInfo.EstateSettings.EstateAccess, Scene.RegionInfo.EstateSettings.EstateID);
@@ -432,13 +688,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             {
                                 estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
                                 estateSettings.RemoveEstateUser(user);
-                                estateSettings.Save();
+                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
                             }
                         }
                     }
 
                     Scene.RegionInfo.EstateSettings.RemoveEstateUser(user);
-                    Scene.RegionInfo.EstateSettings.Save();
+                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
 
                     TriggerEstateInfoChange();
                     remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AccessOptions, Scene.RegionInfo.EstateSettings.EstateAccess, Scene.RegionInfo.EstateSettings.EstateID);
@@ -464,13 +720,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             {
                                 estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
                                 estateSettings.AddEstateGroup(user);
-                                estateSettings.Save();
+                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
                             }
                         }
                     }
 
                     Scene.RegionInfo.EstateSettings.AddEstateGroup(user);
-                    Scene.RegionInfo.EstateSettings.Save();
+                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
 
                     TriggerEstateInfoChange();
                     remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AllowedGroups, Scene.RegionInfo.EstateSettings.EstateGroups, Scene.RegionInfo.EstateSettings.EstateID);
@@ -496,13 +752,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             {
                                 estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
                                 estateSettings.RemoveEstateGroup(user);
-                                estateSettings.Save();
+                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
                             }
                         }
                     }
 
                     Scene.RegionInfo.EstateSettings.RemoveEstateGroup(user);
-                    Scene.RegionInfo.EstateSettings.Save();
+                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
 
                     TriggerEstateInfoChange();
                     remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AllowedGroups, Scene.RegionInfo.EstateSettings.EstateGroups, Scene.RegionInfo.EstateSettings.EstateID);
@@ -551,7 +807,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
                                     estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
                                     estateSettings.AddBan(bitem);
-                                    estateSettings.Save();
+                                    Scene.EstateDataService.StoreEstateSettings(estateSettings);
                                 }
                             }
                         }
@@ -564,7 +820,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                         item.BannedHostIPMask = "0.0.0.0";
 
                         Scene.RegionInfo.EstateSettings.AddBan(item);
-                        Scene.RegionInfo.EstateSettings.Save();
+                        Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
 
                         TriggerEstateInfoChange();
 
@@ -627,13 +883,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                                 {
                                     estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
                                     estateSettings.RemoveBan(user);
-                                    estateSettings.Save();
+                                    Scene.EstateDataService.StoreEstateSettings(estateSettings);
                                 }
                             }
                         }
 
                         Scene.RegionInfo.EstateSettings.RemoveBan(listitem.BannedUserID);
-                        Scene.RegionInfo.EstateSettings.Save();
+                        Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
 
                         TriggerEstateInfoChange();
                     }
@@ -666,13 +922,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             {
                                 estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
                                 estateSettings.AddEstateManager(user);
-                                estateSettings.Save();
+                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
                             }
                         }
                     }
 
                     Scene.RegionInfo.EstateSettings.AddEstateManager(user);
-                    Scene.RegionInfo.EstateSettings.Save();
+                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
 
                     TriggerEstateInfoChange();
                     remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.EstateManagers, Scene.RegionInfo.EstateSettings.EstateManagers, Scene.RegionInfo.EstateSettings.EstateID);
@@ -698,13 +954,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             {
                                 estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
                                 estateSettings.RemoveEstateManager(user);
-                                estateSettings.Save();
+                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
                             }
                         }
                     }
 
                     Scene.RegionInfo.EstateSettings.RemoveEstateManager(user);
-                    Scene.RegionInfo.EstateSettings.Save();
+                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
 
                     TriggerEstateInfoChange();
                     remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.EstateManagers, Scene.RegionInfo.EstateSettings.EstateManagers, Scene.RegionInfo.EstateSettings.EstateID);
@@ -869,18 +1125,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
                 TerrainUploader = null;
             }
+
+            m_log.DebugFormat("[CLIENT]: Terrain upload from {0} to {1} complete.", remoteClient.Name, Scene.Name);
             remoteClient.SendAlertMessage("Terrain Upload Complete. Loading....");
+
             ITerrainModule terr = Scene.RequestModuleInterface<ITerrainModule>();
 
             if (terr != null)
             {
-                m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName);
-
                 try
                 {
-                    MemoryStream terrainStream = new MemoryStream(terrainData);
-                    terr.LoadFromStream(filename, terrainStream);
-                    terrainStream.Close();
+                    using (MemoryStream terrainStream = new MemoryStream(terrainData))
+                        terr.LoadFromStream(filename, terrainStream);
 
                     FileInfo x = new FileInfo(filename);
                     remoteClient.SendAlertMessage("Your terrain was loaded as a " + x.Extension + " file. It may take a few moments to appear.");
@@ -924,7 +1180,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
             {
                 if (TerrainUploader == null)
                 {
-                    m_log.DebugFormat("Starting to receive uploaded terrain");
+                    m_log.DebugFormat(
+                        "[TERRAIN]: Started receiving terrain upload for region {0} from {1}", 
+                        Scene.Name, remote_client.Name);
+
                     TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName);
                     remote_client.OnXferReceive += TerrainUploader.XferReceive;
                     remote_client.OnAbortXfer += AbortTerrainXferHandler;
@@ -938,17 +1197,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
             }
         }
 
-        public bool IsTerrainXfer(ulong xferID)
-        {
-            lock (this)
-            {
-                if (TerrainUploader == null)
-                    return false;
-                else
-                    return TerrainUploader.XferID == xferID;
-            }
-        }
-        
         private void handleTerrainRequest(IClientAPI remote_client, string clientFileName)
         {
             // Save terrain here
@@ -956,7 +1204,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             
             if (terr != null)
             {
-                m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName);
+//                m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName);
                 if (File.Exists(Util.dataDir() + "/terrain.raw"))
                 {
                     File.Delete(Util.dataDir() + "/terrain.raw");
@@ -968,8 +1216,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 input.Read(bdata, 0, (int)input.Length);
                 remote_client.SendAlertMessage("Terrain file written, starting download...");
                 Scene.XferManager.AddNewFile("terrain.raw", bdata);
-                // Tell client about it
-                m_log.Warn("[CLIENT]: Sending Terrain to " + remote_client.Name);
+
+                m_log.DebugFormat("[CLIENT]: Sending terrain for region {0} to {1}", Scene.Name, remote_client.Name);
+
                 remote_client.SendInitiateDownload("terrain.raw", clientFileName);
             }
         }
@@ -1130,11 +1379,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
             remoteClient.SendRegionHandshake(Scene.RegionInfo,args);
         }
 
-        public void sendRegionHandshakeToAll()
-        {
-            Scene.ForEachClient(sendRegionHandshake);
-        }
-
         public void handleEstateChangeInfo(IClientAPI remoteClient, UUID invoice, UUID senderID, UInt32 parms1, UInt32 parms2)
         {
             if (parms2 == 0)
@@ -1189,7 +1433,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             else
                 Scene.RegionInfo.EstateSettings.DenyMinors = false;
 
-            Scene.RegionInfo.EstateSettings.Save();
+            Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
             TriggerEstateInfoChange();
 
             Scene.TriggerEstateSunUpdate();
@@ -1216,7 +1460,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
             sendRegionInfoPacketToAll();
         }
 
-        #endregion
+
+    #endregion
 
         private void EventManager_OnNewClient(IClientAPI client)
         {
@@ -1246,6 +1491,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
             sendRegionHandshake(client);
         }
 
+<<<<<<< HEAD
+        private uint GetEstateFlags()
+=======
         public uint GetRegionFlags()
         {
             RegionFlags flags = RegionFlags.None;
@@ -1304,6 +1552,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         }
 
         public uint GetEstateFlags()
+>>>>>>> avn/ubitvar
         {
             RegionFlags flags = RegionFlags.None;
 
@@ -1344,40 +1593,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
             return (uint)flags;
         }
 
-        public bool IsManager(UUID avatarID)
-        {
-            if (avatarID == Scene.RegionInfo.EstateSettings.EstateOwner)
-                return true;
-
-            List<UUID> ems = new List<UUID>(Scene.RegionInfo.EstateSettings.EstateManagers);
-            if (ems.Contains(avatarID))
-                return true;
-
-            return false;
-        }
-
-        public void TriggerRegionInfoChange()
-        {
-            m_regionChangeTimer.Stop();
-            m_regionChangeTimer.Start();
-        }
-
-        protected void RaiseRegionInfoChange(object sender, ElapsedEventArgs e)
-        {
-            ChangeDelegate change = OnRegionInfoChange;
-
-            if (change != null)
-                change(Scene.RegionInfo.RegionID);
-        }
-
-        public void TriggerEstateInfoChange()
-        {
-            ChangeDelegate change = OnEstateInfoChange;
-
-            if (change != null)
-                change(Scene.RegionInfo.RegionID);
-        }
-
         public void TriggerEstateMessage(UUID fromID, string fromName, string message)
         {
             MessageDelegate onmessage = OnEstateMessage;
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
index 2366767..ec5af2b 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
@@ -281,18 +281,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             rootElement.AppendChild(result);
 
-            return DocToBytes(doc);
+            return Util.DocToBytes(doc);
         }
 
-        private byte[] DocToBytes(XmlDocument doc)
-        {
-            MemoryStream ms = new MemoryStream();
-            XmlTextWriter xw = new XmlTextWriter(ms, null);
-            xw.Formatting = Formatting.Indented;
-            doc.WriteTo(xw);
-            xw.Flush();
-
-            return ms.ToArray();
-        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
index bd22155..d17c517 100644
--- a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
@@ -52,10 +52,12 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.World.Land
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DwellModule")]
-    public class DwellModule : IDwellModule, INonSharedRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DefaultDwellModule")]
+    public class DefaultDwellModule : IDwellModule, INonSharedRegionModule
     {
         private Scene m_scene;
+        private IConfigSource m_Config;
+        private bool m_Enabled = false;
 
         public Type ReplaceableInterface
         {
@@ -64,15 +66,27 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public string Name
         {
-            get { return "DwellModule"; }
+            get { return "DefaultDwellModule"; }
         }
 
         public void Initialise(IConfigSource source)
         {
+            m_Config = source;
+
+            IConfig DwellConfig = m_Config.Configs ["Dwell"];
+
+            if (DwellConfig == null) {
+                m_Enabled = false;
+                return;
+            }
+            m_Enabled = (DwellConfig.GetString ("DwellModule", "DefaultDwellModule") == "DefaultDwellModule");
         }
 
         public void AddRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             m_scene = scene;
 
             m_scene.EventManager.OnNewClient += OnNewClient;
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 6f3249d..8bd46f6 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -69,13 +69,18 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <summary>
         /// Minimum land unit size in region co-ordinates.
         /// </summary>
+<<<<<<< HEAD
+        public const int LandUnit = 4;
+=======
         public const int landUnit = 4;
+>>>>>>> avn/ubitvar
 
         private static readonly string remoteParcelRequestPath = "0009/";
 
         private LandChannel landChannel;
         private Scene m_scene;
-        
+
+        protected IGroupsModule m_groupManager;
         protected IUserManagement m_userManager;
         protected IPrimCountModule m_primCountModule;
         protected IDialogModule m_Dialog;
@@ -101,8 +106,22 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         // caches ExtendedLandData
         private Cache parcelInfoCache;
+<<<<<<< HEAD
+
+
+        /// <summary>
+        /// Record positions that avatar's are currently being forced to move to due to parcel entry restrictions.
+        /// </summary>
+        private Dictionary<UUID, Vector3> forcedPosition = new Dictionary<UUID, Vector3>();
+=======
         private Dictionary<UUID, Vector3> forcedPosition =
                 new Dictionary<UUID, Vector3>();
+>>>>>>> avn/ubitvar
+
+        // Enables limiting parcel layer info transmission when doing simple updates
+        private bool shouldLimitParcelLayerInfoToViewDistance { get; set; }
+        // "View distance" for sending parcel layer info if asked for from a view point in the region
+        private int parcelLayerViewDistance { get; set; }
 
         #region INonSharedRegionModule Members
 
@@ -113,18 +132,32 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void Initialise(IConfigSource source)
         {
+<<<<<<< HEAD
+            shouldLimitParcelLayerInfoToViewDistance = true;
+            parcelLayerViewDistance = 128;
+            IConfig landManagementConfig = source.Configs["LandManagement"];
+            if (landManagementConfig != null)
+            {
+                shouldLimitParcelLayerInfoToViewDistance = landManagementConfig.GetBoolean("LimitParcelLayerUpdateDistance", shouldLimitParcelLayerInfoToViewDistance);
+                parcelLayerViewDistance = landManagementConfig.GetInt("ParcelLayerViewDistance", parcelLayerViewDistance);
+=======
             IConfig cnf = source.Configs["LandManagement"];
             if (cnf != null)
             {
                 DefaultGodParcelGroup = new UUID(cnf.GetString("DefaultAdministratorGroupUUID", UUID.Zero.ToString()));
                 DefaultGodParcelName = cnf.GetString("DefaultAdministratorParcelName", "Default Parcel");
+>>>>>>> avn/ubitvar
             }
         }
 
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
+<<<<<<< HEAD
+            m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / LandUnit, m_scene.RegionInfo.RegionSizeY / LandUnit];
+=======
             m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / landUnit, m_scene.RegionInfo.RegionSizeY / landUnit];
+>>>>>>> avn/ubitvar
             landChannel = new LandChannel(scene, this);
 
             parcelInfoCache = new Cache();
@@ -158,9 +191,10 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void RegionLoaded(Scene scene)
         {
-             m_userManager = m_scene.RequestModuleInterface<IUserManagement>();         
-             m_primCountModule = m_scene.RequestModuleInterface<IPrimCountModule>();
-             m_Dialog = m_scene.RequestModuleInterface<IDialogModule>();
+            m_userManager = m_scene.RequestModuleInterface<IUserManagement>();
+            m_groupManager = m_scene.RequestModuleInterface<IGroupsModule>();
+            m_primCountModule = m_scene.RequestModuleInterface<IPrimCountModule>();
+            m_Dialog = m_scene.RequestModuleInterface<IDialogModule>();
         }
 
         public void RemoveRegion(Scene scene)
@@ -265,7 +299,11 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 m_landList.Clear();
                 m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
+<<<<<<< HEAD
+                m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / LandUnit, m_scene.RegionInfo.RegionSizeY / LandUnit];
+=======
                 m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / landUnit, m_scene.RegionInfo.RegionSizeY / landUnit];
+>>>>>>> avn/ubitvar
             }
         }
         
@@ -275,9 +313,16 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <returns>The parcel created.</returns>
         protected ILandObject CreateDefaultParcel()
         {
+<<<<<<< HEAD
+            m_log.DebugFormat(
+                "[LAND MANAGEMENT MODULE]: Creating default parcel for region {0}", m_scene.RegionInfo.RegionName);
+            
+            ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene);                                                
+=======
             m_log.DebugFormat("{0} Creating default parcel for region {1}", LogHeader, m_scene.RegionInfo.RegionName);
 
             ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene);
+>>>>>>> avn/ubitvar
             fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0,
                                             (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY));
             fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -411,10 +456,15 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void SendLandUpdate(ScenePresence avatar, bool force)
         {
+<<<<<<< HEAD
+            ILandObject over = GetLandObject((int)Math.Min(((int)m_scene.RegionInfo.RegionSizeX - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.X))),
+                                             (int)Math.Min(((int)m_scene.RegionInfo.RegionSizeY - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
+=======
             if (avatar.IsChildAgent)
                 return;
 
             ILandObject over = GetLandObjectClipedXY(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+>>>>>>> avn/ubitvar
 
             if (over != null)
             {
@@ -487,16 +537,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>
         /// <param name="avatar"></param>
         public void EventManagerOnClientMovement(ScenePresence avatar)
-        //
         {
-            ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+            Vector3 pos = avatar.AbsolutePosition;
+            ILandObject over = GetLandObject(pos.X, pos.Y);
             if (over != null)
             {
-                if (!over.IsRestrictedFromLand(avatar.UUID) && (!over.IsBannedFromLand(avatar.UUID) || avatar.AbsolutePosition.Z >= LandChannel.BAN_LINE_SAFETY_HIEGHT))
-                {
-                    avatar.lastKnownAllowedPosition =
-                        new Vector3(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);
-                }
+                if (!over.IsRestrictedFromLand(avatar.UUID) && (!over.IsBannedFromLand(avatar.UUID) || pos.Z >= LandChannel.BAN_LINE_SAFETY_HIEGHT))
+                    avatar.lastKnownAllowedPosition = pos;
             }
         }
 
@@ -555,7 +602,10 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <summary>
         /// Adds a land object to the stored list and adds them to the landIDList to what they own
         /// </summary>
-        /// <param name="new_land">The land object being added</param>
+        /// <param name="new_land">
+        /// The land object being added.  
+        /// Will return null if this overlaps with an existing parcel that has not had its bitmap adjusted.
+        /// </param>
         public ILandObject AddLandObject(ILandObject land)
         {
             ILandObject new_land = land.Copy();
@@ -567,21 +617,32 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             lock (m_landList)
             {
-                int newLandLocalID = ++m_lastLandLocalID;
+                int newLandLocalID = m_lastLandLocalID + 1;
                 new_land.LandData.LocalID = newLandLocalID;
 
                 bool[,] landBitmap = new_land.GetLandBitmap();
+<<<<<<< HEAD
+                // m_log.DebugFormat("{0} AddLandObject. new_land.bitmapSize=({1},{2}). newLocalID={3}",
+                //                 LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), newLandLocalID);
+
+=======
+>>>>>>> avn/ubitvar
                 if (landBitmap.GetLength(0) != m_landIDList.GetLength(0) || landBitmap.GetLength(1) != m_landIDList.GetLength(1))
                 {
                     // Going to variable sized regions can cause mismatches
                     m_log.ErrorFormat("{0} AddLandObject. Added land bitmap different size than region ID map. bitmapSize=({1},{2}), landIDSize=({3},{4})",
+<<<<<<< HEAD
+                        LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), m_landIDList.GetLength(0), m_landIDList.GetLength(1) );
+=======
                         LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), m_landIDList.GetLength(0), m_landIDList.GetLength(1));
+>>>>>>> avn/ubitvar
                 }
                 else
                 {
                     // If other land objects still believe that they occupy any parts of the same space, 
                     // then do not allow the add to proceed.
                     for (int x = 0; x < landBitmap.GetLength(0); x++)
+<<<<<<< HEAD
                     {
                         for (int y = 0; y < landBitmap.GetLength(1); y++)
                         {
@@ -597,6 +658,40 @@ namespace OpenSim.Region.CoreModules.World.Land
                                     {
                                         m_log.ErrorFormat(
                                             "{0}: Cannot add parcel \"{1}\", local ID {2} at tile {3},{4} because this is still occupied by parcel \"{5}\", local ID {6} in {7}",
+                                            LogHeader, new_land.LandData.Name, new_land.LandData.LocalID, x, y, 
+                                            lastRecordedLo.LandData.Name, lastRecordedLo.LandData.LocalID, m_scene.Name);
+
+                                        return null;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    for (int x = 0; x < landBitmap.GetLength(0); x++)
+=======
+>>>>>>> avn/ubitvar
+                    {
+                        for (int y = 0; y < landBitmap.GetLength(1); y++)
+                        {
+                            if (landBitmap[x, y])
+                            {
+<<<<<<< HEAD
+                                // m_log.DebugFormat(
+                                //     "[LAND MANAGEMENT MODULE]: Registering parcel {0} for land co-ord ({1}, {2}) on {3}", 
+                                //     new_land.LandData.Name, x, y, m_scene.RegionInfo.RegionName);
+                                    
+=======
+                                int lastRecordedLandId = m_landIDList[x, y];
+
+                                if (lastRecordedLandId > 0)
+                                {
+                                    ILandObject lastRecordedLo = m_landList[lastRecordedLandId];
+
+                                    if (lastRecordedLo.LandBitmap[x, y])
+                                    {
+                                        m_log.ErrorFormat(
+                                            "{0}: Cannot add parcel \"{1}\", local ID {2} at tile {3},{4} because this is still occupied by parcel \"{5}\", local ID {6} in {7}",
                                             LogHeader, new_land.LandData.Name, new_land.LandData.LocalID, x, y,
                                             lastRecordedLo.LandData.Name, lastRecordedLo.LandData.LocalID, m_scene.Name);
 
@@ -617,6 +712,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                                 //                                "[LAND MANAGEMENT MODULE]: Registering parcel {0} for land co-ord ({1}, {2}) on {3}", 
                                 //                                new_land.LandData.Name, x, y, m_scene.RegionInfo.RegionName);
 
+>>>>>>> avn/ubitvar
                                 m_landIDList[x, y] = newLandLocalID;
                             }
                         }
@@ -624,10 +720,12 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
 
                 m_landList.Add(newLandLocalID, new_land);
+                m_lastLandLocalID++;
             }
 
             new_land.ForceUpdateLandInfo();
             m_scene.EventManager.TriggerLandObjectAdded(new_land);
+
             return new_land;
         }
 
@@ -731,6 +829,33 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <returns>Land object at the point supplied</returns>
         public ILandObject GetLandObject(float x_float, float y_float)
         {
+<<<<<<< HEAD
+            return GetLandObject((int)x_float, (int)y_float, true /* returnNullIfLandObjectNotFound */);
+            /*
+            int x;
+            int y;
+
+            if (x_float >= m_scene.RegionInfo.RegionSizeX || x_float < 0 || y_float >= m_scene.RegionInfo.RegionSizeX || y_float < 0)
+                return null;
+
+            try
+            {
+                x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / (float)landUnit));
+                y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / (float)landUnit));
+            }
+            catch (OverflowException)
+            {
+                return null;
+            }
+
+            if (x >= (m_scene.RegionInfo.RegionSizeX / landUnit)
+                    || y >= (m_scene.RegionInfo.RegionSizeY / landUnit)
+                    || x < 0
+                    || y < 0)
+            {
+                return null;
+            }
+=======
             return GetLandObject((int)x_float, (int)y_float, true);
         }
 
@@ -750,9 +875,34 @@ namespace OpenSim.Region.CoreModules.World.Land
                 avy = 0;
             else if (avy >= m_scene.RegionInfo.RegionSizeY)
                 avy = (int)Constants.RegionSize - 1;
+>>>>>>> avn/ubitvar
 
             lock (m_landIDList)
             {
+<<<<<<< HEAD
+                // Corner case. If an autoreturn happens during sim startup
+                // we will come here with the list uninitialized
+                //
+//                int landId = m_landIDList[x, y];
+                
+//                if (landId == 0)
+//                    m_log.DebugFormat(
+//                        "[LAND MANAGEMENT MODULE]: No land object found at ({0}, {1}) on {2}", 
+//                        x, y, m_scene.RegionInfo.RegionName);
+
+                try
+                {
+                    if (m_landList.ContainsKey(m_landIDList[x, y]))
+                        return m_landList[m_landIDList[x, y]];
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("{0} GetLandObject exception. x={1}, y={2}, m_landIDList.len=({3},{4})",
+                        LogHeader, x, y, m_landIDList.GetLength(0), m_landIDList.GetLength(1));
+                }
+                
+                return null;
+=======
                 try
                 {
                     return m_landList[m_landIDList[avx / landUnit, avy / landUnit]];
@@ -761,23 +911,50 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     return null;
                 }
+>>>>>>> avn/ubitvar
             }
+             */
         }
 
+        // Public entry.
+        // Throws exception if land object is not found
         public ILandObject GetLandObject(int x, int y)
         {
             return GetLandObject(x, y, false /* returnNullIfLandObjectNotFound */);
         }
 
+<<<<<<< HEAD
+        /// <summary>
+        /// Given a region position, return the parcel land object for that location
+        /// </summary>
+        /// <returns>
+        /// The land object.
+        /// </returns>
+        /// <param name='x'></param>
+        /// <param name='y'></param>
+        /// <param name='returnNullIfLandObjectNotFound'>
+        /// Return null if the land object requested is not within the region's bounds.
+        /// </param>
+        private ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectOutsideBounds)
+        {
+            if (x >= m_scene.RegionInfo.RegionSizeX || y >=  m_scene.RegionInfo.RegionSizeY || x < 0 || y < 0)
+=======
         public ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectOutsideBounds)
         {
             if (x >= m_scene.RegionInfo.RegionSizeX || y >= m_scene.RegionInfo.RegionSizeY || x < 0 || y < 0)
+>>>>>>> avn/ubitvar
             {
                 // These exceptions here will cause a lot of complaints from the users specifically because
                 // they happen every time at border crossings
                 if (returnNullIfLandObjectOutsideBounds)
                     return null;
                 else
+<<<<<<< HEAD
+                    throw new Exception(
+                        String.Format("{0} GetLandObject for non-existent position. Region={1}, pos=<{2},{3}",
+                                                LogHeader, m_scene.RegionInfo.RegionName, x, y)
+                );
+=======
                     throw new Exception("Error: Parcel not found at point " + x + ", " + y);
             }
 
@@ -791,7 +968,23 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                         return null;
                 }
+>>>>>>> avn/ubitvar
             }
+
+            return m_landList[m_landIDList[x / 4, y / 4]];
+        }
+
+        // Create a 'parcel is here' bitmap for the parcel identified by the passed landID
+        private bool[,] CreateBitmapForID(int landID)
+        {
+            bool[,] ret = new bool[m_landIDList.GetLength(0), m_landIDList.GetLength(1)];
+
+            for (int xx = 0; xx < m_landIDList.GetLength(0); xx++)
+                for (int yy = 0; yy < m_landIDList.GetLength(0); yy++)
+                    if (m_landIDList[xx, yy] == landID)
+                        ret[xx, yy] = true;
+
+            return ret;
         }
 
         // Create a 'parcel is here' bitmap for the parcel identified by the passed landID
@@ -976,10 +1169,19 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             //Now add the new land object
             ILandObject result = AddLandObject(newLand);
+<<<<<<< HEAD
+
+            if (result != null)
+            {
+                UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData);
+                result.SendLandUpdateToAvatarsOverMe();
+            }
+=======
             UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData);
             result.SendLandUpdateToAvatarsOverMe();
             startLandObject.SendLandUpdateToAvatarsOverMe();
             m_scene.ForEachClient(SendParcelOverlay);
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -1061,12 +1263,29 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         #region Parcel Updating
 
+<<<<<<< HEAD
+        // Send parcel layer info for the whole region
+        public void SendParcelOverlay(IClientAPI remote_client)
+        {
+            SendParcelOverlay(remote_client, 0, 0, (int)Constants.MaximumRegionSize);
+        }
+=======
+>>>>>>> avn/ubitvar
 
         /// <summary>
-        /// Where we send the ParcelOverlay packet to the client
+        /// Send the parcel overlay blocks to the client. We send the overlay packets
+        /// around a location and limited by the 'parcelLayerViewDistance'. This number
+        /// is usually 128 and the code is arranged so it sends all the parcel overlay
+        /// information for a whole region if the region is legacy sized (256x256). If
+        /// the region is larger, only the parcel layer information is sent around
+        /// the point specified. This reduces the problem of parcel layer information
+        /// blocks increasing exponentially as region size increases.
         /// </summary>
         /// <param name="remote_client">The object representing the client</param>
-        public void SendParcelOverlay(IClientAPI remote_client)
+        /// <param name="xPlace">X position in the region to send surrounding parcel layer info</param>
+        /// <param name="yPlace">y position in the region to send surrounding parcel layer info</param>
+        /// <param name="layerViewDistance">Distance from x,y position to send parcel layer info</param>
+        private  void SendParcelOverlay(IClientAPI remote_client, int xPlace, int yPlace, int layerViewDistance)
         {
             if (remote_client.SceneAgent.PresenceType == PresenceType.Npc)
                 return;
@@ -1076,18 +1295,149 @@ namespace OpenSim.Region.CoreModules.World.Land
             byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET];
             int byteArrayCount = 0;
             int sequenceID = 0;
+<<<<<<< HEAD
+
+            int xLow = 0;
+            int xHigh = (int)m_scene.RegionInfo.RegionSizeX;
+            int yLow = 0;
+            int yHigh = (int)m_scene.RegionInfo.RegionSizeY;
+
+            if (shouldLimitParcelLayerInfoToViewDistance)
+            {
+                // Compute view distance around the given point
+                int txLow = xPlace - layerViewDistance;
+                int txHigh = xPlace + layerViewDistance;
+                // If the distance is outside the region area, move the view distance to ba all in the region
+                if (txLow < xLow)
+=======
 
             // Layer data is in landUnit (4m) chunks
             for (int y = 0; y < m_scene.RegionInfo.RegionSizeY; y += landUnit)
             {
                 for (int x = 0; x < m_scene.RegionInfo.RegionSizeX; x += landUnit)
+>>>>>>> avn/ubitvar
                 {
-                    byte tempByte = 0; //This represents the byte for the current 4x4
+                    txLow = xLow;
+                    txHigh = Math.Min(yLow + (layerViewDistance * 2), xHigh);
+                }
+                if (txHigh > xHigh)
+                {
+                    txLow = Math.Max(xLow, xHigh - (layerViewDistance * 2));
+                    txHigh = xHigh;
+                }
+                xLow = txLow;
+                xHigh = txHigh;
 
+<<<<<<< HEAD
+                int tyLow = yPlace - layerViewDistance;
+                int tyHigh = yPlace + layerViewDistance;
+                if (tyLow < yLow)
+                {
+                    tyLow = yLow;
+                    tyHigh = Math.Min(yLow + (layerViewDistance * 2), yHigh);
+                }
+                if (tyHigh > yHigh)
+                {
+                    tyLow = Math.Max(yLow, yHigh - (layerViewDistance * 2));
+                    tyHigh = yHigh;
+                }
+                yLow = tyLow;
+                yHigh = tyHigh;
+            }
+            // m_log.DebugFormat("{0} SendParcelOverlay: place=<{1},{2}>, vDist={3}, xLH=<{4},{5}, yLH=<{6},{7}>",
+            //     LogHeader, xPlace, yPlace, layerViewDistance, xLow, xHigh, yLow, yHigh);
+=======
                     ILandObject currentParcelBlock = GetLandObject(x, y);
+>>>>>>> avn/ubitvar
 
-                    if (currentParcelBlock != null)
+            // Layer data is in landUnit (4m) chunks
+            for (int y = yLow; y < yHigh / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); y++)
+            {
+                for (int x = xLow; x < xHigh / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); x++)
+                {
+                    byteArray[byteArrayCount] = BuildLayerByte(GetLandObject(x * LandUnit, y * LandUnit), x, y, remote_client);
+                    byteArrayCount++;
+                    if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)
                     {
+<<<<<<< HEAD
+                        // m_log.DebugFormat("{0} SendParcelOverlay, sending packet, bytes={1}", LogHeader, byteArray.Length);
+                        remote_client.SendLandParcelOverlay(byteArray, sequenceID);
+                        byteArrayCount = 0;
+                        sequenceID++;
+                        byteArray = new byte[LAND_BLOCKS_PER_PACKET];
+                    }
+
+                }
+            }
+
+            if (byteArrayCount != 0)
+            {
+                remote_client.SendLandParcelOverlay(byteArray, sequenceID);
+                // m_log.DebugFormat("{0} SendParcelOverlay, complete sending packet, bytes={1}", LogHeader, byteArray.Length);
+            }
+        }
+
+        private byte BuildLayerByte(ILandObject currentParcelBlock, int x, int y, IClientAPI remote_client)
+        {
+            byte tempByte = 0; //This represents the byte for the current 4x4
+
+            if (currentParcelBlock != null)
+            {
+                if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
+                {
+                    //Owner Flag
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER);
+                }
+                else if (currentParcelBlock.LandData.SalePrice > 0 &&
+                         (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
+                          currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
+                {
+                    //Sale Flag
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_IS_FOR_SALE);
+                }
+                else if (currentParcelBlock.LandData.OwnerID == UUID.Zero)
+                {
+                    //Public Flag
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_PUBLIC);
+                }
+                else
+                {
+                    //Other Flag
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_OTHER);
+                }
+
+                //Now for border control
+
+                ILandObject westParcel = null;
+                ILandObject southParcel = null;
+                if (x > 0)
+                {
+                    westParcel = GetLandObject((x - 1) * LandUnit, y * LandUnit);
+                }
+                if (y > 0)
+                {
+                    southParcel = GetLandObject(x * LandUnit, (y - 1) * LandUnit);
+                }
+
+                if (x == 0)
+                {
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST);
+                }
+                else if (westParcel != null && westParcel != currentParcelBlock)
+                {
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST);
+                }
+
+                if (y == 0)
+                {
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH);
+                }
+                else if (southParcel != null && southParcel != currentParcelBlock)
+                {
+                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH);
+                }
+
+=======
                         // types 
                         if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
                         {
@@ -1175,7 +1525,10 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (byteArrayCount > 0)
             {
                 remote_client.SendLandParcelOverlay(byteArray, sequenceID);
+>>>>>>> avn/ubitvar
             }
+
+            return tempByte;
         }
 
         public void ClientOnParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id,
@@ -1216,6 +1569,10 @@ namespace OpenSim.Region.CoreModules.World.Land
                 temp[i].SendLandProperties(sequence_id, snap_selection, requestResult, remote_client);
             }
 
+<<<<<<< HEAD
+            // Also send the layer data around the point of interest
+            SendParcelOverlay(remote_client, (start_x + end_x) / 2, (start_y + end_y) / 2, parcelLayerViewDistance);
+=======
 //            SendParcelOverlay(remote_client);
         }
 
@@ -1255,6 +1612,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                          avatar.currentParcelUUID = parcelID; // force parcel flags review
                  });
             }
+>>>>>>> avn/ubitvar
         }
 
         public void ClientOnParcelPropertiesUpdateRequest(LandUpdateArgs args, int localID, IClientAPI remote_client)
@@ -1325,6 +1683,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
                     m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(true, remote_client);
+                    UpdateLandObject(land.LandData.LocalID, land.LandData);
                 }
             }
         }
@@ -1345,8 +1704,10 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land.LandData.GroupID = UUID.Zero;
                     land.LandData.IsGroupOwned = false;
                     land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
+                    
                     m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(true, remote_client);
+                    UpdateLandObject(land.LandData.LocalID, land.LandData);
                 }
             }
         }
@@ -1372,6 +1733,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
                     m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(true, remote_client);
+                    UpdateLandObject(land.LandData.LocalID, land.LandData);
                 }
             }
         }
@@ -1452,24 +1814,42 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         #region Land Object From Storage Functions
 
-        public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data)
+        private void EventManagerOnIncomingLandDataFromStorage(List<LandData> data)
         {
             lock (m_landList)
             {
                 for (int i = 0; i < data.Count; i++)
                     IncomingLandObjectFromStorage(data[i]);
 
+<<<<<<< HEAD
+            // Prevent race conditions from any auto-creation of new parcels for varregions whilst we are still loading
+            // the existing parcels.
+            lock (m_landList)
+            {
+                for (int i = 0; i < data.Count; i++)
+                    IncomingLandObjectFromStorage(data[i]);
+
+                // Layer data is in landUnit (4m) chunks
+                for (int y = 0; y < m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); y++)
+                {
+                    for (int x = 0; x < m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); x++)
+=======
                 // Layer data is in landUnit (4m) chunks
                 for (int y = 0; y < m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / landUnit); y++)
                 {
                     for (int x = 0; x < m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / landUnit); x++)
+>>>>>>> avn/ubitvar
                     {
                         if (m_landIDList[x, y] == 0)
                         {
                             if (m_landList.Count == 1)
                             {
                                 m_log.DebugFormat(
+<<<<<<< HEAD
+                                    "[{0}]: Auto-extending land parcel as landID at {1},{2} is 0 and only one land parcel is present in {3}", 
+=======
                                     "[{0}]: Auto-extending land parcel as landID at {1},{2} is 0 and only one land parcel is present in {3}",
+>>>>>>> avn/ubitvar
                                     LogHeader, x, y, m_scene.Name);
 
                                 int onlyParcelID = 0;
@@ -1492,11 +1872,19 @@ namespace OpenSim.Region.CoreModules.World.Land
                             else if (m_landList.Count > 1)
                             {
                                 m_log.DebugFormat(
+<<<<<<< HEAD
+                                    "{0}: Auto-creating land parcel as landID at {1},{2} is 0 and more than one land parcel is present in {3}", 
+                                    LogHeader, x, y, m_scene.Name);
+
+                                // There are several other parcels so we must create a new one for the unassigned space
+                                ILandObject newLand = new LandObject(UUID.Zero, false, m_scene);                                                
+=======
                                     "{0}: Auto-creating land parcel as landID at {1},{2} is 0 and more than one land parcel is present in {3}",
                                     LogHeader, x, y, m_scene.Name);
 
                                 // There are several other parcels so we must create a new one for the unassigned space
                                 ILandObject newLand = new LandObject(UUID.Zero, false, m_scene);
+>>>>>>> avn/ubitvar
                                 // Claim all the unclaimed "0" ids
                                 newLand.SetLandBitmap(CreateBitmapForID(0));
                                 newLand.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -1507,7 +1895,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                             {
                                 // We should never reach this point as the separate code path when no land data exists should have fired instead.
                                 m_log.WarnFormat(
+<<<<<<< HEAD
+                                    "{0}: Ignoring request to auto-create parcel in {1} as there are no other parcels present", 
+=======
                                     "{0}: Ignoring request to auto-create parcel in {1} as there are no other parcels present",
+>>>>>>> avn/ubitvar
                                     LogHeader, m_scene.Name);
                             }
                         }
@@ -1516,11 +1908,15 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
         }
 
-        public void IncomingLandObjectFromStorage(LandData data)
+        private void IncomingLandObjectFromStorage(LandData data)
         {
+<<<<<<< HEAD
+            ILandObject new_land = new LandObject(data, m_scene);
+=======
 
             ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene);
             new_land.LandData = data.Copy();
+>>>>>>> avn/ubitvar
             new_land.SetLandBitmapFromByteArray();            
             AddLandObject(new_land);
 //            new_land.SendLandUpdateToAvatarsOverMe();
@@ -2057,21 +2453,38 @@ namespace OpenSim.Region.CoreModules.World.Land
                 telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
 
             // Can the user set home here?
-            if (// (a) gods and land managers can set home
-                m_scene.Permissions.IsAdministrator(remoteClient.AgentId) || 
-                m_scene.Permissions.IsGod(remoteClient.AgentId) ||
-                // (b) land owners can set home
-                remoteClient.AgentId == land.LandData.OwnerID ||
-                // (c) members of the land-associated group in roles that can set home
-                ((gpowers & (ulong)GroupPowers.AllowSetHome) == (ulong)GroupPowers.AllowSetHome) ||
-                // (d) parcels with telehubs can be the home of anyone
-                (telehub != null && land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y)))
-            {
-                if (m_scene.GridUserService.SetHome(remoteClient.AgentId.ToString(), land.RegionUUID, position, lookAt))
+            if (// Required: local user; foreign users cannot set home
+                m_scene.UserManagementModule.IsLocalGridUser(remoteClient.AgentId) &&
+                (// (a) gods and land managers can set home
+                 m_scene.Permissions.IsAdministrator(remoteClient.AgentId) || 
+                 m_scene.Permissions.IsGod(remoteClient.AgentId) ||
+                 // (b) land owners can set home
+                 remoteClient.AgentId == land.LandData.OwnerID ||
+                 // (c) members of the land-associated group in roles that can set home
+                 ((gpowers & (ulong)GroupPowers.AllowSetHome) == (ulong)GroupPowers.AllowSetHome) ||
+                 // (d) parcels with telehubs can be the home of anyone
+                 (telehub != null && land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y))))
+            {
+                string userId;
+                UUID test;
+                if (!m_scene.UserManagementModule.GetUserUUI(remoteClient.AgentId, out userId))
+                {
+                    /* Do not set a home position in this grid for a HG visitor */
+                    m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed. (User Lookup)");
+                }
+                else if (!UUID.TryParse(userId, out test))
+                {
+                    m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed. (HG visitor)");
+                }
+                else if (m_scene.GridUserService.SetHome(userId, land.RegionUUID, position, lookAt))
+                {
                     // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot.
                     m_Dialog.SendAlertToUser(remoteClient, "Home position set.");
+                }
                 else
+                {
                     m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed.");
+                }
             }
             else
                 m_Dialog.SendAlertToUser(remoteClient, "You are not allowed to set your home location in this parcel.");
@@ -2155,6 +2568,17 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         private void AppendParcelsSummaryReport(StringBuilder report)
         {           
+<<<<<<< HEAD
+            report.AppendFormat("Land information for {0}\n", m_scene.Name);
+
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Parcel Name", ConsoleDisplayUtil.ParcelNameSize);
+            cdt.AddColumn("ID", 3);
+            cdt.AddColumn("Area", 6);
+            cdt.AddColumn("Starts", ConsoleDisplayUtil.VectorSize);
+            cdt.AddColumn("Ends", ConsoleDisplayUtil.VectorSize);
+            cdt.AddColumn("Owner", ConsoleDisplayUtil.UserNameSize);
+=======
             report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName);            
             report.AppendFormat(
                 "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n",
@@ -2164,12 +2588,27 @@ namespace OpenSim.Region.CoreModules.World.Land
                 "AABBMin",
                 "AABBMax",
                 "Owner");
+>>>>>>> avn/ubitvar
             
             lock (m_landList)
             {
                 foreach (ILandObject lo in m_landList.Values)
                 {
                     LandData ld = lo.LandData;
+<<<<<<< HEAD
+                    string ownerName;
+                    if (ld.IsGroupOwned)
+                    {
+                        GroupRecord rec = m_groupManager.GetGroupRecord(ld.GroupID);
+                        ownerName = (rec != null) ? rec.GroupName : "Unknown Group";
+                    }
+                    else
+                    {
+                        ownerName = m_userManager.GetUserName(ld.OwnerID);
+                    }
+                    cdt.AddRow(
+                        ld.Name, ld.LocalID, ld.Area, lo.StartPoint, lo.EndPoint, ownerName);
+=======
                     
                     report.AppendFormat(
                         "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n", 
@@ -2197,8 +2636,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                 else
                 {
                     ForceAvatarToPosition(avatar, avatar.lastKnownAllowedPosition);
+>>>>>>> avn/ubitvar
                 }
             }
+
+            report.Append(cdt.ToString());
         } 
 
         private void AppendParcelReport(StringBuilder report, ILandObject lo)
@@ -2213,8 +2655,17 @@ namespace OpenSim.Region.CoreModules.World.Land
             cdl.AddRow("Area", ld.Area);
             cdl.AddRow("AABB Min", ld.AABBMin);
             cdl.AddRow("AABB Max", ld.AABBMax);
-
-            cdl.AddRow("Owner", m_userManager.GetUserName(ld.OwnerID));
+            string ownerName;
+            if (ld.IsGroupOwned)
+            {
+                GroupRecord rec = m_groupManager.GetGroupRecord(ld.GroupID);
+                ownerName = (rec != null) ? rec.GroupName : "Unknown Group";
+            }
+            else
+            {
+                ownerName = m_userManager.GetUserName(ld.OwnerID);
+            }
+            cdl.AddRow("Owner", ownerName);
             cdl.AddRow("Is group owned?", ld.IsGroupOwned);
             cdl.AddRow("GroupID", ld.GroupID);
 
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 5858d6c..3b81d6b 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -46,12 +46,20 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static readonly string LogHeader = "[LAND OBJECT]";
+<<<<<<< HEAD
+
+        private readonly int landUnit = 4;
+
+        private int m_lastSeqId = 0;
+              
+=======
 
         private readonly int landUnit = 4;
 
         private int m_lastSeqId = 0;
         private int m_expiryCounter = 0;
 
+>>>>>>> avn/ubitvar
         protected Scene m_scene;
         protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
         protected Dictionary<uint, UUID> m_listTransactions = new Dictionary<uint, UUID>();
@@ -59,22 +67,29 @@ namespace OpenSim.Region.CoreModules.World.Land
         protected ExpiringCache<UUID, bool> m_groupMemberCache = new ExpiringCache<UUID, bool>();
         protected TimeSpan m_groupMemberCacheTimeout = TimeSpan.FromSeconds(30);  // cache invalidation after 30 seconds
 
+<<<<<<< HEAD
+        public bool[,] LandBitmap { get; set; }
+=======
         private bool[,] m_landBitmap;
         public bool[,] LandBitmap
         {
             get { return m_landBitmap; }
             set { m_landBitmap = value; }
         }
+>>>>>>> avn/ubitvar
 
         #endregion
 
         public int GetPrimsFree()
         {
             m_scene.EventManager.TriggerParcelPrimCountUpdate();
-            int free = GetSimulatorMaxPrimCount() - m_landData.SimwidePrims;
+            int free = GetSimulatorMaxPrimCount() - LandData.SimwidePrims;
             return free;
         }
 
+<<<<<<< HEAD
+        public LandData LandData { get; set; }
+=======
         protected LandData m_landData;        
         public LandData LandData
         {
@@ -82,6 +97,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             set { m_landData = value; }
         }
+>>>>>>> avn/ubitvar
 
         public IPrimCounts PrimCounts { get; set; }
 
@@ -103,6 +119,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                     }
                 }
 
+                m_log.ErrorFormat("{0} StartPoint. No start point found. bitmapSize=<{1},{2}>",
+                                    LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
                 return new Vector3(-1, -1, -1);
             }
         }
@@ -122,6 +140,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                     }
                 }
 
+                m_log.ErrorFormat("{0} EndPoint. No end point found. bitmapSize=<{1},{2}>",
+                                    LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
                 return new Vector3(-1, -1, -1);
             }
         }
@@ -179,12 +199,8 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public ILandObject Copy()
         {
-            ILandObject newLand = new LandObject(LandData.OwnerID, LandData.IsGroupOwned, m_scene);
-
-            //Place all new variables here!
+            ILandObject newLand = new LandObject(LandData, m_scene);
             newLand.LandBitmap = (bool[,]) (LandBitmap.Clone());
-            newLand.LandData = LandData.Copy();
-
             return newLand;
         }
 
@@ -209,6 +225,12 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
             {
                 // Normal Calculations
+<<<<<<< HEAD
+                int parcelMax = (int)(((float)LandData.Area / (m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY))
+                              * (float)m_scene.RegionInfo.ObjectCapacity
+                              * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
+                // TODO: The calculation of ObjectBonus should be refactored. It does still not work in the same manner as SL!
+=======
                 int parcelMax = (int)( (long)LandData.Area
                               * (long)m_scene.RegionInfo.ObjectCapacity
                               * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus
@@ -230,6 +252,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 int parcelMax = (int)((long)LandData.Area
                               * (long)m_scene.RegionInfo.ObjectCapacity
                               / 65536L);
+>>>>>>> avn/ubitvar
                 return parcelMax;
             }
         }
@@ -243,10 +266,15 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
             {
                 //Normal Calculations
+<<<<<<< HEAD
+                int simMax = (int)(((float)LandData.SimwideArea / (m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY))
+                           * (float)m_scene.RegionInfo.ObjectCapacity);
+=======
                 int simMax = (int)(   (long)LandData.SimwideArea
                                     * (long)m_scene.RegionInfo.ObjectCapacity
                                     / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) );
                 // m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax);
+>>>>>>> avn/ubitvar
                 return simMax;
             }
         }
@@ -261,7 +289,12 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return;
 
             IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();
-            uint regionFlags = 336723974 & ~((uint)(RegionFlags.AllowLandmark | RegionFlags.AllowSetHome));
+            // uint regionFlags = 336723974 & ~((uint)(RegionFlags.AllowLandmark | RegionFlags.AllowSetHome));
+            uint regionFlags = (uint)(RegionFlags.PublicAllowed
+                                    | RegionFlags.AllowDirectTeleport
+                                    | RegionFlags.AllowParcelChanges
+                                    | RegionFlags.AllowVoice );
+
             if (estateModule != null)
                 regionFlags = estateModule.GetRegionFlags();
 
@@ -406,6 +439,12 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 uint preserve = LandData.Flags & ~allowedDelta;
                 newData.Flags = preserve | (args.ParcelFlags & allowedDelta);
+<<<<<<< HEAD
+
+                m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
+                SendLandUpdateToAvatarsOverMe(snap_selection);
+            }
+=======
 
                 uint curdelta = LandData.Flags ^ newData.Flags;
                 curdelta &= (uint)(ParcelFlags.SoundLocal);
@@ -417,6 +456,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return true; 
             }
             return false;
+>>>>>>> avn/ubitvar
         }
 
         public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area)
@@ -431,9 +471,16 @@ namespace OpenSim.Region.CoreModules.World.Land
             newData.SalePrice = 0;
             newData.AuthBuyerID = UUID.Zero;
             newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
+
+            bool sellObjects = (LandData.Flags & (uint)(ParcelFlags.SellParcelObjects)) != 0
+                && !LandData.IsGroupOwned && !groupOwned;
+            UUID previousOwner = LandData.OwnerID;
+
             m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
 //            m_scene.EventManager.TriggerParcelPrimCountUpdate();
             SendLandUpdateToAvatarsOverMe(true);
+
+            if (sellObjects) SellLandObjects(previousOwner);
         }
 
         public void DeedToGroup(UUID groupID)
@@ -759,10 +806,17 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>
         private void UpdateAABBAndAreaValues()
         {
+<<<<<<< HEAD
+            int min_x = 10000;
+            int min_y = 10000;
+            int max_x = 0;
+            int max_y = 0;
+=======
             int min_x = Int32.MaxValue;
             int min_y = Int32.MaxValue;
             int max_x = Int32.MinValue;
             int max_y = Int32.MinValue;
+>>>>>>> avn/ubitvar
             int tempArea = 0;
             int x, y;
             for (x = 0; x < LandBitmap.GetLength(0); x++)
@@ -771,6 +825,12 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     if (LandBitmap[x, y] == true)
                     {
+<<<<<<< HEAD
+                        if (min_x > x) min_x = x;
+                        if (min_y > y) min_y = y;
+                        if (max_x < x) max_x = x;
+                        if (max_y < y) max_y = y;
+=======
                         if (min_x > x)
                             min_x = x;
                         if (min_y > y)
@@ -779,6 +839,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             max_x = x;
                         if (max_y < y)
                             max_y = y;
+>>>>>>> avn/ubitvar
                         tempArea += landUnit * landUnit; //16sqm peice of land
                     }
                 }
@@ -786,6 +847,26 @@ namespace OpenSim.Region.CoreModules.World.Land
             int tx = min_x * landUnit;
             if (tx > ((int)m_scene.RegionInfo.RegionSizeX - 1))
                 tx = ((int)m_scene.RegionInfo.RegionSizeX - 1);
+<<<<<<< HEAD
+            int ty = min_y * landUnit;
+            if (ty > ((int)m_scene.RegionInfo.RegionSizeY - 1))
+                ty = ((int)m_scene.RegionInfo.RegionSizeY - 1);
+
+            LandData.AABBMin =
+                new Vector3(
+                    (float)(min_x * landUnit), (float)(min_y * landUnit), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0);
+
+            tx = max_x * landUnit;
+            if (tx > ((int)m_scene.RegionInfo.RegionSizeX - 1))
+                tx = ((int)m_scene.RegionInfo.RegionSizeX - 1);
+            ty = max_y * landUnit;
+            if (ty > ((int)m_scene.RegionInfo.RegionSizeY - 1))
+                ty = ((int)m_scene.RegionInfo.RegionSizeY - 1);
+
+            LandData.AABBMax 
+                = new Vector3(
+                    (float)(max_x * landUnit), (float)(max_y * landUnit), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0);
+=======
 
             int htx;
             if (tx >= ((int)m_scene.RegionInfo.RegionSizeX))
@@ -823,6 +904,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             LandData.AABBMax 
                 = new Vector3(
                     (float)(tx), (float)(ty), m_scene != null ? (float)m_scene.Heightmap[htx, hty] : 0);
+>>>>>>> avn/ubitvar
 
             LandData.Area = tempArea;
         }
@@ -838,6 +920,10 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void SetLandBitmap(bool[,] bitmap)
         {
             LandBitmap = bitmap;
+<<<<<<< HEAD
+            // m_log.DebugFormat("{0} SetLandBitmap. BitmapSize=<{1},{2}>", LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
+=======
+>>>>>>> avn/ubitvar
             ForceUpdateLandInfo();
         }
 
@@ -863,6 +949,8 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             // Fill the bitmap square area specified by state and end
             tempBitmap = ModifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
+            // m_log.DebugFormat("{0} GetSquareLandBitmap. tempBitmapSize=<{1},{2}>",
+            //                         LogHeader, tempBitmap.GetLength(0), tempBitmap.GetLength(1));
             return tempBitmap;
         }
 
@@ -891,6 +979,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                     }
                 }
             }
+            // m_log.DebugFormat("{0} ModifyLandBitmapSquare. startXY=<{1},{2}>, endXY=<{3},{4}>, val={5}, landBitmapSize=<{6},{7}>",
+            //                         LogHeader, start_x, start_y, end_x, end_y, set_value, land_bitmap.GetLength(0), land_bitmap.GetLength(1));
             return land_bitmap;
         }
 
@@ -934,10 +1024,16 @@ namespace OpenSim.Region.CoreModules.World.Land
         private byte[] ConvertLandBitmapToBytes()
         {
             byte[] tempConvertArr = new byte[LandBitmap.GetLength(0) * LandBitmap.GetLength(1) / 8];
+<<<<<<< HEAD
+            byte tempByte = 0;
+            int byteNum = 0;
+            int i = 0;
+=======
             int tempByte = 0;
             int i, byteNum = 0;
             int mask = 1;
             i = 0;
+>>>>>>> avn/ubitvar
             for (int y = 0; y < LandBitmap.GetLength(1); y++)
             {
                 for (int x = 0; x < LandBitmap.GetLength(0); x++)
@@ -967,7 +1063,14 @@ namespace OpenSim.Region.CoreModules.World.Land
                         i = 0;
                         byteNum++;
                     }
+<<<<<<< HEAD
+                }
+            }
+            // m_log.DebugFormat("{0} ConvertLandBitmapToBytes. BitmapSize=<{1},{2}>",
+            //                         LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
+=======
  */
+>>>>>>> avn/ubitvar
             return tempConvertArr;
         }
 
@@ -1148,6 +1251,43 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         #endregion
 
+        #region Object Sales
+
+        public void SellLandObjects(UUID previousOwner)
+        {
+            // m_log.DebugFormat(
+            //    "[LAND OBJECT]: Request to sell objects in {0} from {1}", LandData.Name, previousOwner);
+
+            if (LandData.IsGroupOwned)
+                return;
+
+            IBuySellModule m_BuySellModule = m_scene.RequestModuleInterface<IBuySellModule>();
+            if (m_BuySellModule == null)
+            {
+                m_log.Error("[LAND OBJECT]: BuySellModule not found");
+                return;
+            }
+
+            ScenePresence sp;
+            if (!m_scene.TryGetScenePresence(LandData.OwnerID, out sp))
+            {
+                m_log.Error("[LAND OBJECT]: New owner is not present in scene");
+                return;
+            }
+
+            lock (primsOverMe)
+            {
+                foreach (SceneObjectGroup obj in primsOverMe)
+                {
+                    if (obj.OwnerID == previousOwner && obj.GroupID == UUID.Zero &&
+                        (obj.GetEffectivePermissions() & (uint)(OpenSim.Framework.PermissionMask.Transfer)) != 0)
+                        m_BuySellModule.BuyObject(sp.ControllingClient, UUID.Zero, obj.LocalId, 1, 0);
+                }
+            }
+        }
+
+        #endregion
+
         #region Object Returning
 
         public void ReturnObject(SceneObjectGroup obj)
@@ -1170,7 +1310,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     foreach (SceneObjectGroup obj in primsOverMe)
                     {
-                        if (obj.OwnerID == m_landData.OwnerID)
+                        if (obj.OwnerID == LandData.OwnerID)
                         {
                             if (!returns.ContainsKey(obj.OwnerID))
                                 returns[obj.OwnerID] =
@@ -1179,11 +1319,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                         }
                     }
                 }
-                else if (type == (uint)ObjectReturnType.Group && m_landData.GroupID != UUID.Zero)
+                else if (type == (uint)ObjectReturnType.Group && LandData.GroupID != UUID.Zero)
                 {
                     foreach (SceneObjectGroup obj in primsOverMe)
                     {
-                        if (obj.GroupID == m_landData.GroupID)
+                        if (obj.GroupID == LandData.GroupID)
                         {
                             if (!returns.ContainsKey(obj.OwnerID))
                                 returns[obj.OwnerID] =
@@ -1196,9 +1336,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     foreach (SceneObjectGroup obj in primsOverMe)
                     {
-                        if (obj.OwnerID != m_landData.OwnerID &&
-                            (obj.GroupID != m_landData.GroupID ||
-                            m_landData.GroupID == UUID.Zero))
+                        if (obj.OwnerID != LandData.OwnerID &&
+                            (obj.GroupID != LandData.GroupID ||
+                            LandData.GroupID == UUID.Zero))
                         {
                             if (!returns.ContainsKey(obj.OwnerID))
                                 returns[obj.OwnerID] =
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
new file mode 100644
index 0000000..4ed67f3
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
@@ -0,0 +1,266 @@
+/*
+ * 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 NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.CoreModules.World.Land.Tests
+{
+    public class LandManagementModuleTests : OpenSimTestCase
+    {
+        [Test]
+        public void TestAddLandObject()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = new SceneHelpers().SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);             
+            
+            ILandObject lo = new LandObject(userId, false, scene);
+            lo.LandData.Name = "lo1";
+            lo.SetLandBitmap(
+                lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
+            lo = lmm.AddLandObject(lo);          
+
+            // TODO: Should add asserts to check that land object was added properly.
+
+            // At the moment, this test just makes sure that we can't add a land object that overlaps the areas that
+            // the first still holds.
+            ILandObject lo2 = new LandObject(userId, false, scene);
+            lo2.SetLandBitmap(
+                lo2.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
+            lo2.LandData.Name = "lo2";
+            lo2 = lmm.AddLandObject(lo2);
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject(0, 0);
+                Assert.That(loAtCoord.LandData.LocalID, Is.EqualTo(lo.LandData.LocalID));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));                          
+            }
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject((int)Constants.RegionSize - 1, ((int)Constants.RegionSize - 1));
+                Assert.That(loAtCoord.LandData.LocalID, Is.EqualTo(lo.LandData.LocalID));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));
+            }
+        }
+
+        /// <summary>
+        /// Test parcels on region when no land data exists to be loaded.
+        /// </summary>
+        [Test]
+        public void TestLoadWithNoParcels()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            SceneHelpers sh = new SceneHelpers();
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = sh.SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);   
+
+            scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
+
+            ILandObject loAtCoord1 = lmm.GetLandObject(0, 0);
+            Assert.That(loAtCoord1.LandData.LocalID, Is.Not.EqualTo(0));
+            Assert.That(loAtCoord1.LandData.GlobalID, Is.Not.EqualTo(UUID.Zero));
+
+            ILandObject loAtCoord2 = lmm.GetLandObject((int)Constants.RegionSize - 1, ((int)Constants.RegionSize - 1));
+            Assert.That(loAtCoord2.LandData.LocalID, Is.EqualTo(loAtCoord1.LandData.LocalID));
+            Assert.That(loAtCoord2.LandData.GlobalID, Is.EqualTo(loAtCoord1.LandData.GlobalID));
+        }
+
+        /// <summary>
+        /// Test parcels on region when a single parcel already exists but it does not cover the whole region.
+        /// </summary>
+        [Test]
+        public void TestLoadWithSinglePartialCoveringParcel()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            SceneHelpers sh = new SceneHelpers();
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = sh.SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);   
+
+            ILandObject originalLo1 = new LandObject(userId, false, scene);
+            originalLo1.LandData.Name = "lo1";
+            originalLo1.SetLandBitmap(
+                originalLo1.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize / 2));
+
+            sh.SimDataService.StoreLandObject(originalLo1);
+
+            scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
+
+            ILandObject loAtCoord1 = lmm.GetLandObject(0, 0);
+            Assert.That(loAtCoord1.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
+            Assert.That(loAtCoord1.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
+
+            ILandObject loAtCoord2 = lmm.GetLandObject((int)Constants.RegionSize - 1, ((int)Constants.RegionSize - 1));
+            Assert.That(loAtCoord2.LandData.LocalID, Is.EqualTo(loAtCoord1.LandData.LocalID));
+            Assert.That(loAtCoord2.LandData.GlobalID, Is.EqualTo(loAtCoord1.LandData.GlobalID));
+        }
+
+        /// <summary>
+        /// Test parcels on region when a single parcel already exists but it does not cover the whole region.
+        /// </summary>
+        [Test]
+        public void TestLoadWithMultiplePartialCoveringParcels()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            SceneHelpers sh = new SceneHelpers();
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = sh.SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);   
+
+            ILandObject originalLo1 = new LandObject(userId, false, scene);
+            originalLo1.LandData.Name = "lo1";
+            originalLo1.SetLandBitmap(
+                originalLo1.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize / 2));
+
+            sh.SimDataService.StoreLandObject(originalLo1);
+
+            ILandObject originalLo2 = new LandObject(userId, false, scene);
+            originalLo2.LandData.Name = "lo2";
+            originalLo2.SetLandBitmap(
+                originalLo2.GetSquareLandBitmap(
+                0, (int)Constants.RegionSize / 2, (int)Constants.RegionSize, ((int)Constants.RegionSize / 4) * 3));
+
+            sh.SimDataService.StoreLandObject(originalLo2);
+
+            scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
+
+            ILandObject loAtCoord1 = lmm.GetLandObject(0, 0);
+            Assert.That(loAtCoord1.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
+            Assert.That(loAtCoord1.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
+
+            ILandObject loAtCoord2 
+                = lmm.GetLandObject((int)Constants.RegionSize - 1, (((int)Constants.RegionSize / 4) * 3) - 1);
+            Assert.That(loAtCoord2.LandData.Name, Is.EqualTo(originalLo2.LandData.Name));
+            Assert.That(loAtCoord2.LandData.GlobalID, Is.EqualTo(originalLo2.LandData.GlobalID));
+
+            ILandObject loAtCoord3 = lmm.GetLandObject((int)Constants.RegionSize - 1, ((int)Constants.RegionSize - 1));
+            Assert.That(loAtCoord3.LandData.LocalID, Is.Not.EqualTo(loAtCoord1.LandData.LocalID));
+            Assert.That(loAtCoord3.LandData.LocalID, Is.Not.EqualTo(loAtCoord2.LandData.LocalID));
+            Assert.That(loAtCoord3.LandData.GlobalID, Is.Not.EqualTo(loAtCoord1.LandData.GlobalID));
+            Assert.That(loAtCoord3.LandData.GlobalID, Is.Not.EqualTo(loAtCoord2.LandData.GlobalID));
+        }
+
+        /// <summary>
+        /// Test parcels on region when whole region is parcelled (which should normally always be the case).
+        /// </summary>
+        [Test]
+        public void TestLoad()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            SceneHelpers sh = new SceneHelpers();
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = sh.SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);   
+
+            ILandObject originalLo1 = new LandObject(userId, false, scene);
+            originalLo1.LandData.Name = "lo1";
+            originalLo1.SetLandBitmap(
+                originalLo1.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize / 2));
+
+            sh.SimDataService.StoreLandObject(originalLo1);
+
+            ILandObject originalLo2 = new LandObject(userId, false, scene);
+            originalLo2.LandData.Name = "lo2";
+            originalLo2.SetLandBitmap(
+                originalLo2.GetSquareLandBitmap(0, (int)Constants.RegionSize / 2, (int)Constants.RegionSize, (int)Constants.RegionSize));
+
+            sh.SimDataService.StoreLandObject(originalLo2);
+
+            scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject(0, 0);
+                Assert.That(loAtCoord.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));                          
+            }
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject((int)Constants.RegionSize - 1, ((int)Constants.RegionSize - 1));
+                Assert.That(loAtCoord.LandData.Name, Is.EqualTo(originalLo2.LandData.Name));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo2.LandData.GlobalID));
+            }
+        }
+
+        [Test]
+        public void TestSubdivide()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            LandManagementModule lmm = new LandManagementModule();
+            Scene scene = new SceneHelpers().SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, lmm);             
+            
+            ILandObject lo = new LandObject(userId, false, scene);
+            lo.LandData.Name = "lo1";
+            lo.SetLandBitmap(
+                lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
+            lo = lmm.AddLandObject(lo);          
+
+            lmm.Subdivide(0, 0, LandManagementModule.LandUnit, LandManagementModule.LandUnit, userId);
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject(0, 0);
+                Assert.That(loAtCoord.LandData.LocalID, Is.Not.EqualTo(lo.LandData.LocalID));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.Not.EqualTo(lo.LandData.GlobalID));                          
+            }
+
+            {
+                ILandObject loAtCoord = lmm.GetLandObject(LandManagementModule.LandUnit, LandManagementModule.LandUnit);
+                Assert.That(loAtCoord.LandData.LocalID, Is.EqualTo(lo.LandData.LocalID));
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
index 0945b43..949acb6 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
@@ -36,7 +36,6 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.World.Land.Tests
 {
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index c7ffeaf..a228e7a 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -91,17 +91,29 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
             if (generateMaptiles)
             {
-                if (textureTerrain)
+                if (String.IsNullOrEmpty(m_scene.RegionInfo.MaptileStaticFile))
                 {
-                    terrainRenderer = new TexturedMapTileRenderer();
-                }
-                else
-                {
-                    terrainRenderer = new ShadedMapTileRenderer();
-                }
-
-                terrainRenderer.Initialise(m_scene, m_config);
+                    if (textureTerrain)
+                    {
+                        terrainRenderer = new TexturedMapTileRenderer();
+                    }
+                    else
+                    {
+                        terrainRenderer = new ShadedMapTileRenderer();
+                    }
 
+                    terrainRenderer.Initialise(m_scene, m_config);
+
+<<<<<<< HEAD
+                    mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height,
+                                            System.Drawing.Imaging.PixelFormat.Format24bppRgb);
+                    //long t = System.Environment.TickCount;
+                    //for (int i = 0; i < 10; ++i) {
+                    terrainRenderer.TerrainToBitmap(mapbmp);
+                    //}
+                    //t = System.Environment.TickCount - t;
+                    //m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t);
+=======
                 mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height,
                                         System.Drawing.Imaging.PixelFormat.Format24bppRgb);
                 //long t = System.Environment.TickCount;
@@ -110,10 +122,32 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                 //}
                 //t = System.Environment.TickCount - t;
                 //m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t);
+>>>>>>> avn/ubitvar
 
-                if (drawPrimVolume)
+                    if (drawPrimVolume)
+                    {
+                        DrawObjectVolume(m_scene, mapbmp);
+                    }
+                }
+                else
                 {
-                    DrawObjectVolume(m_scene, mapbmp);
+                    try
+                    {
+                        mapbmp = new Bitmap(m_scene.RegionInfo.MaptileStaticFile);
+                    }
+                    catch (Exception)
+                    {
+                        m_log.ErrorFormat(
+                            "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", 
+                            m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
+                        //mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
+                        mapbmp = null;
+                    }
+
+                    if (mapbmp != null) 
+                        m_log.DebugFormat(
+                            "[MAPTILE]: Static map image texture file {0} found for {1}", 
+                            m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
                 }
             }
             else
@@ -288,8 +322,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
             try 
             {
-                //SortedList<float, RectangleDrawStruct> z_sort = new SortedList<float, RectangleDrawStruct>();
-
                 lock (objs)
                 {
                     foreach (EntityBase obj in objs)
@@ -299,7 +331,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                         {
                             SceneObjectGroup mapdot = (SceneObjectGroup)obj;
                             Color mapdotspot = Color.Gray; // Default color when prim color is white
-                            
                             // Loop over prim in group
                             foreach (SceneObjectPart part in mapdot.Parts)
                             {
@@ -417,7 +448,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                                                     || mapdrawendY > (hm.Height - 1))
                                             continue;
 
-    #region obb face reconstruction part duex
+                                        #region obb face reconstruction part duex
                                         Vector3[] vertexes = new Vector3[8];
 
                                         // float[] distance = new float[6];
@@ -521,7 +552,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                                         FaceD[2] = vertexes[7];
                                         FaceC[3] = vertexes[7];
                                         FaceD[5] = vertexes[7];
-    #endregion
+                                        #endregion
 
                                         //int wy = 0;
 
@@ -552,27 +583,25 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                                         z_localIDs.Add(part.LocalId);
                                         z_sortheights.Add(pos.Z);
 
-                                        //for (int wx = mapdrawstartX; wx < mapdrawendX; wx++)
-                                        //{
-                                            //for (wy = mapdrawstartY; wy < mapdrawendY; wy++)
-                                            //{
-                                                //m_log.InfoFormat("[MAPDEBUG]: {0},{1}({2})", wx, (255 - wy),wy);
-                                                //try
-                                                //{
-                                                    // Remember, flip the y!
-                                                //    mapbmp.SetPixel(wx, (255 - wy), mapdotspot);
-                                                //}
-                                                //catch (ArgumentException)
-                                                //{
-                                                //    breakYN = true;
-                                                //}
-
-                                                //if (breakYN)
-                                                //    break;
-                                            //}
-
-                                            //if (breakYN)
-                                            //    break;
+                                        // for (int wx = mapdrawstartX; wx < mapdrawendX; wx++)
+                                        // {
+                                        //     for (wy = mapdrawstartY; wy < mapdrawendY; wy++)
+                                        //     {
+                                        //         m_log.InfoFormat("[MAPDEBUG]: {0},{1}({2})", wx, (255 - wy),wy);
+                                        //         try
+                                        //         {
+                                        //             // Remember, flip the y!
+                                        //             mapbmp.SetPixel(wx, (255 - wy), mapdotspot);
+                                        //         }
+                                        //         catch (ArgumentException)
+                                        //         {
+                                        //             breakYN = true;
+                                        //         }
+                                        //     }
+                                        //     if (breakYN)
+                                        //         break;
+                                        //     }
+                                        // }
                                         //}
                                     } // Object is within 256m Z of terrain
                                 } // object is at least a meter wide
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
index 15533ba..a9cc993 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
@@ -124,8 +124,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
     {
         #region Constants
 
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly string LogHeader = "[TEXTURED MAPTILE RENDERER]";
 
         // some hardcoded terrain UUIDs that work with SL 1.20 (the four default textures and "Blank").
         // The color-values were choosen because they "look right" (at least to me) ;-)
@@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         private Bitmap fetchTexture(UUID id)
         {
             AssetBase asset = m_scene.AssetService.Get(id.ToString());
-            m_log.DebugFormat("[TEXTURED MAP TILE RENDERER]: Fetched texture {0}, found: {1}", id, asset != null);
+            m_log.DebugFormat("{0} Fetched texture {1}, found: {2}", LogHeader, id, asset != null);
             if (asset == null) return null;
 
             ManagedImage managedImage;
@@ -190,18 +190,15 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             }
             catch (DllNotFoundException)
             {
-                m_log.ErrorFormat("[TEXTURED MAP TILE RENDERER]: OpenJpeg is not installed correctly on this system.   Asset Data is empty for {0}", id);
-                
+                m_log.ErrorFormat("{0} OpenJpeg is not installed correctly on this system.   Asset Data is empty for {1}", LogHeader, id);
             }
             catch (IndexOutOfRangeException)
             {
-                m_log.ErrorFormat("[TEXTURED MAP TILE RENDERER]: OpenJpeg was unable to encode this.   Asset Data is empty for {0}", id);
-                
+                m_log.ErrorFormat("{0} OpenJpeg was unable to encode this.   Asset Data is empty for {1}", LogHeader, id);
             }
             catch (Exception)
             {
-                m_log.ErrorFormat("[TEXTURED MAP TILE RENDERER]: OpenJpeg was unable to encode this.   Asset Data is empty for {0}", id);
-                
+                m_log.ErrorFormat("{0} OpenJpeg was unable to encode this.   Asset Data is empty for {1}", LogHeader, id);
             }
             return null;
             
@@ -273,9 +270,14 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
         // the heigthfield might have some jumps in values. Rendered land is smooth, though,
         // as a slope is rendered at that place. So average 4 neighbour values to emulate that.
+<<<<<<< HEAD
+        private float getHeight(ITerrainChannel hm, int x, int y) {
+            if (x < (hm.Width - 1) && y < (hm.Height - 1))
+=======
         private float getHeight(ITerrainChannel hm, int x, int y)
         {
             if (x < ((int)Constants.RegionSize - 1) && y < ((int)Constants.RegionSize - 1))
+>>>>>>> avn/ubitvar
                 return (float)(hm[x, y] * .444 + (hm[x + 1, y] + hm[x, y + 1]) * .222 + hm[x + 1, y +1] * .112);
             else
                 return (float)hm[x, y];
@@ -285,7 +287,15 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         public void TerrainToBitmap(Bitmap mapbmp)
         {
             int tc = Environment.TickCount;
-            m_log.Debug("[TEXTURED MAP TILE RENDERER]: Generating Maptile Step 1: Terrain");
+            m_log.DebugFormat("{0} Generating Maptile Step 1: Terrain", LogHeader);
+
+            ITerrainChannel hm = m_scene.Heightmap;
+
+            if (mapbmp.Width != hm.Width || mapbmp.Height != hm.Height)
+            {
+                m_log.ErrorFormat("{0} TerrainToBitmap. Passed bitmap wrong dimensions. passed=<{1},{2}>, size=<{3},{4}>",
+                    LogHeader, mapbmp.Width, mapbmp.Height, hm.Width, hm.Height);
+            }
 
             ITerrainChannel hm = m_scene.Heightmap;
 
@@ -429,4 +439,4 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             m_log.Debug("[TEXTURED MAP TILE RENDERER]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 601e81e..46b0470 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -595,6 +595,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         /// <returns>true if the url matches an entry on the whitelist, false otherwise</returns>
         protected bool CheckUrlAgainstWhitelist(string rawUrl, string[] whitelist)
         {
+            if (whitelist == null)
+                return false;
+
             Uri url = new Uri(rawUrl);
             
             foreach (string origWlUrl in whitelist)
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
index 03a96a4..ee57aed 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
@@ -39,7 +39,6 @@ using OpenSim.Region.CoreModules.World.Media.Moap;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
 {
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 014c845..0e0f05f 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -141,6 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
 
                 part.ObjectSaleType = 0;
                 part.SalePrice = 10;
+                part.ClickAction = Convert.ToByte(0);
 
                 group.HasGroupChanged = true;
                 part.SendPropertiesToClient(remoteClient);
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 928755d..12e8fb1 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using log4net;
 using Nini.Config;
@@ -160,7 +161,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             string permissionModules = Util.GetConfigVarFromSections<string>(config, "permissionmodules",
                 new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule");
 
-            List<string> modules = new List<string>(permissionModules.Split(','));
+            List<string> modules = new List<string>(permissionModules.Split(',').Select(m => m.Trim()));
 
             if (!modules.Contains("DefaultPermissionsModule"))
                 return;
@@ -468,7 +469,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return false;
         }
-            
+         
         /// <summary>
         /// Parse a user set configuration setting
         /// </summary>
@@ -800,8 +801,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             // Friends with benefits should be able to edit the objects too
             if (IsFriendWithPerms(currentUser, objectOwner))
+            {
                 // Return immediately, so that the administrator can share objects with friends
                 return true;
+            }
         
             // Users should be able to edit what is over their land.
             ILandObject parcel = m_scene.LandChannel.GetLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y);
@@ -900,7 +903,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return permission;
         }
     
-        protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers)
+        protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers, bool allowEstateManager)
         {
             if (parcel.LandData.OwnerID == user)
             {
@@ -915,7 +918,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 return true;
             }
     
-            if (IsEstateManager(user))
+            if (allowEstateManager && IsEstateManager(user))
             {
                 return true;
             }
@@ -942,7 +945,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
         
-            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandRelease);
+            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandRelease, false);
         }
 
         private bool CanReclaimParcel(UUID user, ILandObject parcel, Scene scene)
@@ -950,7 +953,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return GenericParcelOwnerPermission(user, parcel, 0);
+            return GenericParcelOwnerPermission(user, parcel, 0,true);
         }
 
         private bool CanDeedParcel(UUID user, ILandObject parcel, Scene scene)
@@ -967,7 +970,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if ((client.GetGroupPowers(parcel.LandData.GroupID) & (ulong)GroupPowers.LandDeed) == 0)
                 return false;
 
-            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandDeed);
+            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandDeed, false);
         }
 
         private bool CanDeedObject(UUID user, UUID group, Scene scene)
@@ -1008,9 +1011,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 return false;
 
             if (part.OwnerID == owner)
-                return ((part.OwnerMask & PERM_COPY) != 0);
-
-            if (part.GroupID != UUID.Zero)
+            {
+                if ((part.OwnerMask & PERM_COPY) == 0)
+                    return false;
+            }
+            else if (part.GroupID != UUID.Zero)
             {
                 if ((part.OwnerID == part.GroupID) && ((owner != part.LastOwnerID) || ((part.GroupMask & PERM_TRANS) == 0)))
                     return false;
@@ -1052,7 +1057,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return GenericParcelOwnerPermission(user, parcel, (ulong)p);
+            return GenericParcelOwnerPermission(user, parcel, (ulong)p, false);
         }
 
         /// <summary>
@@ -1451,29 +1456,33 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            bool permission = false;
-
 //            m_log.DebugFormat("[PERMISSIONS MODULE]: Checking rez object at {0} in {1}", objectPosition, m_scene.Name);
 
-            ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
-            if (land == null) return false;
-
-            if ((land.LandData.Flags & ((int)ParcelFlags.CreateObjects)) ==
-                (int)ParcelFlags.CreateObjects)
-                permission = true;
+            ILandObject parcel = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
+            if (parcel == null)
+                return false;
 
-            if (IsAdministrator(owner))
+            if ((parcel.LandData.Flags & (uint)ParcelFlags.CreateObjects) != 0)
             {
-                permission = true;
+                return true;
             }
-
-        // Powers are zero, because GroupPowers.AllowRez is not a precondition for rezzing objects
-            if (GenericParcelPermission(owner, objectPosition, 0))
+            else if ((owner == parcel.LandData.OwnerID) || IsAdministrator(owner))
             {
-                permission = true;
+                return true;
+            }
+            else if (((parcel.LandData.Flags & (uint)ParcelFlags.CreateGroupObjects) != 0)
+                && (parcel.LandData.GroupID != UUID.Zero) && IsGroupMember(parcel.LandData.GroupID, owner, 0))
+            {
+                return true;
+            }
+            else if (parcel.LandData.GroupID != UUID.Zero && IsGroupMember(parcel.LandData.GroupID, owner, (ulong)GroupPowers.AllowRez))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
             }
-
-            return permission;
         }
 
         private bool CanRunConsoleCommand(UUID user, Scene requestFromScene)
@@ -1498,7 +1507,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandSetSale);
+            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandSetSale, false);
         }
 
         private bool CanTakeObject(UUID objectID, UUID stealer, Scene scene)
@@ -1515,6 +1524,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
             bool permission = GenericObjectPermission(userID, objectID, false);
+
+            SceneObjectGroup so = (SceneObjectGroup)m_scene.Entities[objectID];
+
             if (!permission)
             {
                 if (!m_scene.Entities.ContainsKey(objectID))
@@ -1528,31 +1540,23 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                     return false;
                 }
 
-                SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
                 // UUID taskOwner = null;
                 // Added this because at this point in time it wouldn't be wise for
                 // the administrator object permissions to take effect.
                 // UUID objectOwner = task.OwnerID;
 
-                if ((task.RootPart.EveryoneMask & PERM_COPY) != 0)
+                if ((so.RootPart.EveryoneMask & PERM_COPY) != 0)
                     permission = true;
+            }
 
-                if (task.OwnerID != userID)
-                {
-                    if ((task.GetEffectivePermissions() & (PERM_COPY | PERM_TRANS)) != (PERM_COPY | PERM_TRANS))
-                        permission = false;
-                }
-                else
-                {
-                    if ((task.GetEffectivePermissions() & PERM_COPY) != PERM_COPY)
-                        permission = false;
-                }
+            if (so.OwnerID != userID)
+            {
+                if ((so.GetEffectivePermissions() & (PERM_COPY | PERM_TRANS)) != (PERM_COPY | PERM_TRANS))
+                    permission = false;
             }
             else
             {
-                SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
-
-                if ((task.GetEffectivePermissions() & (PERM_COPY | PERM_TRANS)) != (PERM_COPY | PERM_TRANS))
+                if ((so.GetEffectivePermissions() & PERM_COPY) != PERM_COPY)
                     permission = false;
             }
             
diff --git a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
index 7d35473..710c8da 100644
--- a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
@@ -81,7 +81,32 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_console.Commands.AddCommand(
                 "Regions", false, "show scene",
                 "show scene",
-                "Show live scene information for the currently selected region.", HandleShowScene);
+                "Show live information for the currently selected scene (fps, prims, etc.).", HandleShowScene);
+
+            m_console.Commands.AddCommand(
+                "Regions", false, "show region",
+                "show region",
+                "Show control information for the currently selected region (host name, max physical prim size, etc).", 
+                "A synonym for \"region get\"",
+                HandleShowRegion);
+
+            m_console.Commands.AddCommand(
+                "Regions", false, "region get",
+                "region get",
+                "Show control information for the currently selected region (host name, max physical prim size, etc).", 
+                "Some parameters can be set with the \"region set\" command.\n"
+                + "Others must be changed via a viewer (usually via the region/estate dialog box).",
+                HandleShowRegion);
+
+            m_console.Commands.AddCommand(
+                "Regions", false, "region set",
+                "region get",
+                "Set control information for the currently selected region.",
+                "Currently, the following parameters can be set:\n"
+                + "agent-limit <int>     - Current root agent limit.  This is persisted over restart.\n"
+                + "max-agent-limit <int> - Maximum root agent limit.  agent-limit cannot exceed this."
+                + "  This is not persisted over restart - to set it every time you must add a MaxAgents entry to your regions file.",
+                HandleRegionSet);
         }
 
         public void RemoveRegion(Scene scene)
@@ -94,6 +119,139 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
         }
 
+        private void HandleShowRegion(string module, string[] cmd)
+        {
+            if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
+                return;
+
+            RegionInfo ri = m_scene.RegionInfo;
+            RegionSettings rs = ri.RegionSettings;
+
+            StringBuilder sb = new StringBuilder();
+            sb.AppendFormat("Region information for {0}\n", m_scene.Name);
+
+            ConsoleDisplayList dispList = new ConsoleDisplayList();
+            dispList.AddRow("Region ID", ri.RegionID);
+            dispList.AddRow("Region handle", ri.RegionHandle);
+            dispList.AddRow("Region location", string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY));
+            dispList.AddRow("Region size", string.Format("{0}x{1}", ri.RegionSizeX, ri.RegionSizeY));
+            //dispList.AddRow("Region type", ri.RegionType);
+            dispList.AddRow("Maturity", rs.Maturity);
+            dispList.AddRow("Region address", ri.ServerURI);
+            dispList.AddRow("From region file", ri.RegionFile);
+            dispList.AddRow("External endpoint", ri.ExternalEndPoint);
+            dispList.AddRow("Internal endpoint", ri.InternalEndPoint);
+            dispList.AddRow("Access level", ri.AccessLevel);
+            dispList.AddRow("Agent limit", rs.AgentLimit);
+            dispList.AddRow("Max agent limit", ri.AgentCapacity);
+            dispList.AddRow("Linkset capacity", ri.LinksetCapacity <= 0 ? "not set" : ri.LinksetCapacity.ToString());
+            dispList.AddRow("Prim capacity", ri.ObjectCapacity);
+            dispList.AddRow("Prim bonus", rs.ObjectBonus);
+            dispList.AddRow("Max prims per user", ri.MaxPrimsPerUser < 0 ? "n/a" : ri.MaxPrimsPerUser.ToString());
+            dispList.AddRow("Clamp prim size", ri.ClampPrimSize);
+            dispList.AddRow("Non physical prim min size", ri.NonphysPrimMin <= 0 ? "not set" : string.Format("{0} m", ri.NonphysPrimMin));
+            dispList.AddRow("Non physical prim max size", ri.NonphysPrimMax <= 0 ? "not set" : string.Format("{0} m", ri.NonphysPrimMax));
+            dispList.AddRow("Physical prim min size", ri.PhysPrimMin <= 0 ? "not set" : string.Format("{0} m", ri.PhysPrimMin));
+            dispList.AddRow("Physical prim max size", ri.PhysPrimMax <= 0 ? "not set" : string.Format("{0} m", ri.PhysPrimMax));
+
+            dispList.AddRow("Allow Damage", rs.AllowDamage);
+            dispList.AddRow("Allow Land join/divide", rs.AllowLandJoinDivide);
+            dispList.AddRow("Allow land resell", rs.AllowLandResell);
+            dispList.AddRow("Block fly", rs.BlockFly);
+            dispList.AddRow("Block show in search", rs.BlockShowInSearch);
+            dispList.AddRow("Block terraform", rs.BlockTerraform);
+            dispList.AddRow("Covenant UUID", rs.Covenant);
+            dispList.AddRow("Convenant change Unix time", rs.CovenantChangedDateTime);
+            dispList.AddRow("Disable collisions", rs.DisableCollisions);
+            dispList.AddRow("Disable physics", rs.DisablePhysics);
+            dispList.AddRow("Disable scripts", rs.DisableScripts);
+            dispList.AddRow("Restrict pushing", rs.RestrictPushing);
+            dispList.AddRow("Fixed sun", rs.FixedSun);
+            dispList.AddRow("Sun position", rs.SunPosition);
+            dispList.AddRow("Sun vector", rs.SunVector);
+            dispList.AddRow("Use estate sun", rs.UseEstateSun);
+            dispList.AddRow("Telehub UUID", rs.TelehubObject);
+            dispList.AddRow("Terrain lower limit", string.Format("{0} m", rs.TerrainLowerLimit));
+            dispList.AddRow("Terrain raise limit", string.Format("{0} m", rs.TerrainRaiseLimit));
+            dispList.AddRow("Water height", string.Format("{0} m", rs.WaterHeight));
+
+            dispList.AddRow("Maptile static file", ri.MaptileStaticFile);
+            dispList.AddRow("Maptile static UUID", ri.MaptileStaticUUID);
+            dispList.AddRow("Last map refresh", ri.lastMapRefresh);
+            dispList.AddRow("Last map UUID", ri.lastMapUUID);
+
+            dispList.AddToStringBuilder(sb);
+
+            MainConsole.Instance.Output(sb.ToString());
+        }
+
+        private void HandleRegionSet(string module, string[] args)
+        {
+            if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
+                return;
+
+            if (args.Length != 4)
+            {
+                MainConsole.Instance.OutputFormat("Usage: region set <param> <value>");
+                return;
+            }           
+
+            string param = args[2];
+            string rawValue = args[3];
+
+            if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
+                return;
+
+            RegionInfo ri = m_scene.RegionInfo;
+            RegionSettings rs = ri.RegionSettings;
+
+            if (param == "agent-limit")
+            {
+                int newValue;
+
+                if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, rawValue, out newValue))
+                    return;
+
+                if (newValue > ri.AgentCapacity)
+                {
+                    MainConsole.Instance.OutputFormat(
+                        "Cannot set {0} to {1} in {2} as max-agent-limit is {3}", "agent-limit", 
+                        newValue, m_scene.Name, ri.AgentCapacity);
+                }
+                else
+                {
+                    rs.AgentLimit = newValue;
+
+                    MainConsole.Instance.OutputFormat(
+                        "{0} set to {1} in {2}", "agent-limit", newValue, m_scene.Name);
+                }
+
+                rs.Save();
+            }
+            else if (param == "max-agent-limit")
+            {
+                int newValue;
+
+                if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, rawValue, out newValue))
+                    return;
+
+                ri.AgentCapacity = newValue;
+
+                MainConsole.Instance.OutputFormat(
+                    "{0} set to {1} in {2}", "max-agent-limit", newValue, m_scene.Name);
+
+                if (ri.AgentCapacity < rs.AgentLimit)
+                {
+                    rs.AgentLimit = ri.AgentCapacity;
+
+                    MainConsole.Instance.OutputFormat(
+                        "Reducing {0} to {1} in {2}", "agent-limit", rs.AgentLimit, m_scene.Name);
+                }
+
+                rs.Save();
+            }
+        }
+
         private void HandleShowScene(string module, string[] cmd)
         {
             if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
index 328fbf0..65f464a 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
@@ -54,13 +54,14 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
         {
             string xmlstream = GetObjectXml(scene);
 
-            MemoryStream stream = ReformatXmlString(xmlstream);
-
-            stream.Seek(0, SeekOrigin.Begin);
-            CreateXmlFile(stream, fileName);
+            using (MemoryStream stream = ReformatXmlString(xmlstream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                CreateXmlFile(stream, fileName);
 
-            stream.Seek(0, SeekOrigin.Begin);
-            CreateCompressedXmlFile(stream, fileName);
+                stream.Seek(0, SeekOrigin.Begin);
+                CreateCompressedXmlFile(stream, fileName);
+            }
         }
 
         private static MemoryStream ReformatXmlString(string xmlstream)
@@ -112,13 +113,16 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
         {
             #region GZip Compressed Version
 
-            FileStream objectsFileCompressed = new FileStream(fileName + ".gzs", FileMode.Create);
-            MemoryStream gzipMSStream = new MemoryStream();
-            GZipStream gzipStream = new GZipStream(gzipMSStream, CompressionMode.Compress);
-            xmlStream.WriteTo(gzipStream);
-            gzipMSStream.WriteTo(objectsFileCompressed);
-            objectsFileCompressed.Flush();
-            objectsFileCompressed.Close();
+            using (FileStream objectsFileCompressed = new FileStream(fileName + ".gzs", FileMode.Create))
+            using (MemoryStream gzipMSStream = new MemoryStream())
+            {
+                using (GZipStream gzipStream = new GZipStream(gzipMSStream, CompressionMode.Compress, true))
+                {
+                    xmlStream.WriteTo(gzipStream);
+                }
+
+                gzipMSStream.WriteTo(objectsFileCompressed);
+            }
 
             #endregion
         }
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index 66059fb..a5bb1a7 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -27,6 +27,7 @@
 
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using System.Xml;
 using log4net.Config;
 using NUnit.Framework;
@@ -42,128 +43,351 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
     [TestFixture]
     public class SerialiserTests : OpenSimTestCase
     {
-        private string xml = @"
-        <SceneObjectGroup>
-            <RootPart>
-                <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
-                    <AllowedDrop>false</AllowedDrop>
-                    <CreatorID><Guid>a6dacf01-4636-4bb9-8a97-30609438af9d</Guid></CreatorID>
-                    <FolderID><Guid>e6a5a05e-e8cc-4816-8701-04165e335790</Guid></FolderID>
-                    <InventorySerial>1</InventorySerial>
-                    <TaskInventory />
-                    <ObjectFlags>0</ObjectFlags>
-                    <UUID><Guid>e6a5a05e-e8cc-4816-8701-04165e335790</Guid></UUID>
-                    <LocalId>2698615125</LocalId>
-                    <Name>PrimMyRide</Name>
-                    <Material>0</Material>
-                    <PassTouches>false</PassTouches>
-                    <RegionHandle>1099511628032000</RegionHandle>
-                    <ScriptAccessPin>0</ScriptAccessPin>
-                    <GroupPosition><X>147.23</X><Y>92.698</Y><Z>22.78084</Z></GroupPosition>
-                    <OffsetPosition><X>0</X><Y>0</Y><Z>0</Z></OffsetPosition>
-                    <RotationOffset><X>-4.371139E-08</X><Y>-1</Y><Z>-4.371139E-08</Z><W>0</W></RotationOffset>
-                    <Velocity><X>0</X><Y>0</Y><Z>0</Z></Velocity>
-                    <RotationalVelocity><X>0</X><Y>0</Y><Z>0</Z></RotationalVelocity>
-                    <AngularVelocity><X>0</X><Y>0</Y><Z>0</Z></AngularVelocity>
-                    <Acceleration><X>0</X><Y>0</Y><Z>0</Z></Acceleration>
-                    <Description />
-                    <Color />
-                    <Text />
-                    <SitName />
-                    <TouchName />
-                    <LinkNum>0</LinkNum>
-                    <ClickAction>0</ClickAction>
-                    <Shape>
-                        <ProfileCurve>1</ProfileCurve>
-                        <TextureEntry>AAAAAAAAERGZmQAAAAAABQCVlZUAAAAAQEAAAABAQAAAAAAAAAAAAAAAAAAAAA==</TextureEntry>
-                        <ExtraParams>AA==</ExtraParams>
-                        <PathBegin>0</PathBegin>
-                        <PathCurve>16</PathCurve>
-                        <PathEnd>0</PathEnd>
-                        <PathRadiusOffset>0</PathRadiusOffset>
-                        <PathRevolutions>0</PathRevolutions>
-                        <PathScaleX>100</PathScaleX>
-                        <PathScaleY>100</PathScaleY>
-                        <PathShearX>0</PathShearX>
-                        <PathShearY>0</PathShearY>
-                        <PathSkew>0</PathSkew>
-                        <PathTaperX>0</PathTaperX>
-                        <PathTaperY>0</PathTaperY>
-                        <PathTwist>0</PathTwist>
-                        <PathTwistBegin>0</PathTwistBegin>
-                        <PCode>9</PCode>
-                        <ProfileBegin>0</ProfileBegin>
-                        <ProfileEnd>0</ProfileEnd>
-                        <ProfileHollow>0</ProfileHollow>
-                        <Scale><X>10</X><Y>10</Y><Z>0.5</Z></Scale>
-                        <State>0</State>
-                        <ProfileShape>Square</ProfileShape>
-                        <HollowShape>Same</HollowShape>
-                        <SculptTexture><Guid>00000000-0000-0000-0000-000000000000</Guid></SculptTexture>
-                        <SculptType>0</SculptType><SculptData />
-                        <FlexiSoftness>0</FlexiSoftness>
-                        <FlexiTension>0</FlexiTension>
-                        <FlexiDrag>0</FlexiDrag>
-                        <FlexiGravity>0</FlexiGravity>
-                        <FlexiWind>0</FlexiWind>
-                        <FlexiForceX>0</FlexiForceX>
-                        <FlexiForceY>0</FlexiForceY>
-                        <FlexiForceZ>0</FlexiForceZ>
-                        <LightColorR>0</LightColorR>
-                        <LightColorG>0</LightColorG>
-                        <LightColorB>0</LightColorB>
-                        <LightColorA>1</LightColorA>
-                        <LightRadius>0</LightRadius>
-                        <LightCutoff>0</LightCutoff>
-                        <LightFalloff>0</LightFalloff>
-                        <LightIntensity>1</LightIntensity>
-                        <FlexiEntry>false</FlexiEntry>
-                        <LightEntry>false</LightEntry>
-                        <SculptEntry>false</SculptEntry>
-                    </Shape>
-                    <Scale><X>10</X><Y>10</Y><Z>0.5</Z></Scale>
-                    <UpdateFlag>0</UpdateFlag>
-                    <SitTargetOrientation><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientation>
-                    <SitTargetPosition><X>0</X><Y>0</Y><Z>0</Z></SitTargetPosition>
-                    <SitTargetPositionLL><X>0</X><Y>0</Y><Z>0</Z></SitTargetPositionLL>
-                    <SitTargetOrientationLL><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientationLL>
-                    <ParentID>0</ParentID>
-                    <CreationDate>1211330445</CreationDate>
-                    <Category>0</Category>
-                    <SalePrice>0</SalePrice>
-                    <ObjectSaleType>0</ObjectSaleType>
-                    <OwnershipCost>0</OwnershipCost>
-                    <GroupID><Guid>00000000-0000-0000-0000-000000000000</Guid></GroupID>
-                    <OwnerID><Guid>a6dacf01-4636-4bb9-8a97-30609438af9d</Guid></OwnerID>
-                    <LastOwnerID><Guid>a6dacf01-4636-4bb9-8a97-30609438af9d</Guid></LastOwnerID>
-                    <BaseMask>2147483647</BaseMask>
-                    <OwnerMask>2147483647</OwnerMask>
-                    <GroupMask>0</GroupMask>
-                    <EveryoneMask>0</EveryoneMask>
-                    <NextOwnerMask>2147483647</NextOwnerMask>
-                    <Flags>None</Flags>
-                    <CollisionSound><Guid>00000000-0000-0000-0000-000000000000</Guid></CollisionSound>
-                    <CollisionSoundVolume>0</CollisionSoundVolume>
-                    <DynAttrs>
-                        <llsd>
-                            <map>
-                                <key>MyNamespace</key>
-                                <map>                                
-                                    <key>MyStore</key>
-                                    <map>   
-                                        <key>the answer</key>
-                                        <integer>42</integer>
-                                    </map>
-                                </map>
+        private const string ObjectRootPartStubXml = 
+@"<SceneObjectGroup>
+    <RootPart>
+        <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
+            <AllowedDrop>false</AllowedDrop>
+            <CreatorID><Guid>a6dacf01-4636-4bb9-8a97-30609438af9d</Guid></CreatorID>
+            <FolderID><Guid>e6a5a05e-e8cc-4816-8701-04165e335790</Guid></FolderID>
+            <InventorySerial>1</InventorySerial>
+            <TaskInventory />
+            <ObjectFlags>0</ObjectFlags>
+            <UUID><Guid>e6a5a05e-e8cc-4816-8701-04165e335790</Guid></UUID>
+            <LocalId>2698615125</LocalId>
+            <Name>PrimMyRide</Name>
+            <Material>0</Material>
+            <PassTouches>false</PassTouches>
+            <RegionHandle>1099511628032000</RegionHandle>
+            <ScriptAccessPin>0</ScriptAccessPin>
+            <GroupPosition><X>147.23</X><Y>92.698</Y><Z>22.78084</Z></GroupPosition>
+            <OffsetPosition><X>0</X><Y>0</Y><Z>0</Z></OffsetPosition>
+            <RotationOffset><X>-4.371139E-08</X><Y>-1</Y><Z>-4.371139E-08</Z><W>0</W></RotationOffset>
+            <Velocity><X>0</X><Y>0</Y><Z>0</Z></Velocity>
+            <RotationalVelocity><X>0</X><Y>0</Y><Z>0</Z></RotationalVelocity>
+            <AngularVelocity><X>0</X><Y>0</Y><Z>0</Z></AngularVelocity>
+            <Acceleration><X>0</X><Y>0</Y><Z>0</Z></Acceleration>
+            <Description />
+            <Color />
+            <Text />
+            <SitName />
+            <TouchName />
+            <LinkNum>0</LinkNum>
+            <ClickAction>0</ClickAction>
+            <Shape>
+                <ProfileCurve>1</ProfileCurve>
+                <TextureEntry>AAAAAAAAERGZmQAAAAAABQCVlZUAAAAAQEAAAABAQAAAAAAAAAAAAAAAAAAAAA==</TextureEntry>
+                <ExtraParams>AA==</ExtraParams>
+                <PathBegin>0</PathBegin>
+                <PathCurve>16</PathCurve>
+                <PathEnd>0</PathEnd>
+                <PathRadiusOffset>0</PathRadiusOffset>
+                <PathRevolutions>0</PathRevolutions>
+                <PathScaleX>100</PathScaleX>
+                <PathScaleY>100</PathScaleY>
+                <PathShearX>0</PathShearX>
+                <PathShearY>0</PathShearY>
+                <PathSkew>0</PathSkew>
+                <PathTaperX>0</PathTaperX>
+                <PathTaperY>0</PathTaperY>
+                <PathTwist>0</PathTwist>
+                <PathTwistBegin>0</PathTwistBegin>
+                <PCode>9</PCode>
+                <ProfileBegin>0</ProfileBegin>
+                <ProfileEnd>0</ProfileEnd>
+                <ProfileHollow>0</ProfileHollow>
+                <Scale><X>10</X><Y>10</Y><Z>0.5</Z></Scale>
+                <State>0</State>
+                <ProfileShape>Square</ProfileShape>
+                <HollowShape>Same</HollowShape>
+                <SculptTexture><Guid>00000000-0000-0000-0000-000000000000</Guid></SculptTexture>
+                <SculptType>0</SculptType><SculptData />
+                <FlexiSoftness>0</FlexiSoftness>
+                <FlexiTension>0</FlexiTension>
+                <FlexiDrag>0</FlexiDrag>
+                <FlexiGravity>0</FlexiGravity>
+                <FlexiWind>0</FlexiWind>
+                <FlexiForceX>0</FlexiForceX>
+                <FlexiForceY>0</FlexiForceY>
+                <FlexiForceZ>0</FlexiForceZ>
+                <LightColorR>0</LightColorR>
+                <LightColorG>0</LightColorG>
+                <LightColorB>0</LightColorB>
+                <LightColorA>1</LightColorA>
+                <LightRadius>0</LightRadius>
+                <LightCutoff>0</LightCutoff>
+                <LightFalloff>0</LightFalloff>
+                <LightIntensity>1</LightIntensity>
+                <FlexiEntry>false</FlexiEntry>
+                <LightEntry>false</LightEntry>
+                <SculptEntry>false</SculptEntry>
+            </Shape>
+            <Scale><X>10</X><Y>10</Y><Z>0.5</Z></Scale>
+            <UpdateFlag>0</UpdateFlag>
+            <SitTargetOrientation><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientation>
+            <SitTargetPosition><X>0</X><Y>0</Y><Z>0</Z></SitTargetPosition>
+            <SitTargetPositionLL><X>0</X><Y>0</Y><Z>0</Z></SitTargetPositionLL>
+            <SitTargetOrientationLL><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientationLL>
+            <ParentID>0</ParentID>
+            <CreationDate>1211330445</CreationDate>
+            <Category>0</Category>
+            <SalePrice>0</SalePrice>
+            <ObjectSaleType>0</ObjectSaleType>
+            <OwnershipCost>0</OwnershipCost>
+            <GroupID><Guid>00000000-0000-0000-0000-000000000000</Guid></GroupID>
+            <OwnerID><Guid>a6dacf01-4636-4bb9-8a97-30609438af9d</Guid></OwnerID>
+            <LastOwnerID><Guid>a6dacf01-4636-4bb9-8a97-30609438af9d</Guid></LastOwnerID>
+            <BaseMask>2147483647</BaseMask>
+            <OwnerMask>2147483647</OwnerMask>
+            <GroupMask>0</GroupMask>
+            <EveryoneMask>0</EveryoneMask>
+            <NextOwnerMask>2147483647</NextOwnerMask>
+            <Flags>None</Flags>
+            <CollisionSound><Guid>00000000-0000-0000-0000-000000000000</Guid></CollisionSound>
+            <CollisionSoundVolume>0</CollisionSoundVolume>
+            <DynAttrs>
+                <llsd>
+                    <map>
+                        <key>MyNamespace</key>
+                        <map>                                
+                            <key>MyStore</key>
+                            <map>   
+                                <key>the answer</key>
+                                <integer>42</integer>
                             </map>
-                        </llsd>
-                    </DynAttrs>
-                </SceneObjectPart>
-            </RootPart>
-            <OtherParts />
-        </SceneObjectGroup>";
-
-        private string badFloatsXml = @"
+                        </map>
+                    </map>
+                </llsd>
+            </DynAttrs>
+        </SceneObjectPart>
+    </RootPart>";
+
+        private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml + 
+@"
+    <OtherParts />
+</SceneObjectGroup>";
+
+        private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml + 
+@"
+  <OtherParts>
+    <Part>
+      <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
+        <AllowedDrop>false</AllowedDrop>
+        <CreatorID><Guid>a6dacf01-4636-4bb9-8a97-30609438af9d</Guid></CreatorID>
+        <FolderID><Guid>9958feb1-02a6-49e4-a4ce-eba6f578ee13</Guid></FolderID>
+        <InventorySerial>3</InventorySerial>
+        <UUID><Guid>9958feb1-02a6-49e4-a4ce-eba6f578ee13</Guid></UUID>
+        <LocalId>1154704500</LocalId>
+        <Name>Alien Head 1</Name>
+        <Material>3</Material>
+        <PassTouches>false</PassTouches>
+        <PassCollisions>false</PassCollisions>
+        <RegionHandle>21990232560640000</RegionHandle>
+        <ScriptAccessPin>0</ScriptAccessPin>
+        <GroupPosition><X>125.5655</X><Y>127.346</Y><Z>22.48036</Z></GroupPosition>
+        <OffsetPosition><X>-0.2171936</X><Y>0.1083984</Y><Z>0.0009994507</Z></OffsetPosition>
+        <RotationOffset><X>-0.5122106</X><Y>0.4851225</Y><Z>-0.4957454</Z><W>0.5064908</W></RotationOffset>
+        <Velocity><X>0</X><Y>0</Y><Z>0</Z></Velocity>
+        <AngularVelocity><X>0</X><Y>0</Y><Z>0</Z></AngularVelocity>
+        <Acceleration><X>0</X><Y>0</Y><Z>0</Z></Acceleration>
+        <Description>(No Description)</Description>
+        <Color><R>0</R><G>0</G><B>0</B><A>255</A></Color>
+        <Text/>
+        <SitName/>
+        <TouchName/>
+        <LinkNum>253</LinkNum>
+        <ClickAction>0</ClickAction>
+        <Shape>
+          <ProfileCurve>5</ProfileCurve>
+          <TextureEntry>Vw3dpvgTRUOiIUOGsnpWlAB/f38AAAAAgL8AAACAPwAAAAAAAAAF4ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</TextureEntry>
+          <ExtraParams>AA==</ExtraParams>
+          <PathBegin>0</PathBegin>
+          <PathCurve>32</PathCurve>
+          <PathEnd>0</PathEnd>
+          <PathRadiusOffset>0</PathRadiusOffset>
+          <PathRevolutions>0</PathRevolutions>
+          <PathScaleX>100</PathScaleX>
+          <PathScaleY>100</PathScaleY>
+          <PathShearX>0</PathShearX>
+          <PathShearY>0</PathShearY>
+          <PathSkew>0</PathSkew>
+          <PathTaperX>0</PathTaperX>
+          <PathTaperY>0</PathTaperY>
+          <PathTwist>0</PathTwist>
+          <PathTwistBegin>0</PathTwistBegin>
+          <PCode>9</PCode>
+          <ProfileBegin>0</ProfileBegin>
+          <ProfileEnd>0</ProfileEnd>
+          <ProfileHollow>0</ProfileHollow>
+          <State>9</State>
+          <LastAttachPoint>0</LastAttachPoint>
+          <ProfileShape>HalfCircle</ProfileShape>
+          <HollowShape>Same</HollowShape>
+          <SculptTexture><Guid>00000000-0000-0000-0000-000000000000</Guid></SculptTexture>
+          <SculptType>0</SculptType>
+          <FlexiSoftness>0</FlexiSoftness>
+          <FlexiTension>0</FlexiTension>
+          <FlexiDrag>0</FlexiDrag>
+          <FlexiGravity>0</FlexiGravity>
+          <FlexiWind>0</FlexiWind>
+          <FlexiForceX>0</FlexiForceX>
+          <FlexiForceY>0</FlexiForceY>
+          <FlexiForceZ>0</FlexiForceZ>
+          <LightColorR>0</LightColorR>
+          <LightColorG>0</LightColorG>
+          <LightColorB>0</LightColorB>
+          <LightColorA>1</LightColorA>
+          <LightRadius>0</LightRadius>
+          <LightCutoff>0</LightCutoff>
+          <LightFalloff>0</LightFalloff>
+          <LightIntensity>1</LightIntensity>
+          <FlexiEntry>false</FlexiEntry>
+          <LightEntry>false</LightEntry>
+          <SculptEntry>false</SculptEntry>
+        </Shape>
+        <Scale><X>0.1148195</X><Y>0.0143891</Y><Z>0.02768878</Z></Scale>
+        <SitTargetOrientation><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientation>
+        <SitTargetPosition><X>0</X><Y>0</Y><Z>0</Z></SitTargetPosition>
+        <SitTargetPositionLL><X>0</X><Y>0</Y><Z>0</Z></SitTargetPositionLL>
+        <SitTargetOrientationLL><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientationLL>
+        <ParentID>1154704499</ParentID>
+        <CreationDate>1256611042</CreationDate>
+        <Category>0</Category>
+        <SalePrice>10</SalePrice>
+        <ObjectSaleType>0</ObjectSaleType>
+        <OwnershipCost>0</OwnershipCost>
+        <GroupID><Guid>00000000-0000-0000-0000-000000000000</Guid></GroupID>
+        <OwnerID><Guid>7b2022f0-5f19-488c-b7e5-829d8f96b448</Guid></OwnerID>
+        <LastOwnerID><Guid>7b2022f0-5f19-488c-b7e5-829d8f96b448</Guid></LastOwnerID>
+        <BaseMask>647168</BaseMask>
+        <OwnerMask>647168</OwnerMask>
+        <GroupMask>0</GroupMask>
+        <EveryoneMask>0</EveryoneMask>
+        <NextOwnerMask>581632</NextOwnerMask>
+        <Flags>None</Flags>
+        <CollisionSound><Guid>00000000-0000-0000-0000-000000000000</Guid></CollisionSound>
+        <CollisionSoundVolume>0</CollisionSoundVolume>
+        <AttachedPos><X>0</X><Y>0</Y><Z>0</Z></AttachedPos>
+        <TextureAnimation/>
+        <ParticleSystem/>
+        <PayPrice0>-2</PayPrice0>
+        <PayPrice1>-2</PayPrice1>
+        <PayPrice2>-2</PayPrice2>
+        <PayPrice3>-2</PayPrice3>
+        <PayPrice4>-2</PayPrice4>
+      </SceneObjectPart>
+    </Part>
+    <Part>
+      <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
+        <AllowedDrop>false</AllowedDrop>
+        <CreatorID><Guid>a6dacf01-4636-4bb9-8a97-30609438af9d</Guid></CreatorID>
+        <FolderID><Guid>674b6b86-f5aa-439a-8e00-0d75bc08c80a</Guid></FolderID>
+        <InventorySerial>3</InventorySerial>
+        <UUID><Guid>674b6b86-f5aa-439a-8e00-0d75bc08c80a</Guid></UUID>
+        <LocalId>1154704501</LocalId>
+        <Name>Alien Head 2</Name>
+        <Material>3</Material>
+        <PassTouches>false</PassTouches>
+        <PassCollisions>false</PassCollisions>
+        <RegionHandle>21990232560640000</RegionHandle>
+        <ScriptAccessPin>0</ScriptAccessPin>
+        <GroupPosition><X>125.5655</X><Y>127.346</Y><Z>22.48036</Z></GroupPosition>
+        <OffsetPosition><X>-0.2490997</X><Y>0.08520126</Y><Z>0.0009002686</Z></OffsetPosition>
+        <RotationOffset><X>-0.4765368</X><Y>0.5194498</Y><Z>-0.5301372</Z><W>0.4712104</W></RotationOffset>
+        <Velocity><X>0</X><Y>0</Y><Z>0</Z></Velocity>
+        <AngularVelocity><X>0</X><Y>0</Y><Z>0</Z></AngularVelocity>
+        <Acceleration><X>0</X><Y>0</Y><Z>0</Z></Acceleration>
+        <Description>(No Description)</Description>
+        <Color><R>0</R><G>0</G><B>0</B><A>255</A></Color>
+        <Text/>
+        <SitName/>
+        <TouchName/>
+        <LinkNum>252</LinkNum>
+        <ClickAction>0</ClickAction>
+        <Shape>
+          <ProfileCurve>0</ProfileCurve>
+          <TextureEntry>Vw3dpvgTRUOiIUOGsnpWlAB/f38AAAAAgL8AAACAPwAAAAAAAAAF4ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</TextureEntry>
+          <ExtraParams>AA==</ExtraParams>
+          <PathBegin>0</PathBegin>
+          <PathCurve>32</PathCurve>
+          <PathEnd>0</PathEnd>
+          <PathRadiusOffset>0</PathRadiusOffset>
+          <PathRevolutions>0</PathRevolutions>
+          <PathScaleX>100</PathScaleX>
+          <PathScaleY>150</PathScaleY>
+          <PathShearX>0</PathShearX>
+          <PathShearY>0</PathShearY>
+          <PathSkew>0</PathSkew>
+          <PathTaperX>0</PathTaperX>
+          <PathTaperY>0</PathTaperY>
+          <PathTwist>0</PathTwist>
+          <PathTwistBegin>0</PathTwistBegin>
+          <PCode>9</PCode>
+          <ProfileBegin>0</ProfileBegin>
+          <ProfileEnd>0</ProfileEnd>
+          <ProfileHollow>0</ProfileHollow>
+          <State>9</State>
+          <LastAttachPoint>0</LastAttachPoint>
+          <ProfileShape>Circle</ProfileShape>
+          <HollowShape>Same</HollowShape>
+          <SculptTexture><Guid>00000000-0000-0000-0000-000000000000</Guid></SculptTexture>
+          <SculptType>0</SculptType>
+          <FlexiSoftness>0</FlexiSoftness>
+          <FlexiTension>0</FlexiTension>
+          <FlexiDrag>0</FlexiDrag>
+          <FlexiGravity>0</FlexiGravity>
+          <FlexiWind>0</FlexiWind>
+          <FlexiForceX>0</FlexiForceX>
+          <FlexiForceY>0</FlexiForceY>
+          <FlexiForceZ>0</FlexiForceZ>
+          <LightColorR>0</LightColorR>
+          <LightColorG>0</LightColorG>
+          <LightColorB>0</LightColorB>
+          <LightColorA>1</LightColorA>
+          <LightRadius>0</LightRadius>
+          <LightCutoff>0</LightCutoff>
+          <LightFalloff>0</LightFalloff>
+          <LightIntensity>1</LightIntensity>
+          <FlexiEntry>false</FlexiEntry>
+          <LightEntry>false</LightEntry>
+          <SculptEntry>false</SculptEntry>
+        </Shape>
+        <Scale><X>0.03574385</X><Y>0.05958032</Y><Z>0.04764182</Z></Scale>
+        <SitTargetOrientation><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientation>
+        <SitTargetPosition><X>0</X><Y>0</Y><Z>0</Z></SitTargetPosition>
+        <SitTargetPositionLL><X>0</X><Y>0</Y><Z>0</Z></SitTargetPositionLL>
+        <SitTargetOrientationLL><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientationLL>
+        <ParentID>1154704499</ParentID>
+        <CreationDate>1256611042</CreationDate>
+        <Category>0</Category>
+        <SalePrice>10</SalePrice>
+        <ObjectSaleType>0</ObjectSaleType>
+        <OwnershipCost>0</OwnershipCost>
+        <GroupID><Guid>00000000-0000-0000-0000-000000000000</Guid></GroupID>
+        <OwnerID><Guid>7b2022f0-5f19-488c-b7e5-829d8f96b448</Guid></OwnerID>
+        <LastOwnerID><Guid>7b2022f0-5f19-488c-b7e5-829d8f96b448</Guid></LastOwnerID>
+        <BaseMask>647168</BaseMask>
+        <OwnerMask>647168</OwnerMask>
+        <GroupMask>0</GroupMask>
+        <EveryoneMask>0</EveryoneMask>
+        <NextOwnerMask>581632</NextOwnerMask>
+        <Flags>None</Flags>
+        <CollisionSound><Guid>00000000-0000-0000-0000-000000000000</Guid></CollisionSound>
+        <CollisionSoundVolume>0</CollisionSoundVolume>
+        <AttachedPos><X>0</X><Y>0</Y><Z>0</Z></AttachedPos>
+        <TextureAnimation/>
+        <ParticleSystem/>
+        <PayPrice0>-2</PayPrice0>
+        <PayPrice1>-2</PayPrice1>
+        <PayPrice2>-2</PayPrice2>
+        <PayPrice3>-2</PayPrice3>
+        <PayPrice4>-2</PayPrice4>
+      </SceneObjectPart>
+    </Part>
+  </OtherParts>
+</SceneObjectGroup>";
+
+        private const string ObjectWithBadFloatsXml = @"
         <SceneObjectGroup>
             <RootPart>
                 <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
@@ -270,7 +494,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             <OtherParts />
         </SceneObjectGroup>";
 
-        private string xml2 = @"
+        private const string ObjectWithNoPartsXml2 = @"
         <SceneObjectGroup>
             <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
                 <CreatorID><UUID>b46ef588-411e-4a8b-a284-d7dcfe8e74ef</UUID></CreatorID>
@@ -377,12 +601,12 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
         }
 
         [Test]
-        public void TestDeserializeXml()
+        public void TestDeserializeXmlObjectWithNoOtherParts()
         {
             TestHelpers.InMethod();
-            //log4net.Config.XmlConfigurator.Configure();
+            TestHelpers.EnableLogging();
 
-            SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(xml);
+            SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(ObjectWithNoOtherPartsXml);
             SceneObjectPart rootPart = so.RootPart;
 
             Assert.That(rootPart.UUID, Is.EqualTo(new UUID("e6a5a05e-e8cc-4816-8701-04165e335790")));
@@ -395,12 +619,51 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
         }
 
         [Test]
+        public void TestDeserializeXmlObjectWithOtherParts()
+        {
+            TestHelpers.InMethod();
+            TestHelpers.EnableLogging();
+
+            SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(ObjectWithOtherPartsXml);
+            SceneObjectPart[] parts = so.Parts;
+            Assert.AreEqual(3, so.Parts.Length);
+
+            {
+                SceneObjectPart part = parts[0];
+
+                Assert.That(part.UUID, Is.EqualTo(new UUID("e6a5a05e-e8cc-4816-8701-04165e335790")));
+                Assert.That(part.CreatorID, Is.EqualTo(new UUID("a6dacf01-4636-4bb9-8a97-30609438af9d")));
+                Assert.That(part.Name, Is.EqualTo("PrimMyRide"));
+                OSDMap store = part.DynAttrs.GetStore("MyNamespace", "MyStore");
+                Assert.AreEqual(42, store["the answer"].AsInteger());
+            }                                    
+
+            {
+                SceneObjectPart part = parts[1];
+
+                Assert.That(part.UUID, Is.EqualTo(new UUID("9958feb1-02a6-49e4-a4ce-eba6f578ee13")));
+                Assert.That(part.CreatorID, Is.EqualTo(new UUID("a6dacf01-4636-4bb9-8a97-30609438af9d")));
+                Assert.That(part.Name, Is.EqualTo("Alien Head 1"));
+            }
+
+            {
+                SceneObjectPart part = parts[2];
+
+                Assert.That(part.UUID, Is.EqualTo(new UUID("674b6b86-f5aa-439a-8e00-0d75bc08c80a")));
+                Assert.That(part.CreatorID, Is.EqualTo(new UUID("a6dacf01-4636-4bb9-8a97-30609438af9d")));
+                Assert.That(part.Name, Is.EqualTo("Alien Head 2"));
+            }
+
+            // TODO: Check other properties
+        }
+
+        [Test]
         public void TestDeserializeBadFloatsXml()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(badFloatsXml);
+            SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(ObjectWithBadFloatsXml);
             SceneObjectPart rootPart = so.RootPart;
 
             Assert.That(rootPart.UUID, Is.EqualTo(new UUID("e6a5a05e-e8cc-4816-8701-04165e335790")));
@@ -517,7 +780,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
 
-            SceneObjectGroup so = m_serialiserModule.DeserializeGroupFromXml2(xml2);
+            SceneObjectGroup so = m_serialiserModule.DeserializeGroupFromXml2(ObjectWithNoPartsXml2);
             SceneObjectPart rootPart = so.RootPart;
 
             Assert.That(rootPart.UUID, Is.EqualTo(new UUID("9be68fdd-f740-4a0f-9675-dfbbb536b946")));
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index 6f344c8..d0318eb 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -68,9 +68,6 @@ namespace OpenSim.Region.CoreModules
         // updating those region settings in GenSunPos()
         private bool receivedEstateToolsSunUpdate = false;
 
-        // Configurable values
-        private string m_RegionMode               = "SL";
-
         // Sun's position information is updated and sent to clients every m_UpdateInterval frames
         private int    m_UpdateInterval           = 0;
 
@@ -90,7 +87,6 @@ namespace OpenSim.Region.CoreModules
         // private double m_longitude      = 0;
         // private double m_latitude       = 0;
         // Configurable defaults                     Defaults close to SL
-        private string d_mode           = "SL";
         private int    d_frame_mod      = 100;    // Every 10 seconds (actually less)
         private double d_day_length     = 4;      // A VW day is 4 RW hours long
         private int    d_year_length    = 60;     // There are 60 VW days in a VW year
@@ -134,12 +130,15 @@ namespace OpenSim.Region.CoreModules
 
         private const int TICKS_PER_SECOND = 10000000;
 
+        private ulong m_CurrentTimeOffset = 0;
+
         // Current time in elapsed seconds since Jan 1st 1970
         private ulong CurrentTime
         {
             get
             {
-                return (ulong)(((DateTime.Now.Ticks) - TicksToEpoch + TicksUTCOffset) / TICKS_PER_SECOND);
+                ulong ctime = (ulong)(((DateTime.Now.Ticks) - TicksToEpoch + TicksUTCOffset) / TICKS_PER_SECOND);
+                return ctime + m_CurrentTimeOffset;
             }
         }
 
@@ -262,10 +261,8 @@ namespace OpenSim.Region.CoreModules
 
         private float GetCurrentTimeAsLindenSunHour()
         {
-            if (m_SunFixed)
-                return m_SunFixedHour + 6;
-
-            return GetCurrentSunHour() + 6.0f;
+            float curtime = m_SunFixed ? m_SunFixedHour : GetCurrentSunHour();
+            return (curtime + 6.0f) % 24.0f;
         }
 
         #region INonSharedRegion Methods
@@ -291,8 +288,6 @@ namespace OpenSim.Region.CoreModules
             try
             {
                 // Mode: determines how the sun is handled
-                m_RegionMode = config.Configs["Sun"].GetString("mode", d_mode);
-                // Mode: determines how the sun is handled
                 // m_latitude = config.Configs["Sun"].GetDouble("latitude", d_latitude);
                 // Mode: determines how the sun is handled
                 // m_longitude = config.Configs["Sun"].GetDouble("longitude", d_longitude);
@@ -314,7 +309,6 @@ namespace OpenSim.Region.CoreModules
             catch (Exception e)
             {
                 m_log.Debug("[SUN]: Configuration access failed, using defaults. Reason: " + e.Message);
-                m_RegionMode        = d_mode;
                 m_YearLengthDays = d_year_length;
                 m_DayLengthHours  = d_day_length;
                 m_HorizonShift   = d_day_night;
@@ -325,40 +319,28 @@ namespace OpenSim.Region.CoreModules
                 // m_longitude   = d_longitude;
             }
 
-            switch (m_RegionMode)
-            {
-                case "T1":
-                default:
-                case "SL":
-                    // Time taken to complete a cycle (day and season)
-
-                    SecondsPerSunCycle = (uint) (m_DayLengthHours * 60 * 60);
-                    SecondsPerYear     = (uint) (SecondsPerSunCycle*m_YearLengthDays);
-
-                    // Ration of real-to-virtual time
+            SecondsPerSunCycle = (uint) (m_DayLengthHours * 60 * 60);
+            SecondsPerYear     = (uint) (SecondsPerSunCycle*m_YearLengthDays);
 
-                    // VWTimeRatio        = 24/m_day_length;
+            // Ration of real-to-virtual time
 
-                    // Speed of rotation needed to complete a cycle in the
-                    // designated period (day and season)
+            // VWTimeRatio        = 24/m_day_length;
 
-                    SunSpeed           = m_SunCycle/SecondsPerSunCycle;
-                    SeasonSpeed        = m_SeasonalCycle/SecondsPerYear;
+            // Speed of rotation needed to complete a cycle in the
+            // designated period (day and season)
 
-                    // Horizon translation
+            SunSpeed           = m_SunCycle/SecondsPerSunCycle;
+            SeasonSpeed        = m_SeasonalCycle/SecondsPerYear;
 
-                    HorizonShift      = m_HorizonShift; // Z axis translation
-                    // HoursToRadians    = (SunCycle/24)*VWTimeRatio;
+            // Horizon translation
 
-                    m_log.Debug("[SUN]: Mode is " + m_RegionMode);
-                    m_log.Debug("[SUN]: Initialization completed. Day is " + SecondsPerSunCycle + " seconds, and year is " + m_YearLengthDays + " days");
-                    m_log.Debug("[SUN]: Axis offset is " + m_HorizonShift);
-                    m_log.Debug("[SUN]: Percentage of time for daylight " + m_DayTimeSunHourScale);
-                    m_log.Debug("[SUN]: Positional data updated every " + m_UpdateInterval + " frames");
-
-                    break;
-            }
+            HorizonShift      = m_HorizonShift; // Z axis translation
+            // HoursToRadians    = (SunCycle/24)*VWTimeRatio;
 
+            m_log.Debug("[SUN]: Initialization completed. Day is " + SecondsPerSunCycle + " seconds, and year is " + m_YearLengthDays + " days");
+            m_log.Debug("[SUN]: Axis offset is " + m_HorizonShift);
+            m_log.Debug("[SUN]: Percentage of time for daylight " + m_DayTimeSunHourScale);
+            m_log.Debug("[SUN]: Positional data updated every " + m_UpdateInterval + " frames");
         }
 
         public Type ReplaceableInterface 
@@ -385,7 +367,8 @@ namespace OpenSim.Region.CoreModules
                 string sunCommand = string.Format("sun {0}", kvp.Key);
                 m_scene.AddCommand("Regions", this, sunCommand, string.Format("{0} [<value>]", sunCommand), kvp.Value, "", HandleSunConsoleCommand);
             }
-
+            m_scene.AddCommand("Regions", this, "sun help", "sun help", "list parameters that can be changed", "", HandleSunConsoleCommand);
+            m_scene.AddCommand("Regions", this, "sun list", "sun list", "list parameters that can be changed", "", HandleSunConsoleCommand);
             ready = true;
         }
 
@@ -419,23 +402,22 @@ namespace OpenSim.Region.CoreModules
 
         public void SunToClient(IClientAPI client)
         {
-            if (m_RegionMode != "T1")
+            if (ready)
             {
-                if (ready)
+                if (m_SunFixed)
                 {
-                    if (m_SunFixed)
-                    {
-                        // m_log.DebugFormat("[SUN]: SunHour {0}, Position {1}, PosTime {2}, OrbitalPosition : {3} ", m_SunFixedHour, Position.ToString(), PosTime.ToString(), OrbitalPosition.ToString());
-                        client.SendSunPos(Position, Velocity, PosTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition);
-                    }
-                    else
-                    {
-                        // m_log.DebugFormat("[SUN]: SunHour {0}, Position {1}, PosTime {2}, OrbitalPosition : {3} ", m_SunFixedHour, Position.ToString(), PosTime.ToString(), OrbitalPosition.ToString());
-                        client.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition);
-                    }
+                    // m_log.DebugFormat("[SUN]: Fixed SunHour {0}, Position {1}, PosTime {2}, OrbitalPosition : {3} ",
+                    //                   m_SunFixedHour, Position.ToString(), PosTime.ToString(), OrbitalPosition.ToString());
+                    client.SendSunPos(Position, Velocity, PosTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition);
+                }
+                else
+                {
+                    // m_log.DebugFormat("[SUN]: SunHour {0}, Position {1}, PosTime {2}, OrbitalPosition : {3} ",
+                    //                  m_SunFixedHour, Position.ToString(), PosTime.ToString(), OrbitalPosition.ToString());
+                    client.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition);
                 }
             }
-        }
+        }            
 
         public void SunUpdate()
         {
@@ -532,6 +514,9 @@ namespace OpenSim.Region.CoreModules
                 case "update_interval":
                     return m_UpdateInterval;
 
+                case "current_time":
+                    return GetCurrentTimeAsLindenSunHour();
+                
                 default:
                     throw new Exception("Unknown sun parameter.");
             }
@@ -539,7 +524,51 @@ namespace OpenSim.Region.CoreModules
 
         public void SetSunParameter(string param, double value)
         {
-            HandleSunConsoleCommand("sun", new string[] {param, value.ToString() });
+            switch (param)
+            {
+                case "year_length":
+                    m_YearLengthDays = (int)value;
+                    SecondsPerYear = (uint) (SecondsPerSunCycle*m_YearLengthDays);
+                    SeasonSpeed = m_SeasonalCycle/SecondsPerYear;
+                    break;
+
+                case "day_length":
+                    m_DayLengthHours = value;
+                    SecondsPerSunCycle = (uint) (m_DayLengthHours * 60 * 60);
+                    SecondsPerYear = (uint) (SecondsPerSunCycle*m_YearLengthDays);
+                    SunSpeed = m_SunCycle/SecondsPerSunCycle;
+                    SeasonSpeed = m_SeasonalCycle/SecondsPerYear;
+                    break;
+
+                case "day_night_offset":
+                    m_HorizonShift = value;
+                    HorizonShift = m_HorizonShift;
+                    break;
+
+                case "day_time_sun_hour_scale":
+                    m_DayTimeSunHourScale = value;
+                    break;
+
+                case "update_interval":
+                    m_UpdateInterval = (int)value;
+                    break;
+
+                case "current_time":
+                    value = (value + 18.0) % 24.0;
+                    // set the current offset so that the effective sun time is the parameter
+                    m_CurrentTimeOffset = 0; // clear this first so we use raw time
+                    m_CurrentTimeOffset = (ulong)(SecondsPerSunCycle * value/ 24.0) - (CurrentTime % SecondsPerSunCycle);
+                    break;
+
+                default:
+                    throw new Exception("Unknown sun parameter.");
+            }
+
+            // Generate shared values
+            GenSunPos();
+
+            // When sun settings are updated, we should update all clients with new settings.
+            SunUpdateToAllClients();
         }
 
         public float GetCurrentSunHour()
@@ -572,7 +601,7 @@ namespace OpenSim.Region.CoreModules
 
             foreach (string output in ParseCmdParams(cmdparams))
             {
-                m_log.Info("[SUN] " + output);
+                MainConsole.Instance.Output(output);
             }
         }
 
@@ -581,10 +610,11 @@ namespace OpenSim.Region.CoreModules
             Dictionary<string, string> Params = new Dictionary<string, string>();
 
             Params.Add("year_length", "number of days to a year");
-            Params.Add("day_length", "number of seconds to a day");
+            Params.Add("day_length", "number of hours to a day");
             Params.Add("day_night_offset", "induces a horizon shift");
             Params.Add("update_interval", "how often to update the sun's position in frames");
             Params.Add("day_time_sun_hour_scale", "scales day light vs nite hours to change day/night ratio");
+            Params.Add("current_time", "time in seconds of the simulator");
 
             return Params;
         }
@@ -618,46 +648,15 @@ namespace OpenSim.Region.CoreModules
             }
             else if (args.Length == 3)
             {
-                float value = 0.0f;
-                if (!float.TryParse(args[2], out value))
+                double value = 0.0;
+                if (! double.TryParse(args[2], out value))
                 {
                     Output.Add(String.Format("The parameter value {0} is not a valid number.", args[2]));
+                    return Output;
                 }
 
-                switch (args[1].ToLower())
-                {
-                    case "year_length":
-                        m_YearLengthDays = (int)value;
-                        break;
-
-                    case "day_length":
-                        m_DayLengthHours = value;
-                        break;
-
-                    case "day_night_offset":
-                        m_HorizonShift = value;
-                        break;
-
-                    case "day_time_sun_hour_scale":
-                        m_DayTimeSunHourScale = value;
-                        break;
-
-                    case "update_interval":
-                        m_UpdateInterval = (int)value;
-                        break;
-
-                    default:
-                        Output.Add(String.Format("Unknown parameter {0}.", args[1]));
-                        return Output;
-                }
-
+                SetSunParameter(args[1].ToLower(), value);
                 Output.Add(String.Format("Parameter {0} set to {1}.", args[1], value.ToString()));
-
-                // Generate shared values
-                GenSunPos();
-
-                // When sun settings are updated, we should update all clients with new settings.
-                SunUpdateToAllClients();
             }
 
             return Output;
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
index 62d232e..be1fb24 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.IO;
+using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
@@ -73,12 +74,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         public ITerrainChannel LoadFile(string filename)
         {
             FileInfo file = new FileInfo(filename);
-            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
-            ITerrainChannel retval = LoadStream(s);
 
-            s.Close();
+            ITerrainChannel channel;
 
-            return retval;
+            using (FileStream s = file.Open(FileMode.Open, FileAccess.Read))
+                channel = LoadStream(s);
+
+            return channel;
         }
 
         public ITerrainChannel LoadFile(string filename, int offsetX, int offsetY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight)
@@ -86,153 +88,159 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             TerrainChannel retval = new TerrainChannel(sectionWidth, sectionHeight);
 
             FileInfo file = new FileInfo(filename);
-            FileStream s = file.Open(FileMode.Open, FileAccess.Read);
-            BinaryReader bs = new BinaryReader(s);
 
-            int currFileYOffset = fileHeight - 1;
-
-            // if our region isn't on the first Y section of the areas to be landscaped, then
-            // advance to our section of the file
-            while (currFileYOffset > offsetY)
+            using (FileStream s = file.Open(FileMode.Open, FileAccess.Read))
+            using (BinaryReader bs = new BinaryReader(s))
             {
-                // read a whole strip of regions
-                int heightsToRead = sectionHeight * (fileWidth * sectionWidth);
-                bs.ReadBytes(heightsToRead * 13); // because there are 13 fun channels
-                currFileYOffset--;
-            }
+                int currFileYOffset = fileHeight - 1;
 
-            // got to the Y start offset within the file of our region
-            // so read the file bits associated with our region
-            int y;
-            // for each Y within our Y offset
-            for (y = sectionHeight - 1; y >= 0; y--)
-            {
-                int currFileXOffset = 0;
-
-                // if our region isn't the first X section of the areas to be landscaped, then
-                // advance the stream to the X start pos of our section in the file
-                // i.e. eat X upto where we start
-                while (currFileXOffset < offsetX)
+                // if our region isn't on the first Y section of the areas to be landscaped, then
+                // advance to our section of the file
+                while (currFileYOffset > offsetY)
                 {
-                    bs.ReadBytes(sectionWidth * 13);
-                    currFileXOffset++;
+                    // read a whole strip of regions
+                    int heightsToRead = sectionHeight * (fileWidth * sectionWidth);
+                    bs.ReadBytes(heightsToRead * 13); // because there are 13 fun channels
+                    currFileYOffset--;
                 }
 
-                // got to our X offset, so write our regions X line
-                int x;
-                for (x = 0; x < sectionWidth; x++)
-                {
-                    // Read a strip and continue
-                    retval[x, y] = bs.ReadByte() * (bs.ReadByte() / 128.0);
-                    bs.ReadBytes(11);
-                }
-                // record that we wrote it
-                currFileXOffset++;
+                // got to the Y start offset within the file of our region
+                // so read the file bits associated with our region
+                int y;
 
-                // if our region isn't the last X section of the areas to be landscaped, then
-                // advance the stream to the end of this Y column
-                while (currFileXOffset < fileWidth)
+                // for each Y within our Y offset
+                for (y = sectionHeight - 1; y >= 0; y--)
                 {
-                    // eat the next regions x line
-                    bs.ReadBytes(sectionWidth * 13); //The 13 channels again
+                    int currFileXOffset = 0;
+
+                    // if our region isn't the first X section of the areas to be landscaped, then
+                    // advance the stream to the X start pos of our section in the file
+                    // i.e. eat X upto where we start
+                    while (currFileXOffset < offsetX)
+                    {
+                        bs.ReadBytes(sectionWidth * 13);
+                        currFileXOffset++;
+                    }
+
+                    // got to our X offset, so write our regions X line
+                    int x;
+                    for (x = 0; x < sectionWidth; x++)
+                    {
+                        // Read a strip and continue
+                        retval[x, y] = bs.ReadByte() * (bs.ReadByte() / 128.0);
+                        bs.ReadBytes(11);
+                    }
+                    // record that we wrote it
                     currFileXOffset++;
+
+                    // if our region isn't the last X section of the areas to be landscaped, then
+                    // advance the stream to the end of this Y column
+                    while (currFileXOffset < fileWidth)
+                    {
+                        // eat the next regions x line
+                        bs.ReadBytes(sectionWidth * 13); //The 13 channels again
+                        currFileXOffset++;
+                    }
                 }
             }
 
-            bs.Close();
-            s.Close();
-
             return retval;
         }
 
         public ITerrainChannel LoadStream(Stream s)
         {
-            TerrainChannel retval = new TerrainChannel();
+            // The raw format doesn't contain any dimension information.
+            // Guess the square dimensions by using the length of the raw file.
+            double dimension = Math.Sqrt((double)(s.Length / 13));
+            // Regions are always multiples of 256.
+            int trimmedDimension = (int)dimension - ((int)dimension % (int)Constants.RegionSize);
+            if (trimmedDimension < Constants.RegionSize)
+                trimmedDimension = (int)Constants.RegionSize;
+
+            TerrainChannel retval = new TerrainChannel(trimmedDimension, trimmedDimension);
 
-            BinaryReader bs = new BinaryReader(s);
-            int y;
-            for (y = 0; y < retval.Height; y++)
+            using (BinaryReader bs = new BinaryReader(s))
             {
-                int x;
-                for (x = 0; x < retval.Width; x++)
+                int y;
+                for (y = 0; y < retval.Height; y++)
                 {
-                    retval[x, (retval.Height - 1) - y] = bs.ReadByte() * (bs.ReadByte() / 128.0);
-                    bs.ReadBytes(11); // Advance the stream to next bytes.
+                    int x;
+                    for (x = 0; x < retval.Width; x++)
+                    {
+                        retval[x, (retval.Height - 1) - y] = bs.ReadByte() * (bs.ReadByte() / 128.0);
+                        bs.ReadBytes(11); // Advance the stream to next bytes.
+                    }
                 }
             }
 
-            bs.Close();
-
             return retval;
         }
 
         public void SaveFile(string filename, ITerrainChannel map)
         {
             FileInfo file = new FileInfo(filename);
-            FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
-            SaveStream(s, map);
 
-            s.Close();
+            using (FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write))
+                SaveStream(s, map);
         }
 
         public void SaveStream(Stream s, ITerrainChannel map)
         {
-            BinaryWriter binStream = new BinaryWriter(s);
-
-            // Output the calculated raw
-            for (int y = 0; y < map.Height; y++)
+            using (BinaryWriter binStream = new BinaryWriter(s))
             {
-                for (int x = 0; x < map.Width; x++)
+                // Output the calculated raw
+                for (int y = 0; y < map.Height; y++)
                 {
-                    double t = map[x, (map.Height - 1) - y];
-                    //if height is less than 0, set it to 0 as
-                    //can't save -ve values in a LLRAW file
-                    if (t < 0d)
+                    for (int x = 0; x < map.Width; x++)
                     {
-                        t = 0d;
+                        double t = map[x, (map.Height - 1) - y];
+                        //if height is less than 0, set it to 0 as
+                        //can't save -ve values in a LLRAW file
+                        if (t < 0d)
+                        {
+                            t = 0d;
+                        }
+
+                        int index = 0;
+
+                        // The lookup table is pre-sorted, so we either find an exact match or
+                        // the next closest (smaller) match with a binary search
+                        index = Array.BinarySearch<HeightmapLookupValue>(LookupHeightTable, new HeightmapLookupValue(0, (float)t));
+                        if (index < 0)
+                            index = ~index - 1;
+
+                        index = LookupHeightTable[index].Index;
+
+                        byte red = (byte) (index & 0xFF);
+                        byte green = (byte) ((index >> 8) & 0xFF);
+                        const byte blue = 20;
+                        const byte alpha1 = 0;
+                        const byte alpha2 = 0;
+                        const byte alpha3 = 0;
+                        const byte alpha4 = 0;
+                        const byte alpha5 = 255;
+                        const byte alpha6 = 255;
+                        const byte alpha7 = 255;
+                        const byte alpha8 = 255;
+                        byte alpha9 = red;
+                        byte alpha10 = green;
+
+                        binStream.Write(red);
+                        binStream.Write(green);
+                        binStream.Write(blue);
+                        binStream.Write(alpha1);
+                        binStream.Write(alpha2);
+                        binStream.Write(alpha3);
+                        binStream.Write(alpha4);
+                        binStream.Write(alpha5);
+                        binStream.Write(alpha6);
+                        binStream.Write(alpha7);
+                        binStream.Write(alpha8);
+                        binStream.Write(alpha9);
+                        binStream.Write(alpha10);
                     }
-
-                    int index = 0;
-
-                    // The lookup table is pre-sorted, so we either find an exact match or
-                    // the next closest (smaller) match with a binary search
-                    index = Array.BinarySearch<HeightmapLookupValue>(LookupHeightTable, new HeightmapLookupValue(0, (float)t));
-                    if (index < 0)
-                        index = ~index - 1;
-
-                    index = LookupHeightTable[index].Index;
-
-                    byte red = (byte) (index & 0xFF);
-                    byte green = (byte) ((index >> 8) & 0xFF);
-                    const byte blue = 20;
-                    const byte alpha1 = 0;
-                    const byte alpha2 = 0;
-                    const byte alpha3 = 0;
-                    const byte alpha4 = 0;
-                    const byte alpha5 = 255;
-                    const byte alpha6 = 255;
-                    const byte alpha7 = 255;
-                    const byte alpha8 = 255;
-                    byte alpha9 = red;
-                    byte alpha10 = green;
-
-                    binStream.Write(red);
-                    binStream.Write(green);
-                    binStream.Write(blue);
-                    binStream.Write(alpha1);
-                    binStream.Write(alpha2);
-                    binStream.Write(alpha3);
-                    binStream.Write(alpha4);
-                    binStream.Write(alpha5);
-                    binStream.Write(alpha6);
-                    binStream.Write(alpha7);
-                    binStream.Write(alpha8);
-                    binStream.Write(alpha9);
-                    binStream.Write(alpha10);
                 }
             }
-
-            binStream.Close();
         }
 
         public string FileExtension
@@ -259,7 +267,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         public bool SupportsTileSave()
         {
             return false;
-        }
-
+        }       
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
index a7e4d9f..219011e 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             bool eof = false;
 
             int fileXPoints = 0;
-//            int fileYPoints = 0;
+            int fileYPoints = 0;
 
             // Terragen file
             while (eof == false)
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
                 {
                     case "SIZE":
                         fileXPoints = bs.ReadInt16() + 1;
-//                        fileYPoints = fileXPoints;
+                        fileYPoints = fileXPoints;
                         bs.ReadInt16();
                         break;
                     case "XPTS":
@@ -83,8 +83,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
                         bs.ReadInt16();
                         break;
                     case "YPTS":
-//                        fileYPoints = bs.ReadInt16();
-                        bs.ReadInt16();
+                        fileYPoints = bs.ReadInt16();
                         bs.ReadInt16();
                         break;
                     case "ALTW":
@@ -138,7 +137,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
                             bs.ReadInt16();
                         }
 
-
                         break;
                     default:
                         bs.ReadInt32();
@@ -206,9 +204,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
                     }
                 }
             }
-
             bs.Close();
-
             return retval;
         }
 
@@ -298,7 +294,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
                 }
             }
 
-            //This is only necessary for older versions of Terragen.
+            //This is necessary for older versions of Terragen.
             bs.Write(enc.GetBytes("EOF "));
 
             bs.Close();
@@ -342,7 +338,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             if (BitConverter.IsLittleEndian == false)
             {
                 byte[] tmp = new byte[4];
-                for (int i = 0; i < 4; i++)
+                for (int i = 3; i >= 0; i--)
                 {
                     tmp[i] = retVal[3 - i];
                 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
index d634e8b..236584a 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
@@ -46,6 +46,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
                     if (fillArea[x, y])
                     {
                         double noise = TerrainUtil.PerlinNoise2D((double) x / map.Width, (double) y / map.Height, 8, 1.0);
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
                         map[x, y] += noise * strength;
                     }
                 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFeature.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFeature.cs
new file mode 100644
index 0000000..78a43db
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFeature.cs
@@ -0,0 +1,60 @@
+/*
+ * 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 OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Region.CoreModules.World.Terrain
+{
+    public interface ITerrainFeature
+    {
+        /// <summary>
+        /// Creates the feature.
+        /// </summary>
+        /// <returns>
+        /// Empty string if successful, otherwise error message.
+        /// </returns>
+        /// <param name='map'>
+        /// ITerrainChannel holding terrain data.
+        /// </param>
+        /// <param name='args'>
+        /// command-line arguments from console.
+        /// </param>
+        string CreateFeature(ITerrainChannel map, string[] args);
+
+        /// <summary>
+        /// Gets a string describing the usage.
+        /// </summary>
+        /// <returns>
+        /// A string describing parameters for creating the feature.
+        /// Format is "feature-name <arg1> <arg2> ..."
+        /// </returns>
+        string GetUsage();
+    }
+
+}
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainModifier.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModifier.cs
new file mode 100644
index 0000000..0e0a0e4
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModifier.cs
@@ -0,0 +1,77 @@
+/*
+ * 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 OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Region.CoreModules.World.Terrain
+{
+    public interface ITerrainModifier
+    {
+        /// <summary>
+        /// Creates the feature.
+        /// </summary>
+        /// <returns>
+        /// Empty string if successful, otherwise error message.
+        /// </returns>
+        /// <param name='map'>
+        /// ITerrainChannel holding terrain data.
+        /// </param>
+        /// <param name='args'>
+        /// command-line arguments from console.
+        /// </param>
+        string ModifyTerrain(ITerrainChannel map, string[] args);
+
+        /// <summary>
+        /// Gets a string describing the usage.
+        /// </summary>
+        /// <returns>
+        /// A string describing parameters for creating the feature.
+        /// Format is "feature-name <arg1> <arg2> ..."
+        /// </returns>
+        string GetUsage();
+
+        /// <summary>
+        /// Apply the appropriate operation on the specified map, at (x, y).
+        /// </summary>
+        /// <param name='map'>
+        /// Map.
+        /// </param>
+        /// <param name='data'>
+        /// Data.
+        /// </param>
+        /// <param name='x'>
+        /// X.
+        /// </param>
+        /// <param name='y'>
+        /// Y.
+        /// </param>
+        double operate(double[,] map, TerrainModifierData data, int x, int y);
+    }
+
+}
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Modifiers/FillModifier.cs b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/FillModifier.cs
new file mode 100644
index 0000000..32f1de9
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/FillModifier.cs
@@ -0,0 +1,93 @@
+/*
+ * 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 OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Region.CoreModules.World.Terrain.Modifiers
+{
+    public class FillModifier : TerrainModifier
+    {
+
+        public FillModifier(ITerrainModule module) : base(module)
+        {
+        }
+
+        public override string ModifyTerrain(ITerrainChannel map, string[] args)
+        {
+            string result;
+            if (args.Length < 3)
+            {
+                result = "Usage: " + GetUsage();
+            }
+            else
+            {
+                TerrainModifierData data;
+                result = this.parseParameters(args, out data);
+
+                // Context-specific validation
+                if (result == String.Empty)
+                {
+                    if (data.shape == String.Empty)
+                    {
+                        data.shape = "rectangle";
+                        data.x0 = 0;
+                        data.y0 = 0;
+                        data.dx = map.Width;
+                        data.dy = map.Height;
+                    }
+                }
+
+                // if it's all good, then do the work
+                if (result == String.Empty)
+                {
+                    this.applyModification(map, data);
+                }
+            }
+
+            return result;
+        }
+
+        public override string GetUsage()
+        {
+            string val = "fill <height> [ -rec=x1,y1,dx[,dy] | -ell=x0,y0,rx[,ry] ] [-taper=<height2>]"
+                                + "\nSets all points within the specified range to the specified value.";
+            return val;
+        }
+
+        public override double operate(double[,] map, TerrainModifierData data, int x, int y)
+        {
+            double factor = this.computeBevel(data, x, y);
+            double result = data.elevation - (data.elevation - data.bevelevation) * factor;
+            return result;
+        }
+
+    }
+
+}
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Modifiers/LowerModifier.cs b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/LowerModifier.cs
new file mode 100644
index 0000000..2ab4bcc
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/LowerModifier.cs
@@ -0,0 +1,92 @@
+/*
+ * 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 OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Region.CoreModules.World.Terrain.Modifiers
+{
+    public class LowerModifier : TerrainModifier
+    {
+        public LowerModifier(ITerrainModule module) : base(module)
+        {
+        }
+
+        public override string ModifyTerrain(ITerrainChannel map, string[] args)
+        {
+            string result;
+            if (args.Length < 3)
+            {
+                result = "Usage: " + GetUsage();
+            }
+            else
+            {
+                TerrainModifierData data;
+                result = this.parseParameters(args, out data);
+
+                // Context-specific validation
+                if (result == String.Empty)
+                {
+                    if (data.shape == String.Empty)
+                    {
+                        data.shape = "rectangle";
+                        data.x0 = 0;
+                        data.y0 = 0;
+                        data.dx = map.Width;
+                        data.dy = map.Height;
+                    }
+                }
+
+                // if it's all good, then do the work
+                if (result == String.Empty)
+                {
+                    this.applyModification(map, data);
+                }
+            }
+
+            return result;
+        }
+
+        public override string GetUsage()
+        {
+            string val = "lower <delta> [ -rec=x1,y1,dx[,dy] | -ell=x0,y0,rx[,ry] ] [-taper=<delta2>]"
+                            + "\nLowers all points within the specified range by the specified amount.";
+            return val;
+
+        }
+
+        public override double operate(double[,] map, TerrainModifierData data, int x, int y)
+        {
+            double factor = this.computeBevel(data, x, y);
+            double result = map[x, y] - (data.elevation - (data.elevation - data.bevelevation) * factor);
+            return result;
+        }
+
+    }
+
+}
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Modifiers/MaxModifier.cs b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/MaxModifier.cs
new file mode 100644
index 0000000..0939c0a
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/MaxModifier.cs
@@ -0,0 +1,92 @@
+/*
+ * 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 OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Region.CoreModules.World.Terrain.Modifiers
+{
+    public class MaxModifier : TerrainModifier
+    {
+        public MaxModifier(ITerrainModule module) : base(module)
+        {
+        }
+
+        public override string ModifyTerrain(ITerrainChannel map, string[] args)
+        {
+            string result;
+            if (args.Length < 3)
+            {
+                result = "Usage: " + GetUsage();
+            }
+            else
+            {
+                TerrainModifierData data;
+                result = this.parseParameters(args, out data);
+
+                // Context-specific validation
+                if (result == String.Empty)
+                {
+                    if (data.shape == String.Empty)
+                    {
+                        data.shape = "rectangle";
+                        data.x0 = 0;
+                        data.y0 = 0;
+                        data.dx = map.Width;
+                        data.dy = map.Height;
+                    }
+                }
+
+                // if it's all good, then do the work
+                if (result == String.Empty)
+                {
+                    this.applyModification(map, data);
+                }
+            }
+
+            return result;
+        }
+
+        public override string GetUsage()
+        {
+            string val = "max <height> [ -rec=x1,y1,dx[,dy] | -ell=x0,y0,rx[,ry] ] [-taper=<height2>]"
+                            + "\nEnsures that all points within the specified range are no higher than the specified value.";
+            return val;
+
+        }
+
+        public override double operate(double[,] map, TerrainModifierData data, int x, int y)
+        {
+            double factor = this.computeBevel(data, x, y);
+            double result = Math.Min(data.elevation - (data.elevation - data.bevelevation) * factor, map[x, y]);
+            return result;
+        }
+
+    }
+
+}
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Modifiers/MinModifier.cs b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/MinModifier.cs
new file mode 100644
index 0000000..cbbccc0
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/MinModifier.cs
@@ -0,0 +1,92 @@
+/*
+ * 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 OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Region.CoreModules.World.Terrain.Modifiers
+{
+    public class MinModifier : TerrainModifier
+    {
+        public MinModifier(ITerrainModule module) : base(module)
+        {
+        }
+
+        public override string ModifyTerrain(ITerrainChannel map, string[] args)
+        {
+            string result;
+            if (args.Length < 3)
+            {
+                result = "Usage: " + GetUsage();
+            }
+            else
+            {
+                TerrainModifierData data;
+                result = this.parseParameters(args, out data);
+
+                // Context-specific validation
+                if (result == String.Empty)
+                {
+                    if (data.shape == String.Empty)
+                    {
+                        data.shape = "rectangle";
+                        data.x0 = 0;
+                        data.y0 = 0;
+                        data.dx = map.Width;
+                        data.dy = map.Height;
+                    }
+                }
+
+                // if it's all good, then do the work
+                if (result == String.Empty)
+                {
+                    this.applyModification(map, data);
+                }
+            }
+
+            return result;
+        }
+
+        public override string GetUsage()
+        {
+            string val = "min <height> [ -rec=x1,y1,dx[,dy] | -ell=x0,y0,rx[,ry] ] [-taper=<height2>]"
+                + "\nEnsures that all points within the specified range are no lower than the specified value.";
+            return val;
+
+        }
+
+        public override double operate(double[,] map, TerrainModifierData data, int x, int y)
+        {
+            double factor = this.computeBevel(data, x, y);
+            double result = Math.Max(data.elevation - (data.elevation - data.bevelevation) * factor, map[x, y]);
+            return result;
+        }
+
+    }
+
+}
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Modifiers/NoiseModifier.cs b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/NoiseModifier.cs
new file mode 100644
index 0000000..d6b95d0
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/NoiseModifier.cs
@@ -0,0 +1,108 @@
+/*
+ * 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 OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.World.Terrain.Modifiers
+{
+    public class NoiseModifier : TerrainModifier
+    {
+        public NoiseModifier(ITerrainModule module) : base(module)
+        {
+        }
+
+        public override string ModifyTerrain(ITerrainChannel map, string[] args)
+        {
+            string result;
+            if (args.Length < 3)
+            {
+                result = "Usage: " + GetUsage();
+            }
+            else
+            {
+                TerrainModifierData data;
+                result = this.parseParameters(args, out data);
+
+                // Context-specific validation
+                if (result == String.Empty)
+                {
+                    if (data.bevel == "taper")
+                    {
+                        if (data.bevelevation < 0.0 || data.bevelevation > 1.0)
+                        {
+                            result = String.Format("Taper must be 0.0 to 1.0: {0}", data.bevelevation);
+                        }
+                    }
+                    else
+                    {
+                        data.bevelevation = 1.0f;
+                    }
+
+                    if (data.elevation < 0.0 || data.elevation > 1.0)
+                    {
+                        result = String.Format("Noise strength must be 0.0 to 1.0: {0}", data.elevation);
+                    }
+
+                    if (data.shape == String.Empty)
+                    {
+                        data.shape = "rectangle";
+                        data.x0 = 0;
+                        data.y0 = 0;
+                        data.dx = map.Width;
+                        data.dy = map.Height;
+                    }
+                }
+
+                // if it's all good, then do the work
+                if (result == String.Empty)
+                {
+                    this.applyModification(map, data);
+                }
+            }
+
+            return result;
+        }
+
+        public override string GetUsage()
+        {
+            string val = "noise <delta> [ -rec=x1,y1,dx[,dy] | -ell=x0,y0,rx[,ry] ] [-taper=<delta2>]"
+                                + "\nAdds noise to all points within the specified range.";
+            return val;
+        }
+
+        public override double operate(double[,] map, TerrainModifierData data, int x, int y)
+        {
+            double factor = this.computeBevel(data, x, y);
+            double noise = TerrainUtil.PerlinNoise2D((double)x / map.GetLength(0), (double)y / map.GetLength(1), 8, 1.0);
+            return map[x, y] + (data.elevation - (data.elevation - data.bevelevation) * factor) * (noise - .5);
+        }
+
+    }
+
+}
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Modifiers/RaiseModifier.cs b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/RaiseModifier.cs
new file mode 100644
index 0000000..35fb9d6
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/RaiseModifier.cs
@@ -0,0 +1,92 @@
+/*
+ * 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 OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Region.CoreModules.World.Terrain.Modifiers
+{
+    public class RaiseModifier : TerrainModifier
+    {
+        public RaiseModifier(ITerrainModule module) : base(module)
+        {
+        }
+
+        public override string ModifyTerrain(ITerrainChannel map, string[] args)
+        {
+            string result;
+            if (args.Length < 3)
+            {
+                result = "Usage: " + GetUsage();
+            }
+            else
+            {
+                TerrainModifierData data;
+                result = this.parseParameters(args, out data);
+
+                // Context-specific validation
+                if (result == String.Empty)
+                {
+                    if (data.shape == String.Empty)
+                    {
+                        data.shape = "rectangle";
+                        data.x0 = 0;
+                        data.y0 = 0;
+                        data.dx = map.Width;
+                        data.dy = map.Height;
+                    }
+                }
+
+                // if it's all good, then do the work
+                if (result == String.Empty)
+                {
+                    this.applyModification(map, data);
+                }
+            }
+
+            return result;
+        }
+
+        public override string GetUsage()
+        {
+            string val = "raise <delta> [ -rec=x1,y1,dx[,dy] | -ell=x0,y0,rx[,ry] ] [-taper=<delta2>]"
+                            + "\nRaises all points within the specified range by the specified amount.";
+            return val;
+
+        }
+
+        public override double operate(double[,] map, TerrainModifierData data, int x, int y)
+        {
+            double factor = this.computeBevel(data, x, y);
+            double result = map[x, y] + (data.elevation - (data.elevation - data.bevelevation) * factor);
+            return result;
+        }
+
+    }
+
+}
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Modifiers/SmoothModifier.cs b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/SmoothModifier.cs
new file mode 100644
index 0000000..9f8d5b2
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Terrain/Modifiers/SmoothModifier.cs
@@ -0,0 +1,131 @@
+/*
+ * 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 OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Region.CoreModules.World.Terrain.Modifiers
+{
+    public class SmoothModifier : TerrainModifier
+    {
+        public SmoothModifier(ITerrainModule module) : base(module)
+        {
+        }
+
+        public override string ModifyTerrain(ITerrainChannel map, string[] args)
+        {
+            string result;
+            if (args.Length < 3)
+            {
+                result = "Usage: " + GetUsage();
+            }
+            else
+            {
+                TerrainModifierData data;
+                result = this.parseParameters(args, out data);
+
+                // Context-specific validation
+                if (result == String.Empty)
+                {
+                    if (data.bevel == "taper")
+                    {
+                        if (data.bevelevation < 0.01 || data.bevelevation > 0.99)
+                        {
+                            result = String.Format("Taper must be 0.01 to 0.99: {0}", data.bevelevation);
+                        }
+                    }
+                    else
+                    {
+                        data.bevelevation = 2.0f / 3.0f;
+                    }
+
+                    if (data.elevation < 0.0 || data.elevation > 1.0)
+                    {
+                        result = String.Format("Smoothing strength must be 0.0 to 1.0: {0}", data.elevation);
+                    }
+
+                    if (data.shape == String.Empty)
+                    {
+                        data.shape = "rectangle";
+                        data.x0 = 0;
+                        data.y0 = 0;
+                        data.dx = map.Width;
+                        data.dy = map.Height;
+                    }
+                }
+
+                // if it's all good, then do the work
+                if (result == String.Empty)
+                {
+                    this.applyModification(map, data);
+                }
+            }
+
+            return result;
+        }
+
+        public override string GetUsage()
+        {
+            string val = "smooth <strength> [ -rec=x1,y1,dx[,dy] | -ell=x0,y0,rx[,ry] ] [-taper=<fraction>]"
+                                + "\nSmooths all points within the specified range using a simple averaging algorithm.";
+            return val;
+        }
+
+        public override double operate(double[,] map, TerrainModifierData data, int x, int y)
+        {
+            double[] scale = new double[3];
+            scale[0] = data.elevation;
+            scale[1] = ((1.0 - scale[0]) * data.bevelevation) / 8.0;
+            scale[2] = ((1.0 - scale[0]) * (1.0 - data.bevelevation)) / 16.0;
+            int xMax = map.GetLength(0);
+            int yMax = map.GetLength(1);
+            double result;
+            if ((x == 0) || (y == 0) || (x == (xMax - 1)) || (y == (yMax - 1)))
+            {
+                result = map[x, y];
+            }
+            else
+            {
+                result = 0.0;
+                for(int yPos = (y - 2); yPos < (y + 3); yPos++)
+                {
+                    int yVal = (yPos <= 0) ? 0 : ((yPos < yMax) ? yPos : yMax - 1);
+                    for(int xPos = (x - 2); xPos < (x + 3); xPos++)
+                    {
+                        int xVal = (xPos <= 0) ? 0 : ((xPos < xMax) ? xPos : xMax - 1);
+                        int dist = Math.Max(Math.Abs(x - xVal), Math.Abs(y - yVal));
+                        result += map[xVal, yVal] * scale[dist];
+                    }
+                }
+            }
+            return result;
+        }
+
+    }
+
+}
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModifier.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModifier.cs
new file mode 100644
index 0000000..7ebd08e
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModifier.cs
@@ -0,0 +1,378 @@
+/*
+ * 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.Reflection;
+using log4net;
+
+using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Region.CoreModules.World.Terrain
+{
+    public abstract class TerrainModifier : ITerrainModifier
+    {
+        protected ITerrainModule m_module;
+        protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected TerrainModifier(ITerrainModule module)
+        {
+            m_module = module;
+        }
+
+        public abstract string ModifyTerrain(ITerrainChannel map, string[] args);
+
+        public abstract string GetUsage();
+
+        public abstract double operate(double[,] map, TerrainModifierData data, int x, int y);
+
+        protected String parseParameters(string[] args, out TerrainModifierData data)
+        {
+            string val;
+            string arg;
+            string result;
+            data = new TerrainModifierData();
+            data.shape = String.Empty;
+            data.bevel = String.Empty;
+            data.dx = 0;
+            data.dy = 0;
+            if (args.Length < 4)
+            {
+                result = "Usage: " + GetUsage();
+            }
+            else
+            {
+                result = this.parseFloat(args[3], out data.elevation);
+            }
+            if (result == String.Empty)
+            {
+                int index = 3;
+                while(++index < args.Length && result == String.Empty)
+                {
+                    arg = args[index];
+                    // check for shape
+                    if (arg.StartsWith("-rec=") || arg.StartsWith("-ell="))
+                    {
+                        if (data.shape != String.Empty)
+                        {
+                            result = "Only 1 '-rec' or '-ell' parameter is permitted.";
+                        }
+                        else
+                        {
+                            data.shape = arg.StartsWith("-ell=") ? "ellipse" : "rectangle";
+                            val = arg.Substring(arg.IndexOf("=") + 1);
+                            string[] coords = val.Split(new char[] {','});
+                            if ((coords.Length < 3) || (coords.Length > 4))
+                            {
+                                result = String.Format("Bad format for shape parameter {0}", arg);
+                            }
+                            else
+                            {
+                                result = this.parseInt(coords[0], out data.x0);
+                                if (result == String.Empty)
+                                {
+                                    result = this.parseInt(coords[1], out data.y0);
+                                }
+                                if (result == String.Empty)
+                                {
+                                    result = this.parseInt(coords[2], out data.dx);
+                                }
+                                if (result == String.Empty)
+                                {
+                                    if (coords.Length == 4)
+                                    {
+                                        result = this.parseInt(coords[3], out data.dy);
+                                    }
+                                    else
+                                    {
+                                        data.dy = data.dx;
+                                    }
+                                }
+                                if (result == String.Empty)
+                                {
+                                    if ((data.dx <= 0) || (data.dy <= 0))
+                                    {
+                                        result = "Shape sizes must be positive integers";
+                                    }
+                                }
+                                else
+                                {
+                                    result = String.Format("Bad value in shape parameters {0}", arg);
+                                }
+                            }
+                        }
+                    }
+                    else if (arg.StartsWith("-taper="))
+                    {
+                        if (data.bevel != String.Empty)
+                        {
+                            result = "Only 1 '-taper' parameter is permitted.";
+                        }
+                        else
+                        {
+                            data.bevel = "taper";
+                            val = arg.Substring(arg.IndexOf("=") + 1);
+                            result = this.parseFloat(val, out data.bevelevation);
+                            if (result != String.Empty)
+                            {
+                                result = String.Format("Bad format for taper parameter {0}", arg);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        result = String.Format("Unrecognized parameter {0}", arg);
+                    }
+                }
+            }
+            return result;
+        }
+
+        protected string parseFloat(String s, out float f)
+        {
+            string result;
+            double d;
+            if (Double.TryParse(s, out d))
+            {
+                try
+                {
+                    f = (float)d;
+                    result = String.Empty;
+                }
+                catch(InvalidCastException)
+                {
+                    result = String.Format("{0} is invalid", s);
+                    f = -1.0f;
+                }
+            }
+            else
+            {
+                f = -1.0f;
+                result = String.Format("{0} is invalid", s);
+            }
+            return result;
+        }
+
+        protected string parseInt(String s, out int i)
+        {
+            string result;
+            if (Int32.TryParse(s, out i))
+            {
+                result = String.Empty;
+            }
+            else
+            {
+                result = String.Format("{0} is invalid", s);
+            }
+            return result;
+        }
+
+        protected void applyModification(ITerrainChannel map, TerrainModifierData data)
+        {
+            bool[,] mask;
+            int xMax;
+            int yMax;
+            int xMid;
+            int yMid;
+            if (data.shape == "ellipse")
+            {
+                mask = this.ellipticalMask(data.dx, data.dy);
+                xMax = mask.GetLength(0);
+                yMax = mask.GetLength(1);
+                xMid = xMax / 2 + xMax % 2;
+                yMid = yMax / 2 + yMax % 2;
+            }
+            else
+            {
+                mask = this.rectangularMask(data.dx, data.dy);
+                xMax = mask.GetLength(0);
+                yMax = mask.GetLength(1);
+                xMid = 0;
+                yMid = 0;
+            }
+//            m_log.DebugFormat("Apply {0} mask {1}x{2} @ {3},{4}", data.shape, xMax, yMax, xMid, yMid);
+            double[,] buffer = map.GetDoubles();
+            int yDim = yMax;
+            while(--yDim >= 0)
+            {
+                int yPos = data.y0 + yDim - yMid;
+                if ((yPos >= 0) && (yPos < map.Height))
+                {
+                    int xDim = xMax;
+                    while(--xDim >= 0)
+                    {
+                        int xPos = data.x0 + xDim - xMid;
+                        if ((xPos >= 0) && (xPos < map.Width) && (mask[xDim, yDim]))
+                        {
+                            double endElevation = this.operate(buffer, data, xPos, yPos);
+                            map[xPos, yPos] = endElevation;
+                        }
+                    }
+                }
+            }
+        }
+
+        protected double computeBevel(TerrainModifierData data, int x, int y)
+        {
+            int deltaX;
+            int deltaY;
+            int xMax;
+            int yMax;
+            double factor;
+            if (data.bevel == "taper")
+            {
+                if (data.shape == "ellipse")
+                {
+                    deltaX = x - data.x0;
+                    deltaY = y - data.y0;
+                    xMax = data.dx;
+                    yMax = data.dy;
+                    factor = (double)((deltaX * deltaX) + (deltaY * deltaY));
+                    factor /= ((xMax * xMax) + (yMax * yMax));
+                }
+                else
+                {
+                    // pyramid
+                    xMax = data.dx / 2 + data.dx % 2;
+                    yMax = data.dy / 2 + data.dy % 2;
+                    deltaX = Math.Abs(data.x0 + xMax - x);
+                    deltaY = Math.Abs(data.y0 + yMax - y);
+                    factor = Math.Max(((double)(deltaY) / yMax), ((double)(deltaX) / xMax));
+                }
+            }
+            else
+            {
+                factor = 0.0;
+            }
+            return factor;
+        }
+
+        private bool[,] rectangularMask(int xSize, int ySize)
+        {
+            bool[,] mask = new bool[xSize, ySize];
+            int yPos = ySize;
+            while(--yPos >= 0)
+            {
+                int xPos = xSize;
+                while(--xPos >= 0)
+                {
+                    mask[xPos, yPos] = true;
+                }
+            }
+            return mask;
+        }
+
+        /*
+         * Fast ellipse-based derivative of Bresenham algorithm.
+         *   https://web.archive.org/web/20120225095359/http://homepage.smc.edu/kennedy_john/belipse.pdf
+         */
+        private bool[,] ellipticalMask(int xRadius, int yRadius)
+        {
+            long twoASquared = 2L * xRadius * xRadius;
+            long twoBSquared = 2L * yRadius * yRadius;
+
+            bool[,] mask = new bool[2 * xRadius + 1, 2 * yRadius + 1];
+
+            long ellipseError = 0L;
+            long stoppingX = twoBSquared * xRadius;
+            long stoppingY = 0L;
+            long xChange = yRadius * yRadius * (1L - 2L * xRadius);
+            long yChange = xRadius * xRadius;
+
+            int xPos = xRadius;
+            int yPos = 0;
+
+            // first set of points
+            while(stoppingX >= stoppingY)
+            {
+                int yUpper = yRadius + yPos;
+                int yLower = yRadius - yPos;
+                // fill in the mask
+                int xNow = xPos;
+                while(xNow >= 0)
+                {
+                    mask[xRadius + xNow, yUpper] = true;
+                    mask[xRadius - xNow, yUpper] = true;
+                    mask[xRadius + xNow, yLower] = true;
+                    mask[xRadius - xNow, yLower] = true;
+                    --xNow;
+                }
+                yPos++;
+                stoppingY += twoASquared;
+                ellipseError += yChange;
+                yChange += twoASquared;
+                if ((2L * ellipseError + xChange) > 0L)
+                {
+                    xPos--;
+                    stoppingX -= twoBSquared;
+                    ellipseError += xChange;
+                    xChange += twoBSquared;
+                }
+            }
+
+            // second set of points
+            xPos = 0;
+            yPos = yRadius;
+            xChange = yRadius * yRadius;
+            yChange = xRadius * xRadius * (1L - 2L * yRadius);
+
+            ellipseError = 0L;
+            stoppingX = 0L;
+            stoppingY = twoASquared * yRadius;
+
+            while(stoppingX <= stoppingY)
+            {
+                int xUpper = xRadius + xPos;
+                int xLower = xRadius - xPos;
+                // fill in the mask
+                int yNow = yPos;
+                while(yNow >= 0)
+                {
+                    mask[xUpper, yRadius + yNow] = true;
+                    mask[xUpper, yRadius - yNow] = true;
+                    mask[xLower, yRadius + yNow] = true;
+                    mask[xLower, yRadius - yNow] = true;
+                    --yNow;
+                }
+                xPos++;
+                stoppingX += twoBSquared;
+                ellipseError += xChange;
+                xChange += twoBSquared;
+                if ((2L * ellipseError + yChange) > 0L)
+                {
+                    yPos--;
+                    stoppingY -= twoASquared;
+                    ellipseError += yChange;
+                    yChange += twoASquared;
+                }
+            }
+            return mask;
+        }
+
+
+    }
+
+}
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModifierData.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModifierData.cs
new file mode 100644
index 0000000..4e0f8d7
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModifierData.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace OpenSim.Region.CoreModules.World.Terrain
+{
+    public struct TerrainModifierData
+    {
+        public float elevation;
+        public string shape;
+        public int x0;
+        public int y0;
+        public int dx;
+        public int dy;
+        public string bevel;
+        public float bevelevation;
+    }
+}
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 7bae9ec..925de2a 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -24,19 +24,24 @@
  * (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.IO;
 using System.Reflection;
 using System.Net;
+
 using log4net;
 using Nini.Config;
+
 using OpenMetaverse;
 using Mono.Addins;
+
+using OpenSim.Data;
 using OpenSim.Framework;
+using OpenSim.Framework.Console;
 using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
+using OpenSim.Region.CoreModules.World.Terrain.Modifiers;
 using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
 using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
 using OpenSim.Region.Framework.Interfaces;
@@ -70,20 +75,36 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         #endregion
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+<<<<<<< HEAD
+=======
         
 #pragma warning disable 414
         private static readonly string LogHeader = "[TERRAIN MODULE]";
 #pragma warning restore 414
 
         private readonly Commander m_commander = new Commander("terrain");
+>>>>>>> avn/ubitvar
+
+#pragma warning disable 414
+        private static readonly string LogHeader = "[TERRAIN MODULE]";
+#pragma warning restore 414
 
+        private readonly Commander m_commander = new Commander("terrain");
         private readonly Dictionary<StandardTerrainEffects, ITerrainFloodEffect> m_floodeffects =
             new Dictionary<StandardTerrainEffects, ITerrainFloodEffect>();
-
         private readonly Dictionary<string, ITerrainLoader> m_loaders = new Dictionary<string, ITerrainLoader>();
-
         private readonly Dictionary<StandardTerrainEffects, ITerrainPaintableEffect> m_painteffects =
             new Dictionary<StandardTerrainEffects, ITerrainPaintableEffect>();
+<<<<<<< HEAD
+        private Dictionary<string, ITerrainEffect> m_plugineffects;
+        private Dictionary<string, ITerrainModifier> m_modifyOperations =
+            new Dictionary<string, ITerrainModifier>();
+        private ITerrainChannel m_channel;
+        private ITerrainChannel m_revert;
+        private Scene m_scene;
+        private volatile bool m_tainted;
+        private readonly Stack<LandUndoState> m_undo = new Stack<LandUndoState>(5);
+=======
 
         private Dictionary<string, ITerrainEffect> m_plugineffects;
         private ITerrainChannel m_channel;
@@ -91,6 +112,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private Scene m_scene;
         private volatile bool m_tainted;
 
+>>>>>>> avn/ubitvar
         private String m_InitialTerrain = "pinhead-island";
 
         // If true, send terrain patch updates to clients based on their view distance
@@ -104,11 +126,19 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             private bool[,] updated;    // for each patch, whether it needs to be sent to this client
             private int updateCount;    // number of patches that need to be sent
             public ScenePresence Presence;   // a reference to the client to send to
+<<<<<<< HEAD
+            public TerrainData Terrain; // reference to the underlying terrain
+=======
+>>>>>>> avn/ubitvar
             public PatchUpdates(TerrainData terrData, ScenePresence pPresence)
             {
                 updated = new bool[terrData.SizeX / Constants.TerrainPatchSize, terrData.SizeY / Constants.TerrainPatchSize];
                 updateCount = 0;
                 Presence = pPresence;
+<<<<<<< HEAD
+                Terrain = terrData;
+=======
+>>>>>>> avn/ubitvar
                 // Initially, send all patches to the client
                 SetAll(true);
             }
@@ -117,14 +147,26 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             {
                 return (updateCount > 0);
             }
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
             public void SetByXY(int x, int y, bool state)
             {
                 this.SetByPatch(x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize, state);
             }
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
             public bool GetByPatch(int patchX, int patchY)
             {
                 return updated[patchX, patchY];
             }
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
             public void SetByPatch(int patchX, int patchY, bool state)
             {
                 bool prevState = updated[patchX, patchY];
@@ -134,11 +176,20 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     updateCount--;
                 updated[patchX, patchY] = state;
             }
+<<<<<<< HEAD
+
+            public void SetAll(bool state)
+            {
+                updateCount = 0;
+                for(int xx = 0; xx < updated.GetLength(0); xx++)
+                    for(int yy = 0; yy < updated.GetLength(1); yy++)
+=======
             public void SetAll(bool state)
             {
                 updateCount = 0;
                 for (int xx = 0; xx < updated.GetLength(0); xx++)
                     for (int yy = 0; yy < updated.GetLength(1); yy++)
+>>>>>>> avn/ubitvar
                         updated[xx, yy] = state;
                 if (state)
                     updateCount = updated.GetLength(0) * updated.GetLength(1);
@@ -155,9 +206,15 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                                 terrData.SizeX / Constants.TerrainPatchSize, terrData.SizeY / Constants.TerrainPatchSize)
                     );
                 }
+<<<<<<< HEAD
+                for(int xx = 0; xx < terrData.SizeX; xx += Constants.TerrainPatchSize)
+                {
+                    for(int yy = 0; yy < terrData.SizeY; yy += Constants.TerrainPatchSize)
+=======
                 for (int xx = 0; xx < terrData.SizeX; xx += Constants.TerrainPatchSize)
                 {
                     for (int yy = 0; yy < terrData.SizeY; yy += Constants.TerrainPatchSize)
+>>>>>>> avn/ubitvar
                     {
                         // Only set tainted. The patch bit may be set if the patch was to be sent later.
                         if (terrData.IsTaintedAt(xx, yy, false))
@@ -182,8 +239,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         #region ICommandableModule Members
 
-        public ICommander CommandInterface
-        {
+        public ICommander CommandInterface {
             get { return m_commander; }
         }
 
@@ -211,7 +267,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             m_scene = scene;
 
             // Install terrain module in the simulator
-            lock (m_scene)
+            lock(m_scene)
             {
                 if (m_scene.Heightmap == null)
                 {
@@ -219,12 +275,20 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                                                                      (int)m_scene.RegionInfo.RegionSizeY,
                                                                      (int)m_scene.RegionInfo.RegionSizeZ);
                     m_scene.Heightmap = m_channel;
+<<<<<<< HEAD
+                    UpdateRevertMap();
+=======
                     UpdateBakedMap();
+>>>>>>> avn/ubitvar
                 }
                 else
                 {
                     m_channel = m_scene.Heightmap;
+<<<<<<< HEAD
+                    UpdateRevertMap();
+=======
                     UpdateBakedMap();
+>>>>>>> avn/ubitvar
                 }
 
                 m_scene.RegisterModuleInterface<ITerrainModule>(this);
@@ -232,7 +296,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 m_scene.EventManager.OnClientClosed += EventManager_OnClientClosed;
                 m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
                 m_scene.EventManager.OnTerrainTick += EventManager_OnTerrainTick;
+<<<<<<< HEAD
+                m_scene.EventManager.OnFrame += EventManager_OnFrame;
+=======
                 m_scene.EventManager.OnTerrainCheckUpdates += EventManager_TerrainCheckUpdates;
+>>>>>>> avn/ubitvar
             }
 
             InstallDefaultEffects();
@@ -243,7 +311,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             string supportedFilesSeparatorForTileSave = "";
 
             m_supportFileExtensionsForTileSave = "";
-            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+            foreach(KeyValuePair<string, ITerrainLoader> loader in m_loaders)
             {
                 m_supportedFileExtensions += supportedFilesSeparator + loader.Key + " (" + loader.Value + ")";
                 supportedFilesSeparator = ", ";
@@ -266,12 +334,16 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         public void RemoveRegion(Scene scene)
         {
-            lock (m_scene)
+            lock(m_scene)
             {
                 // remove the commands
                 m_scene.UnregisterModuleCommander(m_commander.Name);
                 // remove the event-handlers
+<<<<<<< HEAD
+                m_scene.EventManager.OnFrame -= EventManager_OnFrame;
+=======
                 m_scene.EventManager.OnTerrainCheckUpdates -= EventManager_TerrainCheckUpdates;
+>>>>>>> avn/ubitvar
                 m_scene.EventManager.OnTerrainTick -= EventManager_OnTerrainTick;
                 m_scene.EventManager.OnPluginConsole -= EventManager_OnPluginConsole;
                 m_scene.EventManager.OnClientClosed -= EventManager_OnClientClosed;
@@ -285,13 +357,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         {
         }
 
-        public Type ReplaceableInterface 
-        {
+        public Type ReplaceableInterface {
             get { return null; }
         }
 
-        public string Name
-        {
+        public string Name {
             get { return "TerrainModule"; }
         }
 
@@ -310,11 +380,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         /// <param name="filename">Filename to terrain file. Type is determined by extension.</param>
         public void LoadFromFile(string filename)
         {
-            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+            foreach(KeyValuePair<string, ITerrainLoader> loader in m_loaders)
             {
                 if (filename.EndsWith(loader.Key))
                 {
-                    lock (m_scene)
+                    lock(m_scene)
                     {
                         try
                         {
@@ -330,20 +400,20 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                             m_channel = channel;
                             UpdateBakedMap();
                         }
-                        catch (NotImplementedException)
+                        catch(NotImplementedException)
                         {
                             m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value +
                                         " parser does not support file loading. (May be save only)");
                             throw new TerrainException(String.Format("unable to load heightmap: parser {0} does not support loading", loader.Value));
                         }
-                        catch (FileNotFoundException)
+                        catch(FileNotFoundException)
                         {
                             m_log.Error(
                                 "[TERRAIN]: Unable to load heightmap, file not found. (A directory permissions error may also cause this)");
                             throw new TerrainException(
                                 String.Format("unable to load heightmap: file {0} not found (or permissions do not allow access", filename));
                         }
-                        catch (ArgumentException e)
+                        catch(ArgumentException e)
                         {
                             m_log.ErrorFormat("[TERRAIN]: Unable to load heightmap: {0}", e.Message);
                             throw new TerrainException(
@@ -367,7 +437,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         {
             try
             {
-                foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+                foreach(KeyValuePair<string, ITerrainLoader> loader in m_loaders)
                 {
                     if (filename.EndsWith(loader.Key))
                     {
@@ -377,7 +447,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     }
                 }
             }
-            catch (IOException ioe)
+            catch(IOException ioe)
             {
                 m_log.Error(String.Format("[TERRAIN]: Unable to save to {0}, {1}", filename, ioe.Message));
             }
@@ -410,19 +480,23 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         public void LoadFromStream(string filename, Vector3 displacement,
                                 float radianRotation, Vector2 rotationDisplacement, Stream stream)
         {
-            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+            foreach(KeyValuePair<string, ITerrainLoader> loader in m_loaders)
             {
                 if (filename.EndsWith(loader.Key))
                 {
-                    lock (m_scene)
+                    lock(m_scene)
                     {
                         try
                         {
                             ITerrainChannel channel = loader.Value.LoadStream(stream);
                             m_channel.Merge(channel, displacement, radianRotation, rotationDisplacement);
+<<<<<<< HEAD
+                            UpdateRevertMap();
+=======
                             UpdateBakedMap();
+>>>>>>> avn/ubitvar
                         }
-                        catch (NotImplementedException)
+                        catch(NotImplementedException)
                         {
                             m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value +
                                         " parser does not support file loading. (May be save only)");
@@ -482,7 +556,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         {
             try
             {
-                foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+                foreach(KeyValuePair<string, ITerrainLoader> loader in m_loaders)
                 {
                     if (filename.EndsWith(loader.Key))
                     {
@@ -491,7 +565,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     }
                 }
             }
-            catch (NotImplementedException)
+            catch(NotImplementedException)
             {
                 m_log.Error("Unable to save to " + filename + ", saving of this file format has not been implemented.");
                 throw new TerrainException(String.Format("Unable to save heightmap: saving of this file format not implemented"));
@@ -500,16 +574,27 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         // Someone diddled terrain outside the normal code paths. Set the taintedness for all clients.
         // ITerrainModule.TaintTerrain()
+<<<<<<< HEAD
+        public void TaintTerrain()
+        {
+            lock(m_perClientPatchUpdates)
+            {
+                // Set the flags for all clients so the tainted patches will be sent out
+                foreach(PatchUpdates pups in m_perClientPatchUpdates.Values)
+=======
         public void TaintTerrain ()
         {
             lock (m_perClientPatchUpdates)
             {
                 // Set the flags for all clients so the tainted patches will be sent out
                 foreach (PatchUpdates pups in m_perClientPatchUpdates.Values)
+>>>>>>> avn/ubitvar
                 {
                     pups.SetAll(m_scene.Heightmap.GetTerrainData());
                 }
             }
+<<<<<<< HEAD
+=======
         }
 
         // ITerrainModule.PushTerrain()
@@ -530,8 +615,38 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     pups.SetAll(true);
                 }
             }
+>>>>>>> avn/ubitvar
         }
 
+        // ITerrainModule.PushTerrain()
+        public void PushTerrain(IClientAPI pClient)
+        {
+            // If view distance based, set the modified patch bits and the frame event will send the updates
+            if (m_sendTerrainUpdatesByViewDistance)
+            {
+                ScenePresence presence = m_scene.GetScenePresence(pClient.AgentId);
+                if (presence != null)
+                {
+                    lock(m_perClientPatchUpdates)
+                    {
+                        PatchUpdates pups;
+                        if (!m_perClientPatchUpdates.TryGetValue(pClient.AgentId, out pups))
+                        {
+                            // There is a ScenePresence without a send patch map. Create one.
+                            pups = new PatchUpdates(m_scene.Heightmap.GetTerrainData(), presence);
+                            m_perClientPatchUpdates.Add(presence.UUID, pups);
+                        }
+                        // By setting all to modified, the next update tick will send the patches
+                        pups.SetAll(true);
+                    }
+                }
+            }
+            else
+            {
+                // The traditional way is to call into the protocol stack to send them all.
+                pClient.SendLayerData(new float[10]);
+            }
+        }
         #region Plugin Loading Methods
 
         private void LoadPlugins()
@@ -539,13 +654,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             m_plugineffects = new Dictionary<string, ITerrainEffect>();
             LoadPlugins(Assembly.GetCallingAssembly());
             string plugineffectsPath = "Terrain";
-            
+
             // Load the files in the Terrain/ dir
             if (!Directory.Exists(plugineffectsPath))
                 return;
-            
+
             string[] files = Directory.GetFiles(plugineffectsPath);
-            foreach (string file in files)
+            foreach(string file in files)
             {
                 m_log.Info("Loading effects in " + file);
                 try
@@ -553,7 +668,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     Assembly library = Assembly.LoadFrom(file);
                     LoadPlugins(library);
                 }
-                catch (BadImageFormatException)
+                catch(BadImageFormatException)
                 {
                 }
             }
@@ -561,7 +676,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         private void LoadPlugins(Assembly library)
         {
-            foreach (Type pluginType in library.GetTypes())
+            foreach(Type pluginType in library.GetTypes())
             {
                 try
                 {
@@ -583,7 +698,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                         m_log.Info("L ... " + typeName);
                     }
                 }
-                catch (AmbiguousMatchException)
+                catch(AmbiguousMatchException)
                 {
                 }
             }
@@ -591,7 +706,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         public void InstallPlugin(string pluginName, ITerrainEffect effect)
         {
-            lock (m_plugineffects)
+            lock(m_plugineffects)
             {
                 if (!m_plugineffects.ContainsKey(pluginName))
                 {
@@ -634,6 +749,15 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             m_floodeffects[StandardTerrainEffects.Flatten] = new FlattenArea();
             m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_baked);
 
+            // Terrain Modifier operations
+            m_modifyOperations["min"] = new MinModifier(this);
+            m_modifyOperations["max"] = new MaxModifier(this);
+            m_modifyOperations["raise"] = new RaiseModifier(this);
+            m_modifyOperations["lower"] = new LowerModifier(this);
+            m_modifyOperations["fill"] = new FillModifier(this);
+            m_modifyOperations["smooth"] = new SmoothModifier(this);
+            m_modifyOperations["noise"] = new NoiseModifier(this);
+
             // Filesystem load/save loaders
             m_loaders[".r32"] = new RAW32();
             m_loaders[".f32"] = m_loaders[".r32"];
@@ -654,9 +778,24 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         /// </summary>
         public void UpdateBakedMap()
         {
+<<<<<<< HEAD
+            /*
+            int x;
+            for (x = 0; x < m_channel.Width; x++)
+            {
+                int y;
+                for (y = 0; y < m_channel.Height; y++)
+                {
+                    m_revert[x, y] = m_channel[x, y];
+                }
+            }
+             */
+            m_revert = m_channel.MakeCopy();
+=======
             m_baked = m_channel.MakeCopy();
             m_painteffects[StandardTerrainEffects.Revert] = new RevertSphere(m_baked);
             m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_baked);
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -669,22 +808,27 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         /// <param name="fileStartY">Where to begin our slice</param>
         public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY)
         {
-            int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX;
-            int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY;
+            int offsetX = (int)m_scene.RegionInfo.RegionLocX - fileStartX;
+            int offsetY = (int)m_scene.RegionInfo.RegionLocY - fileStartY;
 
             if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight)
             {
                 // this region is included in the tile request
-                foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+                foreach(KeyValuePair<string, ITerrainLoader> loader in m_loaders)
                 {
                     if (filename.EndsWith(loader.Key))
                     {
-                        lock (m_scene)
+                        lock(m_scene)
                         {
                             ITerrainChannel channel = loader.Value.LoadFile(filename, offsetX, offsetY,
                                                                             fileWidth, fileHeight,
+<<<<<<< HEAD
+                                                                            (int)m_scene.RegionInfo.RegionSizeX,
+                                                                            (int)m_scene.RegionInfo.RegionSizeY);
+=======
                                                                             (int) m_scene.RegionInfo.RegionSizeX,
                                                                             (int) m_scene.RegionInfo.RegionSizeY);
+>>>>>>> avn/ubitvar
                             m_scene.Heightmap = channel;
                             m_channel = channel;
                             UpdateBakedMap();
@@ -723,11 +867,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             }
 
             // this region is included in the tile request
-            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+            foreach(KeyValuePair<string, ITerrainLoader> loader in m_loaders)
             {
                 if (filename.EndsWith(loader.Key) && loader.Value.SupportsTileSave())
                 {
-                    lock (m_scene)
+                    lock(m_scene)
                     {
                         loader.Value.SaveFile(m_channel, filename, offsetX, offsetY,
                                               fileWidth, fileHeight,
@@ -739,7 +883,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                             fileStartX, fileStartY, fileStartX + fileWidth - 1, fileStartY + fileHeight - 1,
                             m_scene.RegionInfo.RegionName, filename);
                     }
-                    
+
                     return;
                 }
             }
@@ -750,11 +894,27 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         }
 
         /// <summary>
+<<<<<<< HEAD
+        /// Called before processing of every simulation frame.
+=======
+>>>>>>> avn/ubitvar
         /// This is used to check to see of any of the terrain is tainted and, if so, schedule
         /// updates for all the presences.
         /// This also checks to see if there are updates that need to be sent for each presence.
         /// This is where the logic is to send terrain updates to clients.
         /// </summary>
+<<<<<<< HEAD
+        private void EventManager_OnFrame()
+        {
+            TerrainData terrData = m_channel.GetTerrainData();
+
+            bool shouldTaint = false;
+            for(int x = 0; x < terrData.SizeX; x += Constants.TerrainPatchSize)
+            {
+                for(int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize)
+                {
+                    if (terrData.IsTaintedAt(x, y))
+=======
         private void EventManager_TerrainCheckUpdates()
         {
             // this needs fixing
@@ -766,6 +926,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 for (int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize)
                 {
                     if (terrData.IsTaintedAt(x, y,true))
+>>>>>>> avn/ubitvar
                     {
                         // Found a patch that was modified. Push this flag into the clients.
                         SendToClients(terrData, x, y);
@@ -783,7 +944,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 m_scene.EventManager.TriggerTerrainTainted();
                 m_tainted = true;
             }
+<<<<<<< HEAD
+=======
 
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -819,7 +983,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
                 string[] tmpArgs = new string[args.Length - 2];
                 int i;
-                for (i = 2; i < args.Length; i++)
+                for(i = 2; i < args.Length; i++)
                     tmpArgs[i - 2] = args[i];
 
                 m_commander.ProcessConsoleCommand(args[1], tmpArgs);
@@ -837,7 +1001,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             client.OnLandUndo += client_OnLandUndo;
             client.OnUnackedTerrain += client_OnUnackedTerrain;
         }
-        
+
         /// <summary>
         /// Installs terrain brush hook to IClientAPI
         /// </summary>
@@ -852,6 +1016,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 presence.ControllingClient.OnLandUndo -= client_OnLandUndo;
                 presence.ControllingClient.OnUnackedTerrain -= client_OnUnackedTerrain;
             }
+<<<<<<< HEAD
+
+            lock(m_perClientPatchUpdates)
+                m_perClientPatchUpdates.Remove(client);
+        }
+=======
+>>>>>>> avn/ubitvar
 
             lock (m_perClientPatchUpdates)
                 m_perClientPatchUpdates.Remove(client);
@@ -867,12 +1038,21 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             TerrainData terrData = m_channel.GetTerrainData();
 
             bool wasLimited = false;
+<<<<<<< HEAD
+            for(int x = 0; x < terrData.SizeX; x += Constants.TerrainPatchSize)
+            {
+                for(int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize)
+                {
+                    if (terrData.IsTaintedAt(x, y, false /* clearOnTest */))
+                    {
+=======
             for (int x = 0; x < terrData.SizeX; x += Constants.TerrainPatchSize)
             {
                 for (int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize)
                 {
                     if (terrData.IsTaintedAt(x, y, false /* clearOnTest */))
                    {
+>>>>>>> avn/ubitvar
                         // If we should respect the estate settings then
                         //     fixup and height deltas that don't respect them.
                         // Note that LimitChannelChanges() modifies the TerrainChannel with the limited height values.
@@ -895,13 +1075,22 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             float maxDelta = (float)m_scene.RegionInfo.RegionSettings.TerrainRaiseLimit;
 
             // loop through the height map for this patch and compare it against
+<<<<<<< HEAD
+            // the revert map
+            for(int x = xStart; x < xStart + Constants.TerrainPatchSize; x++)
+=======
             // the baked map
             for (int x = xStart; x < xStart + Constants.TerrainPatchSize; x++)
+>>>>>>> avn/ubitvar
             {
-                for (int y = yStart; y < yStart + Constants.TerrainPatchSize; y++)
+                for(int y = yStart; y < yStart + Constants.TerrainPatchSize; y++)
                 {
                     float requestedHeight = terrData[x, y];
+<<<<<<< HEAD
+                    float bakedHeight = (float)m_revert[x, y];
+=======
                     float bakedHeight = (float)m_baked[x, y];
+>>>>>>> avn/ubitvar
                     float requestedDelta = requestedHeight - bakedHeight;
 
                     if (requestedDelta > maxDelta)
@@ -922,7 +1111,19 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         private void client_OnLandUndo(IClientAPI client)
         {
+<<<<<<< HEAD
+            lock(m_undo)
+            {
+                if (m_undo.Count > 0)
+                {
+                    LandUndoState goback = m_undo.Pop();
+                    if (goback != null)
+                        goback.PlaybackState();
+                }
+            }
+=======
 
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -932,6 +1133,175 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         /// <param name="x">The patch corner to send</param>
         /// <param name="y">The patch corner to send</param>
         private void SendToClients(TerrainData terrData, int x, int y)
+<<<<<<< HEAD
+        {
+            if (m_sendTerrainUpdatesByViewDistance)
+            {
+                // Add that this patch needs to be sent to the accounting for each client.
+                lock(m_perClientPatchUpdates)
+                {
+                    m_scene.ForEachScenePresence(presence =>
+                    {
+                        PatchUpdates thisClientUpdates;
+                        if (!m_perClientPatchUpdates.TryGetValue(presence.UUID, out thisClientUpdates))
+                        {
+                            // There is a ScenePresence without a send patch map. Create one.
+                            thisClientUpdates = new PatchUpdates(terrData, presence);
+                            m_perClientPatchUpdates.Add(presence.UUID, thisClientUpdates);
+                        }
+                        thisClientUpdates.SetByXY(x, y, true);
+                    }
+                    );
+                }
+            }
+            else
+            {
+                // Legacy update sending where the update is sent out as soon as noticed
+                // We know the actual terrain data that is passed is ignored so this passes a dummy heightmap.
+                //float[] heightMap = terrData.GetFloatsSerialized();
+                float[] heightMap = new float[10];
+                m_scene.ForEachClient(
+                    delegate(IClientAPI controller)
+                    {
+                        controller.SendLayerData(x / Constants.TerrainPatchSize,
+                                                 y / Constants.TerrainPatchSize,
+                                                 heightMap);
+                    }
+                );
+            }
+        }
+
+        private class PatchesToSend : IComparable<PatchesToSend>
+        {
+            public int PatchX;
+            public int PatchY;
+            public float Dist;
+
+            public PatchesToSend(int pX, int pY, float pDist)
+            {
+                PatchX = pX;
+                PatchY = pY;
+                Dist = pDist;
+            }
+
+            public int CompareTo(PatchesToSend other)
+            {
+                return Dist.CompareTo(other.Dist);
+            }
+        }
+
+        // Called each frame time to see if there are any patches to send to any of the
+        //    ScenePresences.
+        // We know this is only called if we are doing view distance patch sending so some
+        //    tests are not made.
+        // Loop through all the per-client info and send any patches necessary.
+        private void CheckSendingPatchesToClients()
+        {
+            lock(m_perClientPatchUpdates)
+            {
+                foreach(PatchUpdates pups in m_perClientPatchUpdates.Values)
+                {
+                    if (pups.HasUpdates())
+                    {
+                        // There is something that could be sent to this client.
+                        List<PatchesToSend> toSend = GetModifiedPatchesInViewDistance(pups);
+                        if (toSend.Count > 0)
+                        {
+                            // m_log.DebugFormat("{0} CheckSendingPatchesToClient: sending {1} patches to {2} in region {3}",
+                            //                     LogHeader, toSend.Count, pups.Presence.Name, m_scene.RegionInfo.RegionName);
+                            // Sort the patches to send by the distance from the presence
+                            toSend.Sort();
+                            /* old way that sent individual patches
+                            foreach (PatchesToSend pts in toSend)
+                            {
+                                pups.Presence.ControllingClient.SendLayerData(pts.PatchX, pts.PatchY, null);
+                                // presence.ControllingClient.SendLayerData(xs.ToArray(), ys.ToArray(), null, TerrainPatch.LayerType.Land);
+                            }
+                            */
+
+                            // new way that sends all patches to the protocol so they can be sent in one block
+                            int[] xPieces = new int[toSend.Count];
+                            int[] yPieces = new int[toSend.Count];
+                            float[] patchPieces = new float[toSend.Count * 2];
+                            int pieceIndex = 0;
+                            foreach(PatchesToSend pts in toSend)
+                            {
+                                patchPieces[pieceIndex++] = pts.PatchX;
+                                patchPieces[pieceIndex++] = pts.PatchY;
+                            }
+                            pups.Presence.ControllingClient.SendLayerData(-toSend.Count, 0, patchPieces);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Compute a list of modified patches that are within our view distance.
+        private List<PatchesToSend> GetModifiedPatchesInViewDistance(PatchUpdates pups)
+        {
+            List<PatchesToSend> ret = new List<PatchesToSend>();
+
+            ScenePresence presence = pups.Presence;
+            if (presence == null)
+                return ret;
+
+            Vector3 presencePos = presence.AbsolutePosition;
+
+            // Before this distance check, the whole region just showed up. Adding the distance
+            //   check causes different things to happen for the current and adjacent regions.
+            //   So, to keep legacy views, if the region is legacy sized, don't do distance check.
+            bool isLegacySizedRegion = pups.Terrain.SizeX == Constants.RegionSize && pups.Terrain.SizeY == Constants.RegionSize;
+            bool shouldCheckViewDistance = m_sendTerrainUpdatesByViewDistance && !isLegacySizedRegion;
+
+            int startX = 0;
+            int endX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize;
+            int startY = 0;
+            int endY = (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize;
+
+            // The following only reduces the size of area scanned for updates. Only significant for very large varregions.
+            if (shouldCheckViewDistance)
+            {
+                // Compute the area of patches within our draw distance
+                startX = (((int)(presencePos.X - presence.DrawDistance)) / Constants.TerrainPatchSize) - 2;
+                startX = Math.Max(startX, 0);
+                startX = Math.Min(startX, (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize);
+                startY = (((int)(presencePos.Y - presence.DrawDistance)) / Constants.TerrainPatchSize) - 2;
+                startY = Math.Max(startY, 0);
+                startY = Math.Min(startY, (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize);
+                endX = (((int)(presencePos.X + presence.DrawDistance)) / Constants.TerrainPatchSize) + 2;
+                endX = Math.Max(endX, 0);
+                endX = Math.Min(endX, (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize);
+                endY = (((int)(presencePos.Y + presence.DrawDistance)) / Constants.TerrainPatchSize) + 2;
+                endY = Math.Max(endY, 0);
+                endY = Math.Min(endY, (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize);
+            }
+
+            // m_log.DebugFormat("{0} GetModifiedPatchesInViewDistance. rName={1}, ddist={2}, apos={3}, cpos={4}, isChild={5}, start=<{6},{7}>, end=<{8},{9}>",
+            //                                     LogHeader, m_scene.RegionInfo.RegionName,
+            //                                     presence.DrawDistance, presencePos, presence.CameraPosition,
+            //                                     isLegacySizeChildRegion,
+            //                                     startX, startY, endX, endY);
+            for(int x = startX; x < endX; x++)
+            {
+                for(int y = startY; y < endY; y++)
+                {
+                    //Need to make sure we don't send the same ones over and over
+                    Vector3 patchPos = new Vector3(x * Constants.TerrainPatchSize, y * Constants.TerrainPatchSize, presencePos.Z);
+                    if (pups.GetByPatch(x, y))
+                    {
+                        //Check which has less distance, camera or avatar position, both have to be done.
+                        //Its not a radius, its a diameter and we add 50 so that it doesn't look like it cuts off
+                        if (!shouldCheckViewDistance
+                            || Util.DistanceLessThan(presencePos, patchPos, presence.DrawDistance + 50)
+                            || Util.DistanceLessThan(presence.CameraPosition, patchPos, presence.DrawDistance + 50))
+                        {
+                            //They can see it, send it to them
+                            pups.SetByPatch(x, y, false);
+                            float dist = Vector3.DistanceSquared(presencePos, patchPos);
+                            ret.Add(new PatchesToSend(x, y, dist));
+                        }
+                    }
+=======
         {
             // Add that this patch needs to be sent to the accounting for each client.
             lock (m_perClientPatchUpdates)
@@ -1105,6 +1475,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                             }
                         }
                     }
+>>>>>>> avn/ubitvar
                 }
             }
             return ret;
@@ -1117,17 +1488,34 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             bool allowed = false;
             if (north == south && east == west)
             {
-                if (m_painteffects.ContainsKey((StandardTerrainEffects) action))
+                if (m_painteffects.ContainsKey((StandardTerrainEffects)action))
                 {
-                    bool[,] allowMask = new bool[m_channel.Width,m_channel.Height];
+                    bool[,] allowMask = new bool[m_channel.Width, m_channel.Height];
                     allowMask.Initialize();
                     int n = size + 1;
                     if (n > 2)
                         n = 4;
 
-                    int zx = (int) (west + 0.5);
-                    int zy = (int) (north + 0.5);
+                    int zx = (int)(west + 0.5);
+                    int zy = (int)(north + 0.5);
 
+<<<<<<< HEAD
+                    int dx;
+                    for(dx=-n; dx<=n; dx++)
+                    {
+                        int dy;
+                        for(dy=-n; dy<=n; dy++)
+                        {
+                            int x = zx + dx;
+                            int y = zy + dy;
+                            if (x >= 0 && y >= 0 && x < m_channel.Width && y < m_channel.Height)
+                            {
+                                if (m_scene.Permissions.CanTerraformLand(agentId, new Vector3(x, y, 0)))
+                                {
+                                    allowMask[x, y] = true;
+                                    allowed = true;
+                                }
+=======
 
                     int startX = zx - n;
                     if (startX < 0)
@@ -1154,17 +1542,25 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                             {
                                 allowMask[x, y] = true;
                                 allowed = true;
+>>>>>>> avn/ubitvar
                             }
                         }
                     }
                     if (allowed)
                     {
                         StoreUndoState();
+<<<<<<< HEAD
+                        m_painteffects[(StandardTerrainEffects)action].PaintEffect(
+                            m_channel, allowMask, west, south, height, size, seconds);
+
+                        //revert changes outside estate limits
+=======
                         m_painteffects[(StandardTerrainEffects) action].PaintEffect(
                             m_channel, allowMask, west, south, height, size, seconds,
                             startX, endX, startY, endY);
 
                         //block changes outside estate limits
+>>>>>>> avn/ubitvar
                         if (!god)
                             EnforceEstateLimits();
                     }
@@ -1176,22 +1572,22 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             }
             else
             {
-                if (m_floodeffects.ContainsKey((StandardTerrainEffects) action))
+                if (m_floodeffects.ContainsKey((StandardTerrainEffects)action))
                 {
-                    bool[,] fillArea = new bool[m_channel.Width,m_channel.Height];
+                    bool[,] fillArea = new bool[m_channel.Width, m_channel.Height];
                     fillArea.Initialize();
 
                     int x;
-                    for (x = 0; x < m_channel.Width; x++)
+                    for(x = 0; x < m_channel.Width; x++)
                     {
                         int y;
-                        for (y = 0; y < m_channel.Height; y++)
+                        for(y = 0; y < m_channel.Height; y++)
                         {
                             if (x < east && x > west)
                             {
                                 if (y < north && y > south)
                                 {
-                                    if (m_scene.Permissions.CanTerraformLand(agentId, new Vector3(x,y,0)))
+                                    if (m_scene.Permissions.CanTerraformLand(agentId, new Vector3(x, y, 0)))
                                     {
                                         fillArea[x, y] = true;
                                         allowed = true;
@@ -1204,9 +1600,15 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     if (allowed)
                     {
                         StoreUndoState();
+<<<<<<< HEAD
+                        m_floodeffects[(StandardTerrainEffects)action].FloodEffect(m_channel, fillArea, size);
+
+                        //revert changes outside estate limits
+=======
                         m_floodeffects[(StandardTerrainEffects) action].FloodEffect(m_channel, fillArea, size);
 
                         //block changes outside estate limits
+>>>>>>> avn/ubitvar
                         if (!god)
                             EnforceEstateLimits();
                     }
@@ -1228,7 +1630,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 InterfaceBakeTerrain(null); //bake terrain does not use the passed in parameter
             }
         }
-        
+
         protected void client_OnUnackedTerrain(IClientAPI client, int patchX, int patchY)
         {
             //m_log.Debug("Terrain packet unacked, resending patch: " + patchX + " , " + patchY);
@@ -1239,27 +1641,57 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         private void StoreUndoState()
         {
+<<<<<<< HEAD
+            lock(m_undo)
+            {
+                if (m_undo.Count > 0)
+                {
+                    LandUndoState last = m_undo.Peek();
+                    if (last != null)
+                    {
+                        if (last.Compare(m_channel))
+                            return;
+                    }
+                }
+
+                LandUndoState nUndo = new LandUndoState(this, m_channel);
+                m_undo.Push(nUndo);
+            }
+=======
+>>>>>>> avn/ubitvar
         }
 
         #region Console Commands
 
         private void InterfaceLoadFile(Object[] args)
         {
+<<<<<<< HEAD
+            LoadFromFile((string)args[0]);
+=======
             LoadFromFile((string) args[0]);
+>>>>>>> avn/ubitvar
         }
 
         private void InterfaceLoadTileFile(Object[] args)
         {
+<<<<<<< HEAD
+            LoadFromFile((string)args[0],
+                         (int)args[1],
+                         (int)args[2],
+                         (int)args[3],
+                         (int)args[4]);
+=======
             LoadFromFile((string) args[0],
                          (int) args[1],
                          (int) args[2],
                          (int) args[3],
                          (int) args[4]);
+>>>>>>> avn/ubitvar
         }
 
         private void InterfaceSaveFile(Object[] args)
         {
-            SaveToFile((string) args[0]);
+            SaveToFile((string)args[0]);
         }
 
         private void InterfaceSaveTileFile(Object[] args)
@@ -1279,9 +1711,15 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private void InterfaceRevertTerrain(Object[] args)
         {
             int x, y;
+<<<<<<< HEAD
+            for(x = 0; x < m_channel.Width; x++)
+                for(y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] = m_revert[x, y];
+=======
             for (x = 0; x < m_channel.Width; x++)
                 for (y = 0; y < m_channel.Height; y++)
                     m_channel[x, y] = m_baked[x, y];
+>>>>>>> avn/ubitvar
 
         }
 
@@ -1291,9 +1729,15 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
             if (direction.ToLower().StartsWith("y"))
             {
+<<<<<<< HEAD
+                for(int x = 0; x < m_channel.Width; x++)
+                {
+                    for(int y = 0; y < m_channel.Height / 2; y++)
+=======
                 for (int x = 0; x < m_channel.Width; x++)
                 {
                     for (int y = 0; y < m_channel.Height / 2; y++)
+>>>>>>> avn/ubitvar
                     {
                         double height = m_channel[x, y];
                         double flippedHeight = m_channel[x, (int)m_channel.Height - 1 - y];
@@ -1305,9 +1749,15 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             }
             else if (direction.ToLower().StartsWith("x"))
             {
+<<<<<<< HEAD
+                for(int y = 0; y < m_channel.Height; y++)
+                {
+                    for(int x = 0; x < m_channel.Width / 2; x++)
+=======
                 for (int y = 0; y < m_channel.Height; y++)
                 {
                     for (int x = 0; x < m_channel.Width / 2; x++)
+>>>>>>> avn/ubitvar
                     {
                         double height = m_channel[x, y];
                         double flippedHeight = m_channel[(int)m_channel.Width - 1 - x, y];
@@ -1319,7 +1769,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             }
             else
             {
-                m_log.Error("Unrecognised direction - need x or y");
+                MainConsole.Instance.OutputFormat("ERROR: Unrecognised direction {0} - need x or y", direction);
             }
         }
 
@@ -1346,9 +1796,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 int width = m_channel.Width;
                 int height = m_channel.Height;
 
-                for (int x = 0; x < width; x++)
+                for(int x = 0; x < width; x++)
                 {
-                    for (int y = 0; y < height; y++)
+                    for(int y = 0; y < height; y++)
                     {
                         double currHeight = m_channel[x, y];
                         if (currHeight < currMin)
@@ -1369,12 +1819,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 //m_log.InfoFormat("Scale = {0}", scale);
 
                 // scale the heightmap accordingly
-                for (int x = 0; x < width; x++)
+                for(int x = 0; x < width; x++)
                 {
-                    for (int y = 0; y < height; y++)
+                    for(int y = 0; y < height; y++)
                     {
-                            double currHeight = m_channel[x, y] - currMin;
-                            m_channel[x, y] = desiredMin + (currHeight * scale);
+                        double currHeight = m_channel[x, y] - currMin;
+                        m_channel[x, y] = desiredMin + (currHeight * scale);
                     }
                 }
 
@@ -1387,29 +1837,47 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             double val = (double)args[0];
 
             int x, y;
+<<<<<<< HEAD
+            for(x = 0; x < m_channel.Width; x++)
+                for(y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] += (double)args[0];
+=======
             for (x = 0; x < m_channel.Width; x++)
                 for (y = 0; y < m_channel.Height; y++)
                     m_channel[x, y] += val;
+>>>>>>> avn/ubitvar
         }
 
         private void InterfaceMultiplyTerrain(Object[] args)
         {
             int x, y;
+<<<<<<< HEAD
+            for(x = 0; x < m_channel.Width; x++)
+                for(y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] *= (double)args[0];
+=======
             double val = (double)args[0];
 
             for (x = 0; x < m_channel.Width; x++)
                 for (y = 0; y < m_channel.Height; y++)
                     m_channel[x, y] *= val;
+>>>>>>> avn/ubitvar
         }
 
         private void InterfaceLowerTerrain(Object[] args)
         {
             int x, y;
+<<<<<<< HEAD
+            for(x = 0; x < m_channel.Width; x++)
+                for(y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] -= (double)args[0];
+=======
             double val = (double)args[0];
 
             for (x = 0; x < m_channel.Width; x++)
                 for (y = 0; y < m_channel.Height; y++)
                     m_channel[x, y] -= val;
+>>>>>>> avn/ubitvar
         }
 
         public void InterfaceFillTerrain(Object[] args)
@@ -1417,18 +1885,28 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             int x, y;
             double val = (double)args[0];
 
+<<<<<<< HEAD
+            for(x = 0; x < m_channel.Width; x++)
+                for(y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] = (double)args[0];
+=======
             for (x = 0; x < m_channel.Width; x++)
                 for (y = 0; y < m_channel.Height; y++)
                     m_channel[x, y] = val;
+>>>>>>> avn/ubitvar
         }
 
         private void InterfaceMinTerrain(Object[] args)
         {
             int x, y;
+<<<<<<< HEAD
+            for(x = 0; x < m_channel.Width; x++)
+=======
             double val = (double)args[0];
             for (x = 0; x < m_channel.Width; x++)
+>>>>>>> avn/ubitvar
             {
-                for (y = 0; y < m_channel.Height; y++)
+                for(y = 0; y < m_channel.Height; y++)
                 {
                     m_channel[x, y] = Math.Max(val, m_channel[x, y]);
                 }
@@ -1438,14 +1916,36 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private void InterfaceMaxTerrain(Object[] args)
         {
             int x, y;
+<<<<<<< HEAD
+            for(x = 0; x < m_channel.Width; x++)
+=======
             double val = (double)args[0];
             for (x = 0; x < m_channel.Width; x++)
+>>>>>>> avn/ubitvar
             {
-                for (y = 0; y < m_channel.Height; y++)
+                for(y = 0; y < m_channel.Height; y++)
                 {
                     m_channel[x, y] = Math.Min(val, m_channel[x, y]);
                 }
             }
+<<<<<<< HEAD
+        }
+
+        private void InterfaceShow(Object[] args)
+        {
+            Vector2 point;
+
+            if (!ConsoleUtil.TryParseConsole2DVector((string)args[0], null, out point))
+            {
+                Console.WriteLine("ERROR: {0} is not a valid vector", args[0]);
+                return;
+            }
+
+            double height = m_channel[(int)point.X, (int)point.Y];
+
+            Console.WriteLine("Terrain height at {0} is {1}", point, height);
+=======
+>>>>>>> avn/ubitvar
         }
 
         private void InterfaceShowDebugStats(Object[] args)
@@ -1455,10 +1955,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             double sum = 0;
 
             int x;
-            for (x = 0; x < m_channel.Width; x++)
+            for(x = 0; x < m_channel.Width; x++)
             {
                 int y;
-                for (y = 0; y < m_channel.Height; y++)
+                for(y = 0; y < m_channel.Height; y++)
                 {
                     sum += m_channel[x, y];
                     if (max < m_channel[x, y])
@@ -1470,13 +1970,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
             double avg = sum / (m_channel.Height * m_channel.Width);
 
-            m_log.Info("Channel " + m_channel.Width + "x" + m_channel.Height);
-            m_log.Info("max/min/avg/sum: " + max + "/" + min + "/" + avg + "/" + sum);
+            MainConsole.Instance.OutputFormat("Channel {0}x{1}", m_channel.Width, m_channel.Height);
+            MainConsole.Instance.OutputFormat("max/min/avg/sum: {0}/{1}/{2}/{3}", max, min, avg, sum);
         }
 
         private void InterfaceEnableExperimentalBrushes(Object[] args)
         {
-            if ((bool) args[0])
+            if ((bool)args[0])
             {
                 m_painteffects[StandardTerrainEffects.Revert] = new WeatherSphere();
                 m_painteffects[StandardTerrainEffects.Flatten] = new OlsenSphere();
@@ -1491,27 +1991,30 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private void InterfaceRunPluginEffect(Object[] args)
         {
             string firstArg = (string)args[0];
+
             if (firstArg == "list")
             {
-                m_log.Info("List of loaded plugins");
-                foreach (KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects)
+                MainConsole.Instance.Output("List of loaded plugins");
+                foreach(KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects)
                 {
-                    m_log.Info(kvp.Key);
+                    MainConsole.Instance.Output(kvp.Key);
                 }
                 return;
             }
+
             if (firstArg == "reload")
             {
                 LoadPlugins();
                 return;
             }
+
             if (m_plugineffects.ContainsKey(firstArg))
             {
                 m_plugineffects[firstArg].RunEffect(m_channel);
             }
             else
             {
-                m_log.Warn("No such plugin effect loaded.");
+                MainConsole.Instance.Output("WARNING: No such plugin effect {0} loaded.", firstArg);
             }
         }
 
@@ -1600,12 +2103,17 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 new Command("stats", CommandIntentions.COMMAND_STATISTICAL, InterfaceShowDebugStats,
                             "Shows some information about the regions heightmap for debugging purposes.");
 
+            Command showCommand =
+                new Command("show", CommandIntentions.COMMAND_NON_HAZARDOUS, InterfaceShow,
+                            "Shows terrain height at a given co-ordinate.");
+            showCommand.AddArgument("point", "point in <x>,<y> format with no spaces (e.g. 45,45)", "String");
+
             Command experimentalBrushesCommand =
                 new Command("newbrushes", CommandIntentions.COMMAND_HAZARDOUS, InterfaceEnableExperimentalBrushes,
                             "Enables experimental brushes which replace the standard terrain brushes. WARNING: This is a debug setting and may be removed at any time.");
             experimentalBrushesCommand.AddArgument("Enabled?", "true / false - Enable new brushes", "Boolean");
 
-            //Plugins
+            // Plugins
             Command pluginRunCommand =
                 new Command("effect", CommandIntentions.COMMAND_HAZARDOUS, InterfaceRunPluginEffect, "Runs a specified plugin effect");
             pluginRunCommand.AddArgument("name", "The plugin effect you wish to run, or 'list' to see all plugins", "String");
@@ -1621,6 +2129,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             m_commander.RegisterCommand("bake", bakeRegionCommand);
             m_commander.RegisterCommand("revert", revertRegionCommand);
             m_commander.RegisterCommand("newbrushes", experimentalBrushesCommand);
+            m_commander.RegisterCommand("show", showCommand);
             m_commander.RegisterCommand("stats", showDebugStatsCommand);
             m_commander.RegisterCommand("effect", pluginRunCommand);
             m_commander.RegisterCommand("flip", flipCommand);
@@ -1630,10 +2139,66 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
             // Add this to our scene so scripts can call these functions
             m_scene.RegisterModuleCommander(m_commander);
+
+            // Add Modify command to Scene, since Command object requires fixed-length arglists
+            m_scene.AddCommand("Terrain", this, "terrain modify",
+                               "terrain modify <operation> <value> [<area>] [<taper>]",
+                               "Modifies the terrain as instructed." +
+                               "\nEach operation can be limited to an area of effect:" +
+                               "\n * -ell=x,y,rx[,ry] constrains the operation to an ellipse centred at x,y" +
+                               "\n * -rec=x,y,dx[,dy] constrains the operation to a rectangle based at x,y" +
+                               "\nEach operation can have its effect tapered based on distance from centre:" +
+                               "\n * elliptical operations taper as cones" +
+                               "\n * rectangular operations taper as pyramids"
+                               ,
+                               ModifyCommand);
+
         }
 
+        public void ModifyCommand(string module, string[] cmd)
+        {
+            string result;
+            Scene scene = SceneManager.Instance.CurrentScene;
+            if ((scene != null) && (scene != m_scene))
+            {
+                result = String.Empty;
+            }
+            else if (cmd.Length > 2)
+            {
+                string operationType = cmd[2];
 
-        #endregion
+
+                ITerrainModifier operation;
+                if (!m_modifyOperations.TryGetValue(operationType, out operation))
+                {
+                    result = String.Format("Terrain Modify \"{0}\" not found.", operationType);
+                }
+                else if ((cmd.Length > 3) && (cmd[3] == "usage"))
+                {
+                    result = "Usage: " + operation.GetUsage();
+                }
+                else
+                {
+                    result = operation.ModifyTerrain(m_channel, cmd);
+                }
+
+                if (result == String.Empty)
+                {
+                    result = "Modified terrain";
+                    m_log.DebugFormat("Performed terrain operation {0}", operationType);
+                }
+            }
+            else
+            {
+                result = "Usage: <operation-name> <arg1> <arg2>...";
+            }
+            if (result != String.Empty)
+            {
+                MainConsole.Instance.Output(result);
+            }
+        }
+
+#endregion
 
     }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs
index e2178e5..0563ad0 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs
@@ -25,55 +25,51 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Net;
-using OpenMetaverse;
+using System;
+using NUnit.Framework;
 using OpenSim.Framework;
+using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Scenes;
-using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Tests.Common;
 
-namespace OpenSim.Region.ClientStack.LindenUDP.Tests
+namespace OpenSim.Region.CoreModules.Terrain.Tests
 {
-    /// <summary>
-    /// Mock scene for unit tests
-    /// </summary>
-    public class MockScene : SceneBase
+    public class TerrainModuleTests : OpenSimTestCase
     {
-        public int ObjectNameCallsReceived
+        [Test]
+        public void TestTerrainFill()
         {
-            get { return m_objectNameCallsReceived; }
-        }
-        protected int m_objectNameCallsReceived;
-        
-        public MockScene() : base(new RegionInfo(1000, 1000, null, null))
-        {
-            m_regStatus = RegionStatus.Up;
-        }
-        
-        public override void Update(int frames) {}
-        public override void LoadWorldMap() {}
-        
-        public override ISceneAgent AddNewAgent(IClientAPI client, PresenceType type)
-        {
-            client.OnObjectName += RecordObjectNameCall;
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
 
-            // FIXME
-            return null;
-        }
+            //UUID userId = TestHelpers.ParseTail(0x1);
 
-        public override bool CloseAgent(UUID agentID, bool force) { return true; }
+            TerrainModule tm = new TerrainModule();
+            Scene scene = new SceneHelpers().SetupScene();            
+            SceneHelpers.SetupSceneModules(scene, tm);             
 
-        public override bool CheckClient(UUID clientId, IPEndPoint endPoint) { return true; }
+            // Fillheight of 30
+            {
+                double fillHeight = 30;
 
-        public override void OtherRegionUp(GridRegion otherRegion) {  }
+                tm.InterfaceFillTerrain(new object[] { fillHeight });
 
-        public override bool TryGetScenePresence(UUID uuid, out ScenePresence sp) { sp = null; return false; }
-            
-        /// <summary>
-        /// Doesn't really matter what the call is - we're using this to test that a packet has actually been received
-        /// </summary>
-        protected void RecordObjectNameCall(IClientAPI remoteClient, uint localID, string message)
-        {
-            m_objectNameCallsReceived++;
+                double height = scene.Heightmap[128, 128];
+
+                Assert.AreEqual(fillHeight, height);
+            }
+
+            // Max fillheight of 30
+            // According to http://wiki.secondlife.com/wiki/Tips_for_Creating_Heightfields_and_Details_on_Terrain_RAW_Files#Notes_for_Creating_Height_Field_Maps_for_Second_Life
+            {
+                double fillHeight = 508;
+
+                tm.InterfaceFillTerrain(new object[] { fillHeight });
+
+                double height = scene.Heightmap[128, 128];
+
+                Assert.AreEqual(fillHeight, height);
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
index 2329c1f..40db370 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
@@ -60,8 +60,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Tests
             TerrainChannel map = new TerrainChannel((int)Constants.RegionSize, (int)Constants.RegionSize);
             ITerrainPaintableEffect effect = new RaiseSphere();
 
+<<<<<<< HEAD
+            effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0);
+=======
             effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0,
                 0, midRegion - 1,0, (int)Constants.RegionSize -1);
+>>>>>>> avn/ubitvar
             Assert.That(map[127, midRegion] > 0.0, "Raise brush should raising value at this point (127,128).");
             Assert.That(map[125, midRegion] > 0.0, "Raise brush should raising value at this point (124,128).");
             Assert.That(map[120, midRegion] == 0.0, "Raise brush should not change value at this point (120,128).");
@@ -80,8 +84,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Tests
             }
             effect = new LowerSphere();
 
+<<<<<<< HEAD
+            effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0);
+=======
             effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0,
                 0, (int)Constants.RegionSize -1,0, (int)Constants.RegionSize -1);
+>>>>>>> avn/ubitvar
             Assert.That(map[127, midRegion] >= 0.0, "Lower should not lowering value below 0.0 at this point (127,128).");
             Assert.That(map[127, midRegion] == 0.0, "Lower brush should lowering value to 0.0 at this point (127,128).");
             Assert.That(map[125, midRegion] < 1.0, "Lower brush should lowering value at this point (124,128).");
@@ -104,10 +112,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Tests
             x[0, 0] -= 1.0;
             Assert.That(x[0, 0] == 4.0, "Terrain addition/subtraction error.");
 
-            x[0, 0] = Math.PI;
-            double[,] doublesExport = x.GetDoubles();
-            Assert.That(doublesExport[0, 0] == Math.PI, "Export to double[,] array not working correctly.");
-
             x[0, 0] = 1.0;
             float[] floatsExport = x.GetFloatsSerialised();
             Assert.That(floatsExport[0] == 1.0f, "Export to float[] not working correctly.");
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
index 91ca7e2..77c10b8 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -73,133 +73,131 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         /// Builds a composited terrain texture given the region texture
         /// and heightmap settings
         /// </summary>
-        /// <param name="heightmap">Terrain heightmap</param>
+        /// <param name="terrain">Terrain heightmap</param>
         /// <param name="regionInfo">Region information including terrain texture parameters</param>
-        /// <returns>A composited 256x256 RGB texture ready for rendering</returns>
+        /// <returns>A 256x256 square RGB texture ready for rendering</returns>
         /// <remarks>Based on the algorithm described at http://opensimulator.org/wiki/Terrain_Splatting
+        /// Note we create a 256x256 dimension texture even if the actual terrain is larger.
         /// </remarks>
+<<<<<<< HEAD
+        public static Bitmap Splat(ITerrainChannel terrain,
+                UUID[] textureIDs, float[] startHeights, float[] heightRanges,
+                Vector3d regionPosition, IAssetService assetService, bool textureTerrain)
+=======
         public static Bitmap Splat(ITerrainChannel terrain, UUID[] textureIDs, float[] startHeights, float[] heightRanges, Vector3d regionPosition, IAssetService assetService, bool textureTerrain)
+>>>>>>> avn/ubitvar
         {
             Debug.Assert(textureIDs.Length == 4);
             Debug.Assert(startHeights.Length == 4);
             Debug.Assert(heightRanges.Length == 4);
 
             Bitmap[] detailTexture = new Bitmap[4];
-            Bitmap output = null;
-            BitmapData outputData = null;
 
-            try
+            if (textureTerrain)
             {
-                if (textureTerrain)
+                // Swap empty terrain textureIDs with default IDs
+                for (int i = 0; i < textureIDs.Length; i++)
                 {
-                    // Swap empty terrain textureIDs with default IDs
-                    for (int i = 0; i < textureIDs.Length; i++)
-                    {
-                        if (textureIDs[i] == UUID.Zero)
-                            textureIDs[i] = DEFAULT_TERRAIN_DETAIL[i];
-                    }
-    
-                    #region Texture Fetching
-    
-                    if (assetService != null)
+                    if (textureIDs[i] == UUID.Zero)
+                        textureIDs[i] = DEFAULT_TERRAIN_DETAIL[i];
+                }
+
+                #region Texture Fetching
+
+                if (assetService != null)
+                {
+                    for (int i = 0; i < 4; i++)
                     {
-                        for (int i = 0; i < 4; i++)
+                        AssetBase asset;
+                        UUID cacheID = UUID.Combine(TERRAIN_CACHE_MAGIC, textureIDs[i]);
+
+                        // Try to fetch a cached copy of the decoded/resized version of this texture
+                        asset = assetService.GetCached(cacheID.ToString());
+                        if (asset != null)
                         {
-                            AssetBase asset;
-                            UUID cacheID = UUID.Combine(TERRAIN_CACHE_MAGIC, textureIDs[i]);
-    
-                            // Try to fetch a cached copy of the decoded/resized version of this texture
-                            asset = assetService.GetCached(cacheID.ToString());
+                            try
+                            {
+                                using (System.IO.MemoryStream stream = new System.IO.MemoryStream(asset.Data))
+                                    detailTexture[i] = (Bitmap)Image.FromStream(stream);
+                            }
+                            catch (Exception ex)
+                            {
+                                m_log.Warn("Failed to decode cached terrain texture " + cacheID +
+                                    " (textureID: " + textureIDs[i] + "): " + ex.Message);
+                            }
+                        }
+
+                        if (detailTexture[i] == null)
+                        {
+                            // Try to fetch the original JPEG2000 texture, resize if needed, and cache as PNG
+                            asset = assetService.Get(textureIDs[i].ToString());
                             if (asset != null)
                             {
-//                                m_log.DebugFormat(
-//                                    "[TERRAIN SPLAT]: Got asset service cached terrain texture {0} {1}", i, asset.ID);
+//                                    m_log.DebugFormat(
+//                                        "[TERRAIN SPLAT]: Got cached original JPEG2000 terrain texture {0} {1}", i, asset.ID);
 
-                                try
-                                {
-                                    using (System.IO.MemoryStream stream = new System.IO.MemoryStream(asset.Data))
-                                        detailTexture[i] = (Bitmap)Image.FromStream(stream);
-                                }
+                                try { detailTexture[i] = (Bitmap)CSJ2K.J2kImage.FromBytes(asset.Data); }
                                 catch (Exception ex)
                                 {
-                                    m_log.Warn("Failed to decode cached terrain texture " + cacheID +
-                                        " (textureID: " + textureIDs[i] + "): " + ex.Message);
+                                    m_log.Warn("Failed to decode terrain texture " + asset.ID + ": " + ex.Message);
                                 }
                             }
-    
-                            if (detailTexture[i] == null)
-                            {
-                                // Try to fetch the original JPEG2000 texture, resize if needed, and cache as PNG
-                                asset = assetService.Get(textureIDs[i].ToString());
-                                if (asset != null)
-                                {
-//                                    m_log.DebugFormat(
-//                                        "[TERRAIN SPLAT]: Got cached original JPEG2000 terrain texture {0} {1}", i, asset.ID);
 
-                                    try { detailTexture[i] = (Bitmap)CSJ2K.J2kImage.FromBytes(asset.Data); }
-                                    catch (Exception ex)
+                            if (detailTexture[i] != null)
+                            {    
+                                // Make sure this texture is the correct size, otherwise resize
+                                if (detailTexture[i].Width != 256 || detailTexture[i].Height != 256)
+                                {
+                                    using (Bitmap origBitmap = detailTexture[i])
                                     {
-                                        m_log.Warn("Failed to decode terrain texture " + asset.ID + ": " + ex.Message);
+                                        detailTexture[i] = ImageUtils.ResizeImage(origBitmap, 256, 256);
                                     }
                                 }
-    
-                                if (detailTexture[i] != null)
-                                {    
-                                    // Make sure this texture is the correct size, otherwise resize
-                                    if (detailTexture[i].Width != 256 || detailTexture[i].Height != 256)
-                                    {
-                                        using (Bitmap origBitmap = detailTexture[i])
-                                        {
-                                            detailTexture[i] = ImageUtils.ResizeImage(origBitmap, 256, 256);
-                                        }
-                                    }
-    
-                                    // Save the decoded and resized texture to the cache
-                                    byte[] data;
-                                    using (System.IO.MemoryStream stream = new System.IO.MemoryStream())
-                                    {
-                                        detailTexture[i].Save(stream, ImageFormat.Png);
-                                        data = stream.ToArray();
-                                    }
-    
-                                    // Cache a PNG copy of this terrain texture
-                                    AssetBase newAsset = new AssetBase
-                                    {
-                                        Data = data,
-                                        Description = "PNG",
-                                        Flags = AssetFlags.Collectable,
-                                        FullID = cacheID,
-                                        ID = cacheID.ToString(),
-                                        Local = true,
-                                        Name = String.Empty,
-                                        Temporary = true,
-                                        Type = (sbyte)AssetType.Unknown
-                                    };
-                                    newAsset.Metadata.ContentType = "image/png";
-                                    assetService.Store(newAsset);
+
+                                // Save the decoded and resized texture to the cache
+                                byte[] data;
+                                using (System.IO.MemoryStream stream = new System.IO.MemoryStream())
+                                {
+                                    detailTexture[i].Save(stream, ImageFormat.Png);
+                                    data = stream.ToArray();
                                 }
+
+                                // Cache a PNG copy of this terrain texture
+                                AssetBase newAsset = new AssetBase
+                                {
+                                    Data = data,
+                                    Description = "PNG",
+                                    Flags = AssetFlags.Collectable,
+                                    FullID = cacheID,
+                                    ID = cacheID.ToString(),
+                                    Local = true,
+                                    Name = String.Empty,
+                                    Temporary = true,
+                                    Type = (sbyte)AssetType.Unknown
+                                };
+                                newAsset.Metadata.ContentType = "image/png";
+                                assetService.Store(newAsset);
                             }
                         }
                     }
-    
-                    #endregion Texture Fetching
                 }
-    
-                // Fill in any missing textures with a solid color
-                for (int i = 0; i < 4; i++)
+
+                #endregion Texture Fetching
+            }
+
+            // Fill in any missing textures with a solid color
+            for (int i = 0; i < 4; i++)
+            {
+                if (detailTexture[i] == null)
                 {
-                    if (detailTexture[i] == null)
+                    m_log.DebugFormat("{0} Missing terrain texture for layer {1}. Filling with solid default color",
+                                                            LogHeader, i);
+                    // Create a solid color texture for this layer
+                    detailTexture[i] = new Bitmap(256, 256, PixelFormat.Format24bppRgb);
+                    using (Graphics gfx = Graphics.FromImage(detailTexture[i]))
                     {
-//                        m_log.DebugFormat(
-//                            "[TERRAIN SPLAT]: Generating solid colour for missing texture {0}", i);
-
-                        // Create a solid color texture for this layer
-                        detailTexture[i] = new Bitmap(256, 256, PixelFormat.Format24bppRgb);
-                        using (Graphics gfx = Graphics.FromImage(detailTexture[i]))
-                        {
-                            using (SolidBrush brush = new SolidBrush(DEFAULT_TERRAIN_COLOR[i]))
-                                gfx.FillRectangle(brush, 0, 0, 256, 256);
-                        }
+                        using (SolidBrush brush = new SolidBrush(DEFAULT_TERRAIN_COLOR[i]))
+                            gfx.FillRectangle(brush, 0, 0, 256, 256);
                     }
                     else
                     {
@@ -209,6 +207,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                         }
                     }
                 }
+<<<<<<< HEAD
+                else
+=======
     
                 #region Layer Map
     
@@ -218,9 +219,13 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 int yFactor = terrain.Height / 256;
     
                 for (int y = 0; y < 256; y++)
+>>>>>>> avn/ubitvar
                 {
-                    for (int x = 0; x < 256; x++)
+                    if (detailTexture[i].Width != 256 || detailTexture[i].Height != 256)
                     {
+<<<<<<< HEAD
+                        detailTexture[i] = ResizeBitmap(detailTexture[i], 256, 256);
+=======
                         float height = (float)terrain[x * xFactor, y * yFactor];
     
                         float pctX = (float)x / 255f;
@@ -261,18 +266,69 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                         float layer = ((height + noise - startHeight) / heightRange) * 4f;
                         if (Single.IsNaN(layer)) layer = 0f;
                         layermap[x,y] = Utils.Clamp(layer, 0f, 3f);
+>>>>>>> avn/ubitvar
                     }
                 }
-    
-                #endregion Layer Map
-    
-                #region Texture Compositing
-    
-                output = new Bitmap(256, 256, PixelFormat.Format24bppRgb);
-                outputData = output.LockBits(new Rectangle(0, 0, 256, 256), ImageLockMode.WriteOnly, PixelFormat.Format24bppRgb);
-    
-                unsafe
+            }
+
+            #region Layer Map
+
+            float[,] layermap = new float[256, 256];
+
+            // Scale difference between actual region size and the 256 texture being created
+            int xFactor = terrain.Width / 256;
+            int yFactor = terrain.Height / 256;
+
+            // Create 'layermap' where each value is the fractional layer number to place
+            //    at that point. For instance, a value of 1.345 gives the blending of
+            //    layer 1 and layer 2 for that point.
+            for (int y = 0; y < 256; y++)
+            {
+                for (int x = 0; x < 256; x++)
                 {
+<<<<<<< HEAD
+                    float height = (float)terrain[x * xFactor, y * yFactor];
+
+                    float pctX = (float)x / 255f;
+                    float pctY = (float)y / 255f;
+
+                    // Use bilinear interpolation between the four corners of start height and 
+                    // height range to select the current values at this position
+                    float startHeight = ImageUtils.Bilinear(
+                        startHeights[0],
+                        startHeights[2],
+                        startHeights[1],
+                        startHeights[3],
+                        pctX, pctY);
+                    startHeight = Utils.Clamp(startHeight, 0f, 255f);
+
+                    float heightRange = ImageUtils.Bilinear(
+                        heightRanges[0],
+                        heightRanges[2],
+                        heightRanges[1],
+                        heightRanges[3],
+                        pctX, pctY);
+                    heightRange = Utils.Clamp(heightRange, 0f, 255f);
+
+                    // Generate two frequencies of perlin noise based on our global position
+                    // The magic values were taken from http://opensimulator.org/wiki/Terrain_Splatting
+                    Vector3 vec = new Vector3
+                    (
+                        ((float)regionPosition.X + (x * xFactor)) * 0.20319f,
+                        ((float)regionPosition.Y + (y * yFactor)) * 0.20319f,
+                        height * 0.25f
+                    );
+
+                    float lowFreq = Perlin.noise2(vec.X * 0.222222f, vec.Y * 0.222222f) * 6.5f;
+                    float highFreq = Perlin.turbulence2(vec.X, vec.Y, 2f) * 2.25f;
+                    float noise = (lowFreq + highFreq) * 2f;
+
+                    // Combine the current height, generated noise, start height, and height range parameters, then scale all of it 
+                    float layer = ((height + noise - startHeight) / heightRange) * 4f;
+                    if (Single.IsNaN(layer))
+                        layer = 0f;
+                    layermap[x, y] = Utils.Clamp(layer, 0f, 3f);
+=======
                     // Get handles to all of the texture data arrays
                     BitmapData[] datas = new BitmapData[]
                     {
@@ -323,15 +379,78 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
     
                     for (int i = 0; i < 4; i++)
                         detailTexture[i].UnlockBits(datas[i]);
+>>>>>>> avn/ubitvar
                 }
             }
-            finally
+
+            #endregion Layer Map
+
+            #region Texture Compositing
+
+            Bitmap output = new Bitmap(256, 256, PixelFormat.Format24bppRgb);
+            BitmapData outputData = output.LockBits(new Rectangle(0, 0, 256, 256), ImageLockMode.WriteOnly, PixelFormat.Format24bppRgb);
+
+            // Unsafe work as we lock down the source textures for quicker access and access the
+            //    pixel data directly
+            unsafe
             {
-                for (int i = 0; i < 4; i++)
-                    if (detailTexture[i] != null)
-                        detailTexture[i].Dispose();
+                // Get handles to all of the texture data arrays
+                BitmapData[] datas = new BitmapData[]
+                {
+                    detailTexture[0].LockBits(new Rectangle(0, 0, 256, 256), ImageLockMode.ReadOnly, detailTexture[0].PixelFormat),
+                    detailTexture[1].LockBits(new Rectangle(0, 0, 256, 256), ImageLockMode.ReadOnly, detailTexture[1].PixelFormat),
+                    detailTexture[2].LockBits(new Rectangle(0, 0, 256, 256), ImageLockMode.ReadOnly, detailTexture[2].PixelFormat),
+                    detailTexture[3].LockBits(new Rectangle(0, 0, 256, 256), ImageLockMode.ReadOnly, detailTexture[3].PixelFormat)
+                };
+
+                // Compute size of each pixel data (used to address into the pixel data array)
+                int[] comps = new int[]
+                {
+                    (datas[0].PixelFormat == PixelFormat.Format32bppArgb) ? 4 : 3,
+                    (datas[1].PixelFormat == PixelFormat.Format32bppArgb) ? 4 : 3,
+                    (datas[2].PixelFormat == PixelFormat.Format32bppArgb) ? 4 : 3,
+                    (datas[3].PixelFormat == PixelFormat.Format32bppArgb) ? 4 : 3
+                };
+
+                for (int y = 0; y < 256; y++)
+                {
+                    for (int x = 0; x < 256; x++)
+                    {
+                        float layer = layermap[x, y];
+
+                        // Select two textures
+                        int l0 = (int)Math.Floor(layer);
+                        int l1 = Math.Min(l0 + 1, 3);
+
+                        byte* ptrA = (byte*)datas[l0].Scan0 + y * datas[l0].Stride + x * comps[l0];
+                        byte* ptrB = (byte*)datas[l1].Scan0 + y * datas[l1].Stride + x * comps[l1];
+                        byte* ptrO = (byte*)outputData.Scan0 + y * outputData.Stride + x * 3;
+
+                        float aB = *(ptrA + 0);
+                        float aG = *(ptrA + 1);
+                        float aR = *(ptrA + 2);
+
+                        float bB = *(ptrB + 0);
+                        float bG = *(ptrB + 1);
+                        float bR = *(ptrB + 2);
+
+                        float layerDiff = layer - l0;
+
+                        // Interpolate between the two selected textures
+                        *(ptrO + 0) = (byte)Math.Floor(aB + layerDiff * (bB - aB));
+                        *(ptrO + 1) = (byte)Math.Floor(aG + layerDiff * (bG - aG));
+                        *(ptrO + 2) = (byte)Math.Floor(aR + layerDiff * (bR - aR));
+                    }
+                }
+
+                for (int i = 0; i < detailTexture.Length; i++)
+                    detailTexture[i].UnlockBits(datas[i]);
             }
 
+            for (int i = 0; i < detailTexture.Length; i++)
+                if (detailTexture[i] != null)
+                    detailTexture[i].Dispose();
+
             output.UnlockBits(outputData);
 
             // We generated the texture upside down, so flip it
@@ -352,6 +471,10 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             b.Dispose();
             return result;
         }
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
         public static Bitmap SplatSimple(float[] heightmap)
         {
             const float BASE_HSV_H = 93f / 360f;
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index f538c9e..d8420d9 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -31,21 +31,25 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Reflection;
+
 using CSJ2K;
 using Nini.Config;
 using log4net;
 using Rednettle.Warp3D;
 using Mono.Addins;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using OpenMetaverse.Rendering;
-using OpenMetaverse.StructuredData;
+
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using OpenSim.Services.Interfaces;
 
+using OpenMetaverse;
+using OpenMetaverse.Assets;
+using OpenMetaverse.Imaging;
+using OpenMetaverse.Rendering;
+using OpenMetaverse.StructuredData;
+
 using WarpRenderer = global::Warp3D.Warp3D;
 
 namespace OpenSim.Region.CoreModules.World.Warp3DMap
@@ -58,11 +62,22 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+#pragma warning disable 414
+        private static string LogHeader = "[WARP 3D IMAGE MODULE]";
+#pragma warning restore 414
+
         private Scene m_scene;
         private IRendering m_primMesher;
-        private IConfigSource m_config;
         private Dictionary<UUID, Color4> m_colors = new Dictionary<UUID, Color4>();
-        private bool m_useAntiAliasing = false; // TODO: Make this a config option
+
+        private IConfigSource m_config;
+        private bool m_drawPrimVolume = true;   // true if should render the prims on the tile
+        private bool m_textureTerrain = true;   // true if to create terrain splatting texture
+        private bool m_texturePrims = true;     // true if should texture the rendered prims
+        private float m_texturePrimSize = 48f;  // size of prim before we consider texturing it
+        private bool m_renderMeshes = false;    // true if to render meshes rather than just bounding boxes
+        private bool m_useAntiAliasing = false; // true if to anti-alias the rendered image
+
         private bool m_Enabled = false;
 
         private Bitmap lastImage = null;
@@ -74,11 +89,27 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         {
             m_config = source;
 
+            string[] configSections = new string[] { "Map", "Startup" };
+
             if (Util.GetConfigVarFromSections<string>(
-                m_config, "MapImageModule", new string[] { "Startup", "Map" }, "MapImageModule") != "Warp3DImageModule")
+                m_config, "MapImageModule", configSections, "MapImageModule") != "Warp3DImageModule")
                 return;
 
             m_Enabled = true;
+
+            m_drawPrimVolume 
+                = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, m_drawPrimVolume);
+            m_textureTerrain 
+                = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, m_textureTerrain);
+            m_texturePrims
+                = Util.GetConfigVarFromSections<bool>(m_config, "TexturePrims", configSections, m_texturePrims);
+            m_texturePrimSize
+                = Util.GetConfigVarFromSections<float>(m_config, "TexturePrimSize", configSections, m_texturePrimSize);
+            m_renderMeshes
+                = Util.GetConfigVarFromSections<bool>(m_config, "RenderMeshes", configSections, m_renderMeshes);
+            m_useAntiAliasing
+                = Util.GetConfigVarFromSections<bool>(m_config, "UseAntiAliasing", configSections, m_useAntiAliasing);
+
         }
 
         public void AddRegion(Scene scene)
@@ -125,6 +156,13 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
         public Bitmap CreateMapTile()
         {
+<<<<<<< HEAD
+            // Vector3 camPos = new Vector3(127.5f, 127.5f, 221.7025033688163f);
+            // Camera above the middle of the region
+            Vector3 camPos = new Vector3(
+                            m_scene.RegionInfo.RegionSizeX/2 - 0.5f,
+                            m_scene.RegionInfo.RegionSizeY/2 - 0.5f,
+=======
             /* this must be on all map, not just its image
             if ((DateTime.Now - lastImageTime).TotalSeconds < 3600)
             {
@@ -141,10 +179,16 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             Vector3 camPos = new Vector3(
                             m_scene.RegionInfo.RegionSizeX / 2 - 0.5f,
                             m_scene.RegionInfo.RegionSizeY / 2 - 0.5f,
+>>>>>>> avn/ubitvar
                             221.7025033688163f);
             // Viewport viewing down onto the region
             Viewport viewport = new Viewport(camPos, -Vector3.UnitZ, 1024f, 0.1f,
                         (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY,
+<<<<<<< HEAD
+                        (float)m_scene.RegionInfo.RegionSizeX, (float)m_scene.RegionInfo.RegionSizeY );
+            // Fill the viewport and return the image
+            return CreateMapTile(viewport, false);
+=======
                         (float)m_scene.RegionInfo.RegionSizeX, (float)m_scene.RegionInfo.RegionSizeY);
 
             Bitmap tile = CreateMapTile(viewport, false);
@@ -155,26 +199,17 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             lastImageTime = DateTime.Now;
             return (Bitmap)lastImage.Clone();
  */
+>>>>>>> avn/ubitvar
         }
 
         public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures)
         {
-            Viewport viewport = new Viewport(camPos, camDir, fov, (float)Constants.RegionSize, 0.1f, width, height);
+            Viewport viewport = new Viewport(camPos, camDir, fov, Constants.RegionSize,  0.1f, width, height);
             return CreateMapTile(viewport, useTextures);
         }
 
         public Bitmap CreateMapTile(Viewport viewport, bool useTextures)
         {
-            bool drawPrimVolume = true;
-            bool textureTerrain = true;
-
-            string[] configSections = new string[] { "Map", "Startup" };
-
-            drawPrimVolume 
-                = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, drawPrimVolume);
-            textureTerrain 
-                = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, textureTerrain);
-
             m_colors.Clear();
 
             int width = viewport.Width;
@@ -187,6 +222,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             }
 
             WarpRenderer renderer = new WarpRenderer();
+
             renderer.CreateScene(width, height);
             renderer.Scene.autoCalcNormals = false;
 
@@ -218,8 +254,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             renderer.Scene.addLight("Light2", new warp_Light(new warp_Vector(-1f, -1f, 1f), 0xffffff, 0, 100, 40));
 
             CreateWater(renderer);
-            CreateTerrain(renderer, textureTerrain);
-            if (drawPrimVolume)
+            CreateTerrain(renderer, m_textureTerrain);
+            if (m_drawPrimVolume)
                 CreateAllPrims(renderer, useTextures);
 
             renderer.Render();
@@ -235,6 +271,18 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             // afterwards.  It's generally regarded as a bad idea to manually GC.  If Warp3D is using lots of memory
             // then this may be some issue with the Warp3D code itself, though it's also quite possible that generating
             // this map tile simply takes a lot of memory.
+            foreach (var o in renderer.Scene.objectData.Values)
+            {
+                warp_Object obj = (warp_Object)o;
+                obj.vertexData = null;
+                obj.triangleData = null;
+            }
+
+            renderer.Scene.removeAllObjects();
+            renderer = null;
+            viewport = null;
+
+            m_colors.Clear();
             GC.Collect();
             m_log.Debug("[WARP 3D IMAGE MODULE]: GC.Collect()");
 
@@ -261,21 +309,32 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
         #region Rendering Methods
 
+        // Add a water plane to the renderer.
         private void CreateWater(WarpRenderer renderer)
         {
             float waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
 
             renderer.AddPlane("Water", m_scene.RegionInfo.RegionSizeX * 0.5f);
+<<<<<<< HEAD
+            renderer.Scene.sceneobject("Water").setPos(m_scene.RegionInfo.RegionSizeX/2 - 0.5f,
+                                                       waterHeight,
+                                                       m_scene.RegionInfo.RegionSizeY/2 - 0.5f );
+=======
             renderer.Scene.sceneobject("Water").setPos(m_scene.RegionInfo.RegionSizeX / 2 - 0.5f,
                                                        waterHeight,
                                                        m_scene.RegionInfo.RegionSizeY / 2 - 0.5f);
+>>>>>>> avn/ubitvar
 
-            renderer.AddMaterial("WaterColor", ConvertColor(WATER_COLOR));
-                        renderer.Scene.material("WaterColor").setReflectivity(0);  // match water color with standard map module thanks lkalif
-            renderer.Scene.material("WaterColor").setTransparency((byte)((1f - WATER_COLOR.A) * 255f));
+            warp_Material waterColorMaterial = new warp_Material(ConvertColor(WATER_COLOR));
+                        waterColorMaterial.setReflectivity(0);  // match water color with standard map module thanks lkalif
+            waterColorMaterial.setTransparency((byte)((1f - WATER_COLOR.A) * 255f));
+            renderer.Scene.addMaterial("WaterColor", waterColorMaterial);
             renderer.SetObjectMaterial("Water", "WaterColor");
         }
 
+        // Add a terrain to the renderer.
+        // Note that we create a 'low resolution' 256x256 vertex terrain rather than trying for
+        //    full resolution. This saves a lot of memory especially for very large regions.
         private void CreateTerrain(WarpRenderer renderer, bool textureTerrain)
         {
             ITerrainChannel terrain = m_scene.Heightmap;
@@ -293,7 +352,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     warp_Vector pos = ConvertVector(x, y, (float)terrain[(int)x, (int)y]);
                     obj.addVertex(new warp_Vertex(pos,
                         x / (float)m_scene.RegionInfo.RegionSizeX,
+<<<<<<< HEAD
+                        (((float)m_scene.RegionInfo.RegionSizeY) - y) / m_scene.RegionInfo.RegionSizeY) );
+=======
                         (((float)m_scene.RegionInfo.RegionSizeY) - y) / m_scene.RegionInfo.RegionSizeY));
+>>>>>>> avn/ubitvar
                 }
             }
 
@@ -338,7 +401,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             float[] startHeights = new float[4];
             float[] heightRanges = new float[4];
 
-            RegionSettings regionInfo = m_scene.RegionInfo.RegionSettings;
+            OpenSim.Framework.RegionSettings regionInfo = m_scene.RegionInfo.RegionSettings;
 
             textureIDs[0] = regionInfo.TerrainTexture1;
             textureIDs[1] = regionInfo.TerrainTexture2;
@@ -359,11 +422,14 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             Util.RegionHandleToWorldLoc(m_scene.RegionInfo.RegionHandle, out globalX, out globalY);
 
             warp_Texture texture;
-
             using (
                 Bitmap image
+<<<<<<< HEAD
+                    = TerrainSplat.Splat(terrain, textureIDs, startHeights, heightRanges,
+=======
                     = TerrainSplat.Splat(
                         terrain, textureIDs, startHeights, heightRanges,
+>>>>>>> avn/ubitvar
                         new Vector3d(globalX, globalY, 0.0), m_scene.AssetService, textureTerrain))
             {
                 texture = new warp_Texture(image);
@@ -384,7 +450,6 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             m_scene.ForEachSOG(
                 delegate(SceneObjectGroup group)
                 {
-                    CreatePrim(renderer, group.RootPart, useTextures);
                     foreach (SceneObjectPart child in group.Parts)
                         CreatePrim(renderer, child, useTextures);
                 }
@@ -401,8 +466,48 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             if (prim.Scale.LengthSquared() < MIN_SIZE * MIN_SIZE)
                 return;
 
+            FacetedMesh renderMesh = null;
             Primitive omvPrim = prim.Shape.ToOmvPrimitive(prim.OffsetPosition, prim.RotationOffset);
-            FacetedMesh renderMesh = m_primMesher.GenerateFacetedMesh(omvPrim, DetailLevel.Medium);
+
+            if (m_renderMeshes)
+            {
+                if (omvPrim.Sculpt != null && omvPrim.Sculpt.SculptTexture != UUID.Zero)
+                {
+                    // Try fetchinng the asset
+                    byte[] sculptAsset = m_scene.AssetService.GetData(omvPrim.Sculpt.SculptTexture.ToString());
+                    if (sculptAsset != null)
+                    {
+                        // Is it a mesh?
+                        if (omvPrim.Sculpt.Type == SculptType.Mesh)
+                        {
+                            AssetMesh meshAsset = new AssetMesh(omvPrim.Sculpt.SculptTexture, sculptAsset);
+                            FacetedMesh.TryDecodeFromAsset(omvPrim, meshAsset, DetailLevel.Highest, out renderMesh);
+                            meshAsset = null;
+                        }
+                        else // It's sculptie
+                        {
+                            IJ2KDecoder imgDecoder = m_scene.RequestModuleInterface<IJ2KDecoder>();
+                            if (imgDecoder != null)
+                            {
+                                Image sculpt = imgDecoder.DecodeToImage(sculptAsset);
+                                if (sculpt != null)
+                                {
+                                    renderMesh = m_primMesher.GenerateFacetedSculptMesh(omvPrim, (Bitmap)sculpt,
+                                                                                        DetailLevel.Medium);
+                                    sculpt.Dispose();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            // If not a mesh or sculptie, try the regular mesher
+            if (renderMesh == null)
+            {
+                renderMesh = m_primMesher.GenerateFacetedMesh(omvPrim, DetailLevel.Medium);
+            }
+
             if (renderMesh == null)
                 return;
 
@@ -461,7 +566,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
                 Primitive.TextureEntryFace teFace = prim.Shape.Textures.GetFace((uint)i);
                 Color4 faceColor = GetFaceColor(teFace);
-                string materialName = GetOrCreateMaterial(renderer, faceColor);
+                string materialName = String.Empty;
+                if (m_texturePrims && prim.Scale.LengthSquared() > m_texturePrimSize*m_texturePrimSize)
+                    materialName = GetOrCreateMaterial(renderer, faceColor, teFace.TextureID);
+                else
+                    materialName = GetOrCreateMaterial(renderer, faceColor);
 
                 faceObj.transform(m);
                 faceObj.setPos(primPos);
@@ -550,6 +659,49 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             return name;
         }
 
+        public string GetOrCreateMaterial(WarpRenderer renderer, Color4 faceColor, UUID textureID)
+        {
+            string materialName = "Color-" + faceColor.ToString() + "-Texture-" + textureID.ToString();
+
+            if (renderer.Scene.material(materialName) == null)
+            {
+                renderer.AddMaterial(materialName, ConvertColor(faceColor));
+                if (faceColor.A < 1f)
+                {
+                    renderer.Scene.material(materialName).setTransparency((byte) ((1f - faceColor.A)*255f));
+                }
+                warp_Texture texture = GetTexture(textureID);
+                if (texture != null)
+                    renderer.Scene.material(materialName).setTexture(texture);
+            }
+
+            return materialName;
+        }
+
+        private warp_Texture GetTexture(UUID id)
+        {
+            warp_Texture ret = null;
+
+            byte[] asset = m_scene.AssetService.GetData(id.ToString());
+
+            if (asset != null)
+            {
+                IJ2KDecoder imgDecoder = m_scene.RequestModuleInterface<IJ2KDecoder>();
+
+                try
+                {
+                    using (Bitmap img = (Bitmap)imgDecoder.DecodeToImage(asset))
+                        ret = new warp_Texture(img);
+                }
+                catch (Exception e)
+                {
+                    m_log.Warn(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0}, exception  ", id), e);
+                }                    
+            }
+
+            return ret;
+        }
+
         #endregion Rendering Methods
 
         #region Static Helpers
@@ -559,6 +711,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             return new warp_Vector(x, z, y);
         }
 
+        // Note: axis change.
+        private static warp_Vector ConvertVector(float x, float y, float z)
+        {
+            return new warp_Vector(x, z, y);
+        }
+
         private static warp_Vector ConvertVector(Vector3 vector)
         {
             return new warp_Vector(vector.X, vector.Z, vector.Y);
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 1e5af1b..553d057 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -76,6 +76,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             m_scenes.Add(scene);
             scene.EventManager.OnNewClient += OnNewClient;
             m_Clients = new List<UUID>();
+
         }
 
         public void RemoveRegion(Scene scene)
@@ -140,7 +141,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags)
         {
+<<<<<<< HEAD
+            List<MapBlockData> blocks = new List<MapBlockData>();
+            if (mapName.Length < 3 || (mapName.EndsWith("#") && mapName.Length < 4))
+=======
             Util.FireAndForget(x =>
+>>>>>>> avn/ubitvar
             {
                 List<MapBlockData> blocks = new List<MapBlockData>();
                 if (mapName.Length < 3 || (mapName.EndsWith("#") && mapName.Length < 4))
@@ -226,6 +232,74 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 // they have different values depending on different viewers, apparently
                 remoteClient.SendMapBlock(blocks, flags);
 
+<<<<<<< HEAD
+            List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);
+            
+            string mapNameOrig = mapName;
+            if (regionInfos.Count == 0)
+            {
+                // Hack to get around the fact that ll V3 now drops the port from the
+                // map name. See https://jira.secondlife.com/browse/VWR-28570
+                //
+                // Caller, use this magic form instead:
+                // secondlife://http|!!mygrid.com|8002|Region+Name/128/128
+                // or url encode if possible.
+                // the hacks we do with this viewer...
+                //
+                if (mapName.Contains("|"))
+                    mapName = mapName.Replace('|', ':');
+                if (mapName.Contains("+"))
+                    mapName = mapName.Replace('+', ' ');
+                if (mapName.Contains("!"))
+                    mapName = mapName.Replace('!', '/');
+                
+                if (mapName != mapNameOrig)
+                    regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);
+            }
+            
+            m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions. Flags={2}", mapName, regionInfos.Count, flags);
+            
+            if (regionInfos.Count > 0)
+            {
+                foreach (GridRegion info in regionInfos)
+                {
+                    if ((flags & 2) == 2) // V2 sends this
+                    {
+                        List<MapBlockData> datas = WorldMap.Map2BlockFromGridRegion(info, flags);
+                        // ugh! V2-3 is very sensitive about the result being
+                        // exactly the same as the requested name
+                        if (regionInfos.Count == 1 && (mapName != mapNameOrig))
+                            datas.ForEach(d => d.Name = mapNameOrig);
+
+                        blocks.AddRange(datas);
+                    }
+                    else
+                    {
+                        MapBlockData data = WorldMap.MapBlockFromGridRegion(info, flags);
+                        blocks.Add(data);
+                    }
+                }
+            }
+
+            // final block, closing the search result
+            AddFinalBlock(blocks);
+
+            // flags are agent flags sent from the viewer.
+            // they have different values depending on different viewers, apparently
+            remoteClient.SendMapBlock(blocks, flags);
+
+            // send extra user messages for V3
+            // because the UI is very confusing
+            // while we don't fix the hard-coded urls
+            if (flags == 2) 
+            {
+                if (regionInfos.Count == 0)
+                    remoteClient.SendAlertMessage("No regions found with that name.");
+                // this seems unnecessary because found regions will show up in the search results
+                //else if (regionInfos.Count == 1)
+                //    remoteClient.SendAlertMessage("Region found!");
+            }
+=======
                 // send extra user messages for V3
                 // because the UI is very confusing
                 // while we don't fix the hard-coded urls
@@ -237,6 +311,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 //                        remoteClient.SendAgentAlertMessage("Region found!", false);
                 }
             });
+>>>>>>> avn/ubitvar
         }
 
         private void AddFinalBlock(List<MapBlockData> blocks)
@@ -244,7 +319,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 // final block, closing the search result
                 MapBlockData data = new MapBlockData();
                 data.Agents = 0;
-                data.Access = 255;
+                data.Access = (byte)SimAccess.NonExistent;
                 data.MapImageId = UUID.Zero;
                 data.Name = "";
                 data.RegionFlags = 0;
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 1f8f6b0..2fbd017 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -59,13 +59,21 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WorldMapModule")]
     public class WorldMapModule : INonSharedRegionModule, IWorldMapModule
     {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+#pragma warning disable 414
+        private static string LogHeader = "[WORLD MAP]";
+#pragma warning restore 414
 
         private static readonly string DEFAULT_WORLD_MAP_EXPORT_PATH = "exportmap.jpg";
         private static readonly UUID STOP_UUID = UUID.Random();
         private static readonly string m_mapLayerPath = "0001/";
 
+<<<<<<< HEAD
+        private IMapImageGenerator m_mapImageGenerator;
+        private IMapImageUploadModule m_mapImageServiceModule;
+
+        private OpenSim.Framework.BlockingQueue<MapRequestState> requests = new OpenSim.Framework.BlockingQueue<MapRequestState>();
+=======
         private ManualResetEvent queueEvent = new ManualResetEvent(false);
         private Queue<MapRequestState> requests = new Queue<MapRequestState>();
 
@@ -74,6 +82,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         private IMapImageGenerator m_mapImageGenerator;
         private IMapImageUploadModule m_mapImageServiceModule;
+>>>>>>> avn/ubitvar
 
         protected Scene m_scene;
         private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>();
@@ -102,7 +111,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 = Util.GetConfigVarFromSections<int>(config, "BlacklistTimeout", configSections, 10 * 60) * 1000;
         }
 
-        public virtual void AddRegion (Scene scene)
+        public virtual void AddRegion(Scene scene)
         {
             if (!m_Enabled)
                 return;
@@ -145,10 +154,17 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             if (!m_Enabled)
                 return;
 
+<<<<<<< HEAD
+            m_ServiceThrottle = scene.RequestModuleInterface<IServiceThrottleModule>();
+=======
             m_mapImageGenerator = m_scene.RequestModuleInterface<IMapImageGenerator>();
             m_mapImageServiceModule = m_scene.RequestModuleInterface<IMapImageUploadModule>();
         }
+>>>>>>> avn/ubitvar
 
+            m_mapImageGenerator = m_scene.RequestModuleInterface<IMapImageGenerator>();
+            m_mapImageServiceModule = m_scene.RequestModuleInterface<IMapImageUploadModule>();
+        }
 
         public virtual void Close()
         {
@@ -259,6 +275,56 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is
             // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks.
 
+<<<<<<< HEAD
+            if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048)
+            {
+                ScenePresence avatarPresence = null;
+
+                m_scene.TryGetScenePresence(agentID, out avatarPresence);
+
+                if (avatarPresence != null)
+                {
+                    bool lookup = false;
+
+                    lock (cachedMapBlocks)
+                    {
+                        if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch()))
+                        {
+                            List<MapBlockData> mapBlocks;
+
+                            mapBlocks = cachedMapBlocks;
+                            avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
+                        }
+                        else
+                        {
+                            lookup = true;
+                        }
+                    }
+                    if (lookup)
+                    {
+                        List<MapBlockData> mapBlocks = new List<MapBlockData>(); ;
+
+                        // Get regions that are within 8 regions of here
+                        List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+                                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocX - 8),
+                                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocX + 8),
+                                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocY - 8),
+                                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocY + 8) );
+                        foreach (GridRegion r in regions)
+                        {
+                            MapBlockData block = MapBlockFromGridRegion(r, 0);
+                            mapBlocks.Add(block);
+                        }
+                        avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
+
+                        lock (cachedMapBlocks)
+                            cachedMapBlocks = mapBlocks;
+
+                        cachedTime = Util.UnixTimeSinceEpoch();
+                    }
+                }
+            }
+=======
             //if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048)
             //{
             //    ScenePresence avatarPresence = null;
@@ -307,6 +373,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             //        }
             //    }
             //}
+>>>>>>> avn/ubitvar
 
             LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
             mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse());
@@ -386,7 +453,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
 //            m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
 
-            Watchdog.StartThread(
+            WorkManager.StartThread(
                 process,
                 string.Format("MapItemRequestThread ({0})", m_scene.RegionInfo.RegionName),
                 ThreadPriority.BelowNormal,
@@ -449,17 +516,29 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             uint xstart = 0;
             uint ystart = 0;
             Util.RegionHandleToWorldLoc(m_scene.RegionInfo.RegionHandle, out xstart, out ystart);
+<<<<<<< HEAD
+            if (itemtype == (int)GridItemType.AgentLocations)
+=======
 
             if (itemtype == 6) // Service 6 right now (MAP_ITEM_AGENTS_LOCATION; green dots)
+>>>>>>> avn/ubitvar
             {
                 if (regionhandle == 0 || regionhandle == m_scene.RegionInfo.RegionHandle)
                 {
-                    // Local Map Item Request
+                    // Just requesting map info about the current, local region
                     int tc = Environment.TickCount;
                     List<mapItemReply> mapitems = new List<mapItemReply>();
                     mapItemReply mapitem = new mapItemReply();
                     if (m_scene.GetRootAgentCount() <= 1)
                     {
+<<<<<<< HEAD
+                        mapitem = new mapItemReply(
+                                        xstart + 1,
+                                        ystart + 1,
+                                        UUID.Zero,
+                                        Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString()),
+                                        0, 0);
+=======
                         mapitem = new mapItemReply();
                         mapitem.x = xstart + 1;
                         mapitem.y = ystart + 1;
@@ -467,6 +546,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         mapitem.name = Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString());
                         mapitem.Extra = 0;
                         mapitem.Extra2 = 0;
+>>>>>>> avn/ubitvar
                         mapitems.Add(mapitem);
                     }
                     else
@@ -476,6 +556,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                             // Don't send a green dot for yourself
                             if (sp.UUID != remoteClient.AgentId)
                             {
+<<<<<<< HEAD
+                                mapitem = new mapItemReply(
+                                        xstart + (uint)sp.AbsolutePosition.X,
+                                        ystart + (uint)sp.AbsolutePosition.Y,
+                                        UUID.Zero,
+                                        Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString()),
+                                        1, 0);
+=======
                                 mapitem = new mapItemReply();
                                 mapitem.x = xstart + (uint)sp.AbsolutePosition.X;
                                 mapitem.y = ystart + (uint)sp.AbsolutePosition.Y;
@@ -483,6 +571,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                 mapitem.name = Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString());
                                 mapitem.Extra = 1;
                                 mapitem.Extra2 = 0;
+>>>>>>> avn/ubitvar
                                 mapitems.Add(mapitem);
                             }
                         });
@@ -497,7 +586,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     RequestMapItems("",remoteClient.AgentId,flags,EstateID,godlike,itemtype,regionhandle);
                 }
             }
-            else if (itemtype == 7) // Service 7 (MAP_ITEM_LAND_FOR_SALE)
+            else if (itemtype == (int)GridItemType.LandForSale) // Service 7 (MAP_ITEM_LAND_FOR_SALE)
             {
                 if (regionhandle == 0 || regionhandle == m_scene.RegionInfo.RegionHandle)
                 {
@@ -527,6 +616,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                 float x = (min.X+max.X)/2;
                                 float y = (min.Y+max.Y)/2;
 
+<<<<<<< HEAD
+                                mapitem = new mapItemReply(
+                                                xstart + (uint)x,
+                                                ystart + (uint)y,
+                                                parcel.GlobalID,
+                                                parcel.Name,
+                                                parcel.Area,
+                                                parcel.SalePrice
+                                );
+=======
                                 mapitem = new mapItemReply();
                                 mapitem.x = xstart + (uint)x;
                                 mapitem.y = ystart +(uint)y;
@@ -535,6 +634,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                 mapitem.name = parcel.Name;
                                 mapitem.Extra = parcel.Area;
                                 mapitem.Extra2 = parcel.SalePrice;
+>>>>>>> avn/ubitvar
                                 mapitems.Add(mapitem);
                             }
                         }
@@ -549,7 +649,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     RequestMapItems("",remoteClient.AgentId,flags,EstateID,godlike,itemtype,regionhandle);
                 }
             }
-            else if (itemtype == 1) // Service 1 (MAP_ITEM_TELEHUB)
+            else if (itemtype == (int)GridItemType.Telehub) // Service 1 (MAP_ITEM_TELEHUB)
             {
                 if (regionhandle == 0 || regionhandle == m_scene.RegionInfo.RegionHandle)
                 {
@@ -559,6 +659,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     SceneObjectGroup sog = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
                     if (sog != null)
                     {
+<<<<<<< HEAD
+                        mapitem = new mapItemReply(
+                                            xstart + (uint)sog.AbsolutePosition.X,
+                                            ystart + (uint)sog.AbsolutePosition.Y,
+                                            UUID.Zero,
+                                            sog.Name,
+                                            0,  // color (not used)
+                                            0   // 0 = telehub / 1 = infohub
+                        );
+=======
                         mapitem = new mapItemReply();
                         mapitem.x = xstart + (uint)sog.AbsolutePosition.X;
                         mapitem.y = ystart + (uint)sog.AbsolutePosition.Y;
@@ -566,6 +676,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         mapitem.name = sog.Name;
                         mapitem.Extra = 0; // color (not used)
                         mapitem.Extra2 = 0; // 0 = telehub / 1 = infohub
+>>>>>>> avn/ubitvar
                         mapitems.Add(mapitem);
 
                         remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
@@ -652,8 +763,126 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         {
             lock (requests)
             {
+<<<<<<< HEAD
+                if (st.agentID != UUID.Zero)
+                {
+                    bool dorequest = true;
+                    lock (m_rootAgents)
+                    {
+                        if (!m_rootAgents.Contains(st.agentID))
+                            dorequest = false;
+                    }
+
+                    if (dorequest && !m_blacklistedregions.ContainsKey(st.regionhandle))
+                    {
+                        if (nAsyncRequests >= MAX_ASYNC_REQUESTS) // hit the break
+                        {
+                            // AH!!! Recursive !
+                            // Put this request back in the queue and return
+                            EnqueueMapItemRequest(st);
+                            return;
+                        }
+
+                        RequestMapItemsDelegate d = RequestMapItemsAsync;
+                        d.BeginInvoke(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle, RequestMapItemsCompleted, null);
+                        //OSDMap response = RequestMapItemsAsync(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle);
+                        //RequestMapItemsCompleted(response);
+                        Interlocked.Increment(ref nAsyncRequests);
+                    }
+                }
+            });
+        }
+
+        /// <summary>
+        /// Sends the mapitem response to the IClientAPI
+        /// </summary>
+        /// <param name="response">The OSDMap Response for the mapitem</param>
+        private void RequestMapItemsCompleted(IAsyncResult iar)
+        {
+            AsyncResult result = (AsyncResult)iar;
+            RequestMapItemsDelegate icon = (RequestMapItemsDelegate)result.AsyncDelegate;
+
+            OSDMap response = (OSDMap)icon.EndInvoke(iar);
+
+            Interlocked.Decrement(ref nAsyncRequests);
+
+            if (!response.ContainsKey("requestID"))
+                return;
+
+            UUID requestID = response["requestID"].AsUUID();
+
+            if (requestID != UUID.Zero)
+            {
+                MapRequestState mrs = new MapRequestState();
+                mrs.agentID = UUID.Zero;
+                lock (m_openRequests)
+                {
+                    if (m_openRequests.ContainsKey(requestID))
+                    {
+                        mrs = m_openRequests[requestID];
+                        m_openRequests.Remove(requestID);
+                    }
+                }
+
+                if (mrs.agentID != UUID.Zero)
+                {
+                    ScenePresence av = null;
+                    m_scene.TryGetScenePresence(mrs.agentID, out av);
+                    if (av != null)
+                    {
+                        if (response.ContainsKey(mrs.itemtype.ToString()))
+                        {
+                            List<mapItemReply> returnitems = new List<mapItemReply>();
+                            OSDArray itemarray = (OSDArray)response[mrs.itemtype.ToString()];
+                            for (int i = 0; i < itemarray.Count; i++)
+                            {
+                                OSDMap mapitem = (OSDMap)itemarray[i];
+                                mapItemReply mi = new mapItemReply();
+                                mi.FromOSD(mapitem);
+                                returnitems.Add(mi);
+                            }
+                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), mrs.itemtype, mrs.flags);
+                        }
+
+                        // Service 7 (MAP_ITEM_LAND_FOR_SALE)
+                        uint itemtype = (uint)GridItemType.LandForSale;
+
+                        if (response.ContainsKey(itemtype.ToString()))
+                        {
+                            List<mapItemReply> returnitems = new List<mapItemReply>();
+                            OSDArray itemarray = (OSDArray)response[itemtype.ToString()];
+                            for (int i = 0; i < itemarray.Count; i++)
+                            {
+                                OSDMap mapitem = (OSDMap)itemarray[i];
+                                mapItemReply mi = new mapItemReply();
+                                mi.FromOSD(mapitem);
+                                returnitems.Add(mi);
+                            }
+                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, mrs.flags);
+                        }
+
+                        // Service 1 (MAP_ITEM_TELEHUB)
+                        itemtype = (uint)GridItemType.Telehub;
+
+                        if (response.ContainsKey(itemtype.ToString()))
+                        {
+                            List<mapItemReply> returnitems = new List<mapItemReply>();
+                            OSDArray itemarray = (OSDArray)response[itemtype.ToString()];
+                            for (int i = 0; i < itemarray.Count; i++)
+                            {
+                                OSDMap mapitem = (OSDMap)itemarray[i];
+                                mapItemReply mi = new mapItemReply();
+                                mi.FromOSD(mapitem);
+                                returnitems.Add(mi);
+                            }
+                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, mrs.flags);
+                        }
+                    }
+                }
+=======
                 queueEvent.Set();
                 requests.Enqueue(state);
+>>>>>>> avn/ubitvar
             }
         }
 
@@ -833,7 +1062,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             finally
             {
                 if (os != null)
-                    os.Close();
+                    os.Dispose();
             }
 
             string response_mapItems_reply = null;
@@ -999,8 +1228,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// <param name="maxY"></param>
         public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
+<<<<<<< HEAD
+=======
             m_log.DebugFormat("[WoldMapModule] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag);
 /*  this flag does not seem to mean what his says
+>>>>>>> avn/ubitvar
             if ((flag & 0x10000) != 0)  // user clicked on qthe map a tile that isn't visible
             {
                 List<MapBlockData> response = new List<MapBlockData>();
@@ -1009,15 +1241,34 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 // on an unloaded square.
                 // But make sure: Look whether the one we requested is in there
                 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+<<<<<<< HEAD
+                                    (int)Util.RegionToWorldLoc((uint)minX), (int)Util.RegionToWorldLoc((uint)maxX),
+                                    (int)Util.RegionToWorldLoc((uint)minY), (int)Util.RegionToWorldLoc((uint)maxY) );
+
+                m_log.DebugFormat("[WORLD MAP MODULE] RequestMapBlocks min=<{0},{1}>, max=<{2},{3}>, flag={4}, cntFound={5}",
+                                            minX, minY, maxX, maxY, flag.ToString("X"), regions.Count);
+=======
                     (int)Util.RegionToWorldLoc((uint)minX),
                     (int)Util.RegionToWorldLoc((uint)maxX),
                     (int)Util.RegionToWorldLoc((uint)minY),
                     (int)Util.RegionToWorldLoc((uint)maxY) );
  
+>>>>>>> avn/ubitvar
                 if (regions != null)
                 {
                     foreach (GridRegion r in regions)
                     {
+<<<<<<< HEAD
+                        if (r.RegionLocX == Util.RegionToWorldLoc((uint)minX)
+                            && r.RegionLocY == Util.RegionToWorldLoc((uint)minY) )
+                        {
+                            // found it => add it to response
+                            // Version 2 viewers can handle the larger regions
+                            if ((flag & 2) == 2)
+                                response.AddRange(Map2BlockFromGridRegion(r, flag));
+                            else
+                                response.Add(MapBlockFromGridRegion(r, flag));
+=======
                         if (r.RegionLocX == Util.RegionToWorldLoc((uint)minX) &&
                             r.RegionLocY == Util.RegionToWorldLoc((uint)minY))
                         {
@@ -1030,6 +1281,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                 MapBlockFromGridRegion(block, r, flag);
                                 response.Add(block);
                             }
+>>>>>>> avn/ubitvar
                             break;
                         }
                     }
@@ -1042,6 +1294,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     block.X = (ushort)minX;
                     block.Y = (ushort)minY;
                     block.Access = (byte)SimAccess.Down; // means 'simulator is offline'
+<<<<<<< HEAD
+                    // block.Access = (byte)SimAccess.NonExistent;
+=======
+>>>>>>> avn/ubitvar
                     response.Add(block);
                 }
                 // The lower 16 bits are an unsigned int16
@@ -1117,6 +1373,19 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             List<MapBlockData> allBlocks = new List<MapBlockData>();
             List<MapBlockData> mapBlocks = new List<MapBlockData>();
             List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+<<<<<<< HEAD
+                        (int)Util.RegionToWorldLoc((uint)(minX - 4)), (int)Util.RegionToWorldLoc((uint)(maxX + 4)),
+                        (int)Util.RegionToWorldLoc((uint)(minY - 4)), (int)Util.RegionToWorldLoc((uint)(maxY + 4)) );
+            //m_log.DebugFormat("{0} GetAndSendBlocks. min=<{1},{2}>, max=<{3},{4}>, cntFound={5}",
+            //                            LogHeader, minX, minY, maxX, maxY, regions.Count);
+            foreach (GridRegion r in regions)
+            {
+                // Version 2 viewers can handle the larger regions
+                if ((flag & 2) == 2)
+                    mapBlocks.AddRange(Map2BlockFromGridRegion(r, flag));
+                else
+                    mapBlocks.Add(MapBlockFromGridRegion(r, flag));
+=======
                 minX * (int)Constants.RegionSize,
                 maxX * (int)Constants.RegionSize,
                 minY * (int)Constants.RegionSize,
@@ -1138,6 +1407,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 mapBlocks.Add(block);
                 remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
                 return allBlocks;
+>>>>>>> avn/ubitvar
             }
 
             foreach (GridRegion r in regions)
@@ -1168,22 +1438,37 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             return allBlocks;
         }
 
+<<<<<<< HEAD
+        // Fill a passed MapBlockData from a GridRegion
+        public MapBlockData MapBlockFromGridRegion(GridRegion r, uint flag)
+=======
         public void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag)
+>>>>>>> avn/ubitvar
         {
+            MapBlockData block = new MapBlockData();
+
             block.Access = r.Access;
             switch (flag & 0xffff)
             {
-            case 0:
-                block.MapImageId = r.TerrainImage;
-                break;
-            case 2:
-                block.MapImageId = r.ParcelImage;
-                break;
-            default:
-                block.MapImageId = UUID.Zero;
-                break;
+                case 0:
+                    block.MapImageId = r.TerrainImage;
+                    break;
+                case 2:
+                    block.MapImageId = r.ParcelImage;
+                    break;
+                default:
+                    block.MapImageId = UUID.Zero;
+                    break;
             }
             block.Name = r.RegionName;
+<<<<<<< HEAD
+            block.X = (ushort)Util.WorldToRegionLoc((uint)r.RegionLocX);
+            block.Y = (ushort)Util.WorldToRegionLoc((uint)r.RegionLocY);
+            block.SizeX = (ushort) r.RegionSizeX;
+            block.SizeY = (ushort) r.RegionSizeY;
+
+            return block;
+=======
             block.X = (ushort)(r.RegionLocX / Constants.RegionSize);
             block.Y = (ushort)(r.RegionLocY / Constants.RegionSize);
             block.SizeX = (ushort)r.RegionSizeX;
@@ -1223,8 +1508,45 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 blocks.Add(block);
             }
             return blocks;
+>>>>>>> avn/ubitvar
         }
 
+        public List<MapBlockData> Map2BlockFromGridRegion(GridRegion r, uint flag)
+        {
+            List<MapBlockData> blocks = new List<MapBlockData>();
+            MapBlockData block = new MapBlockData();
+            if (r == null)
+            {
+                block.Access = (byte)SimAccess.Down;
+                block.MapImageId = UUID.Zero;
+                blocks.Add(block);
+            }
+            else
+            {
+                block.Access = r.Access;
+                switch (flag & 0xffff)
+                {
+                    case 0:
+                        block.MapImageId = r.TerrainImage;
+                        break;
+                    case 2:
+                        block.MapImageId = r.ParcelImage;
+                        break;
+                    default:
+                        block.MapImageId = UUID.Zero;
+                        break;
+                }
+                block.Name = r.RegionName;
+                block.X = (ushort)(r.RegionLocX / Constants.RegionSize);
+                block.Y = (ushort)(r.RegionLocY / Constants.RegionSize);
+                block.SizeX = (ushort)r.RegionSizeX;
+                block.SizeY = (ushort)r.RegionSizeY;
+                blocks.Add(block);
+            }
+            return blocks;
+        }
+
+
         public Hashtable OnHTTPThrottled(Hashtable keysvals)
         {
             Hashtable reply = new Hashtable();
@@ -1291,10 +1613,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         image.Dispose();
 
                     if (imgstream != null)
-                    {
-                        imgstream.Close();
                         imgstream.Dispose();
-                    }
                 }
             }
             else
@@ -1353,17 +1672,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             List<MapBlockData> mapBlocks = new List<MapBlockData>();
             List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                    (int)(m_scene.RegionInfo.RegionLocX - 9) * (int)Constants.RegionSize,
-                    (int)(m_scene.RegionInfo.RegionLocX + 9) * (int)Constants.RegionSize,
-                    (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize,
-                    (int)(m_scene.RegionInfo.RegionLocY + 9) * (int)Constants.RegionSize);
+                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocX - 9),
+                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocX + 9),
+                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocY - 9),
+                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocY + 9));
             List<AssetBase> textures = new List<AssetBase>();
             List<Image> bitImages = new List<Image>();
 
             foreach (GridRegion r in regions)
             {
-                MapBlockData mapBlock = new MapBlockData();
-                MapBlockFromGridRegion(mapBlock, r, 0);
+                MapBlockData mapBlock = MapBlockFromGridRegion(r, 0);
                 AssetBase texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString());
 
                 if (texAsset != null)
@@ -1434,7 +1752,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             uint xstart = 0;
             uint ystart = 0;
 
+<<<<<<< HEAD
+            Util.RegionHandleToWorldLoc(m_scene.RegionInfo.RegionHandle,out xstart,out ystart);
+            // m_log.DebugFormat("{0} HandleRemoteMapItemRequest. loc=<{1},{2}>",
+            //             LogHeader, Util.WorldToRegionLoc(xstart), Util.WorldToRegionLoc(ystart));
+=======
             Util.RegionHandleToWorldLoc(m_scene.RegionInfo.RegionHandle, out xstart, out ystart);
+>>>>>>> avn/ubitvar
 
             // Service 6 (MAP_ITEM_AGENTS_LOCATION; green dots)
 
@@ -1554,6 +1878,23 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 return;
 
             m_log.DebugFormat("[WORLD MAP]: Generating map image for {0}", m_scene.Name);
+<<<<<<< HEAD
+
+            using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile())
+            {
+                // V1 (This Module)
+                GenerateMaptile(mapbmp);
+
+                // v2/3 (MapImageServiceModule)
+                m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
+            }
+        }
+
+        private void GenerateMaptile(Bitmap mapbmp)
+        {
+            byte[] data;
+
+=======
 
             using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile())
             {
@@ -1569,6 +1910,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         {
             byte[] data;
 
+>>>>>>> avn/ubitvar
             try
             {
                 data = OpenJPEG.EncodeFromImage(mapbmp, true);
@@ -1685,7 +2027,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             int regionSizeX = (int)m_scene.RegionInfo.RegionSizeX;
             int regionSizeY = (int)m_scene.RegionInfo.RegionSizeY;
 
+<<<<<<< HEAD
+            int landTileSize = LandManagementModule.LandUnit;
+=======
             int landTileSize = LandManagementModule.landUnit;
+>>>>>>> avn/ubitvar
             int regionLandTilesX = regionSizeX / landTileSize;
             int regionLandTilesY = regionSizeY / landTileSize;
 
@@ -1708,7 +2054,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 {
                     using (SolidBrush transparent = new SolidBrush(background))
                         g.FillRectangle(transparent, 0, 0, regionSizeX, regionSizeY);
+<<<<<<< HEAD
+=======
 
+>>>>>>> avn/ubitvar
 
                     foreach (ILandObject land in parcels)
                     {
@@ -1731,6 +2080,17 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
                     using (SolidBrush yellow = new SolidBrush(Color.FromArgb(255, 249, 223, 9)))
                     {
+<<<<<<< HEAD
+                        for (int x = 0 ; x < regionLandTilesX ; x++)
+                        {
+                            for (int y = 0 ; y < regionLandTilesY ; y++)
+                            {
+                                if (saleBitmap[x, y])
+                                    g.FillRectangle(
+                                        yellow, x * landTileSize, 
+                                        regionSizeX - landTileSize - (y * landTileSize), 
+                                        landTileSize, 
+=======
                         for (int x = 0; x < regionLandTilesX ; x++)
                         {
                             for (int y = 0; y < regionLandTilesY ; y++)
@@ -1741,6 +2101,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                         x * landTileSize,
                                         regionSizeX - landTileSize - (y * landTileSize),
                                         landTileSize,
+>>>>>>> avn/ubitvar
                                         landTileSize);
                             }
                         }
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 78c050a..7472050 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -29,8 +29,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Reflection;
+using System.Text;
 using System.Xml;
 using log4net;
 using Nini.Config;
@@ -42,8 +44,8 @@ using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-[assembly: Addin("DataSnapshot", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.5")]
+[assembly: Addin("DataSnapshot", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
 
 namespace OpenSim.Region.DataSnapshot
 {
@@ -131,9 +133,12 @@ namespace OpenSim.Region.DataSnapshot
                         m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period);
                         m_maxStales = config.Configs["DataSnapshot"].GetInt("max_changes_before_update", m_maxStales);
                         m_snapsDir = config.Configs["DataSnapshot"].GetString("snapshot_cache_directory", m_snapsDir);
-                        m_dataServices = config.Configs["DataSnapshot"].GetString("data_services", m_dataServices);
                         m_listener_port = config.Configs["Network"].GetString("http_listener_port", m_listener_port);
 
+                        m_dataServices = config.Configs["DataSnapshot"].GetString("data_services", m_dataServices);
+                        // New way of spec'ing data services, one per line
+                        AddDataServicesVars(config.Configs["DataSnapshot"]);
+
                         String[] annoying_string_array = config.Configs["DataSnapshot"].GetString("disable_modules", "").Split(".".ToCharArray());
                         foreach (String bloody_wanker in annoying_string_array)
                         {
@@ -289,6 +294,28 @@ namespace OpenSim.Region.DataSnapshot
             return null;
         }
 
+        private void AddDataServicesVars(IConfig config)
+        {
+            // Make sure the services given this way aren't in m_dataServices already
+            List<string> servs = new List<string>(m_dataServices.Split(new char[] { ';' }));
+
+            StringBuilder sb = new StringBuilder();
+            string[] keys = config.GetKeys();
+
+            if (keys.Length > 0)
+            {
+                IEnumerable<string> serviceKeys = keys.Where(value => value.StartsWith("DATA_SRV_"));
+                foreach (string serviceKey in serviceKeys)
+                {
+                    string keyValue = config.GetString(serviceKey, string.Empty).Trim();
+                    if (!servs.Contains(keyValue))
+                        sb.Append(keyValue).Append(";");
+                }
+            }
+
+            m_dataServices = (m_dataServices == "noservices") ? sb.ToString() : sb.Append(m_dataServices).ToString();
+        }
+
         #endregion
 
         #region [Public] Snapshot storage functions
@@ -368,27 +395,48 @@ namespace OpenSim.Region.DataSnapshot
             string delimStr = ";";
             char [] delimiter = delimStr.ToCharArray();
 
-            string[] services = servicesStr.Split(delimiter);
+            string[] services = servicesStr.Split(delimiter, StringSplitOptions.RemoveEmptyEntries);
 
             for (int i = 0; i < services.Length; i++)
             {
                 string url = services[i].Trim();
-                RestClient cli = new RestClient(url);
-                cli.AddQueryParameter("service", serviceName);
-                cli.AddQueryParameter("host", m_hostname);
-                cli.AddQueryParameter("port", m_listener_port);
-                cli.AddQueryParameter("secret", m_Secret.ToString());
-                cli.RequestMethod = "GET";
-                try
-                {
-                    reply = cli.Request();
-                }
-                catch (WebException)
+                using (RestClient cli = new RestClient(url))
                 {
-                    m_log.Warn("[DATASNAPSHOT]: Unable to notify " + url);
+<<<<<<< HEAD
+                    cli.AddQueryParameter("service", serviceName);
+                    cli.AddQueryParameter("host", m_hostname);
+                    cli.AddQueryParameter("port", m_listener_port);
+                    cli.AddQueryParameter("secret", m_Secret.ToString());
+                    cli.RequestMethod = "GET";
+                    try
+                    {
+                        reply = cli.Request(null);
+                    }
+                    catch (WebException)
+                    {
+                        m_log.Warn("[DATASNAPSHOT]: Unable to notify " + url);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Warn("[DATASNAPSHOT]: Ignoring unknown exception " + e.ToString());
+                    }
+
+                    byte[] response = new byte[1024];
+                    // int n = 0;
+                    try
+                    {
+                        // n = reply.Read(response, 0, 1024);
+                        reply.Read(response, 0, 1024);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.WarnFormat("[DATASNAPSHOT]: Unable to decode reply from data service. Ignoring. {0}", e.StackTrace);
+                    }
+                    // This is not quite working, so...
+                    // string responseStr = Util.UTF8.GetString(response);
+                    m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret);
                 }
-                catch (Exception e)
-                {
+=======
                     m_log.Warn("[DATASNAPSHOT]: Ignoring unknown exception " + e.ToString());
                 }
 
@@ -409,6 +457,7 @@ namespace OpenSim.Region.DataSnapshot
 
                 if(reply != null)
                     reply.Close();
+>>>>>>> avn/ubitvar
             }
 
         }
diff --git a/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs b/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs
index 3d74597..e60d3ae 100644
--- a/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentStatefulModule.cs b/OpenSim/Region/Framework/Interfaces/IAgentStatefulModule.cs
new file mode 100644
index 0000000..ccb2a03
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IAgentStatefulModule.cs
@@ -0,0 +1,61 @@
+/*
+ * 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;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public interface IAgentStatefulModule
+    {
+        /// <summary>
+        /// Returns a list of all the formats (by UUID) that this module
+        /// can render agent state in.
+        /// </summary>
+        List<UUID> GetRenderStateFormats();
+
+        /// <summary>
+        /// Returns a list (by UUID) of all formats this module can decode
+        /// to populate it's internal agent-related state.
+        /// </summary>
+        List<UUID> GetAcceptStateFormats();
+
+        /// <summary>
+        /// Render all internally held state for the given agent in the
+        /// requested format.
+        /// </summary>
+        string RenderState(UUID agentID, UUID format);
+
+        /// <summary>
+        /// Populate the internal state for the given agent from the
+        /// data argument, which is in the specified format. All prior
+        /// state relating to this agent is removed by this operation.
+        /// </summary>
+        bool ReceiveState(UUID agentID, UUID format, string data);
+    }
+}
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 84cdc15..50448b4 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -93,14 +93,21 @@ namespace OpenSim.Region.Framework.Interfaces
 
         void EnableChildAgent(ScenePresence agent, GridRegion region);
 
+<<<<<<< HEAD
+        GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version,
+                                        out Vector3 newpos, out string reason);
+
+=======
         GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos);
         GridRegion GetObjectDestination(SceneObjectGroup grp, Vector3 targetPosition, out Vector3 newpos);
         bool checkAgentAccessToRegion(ScenePresence agent, GridRegion destiny, Vector3 position, out string version, out string reason);
+>>>>>>> avn/ubitvar
         void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
         bool CrossPrimGroupIntoNewRegion(GridRegion destination, Vector3 newPosition, SceneObjectGroup grp, bool silent);
 
         ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
 
+        bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition);
     }
 
     public interface IUserAgentVerificationModule
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateDataService.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataService.cs
deleted file mode 100644
index 35cc220..0000000
--- a/OpenSim/Region/Framework/Interfaces/IEstateDataService.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * 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 OpenSim.Framework;
-using OpenMetaverse;
-
-namespace OpenSim.Region.Framework.Interfaces
-{
-    public interface IEstateDataService
-    {
-        /// <summary>
-        /// Load estate settings for a region.
-        /// </summary>
-        /// <param name="regionID"></param>
-        /// <param name="create">If true, then an estate is created if one is not found.</param>
-        /// <returns></returns>        
-        EstateSettings LoadEstateSettings(UUID regionID, bool create);
-        
-        /// <summary>
-        /// Load estate settings for an estate ID.
-        /// </summary>
-        /// <param name="estateID"></param>
-        /// <returns></returns>        
-        EstateSettings LoadEstateSettings(int estateID);
-
-        /// <summary>
-        /// Create a new estate.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="EstateSettings"/>
-        /// </returns>
-        EstateSettings CreateNewEstate();
-        
-        /// <summary>
-        /// Load/Get all estate settings.
-        /// </summary>
-        /// <returns>An empty list if no estates were found.</returns>
-        List<EstateSettings> LoadEstateSettingsAll();
-        
-        /// <summary>
-        /// Store estate settings.
-        /// </summary>
-        /// <remarks>
-        /// This is also called by EstateSettings.Save()</remarks>
-        /// <param name="es"></param>        
-        void StoreEstateSettings(EstateSettings es);
-        
-        /// <summary>
-        /// Get estate IDs.
-        /// </summary>
-        /// <param name="search">Name of estate to search for.  This is the exact name, no parttern matching is done.</param>
-        /// <returns></returns>        
-        List<int> GetEstates(string search);
-        
-        /// <summary>
-        /// Get the IDs of all estates owned by the given user.
-        /// </summary>
-        /// <returns>An empty list if no estates were found.</returns>
-        List<int> GetEstatesByOwner(UUID ownerID);        
-        
-        /// <summary>
-        /// Get the IDs of all estates.
-        /// </summary>
-        /// <returns>An empty list if no estates were found.</returns>
-        List<int> GetEstatesAll();
-            
-        /// <summary>
-        /// Link a region to an estate.
-        /// </summary>
-        /// <param name="regionID"></param>
-        /// <param name="estateID"></param>
-        /// <returns>true if the link succeeded, false otherwise</returns>        
-        bool LinkRegion(UUID regionID, int estateID);
-        
-        /// <summary>
-        /// Get the UUIDs of all the regions in an estate.
-        /// </summary>
-        /// <param name="estateID"></param>
-        /// <returns></returns>        
-        List<UUID> GetRegions(int estateID);
-        
-        /// <summary>
-        /// Delete an estate
-        /// </summary>
-        /// <param name="estateID"></param>
-        /// <returns>true if the delete succeeded, false otherwise</returns>        
-        bool DeleteEstate(int estateID);
-    }
-}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
deleted file mode 100644
index 8febb13..0000000
--- a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Region.Framework.Interfaces
-{
-    public interface IEstateDataStore
-    {
-        /// <summary>
-        /// Initialise the data store.
-        /// </summary>
-        /// <param name="connectstring"></param>
-        void Initialise(string connectstring);
-
-        /// <summary>
-        /// Load estate settings for a region.
-        /// </summary>
-        /// <param name="regionID"></param>
-        /// <param name="create">If true, then an estate is created if one is not found.</param>
-        /// <returns></returns>
-        EstateSettings LoadEstateSettings(UUID regionID, bool create);
-        
-        /// <summary>
-        /// Load estate settings for an estate ID.
-        /// </summary>
-        /// <param name="estateID"></param>
-        /// <returns></returns>
-        EstateSettings LoadEstateSettings(int estateID);
-        
-        /// <summary>
-        /// Create a new estate.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="EstateSettings"/>
-        /// </returns>
-        EstateSettings CreateNewEstate();
-
-        /// <summary>
-        /// Load/Get all estate settings.
-        /// </summary>
-        /// <returns>An empty list if no estates were found.</returns>
-        List<EstateSettings> LoadEstateSettingsAll();
-        
-        /// <summary>
-        /// Store estate settings.
-        /// </summary>
-        /// <remarks>
-        /// This is also called by EstateSettings.Save()</remarks>
-        /// <param name="es"></param>
-        void StoreEstateSettings(EstateSettings es);
-        
-        /// <summary>
-        /// Get estate IDs.
-        /// </summary>
-        /// <param name="search">Name of estate to search for.  This is the exact name, no parttern matching is done.</param>
-        /// <returns></returns>
-        List<int> GetEstates(string search);
-
-        /// <summary>
-        /// Get the IDs of all estates owned by the given user.
-        /// </summary>
-        /// <returns>An empty list if no estates were found.</returns>
-        List<int> GetEstatesByOwner(UUID ownerID);
-        
-        /// <summary>
-        /// Get the IDs of all estates.
-        /// </summary>
-        /// <returns>An empty list if no estates were found.</returns>
-        List<int> GetEstatesAll();
-        
-        /// <summary>
-        /// Link a region to an estate.
-        /// </summary>
-        /// <param name="regionID"></param>
-        /// <param name="estateID"></param>
-        /// <returns>true if the link succeeded, false otherwise</returns>
-        bool LinkRegion(UUID regionID, int estateID);
-        
-        /// <summary>
-        /// Get the UUIDs of all the regions in an estate.
-        /// </summary>
-        /// <param name="estateID"></param>
-        /// <returns></returns>
-        List<UUID> GetRegions(int estateID);
-        
-        /// <summary>
-        /// Delete an estate
-        /// </summary>
-        /// <param name="estateID"></param>
-        /// <returns>true if the delete succeeded, false otherwise</returns>
-        bool DeleteEstate(int estateID);
-    }
-}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 944c66b..461c880 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -26,6 +26,8 @@
  */
 
 using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
@@ -41,6 +43,11 @@ namespace OpenSim.Region.Framework.Interfaces
         uint GetRegionFlags();
         bool IsManager(UUID avatarID);
 
+        string SetEstateOwner(int estateID, UserAccount account);
+        string SetEstateName(int estateID, string newName);
+        string SetRegionEstate(RegionInfo regionInfo, int estateID);
+        string CreateEstate(string estateName, UUID ownerID);
+
         /// <summary>
         /// Tell all clients about the current state of the region (terrain textures, water height, etc.).
         /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs
index f158236..7dc1552 100644
--- a/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using OpenMetaverse;
 using OpenSim.Framework;
 
@@ -57,7 +58,7 @@ namespace OpenSim.Region.Framework.Interfaces
         bool StartGroupChatSession(UUID agentID, UUID groupID);
         
         /// <summary>
-        /// Send a message to an entire group.
+        /// Send a message to each member of a group whose chat session is active.
         /// </summary>
         /// <param name="im">
         /// The message itself.  The fields that must be populated are
@@ -69,5 +70,28 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </param>
         /// <param name="groupID"></param>
         void SendMessageToGroup(GridInstantMessage im, UUID groupID);
+
+        /// <summary>
+        /// Send a message to all the members of a group that fulfill a condition.
+        /// </summary>
+        /// <param name="im">
+        /// The message itself.  The fields that must be populated are
+        /// 
+        /// imSessionID - Populate this with the group ID (session ID and group ID are currently identical)
+        /// fromAgentName - Populate this with whatever arbitrary name you want to show up in the chat dialog
+        /// message - The message itself
+        /// dialog - This must be (byte)InstantMessageDialog.SessionSend
+        /// </param>
+        /// <param name="groupID"></param>
+        /// <param name="sendingAgentForGroupCalls">
+        /// The requesting agent to use when querying the groups service.  Sometimes this is different from 
+        /// im.fromAgentID, with group notices, for example.
+        /// </param>
+        /// <param name="sendCondition">
+        /// The condition that must be met by a member for the message to be sent.  If null then the message is sent
+        /// if the chat session is active.
+        /// </param>
+        void SendMessageToGroup(
+            GridInstantMessage im, UUID groupID, UUID sendingAgentForGroupCalls, Func<GroupMembersData, bool> sendCondition);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
index eb6c5ac..2f9b222 100644
--- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 
@@ -41,11 +42,56 @@ namespace OpenSim.Region.Framework.Interfaces
         HTTP_PRAGMA_NO_CACHE = 6
     }
 
+    /// <summary>
+    /// The initial status of the request before it is placed on the wire.
+    /// </summary>
+    /// <remarks>
+    /// The request may still fail later on, in which case the normal HTTP status is set.
+    /// </remarks>
+    [Flags]
+    public enum HttpInitialRequestStatus
+    {
+        OK = 1,
+        DISALLOWED_BY_FILTER = 2
+    }
+
     public interface IHttpRequestModule
     {
         UUID MakeHttpRequest(string url, string parameters, string body);
+<<<<<<< HEAD
+
+        /// <summary>
+        /// Starts the http request.
+        /// </summary>
+        /// <remarks>
+        /// This is carried out asynchronously unless it fails initial checks.  Results are fetched by the script engine
+        /// HTTP requests module to be distributed back to scripts via a script event.
+        /// </remarks>
+        /// <returns>The ID of the request.  If the requested could not be performed then this is UUID.Zero</returns>
+        /// <param name="localID">Local ID of the object containing the script making the request.</param>
+        /// <param name="itemID">Item ID of the script making the request.</param>
+        /// <param name="url">Url to request.</param>
+        /// <param name="parameters">LSL parameters for the request.</param>
+        /// <param name="headers">Extra headers for the request.</param>
+        /// <param name="body">Body of the request.</param>
+        /// <param name="status">
+        /// Initial status of the request.  If OK then the request is actually made to the URL.  Subsequent status is
+        /// then returned via IServiceRequest when the response is asynchronously fetched.
+        /// </param>
+        UUID StartHttpRequest(
+            uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body, 
+            out HttpInitialRequestStatus status);
+
+        /// <summary>
+        /// Stop and remove all http requests for the given script.
+        /// </summary>
+        /// <param name='id'></param>
+        void StopHttpRequestsForScript(UUID id);
+
+=======
         UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body);
         void StopHttpRequest(uint m_localID, UUID m_itemID);
+>>>>>>> avn/ubitvar
         IServiceRequest GetNextCompletedRequest();
         void RemoveCompletedRequest(UUID id);
     }
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
index 3576e35..6bad018 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
@@ -38,7 +38,9 @@ namespace OpenSim.Region.Framework.Interfaces
     public interface IInventoryAccessModule
     {
         UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data);
-        
+
+        bool UpdateInventoryItemAsset(UUID ownerID, InventoryItemBase item, AssetBase asset);
+
         /// <summary>
         /// Copy objects to a user's inventory.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
index ddf7565..37e20c3 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using OpenSim.Services.Interfaces;
+using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
@@ -41,8 +42,24 @@ namespace OpenSim.Region.Framework.Interfaces
     /// <param name="invPath">The inventory path saved</param>
     /// <param name="savePath">The stream to which the archive was saved</param>
     /// <param name="reportedException">Contains the exception generated if the save did not succeed</param>
+    /// <param name="saveCount">Number of inventory items saved to archive</param>
+    /// <param name="filterCount">Number of inventory items skipped due to perm filter option</param>
     public delegate void InventoryArchiveSaved(
-        Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, Exception reportedException);
+        UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, Exception reportedException, int saveCount, int filterCount);
+
+    /// <summary>
+    /// Used for the OnInventoryArchiveLoaded event.
+    /// </summary>
+    /// <param name="id">Request id</param>
+    /// <param name="succeeded">true if the load succeeded, false otherwise</param>
+    /// <param name="userInfo">The user for whom the load was conducted</param>
+    /// <param name="invPath">The inventory path loaded</param>
+    /// <param name="savePath">The stream from which the archive was loaded</param>
+    /// <param name="reportedException">Contains the exception generated if the load did not succeed</param>
+    /// <param name="loadCount">Number of inventory items loaded from archive</param>
+    public delegate void InventoryArchiveLoaded(
+        UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream loadStream, Exception reportedException, int loadCount);
+
 
     public interface IInventoryArchiverModule
     {
@@ -52,6 +69,11 @@ namespace OpenSim.Region.Framework.Interfaces
         event InventoryArchiveSaved OnInventoryArchiveSaved;
 
         /// <summary>
+        /// Fired when an archive inventory load has been completed.
+        /// </summary>
+        event InventoryArchiveLoaded OnInventoryArchiveLoaded;
+
+        /// <summary>
         /// Dearchive a user's inventory folder from the given stream
         /// </summary>
         /// <param name="firstName"></param>
@@ -59,7 +81,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="invPath">The inventory path in which to place the loaded folders and items</param>
         /// <param name="loadStream">The stream from which the inventory archive will be loaded</param>
         /// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
-        bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, Stream loadStream);
+        bool DearchiveInventory(UUID id, string firstName, string lastName, string invPath, string pass, Stream loadStream);
 
         /// <summary>
         /// Dearchive a user's inventory folder from the given stream
@@ -72,7 +94,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// the loaded IAR with existing folders where possible.</param>
         /// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
         bool DearchiveInventory(
-            string firstName, string lastName, string invPath, string pass, Stream loadStream,
+            UUID id, string firstName, string lastName, string invPath, string pass, Stream loadStream,
             Dictionary<string, object> options);
 
         /// <summary>
@@ -84,7 +106,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="invPath">The inventory path from which the inventory should be saved.</param>
         /// <param name="saveStream">The stream to which the inventory archive will be saved</param>
         /// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
-        bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream);
+        bool ArchiveInventory(UUID id, string firstName, string lastName, string invPath, string pass, Stream saveStream);
 
         /// <summary>
         /// Archive a user's inventory folder to the given stream
@@ -97,7 +119,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="options">Archiving options.  Currently, there are none.</param>
         /// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
         bool ArchiveInventory(
-            Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream,
+            UUID id, string firstName, string lastName, string invPath, string pass, Stream saveStream,
             Dictionary<string, object> options);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
index 46d03b3..1cbd045 100644
--- a/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
+++ b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Drawing;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
 
@@ -53,5 +54,12 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="components">number of components</param>
         /// <returns>true if decode was successful.  false otherwise.</returns>
         bool Decode(UUID assetID, byte[] j2kData, out OpenJPEG.J2KLayerInfo[] layers, out int components);
+
+        /// <summary>
+        /// Provides a synchronous decode direct to an image object
+        /// </summary>
+        /// <param name="j2kData"></param>
+        /// <returns>decoded image or 'null' of unsuccessful</returns>
+        Image DecodeToImage(byte[] j2kData);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
index 5151567..eb79711 100644
--- a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
@@ -25,14 +25,24 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+<<<<<<< HEAD
+using System.Drawing;
+using OpenSim.Framework;
+=======
 using OpenMetaverse;
 using OpenSim.Framework;
 using System.Drawing;
+>>>>>>> avn/ubitvar
 
 namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IMapImageUploadModule
     {
+<<<<<<< HEAD
+        void UploadMapTile(IScene scene, Bitmap mapTile);
+    }
+}
+=======
         /// <summary>
         /// Upload a new maptile
         /// </summary>
@@ -40,3 +50,4 @@ namespace OpenSim.Region.Framework.Interfaces
         void UploadMapTile(IScene scene, Bitmap mapTile);
     }
 }
+>>>>>>> avn/ubitvar
diff --git a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
index b0b47a7..290b826 100644
--- a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
@@ -36,6 +36,26 @@ namespace OpenSim.Region.Framework.Interfaces
     {
         event UndeliveredMessage OnUndeliveredMessage;
 
+        /// <summary>
+        /// Attempt to send an instant message to a given destination.
+        /// </summary>
+        /// <remarks>
+        /// If the message cannot be delivered for any reason, this will be signalled on the OnUndeliveredMessage
+        /// event.  result(false) will also be called if the message cannot be delievered unless the type is
+        /// InstantMessageDialog.MessageFromAgent.  For successful message delivery, result(true) is called.
+        /// </remarks>
+        /// <param name="im"></param>
+        /// <param name="result"></param>
         void SendInstantMessage(GridInstantMessage im, MessageResultNotification result);
+
+        /// <summary>
+        /// Appropriately handle a known undeliverable message without attempting a send.
+        /// </summary>
+        /// <remarks>
+        /// Essentially, this invokes the OnUndeliveredMessage event.
+        /// </remarks>
+        /// <param name="im"></param>
+        /// <param name="result"></param>
+        void HandleUndeliverableMessage(GridInstantMessage im, MessageResultNotification result);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/INPCModule.cs b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
index 9817cf7..478833e 100644
--- a/OpenSim/Region/Framework/Interfaces/INPCModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
@@ -72,6 +72,32 @@ namespace OpenSim.Region.Framework.Interfaces
                 AvatarAppearance appearance);
 
         /// <summary>
+        /// Create an NPC with a user-supplied agentID
+        /// </summary>
+        /// <param name="firstname"></param>
+        /// <param name="lastname"></param>
+        /// <param name="position"></param>
+        /// <param name="agentID"></param>
+        /// The desired agent ID
+        /// <param name="owner"></param>
+        /// <param name="senseAsAgent">
+        /// Make the NPC show up as an agent on LSL sensors. The default is
+        /// that they show up as the NPC type instead, but this is currently
+        /// an OpenSim-only extension.
+        /// </param>
+        /// <param name="scene"></param>
+        /// <param name="appearance">
+        /// The avatar appearance to use for the new NPC.
+        /// </param>
+        /// <returns>
+        /// The UUID of the ScenePresence created. UUID.Zero if there was a
+        /// failure.
+        /// </returns>
+        UUID CreateNPC(string firstname, string lastname,
+                Vector3 position, UUID agentID, UUID owner, bool senseAsAgent, Scene scene,
+                AvatarAppearance appearance);
+
+        /// <summary>
         /// Check if the agent is an NPC.
         /// </summary>
         /// <param name="agentID"></param>
@@ -96,6 +122,17 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <summary>
         /// Check if the caller has permission to manipulate the given NPC.
         /// </summary>
+        /// <remarks>
+        /// A caller has permission if
+        ///   * An NPC exists with the given npcID.
+        ///   * The caller UUID given is UUID.Zero.
+        ///   * The avatar is unowned (owner is UUID.Zero).
+        ///   * The avatar is owned and the owner and callerID match.
+        ///   * The avatar is owned and the callerID matches its agentID.
+        /// </remarks>
+        /// <param name="av"></param>
+        /// <param name="callerID"></param>
+        /// <returns>true if they do, false if they don't.</returns>
         /// <param name="npcID"></param>
         /// <param name="callerID"></param>
         /// <returns>
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index ed93916..445342d 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -127,7 +127,12 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
         /// <param name="options">
         /// Dictionary of options.
+<<<<<<< HEAD
+        /// </param>
+        void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string,object> options);
+=======
         /// </param>    
         void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options);
+>>>>>>> avn/ubitvar
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
index 9b1e4ca..2089bce 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
@@ -32,6 +32,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
+    [TypeExtensionPoint(Path = "/OpenSim/RegionModules", NodeName="RegionModule")]
     public interface IRegionModuleBase
     {
         /// <value>
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
index 595e031..ff18519 100644
--- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
@@ -24,10 +24,15 @@
  * (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.IO;
 
+using OpenSim.Framework;
 
+<<<<<<< HEAD
+=======
 using System.IO;
 using OpenSim.Framework;
+>>>>>>> avn/ubitvar
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
@@ -51,6 +56,12 @@ namespace OpenSim.Region.Framework.Interfaces
         void PushTerrain(IClientAPI pClient);
      
         /// <summary>
+        /// When a client initially connects, all the terrain must be pushed to the viewer.
+        /// This call causes all the terrain patches to be sent to the client.
+        /// </summary>
+        void PushTerrain(IClientAPI pClient);
+        
+        /// <summary>
         /// Load a terrain from a stream.
         /// </summary>
         /// <param name="filename">
@@ -58,6 +69,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </param>
         /// <param name="stream"></param>
         void LoadFromStream(string filename, Stream stream);
+        void LoadFromStream(string filename, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement, Stream stream);
         void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap);
         void LoadFromStream(string filename, Vector3 displacement,
                                 float radianRotation, Vector2 rotationDisplacement, Stream stream);
diff --git a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
deleted file mode 100644
index f8088c3..0000000
--- a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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;
-
-namespace OpenSim.Region.Framework.Interfaces
-{
-    /// <summary>
-    /// This maintains the relationship between a UUID and a user name.
-    /// </summary>
-    public interface IUserManagement
-    {
-        string GetUserName(UUID uuid);
-        string GetUserHomeURL(UUID uuid);
-        string GetUserUUI(UUID uuid);
-        string GetUserServerURL(UUID uuid, string serverType);
-
-        /// <summary>
-        /// Get user ID by the given name.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns>UUID.Zero if no user with that name is found or if the name is "Unknown User"</returns>
-        UUID GetUserIdByName(string name);
-
-        /// <summary>
-        /// Get user ID by the given name.
-        /// </summary>
-        /// <param name="firstName"></param>
-        /// <param name="lastName"></param>
-        /// <returns>UUID.Zero if no user with that name is found or if the name is "Unknown User"</returns>
-        UUID GetUserIdByName(string firstName, string lastName);
-
-        /// <summary>
-        /// Add a user.
-        /// </summary>
-        /// <remarks>
-        /// If an account is found for the UUID, then the names in this will be used rather than any information
-        /// extracted from creatorData.
-        /// </remarks>
-        /// <param name="uuid"></param>
-        /// <param name="creatorData">The creator data for this user.</param>
-        void AddUser(UUID uuid, string creatorData);
-
-        /// <summary>
-        /// Add a user.
-        /// </summary>
-        /// <remarks>
-        /// The UUID is related to the name without any other checks being performed, such as user account presence.
-        /// </remarks>
-        /// <param name="uuid"></param>
-        /// <param name="firstName"></param>
-        /// <param name="lastName"></param>
-        void AddUser(UUID uuid, string firstName, string lastName);
-
-        /// <summary>
-        /// Add a user.
-        /// </summary>
-        /// <remarks>
-        /// The arguments apart from uuid are formed into a creatorData string and processing proceeds as for the
-        /// AddUser(UUID uuid, string creatorData) method.
-        /// </remarks>
-        /// <param name="uuid"></param>
-        /// <param name="firstName"></param>
-        /// <param name="profileURL"></param>
-        void AddUser(UUID uuid, string firstName, string lastName, string homeURL);
-
-        bool IsLocalGridUser(UUID uuid);
-    }
-}
diff --git a/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs
index b087c8b..16b6024 100644
--- a/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs
@@ -33,8 +33,11 @@ using OpenSim.Framework;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
 
+using Mono.Addins;
+
 namespace OpenSim.Region.Framework.Interfaces
 {
+    [TypeExtensionPoint(Path = "/OpenSim/WindModule", NodeName = "WindModel")]
     public interface IWindModelPlugin : IPlugin
     {
         /// <summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
index e9cf4ad..08dc3e3 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
@@ -37,6 +37,10 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         void GenerateMaptile();
         List<MapBlockData> Map2BlockFromGridRegion(GridRegion r, uint flag);
+<<<<<<< HEAD
+        MapBlockData MapBlockFromGridRegion(GridRegion r, uint flag);
+=======
         void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag);
+>>>>>>> avn/ubitvar
     }
 }
diff --git a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
index a2a99d4..97dea1f 100644
--- a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Mono.Addins;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -22,6 +23,7 @@ using System.Runtime.InteropServices;
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("d25e7aed-7f55-4bb8-9970-0d7d978ea8a5")]
 
+
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
@@ -29,5 +31,6 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
+[assembly: AddinRoot("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
 
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index b7400ea..eb1a970 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -306,6 +306,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             return base.Equals(obj);
         }
 
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
         public override string ToString()
         {
             StringBuilder buff = new StringBuilder();
diff --git a/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs b/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs
index 3afc87f..b3b38b2 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -113,31 +113,34 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
         public byte[] ToBytes()
         {
-            byte[] outputbytes = new byte[0];
+            byte[] outputbytes;
 
-            BinaryWriter iostream = new BinaryWriter(new MemoryStream());
-            iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(unknown0)));
-            iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(unknown1)));
-            iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(Priority)));
-            iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(Length)));
-            iostream.Write(BinBVHUtil.WriteNullTerminatedString(ExpressionName));
-            iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(InPoint)));
-            iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(OutPoint)));
-            iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(Loop ? 1 : 0)));
-            iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(EaseInTime)));
-            iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(EaseOutTime)));
-            iostream.Write(BinBVHUtil.ES(Utils.UIntToBytes(HandPose)));
-            iostream.Write(BinBVHUtil.ES(Utils.UIntToBytes((uint)(Joints.Length))));
-            
-            for (int i = 0; i < Joints.Length; i++)
+            using (MemoryStream ms = new MemoryStream())
+            using (BinaryWriter iostream = new BinaryWriter(ms))
             {
-                Joints[i].WriteBytesToStream(iostream, InPoint, OutPoint);
+                iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(unknown0)));
+                iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(unknown1)));
+                iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(Priority)));
+                iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(Length)));
+                iostream.Write(BinBVHUtil.WriteNullTerminatedString(ExpressionName));
+                iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(InPoint)));
+                iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(OutPoint)));
+                iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(Loop ? 1 : 0)));
+                iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(EaseInTime)));
+                iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(EaseOutTime)));
+                iostream.Write(BinBVHUtil.ES(Utils.UIntToBytes(HandPose)));
+                iostream.Write(BinBVHUtil.ES(Utils.UIntToBytes((uint)(Joints.Length))));
+
+                for (int i = 0; i < Joints.Length; i++)
+                {
+                    Joints[i].WriteBytesToStream(iostream, InPoint, OutPoint);
+                }
+                iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(0)));
+            
+                using (MemoryStream ms2 = (MemoryStream)iostream.BaseStream)
+                    outputbytes = ms2.ToArray();
             }
-            iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(0)));
-            MemoryStream ms = (MemoryStream)iostream.BaseStream;
-            outputbytes = ms.ToArray();
-            ms.Close();
-            iostream.Close();
+
             return outputbytes;
         }
         
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 24fbef9..22b8e4d 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -433,6 +433,9 @@ namespace OpenSim.Region.Framework.Scenes
         public delegate void IncomingInstantMessage(GridInstantMessage message);
         public event IncomingInstantMessage OnIncomingInstantMessage;
 
+        public delegate void CrossAgentToNewRegion(ScenePresence sp, bool isFlying, GridRegion newRegion);
+        public event CrossAgentToNewRegion OnCrossAgentToNewRegion;
+
         public event IncomingInstantMessage OnUnhandledInstantMessage;
 
         public delegate void ClientClosed(UUID clientID, Scene scene);
@@ -786,8 +789,30 @@ namespace OpenSim.Region.Framework.Scenes
         /// <see cref="Scene.doObjectDuplicateOnRay"/>
         /// </remarks>
         public event Action<SceneObjectGroup> OnObjectAddedToScene;
+        
+        /// <summary>
+        ///  When a client sends a derez request for an object inworld
+        ///  but before the object is deleted
+        /// </summary>
+        public event DeRezRequested OnDeRezRequested;
+        /// <summary>
+        /// Triggered when a client sends a derez request for an object inworld
+        /// </summary>
+        /// <param name="remoteClient">The client question (it can be null)</param>
+        /// <param name="obj">The object in question</param>
+        /// <param name="action">The exact derez action</param>
+        /// <returns>Flag indicating whether the object should be deleted from the scene or not</returns>
+        public delegate bool DeRezRequested(IClientAPI remoteClient, List<SceneObjectGroup> objs, DeRezAction action);
 
         /// <summary>
+        /// Triggered when an object is removed from the scene.
+        /// </summary>
+        /// <remarks>
+        /// Triggered by <see cref="TriggerObjectBeingRemovedFromScene"/>
+        /// in <see cref="Scene.DeleteSceneObject"/>
+        /// </remarks>
+        public event ObjectBeingRemovedFromScene OnObjectBeingRemovedFromScene;
+        /// <summary>
         /// Delegate for <see cref="OnObjectBeingRemovedFromScene"/>
         /// </summary>
         /// <param name="obj">The object being removed from the scene</param>
@@ -806,15 +831,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// </remarks>
         public event Action<SceneObjectPart> OnObjectRemovedFromPhysicalScene;
 
-        /// <summary>
-        /// Triggered when an object is removed from the scene.
-        /// </summary>
-        /// <remarks>
-        /// Triggered by <see cref="TriggerObjectBeingRemovedFromScene"/>
-        /// in <see cref="Scene.DeleteSceneObject"/>
-        /// </remarks>
-        public event ObjectBeingRemovedFromScene OnObjectBeingRemovedFromScene;
-
         public delegate void NoticeNoLandDataFromStorage();
         public event NoticeNoLandDataFromStorage OnNoticeNoLandDataFromStorage;
 
@@ -1568,8 +1584,33 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
-        }        
-        
+        }
+
+        public bool TriggerDeRezRequested(IClientAPI client, List<SceneObjectGroup> objs, DeRezAction action)
+        {
+            bool canDeRez = true;
+
+            DeRezRequested handlerDeRezRequested = OnDeRezRequested;
+            if (handlerDeRezRequested != null)
+            {
+                foreach (DeRezRequested d in handlerDeRezRequested.GetInvocationList())
+                {
+                    try
+                    {
+                        canDeRez &= d(client, objs, action);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[EVENT MANAGER]: Delegate for TriggerDeRezRequested failed - continuing.  {0} {1}",
+                            e.Message, e.StackTrace);
+                    }
+                }
+            }
+
+            return canDeRez;
+        }
+
         public void TriggerObjectBeingRemovedFromScene(SceneObjectGroup obj)
         {
             ObjectBeingRemovedFromScene handlerObjectBeingRemovedFromScene = OnObjectBeingRemovedFromScene;
@@ -2011,6 +2052,27 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public void TriggerCrossAgentToNewRegion(ScenePresence agent, bool isFlying, GridRegion newRegion)
+        {
+            CrossAgentToNewRegion handlerCrossAgentToNewRegion = OnCrossAgentToNewRegion;
+            if (handlerCrossAgentToNewRegion != null)
+            {
+                foreach (CrossAgentToNewRegion d in handlerCrossAgentToNewRegion.GetInvocationList())
+                {
+                    try
+                    {
+                        d(agent, isFlying, newRegion);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[EVENT MANAGER]: Delegate for TriggerCrossAgentToNewRegion failed - continuing.  {0} {1}",
+                            e.Message, e.StackTrace);
+                    }
+                }
+            }
+        }
+
         public void TriggerIncomingInstantMessage(GridInstantMessage message)
         {
             IncomingInstantMessage handlerIncomingInstantMessage = OnIncomingInstantMessage;
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index e3f979f..2b95a4c 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Scenes
 {
     public class KeyframeTimer
     {
-        private static Dictionary<Scene, KeyframeTimer>m_timers =
+        private static Dictionary<Scene, KeyframeTimer> m_timers =
                 new Dictionary<Scene, KeyframeTimer>();
 
         private Timer m_timer;
@@ -67,8 +67,15 @@ namespace OpenSim.Region.Framework.Scenes
             m_timer.Interval = TickDuration;
             m_timer.AutoReset = true;
             m_timer.Elapsed += OnTimer;
+        }
 
-            m_timer.Start();
+        public void Start()
+        {
+            lock (m_timer)
+            {
+                if (!m_timer.Enabled)
+                    m_timer.Start();
+            }
         }
 
         private void OnTimer(object sender, ElapsedEventArgs ea)
@@ -120,6 +127,25 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     timer = new KeyframeTimer(motion.Scene);
                     m_timers[motion.Scene] = timer;
+
+                    if (!SceneManager.Instance.AllRegionsReady)
+                    {
+                        // Start the timers only once all the regions are ready. This is required
+                        // when using megaregions, because the megaregion is correctly configured
+                        // only after all the regions have been loaded. (If we don't do this then
+                        // when the prim moves it might think that it crossed into a region.)
+                        SceneManager.Instance.OnRegionsReadyStatusChange += delegate(SceneManager sm)
+                        {
+                            if (sm.AllRegionsReady)
+                                timer.Start();
+                        };
+                    }
+                    
+                    // Check again, in case the regions were started while we were adding the event handler
+                    if (SceneManager.Instance.AllRegionsReady)
+                    {
+                        timer.Start();
+                    }
                 }
             }
 
@@ -154,7 +180,7 @@ namespace OpenSim.Region.Framework.Scenes
     [Serializable]
     public class KeyframeMotion
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public enum PlayMode : int
         {
@@ -180,6 +206,7 @@ namespace OpenSim.Region.Framework.Scenes
             public int TimeMS;
             public int TimeTotal;
             public Vector3 AngularVelocity;
+            public Vector3 StartPosition;
         };
 
         private Vector3 m_serializedPosition;
@@ -284,10 +311,11 @@ namespace OpenSim.Region.Framework.Scenes
 
             try
             {
-                MemoryStream ms = new MemoryStream(data);
-                BinaryFormatter fmt = new BinaryFormatter();
-
-                newMotion = (KeyframeMotion)fmt.Deserialize(ms);
+                using (MemoryStream ms = new MemoryStream(data))
+                {
+                    BinaryFormatter fmt = new BinaryFormatter();
+                    newMotion = (KeyframeMotion)fmt.Deserialize(ms);
+                }
 
                 newMotion.m_group = grp;
 
@@ -323,6 +351,26 @@ namespace OpenSim.Region.Framework.Scenes
             m_group = grp;
             m_scene = grp.Scene;
 
+<<<<<<< HEAD
+            Vector3 grppos = grp.AbsolutePosition;
+            Vector3 offset = grppos - m_serializedPosition;
+            // avoid doing it more than once
+            // current this will happen dragging a prim to other region
+            m_serializedPosition = grppos;
+
+            m_basePosition += offset;
+            m_nextPosition += offset;
+            
+            m_currentFrame.StartPosition += offset;
+            m_currentFrame.Position += offset;
+
+            for (int i = 0; i < m_frames.Count; i++)
+            {
+                Keyframe k = m_frames[i];
+                k.StartPosition += offset;
+                k.Position += offset;
+                m_frames[i]=k;
+=======
             lock (m_frames)
             {
                 Vector3 grppos = grp.AbsolutePosition;
@@ -342,6 +390,7 @@ namespace OpenSim.Region.Framework.Scenes
                     k.Position += offset;
                     m_frames[i] = k;
                 }
+>>>>>>> avn/ubitvar
             }
 
             if (m_running)
@@ -433,6 +482,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 StartTimer();
                 m_running = true;
+                m_group.Scene.EventManager.TriggerMovingStartEvent(m_group.RootPart.LocalId);
             }
             else
             {
@@ -515,6 +565,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     Keyframe k = m_keyframes[i];
 
+                    k.StartPosition = pos;
                     if (k.Position.HasValue)
                     {
                         k.Position = (k.Position * direction);
@@ -657,6 +708,29 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (m_frames.Count == 0)
             {
+<<<<<<< HEAD
+                if (!m_running) return;
+
+                GetNextList();
+
+                if (m_frames.Count == 0)
+                {
+                    Stop();
+//                    Scene scene = m_group.Scene;
+//
+//                    IScriptModule[] scriptModules = scene.RequestModuleInterfaces<IScriptModule>();
+//                    foreach (IScriptModule m in scriptModules)
+//                    {
+//                        if (m == null)
+//                            continue;
+//                        m.PostObjectEvent(m_group.RootPart.UUID, "moving_end", new object[0]);
+//                    }
+
+                    m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId);
+                        
+                    return;
+                }
+=======
                 lock (m_frames)
                 {
                     GetNextList();
@@ -673,6 +747,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 continue;
                             m.PostObjectEvent(m_group.RootPart.UUID, "moving_end", new object[0]);
                         }
+>>>>>>> avn/ubitvar
 
                         return;
                     }
@@ -688,9 +763,9 @@ namespace OpenSim.Region.Framework.Scenes
             m_currentFrame.TimeMS -= (int)tickDuration;
 
             // Do the frame processing
-            double steps = (double)m_currentFrame.TimeMS / tickDuration;
+            double remainingSteps = (double)m_currentFrame.TimeMS / tickDuration;
 
-            if (steps <= 0.0)
+            if (remainingSteps <= 0.0)
             {
                 m_group.RootPart.Velocity = Vector3.Zero;
                 m_group.RootPart.AngularVelocity = Vector3.Zero;
@@ -714,23 +789,75 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                float complete = ((float)m_currentFrame.TimeTotal - (float)m_currentFrame.TimeMS) / (float)m_currentFrame.TimeTotal;
+                float completed = ((float)m_currentFrame.TimeTotal - (float)m_currentFrame.TimeMS) / (float)m_currentFrame.TimeTotal;
+                bool lastStep = m_currentFrame.TimeMS <= tickDuration;
+
+                Vector3 positionThisStep = m_currentFrame.StartPosition + (m_currentFrame.Position.Value - m_currentFrame.StartPosition) * completed;
+                Vector3 motionThisStep = positionThisStep - m_group.AbsolutePosition;
 
-                Vector3 v = (Vector3)m_currentFrame.Position - m_group.AbsolutePosition;
-                Vector3 motionThisFrame = v / (float)steps;
-                v = v * 1000 / m_currentFrame.TimeMS;
+<<<<<<< HEAD
+                float mag = Vector3.Mag(motionThisStep);
 
+                if ((mag >= 0.02f) || lastStep)
+                {
+                    m_nextPosition = m_group.AbsolutePosition + motionThisStep;
+                    m_group.AbsolutePosition = m_nextPosition;
+=======
                 m_nextPosition = m_group.AbsolutePosition + motionThisFrame;
 
                 if (Vector3.Mag(motionThisFrame) >= 0.05f)
+>>>>>>> avn/ubitvar
                     update = true;
 
+                //int totalSteps = m_currentFrame.TimeTotal / (int)tickDuration;
+                //m_log.DebugFormat("KeyframeMotion.OnTimer: step {0}/{1}, curPosition={2}, finalPosition={3}, motionThisStep={4} (scene {5})",
+                //    totalSteps - remainingSteps + 1, totalSteps, m_group.AbsolutePosition, m_currentFrame.Position, motionThisStep, m_scene.RegionInfo.RegionName);
+
                 if ((Quaternion)m_currentFrame.Rotation != m_group.GroupRotation)
                 {
                     Quaternion current = m_group.GroupRotation;
 
-                    Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, complete);
+                    Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, completed);
                     step.Normalize();
+<<<<<<< HEAD
+/* use simpler change detection
+* float angle = 0;
+
+                    float aa = current.X * current.X + current.Y * current.Y + current.Z * current.Z + current.W * current.W;
+                    float bb = step.X * step.X + step.Y * step.Y + step.Z * step.Z + step.W * step.W;
+                    float aa_bb = aa * bb;
+
+                    if (aa_bb == 0)
+                    {
+                        angle = 0;
+                    }
+                    else
+                    {
+                        float ab = current.X * step.X +
+                                   current.Y * step.Y +
+                                   current.Z * step.Z +
+                                   current.W * step.W;
+                        float q = (ab * ab) / aa_bb;
+
+                        if (q > 1.0f)
+                        {
+                            angle = 0;
+                        }
+                        else
+                        {
+                            angle = (float)Math.Acos(2 * q - 1);
+                        }
+                    }
+
+                    if (angle > 0.01f)
+*/
+                    if(Math.Abs(step.X - current.X) > 0.001f 
+                        || Math.Abs(step.Y - current.Y) > 0.001f 
+                        || Math.Abs(step.Z - current.Z) > 0.001f
+                        || lastStep)
+                        // assuming w is a dependente var
+
+=======
                     /* use simpler change detection
                     * float angle = 0;
 
@@ -766,6 +893,7 @@ namespace OpenSim.Region.Framework.Scenes
                         || Math.Abs(step.Y - current.Y) > 0.001f
                         || Math.Abs(step.Z - current.Z) > 0.001f)
                     // assuming w is a dependente var
+>>>>>>> avn/ubitvar
                     {
                         //                                m_group.UpdateGroupRotationR(step);
                         m_group.RootPart.RotationOffset = step;
@@ -791,19 +919,29 @@ namespace OpenSim.Region.Framework.Scenes
                 timerWasStopped = m_timerStopped;
             }
             StopTimer();
-            MemoryStream ms = new MemoryStream();
 
-            BinaryFormatter fmt = new BinaryFormatter();
             SceneObjectGroup tmp = m_group;
             m_group = null;
             if (!m_selected && tmp != null)
                 m_serializedPosition = tmp.AbsolutePosition;
+<<<<<<< HEAD
+=======
             fmt.Serialize(ms, this);
             m_group = tmp;
             if (!timerWasStopped && m_running && !m_waitingCrossing)
                 StartTimer();
+>>>>>>> avn/ubitvar
 
-            return ms.ToArray();
+            using (MemoryStream ms = new MemoryStream())
+            {
+                BinaryFormatter fmt = new BinaryFormatter();
+                fmt.Serialize(ms, this);
+                m_group = tmp;
+                if (m_running && !m_waitingCrossing)
+                    StartTimer();
+
+                return ms.ToArray();
+            }
         }
 
         public void StartCrossingCheck()
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 4ab5a4a..e289666 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -30,24 +30,27 @@ using System.Collections.Generic;
 using System.Collections;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using System.Timers;
 using System.Xml;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using log4net;
 using OpenSim.Framework;
+using OpenSim.Framework.Serialization.External;
 using OpenSim.Region.Framework;
 using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes.Serialization;
+using OpenSim.Services.Interfaces;
 using PermissionMask = OpenSim.Framework.PermissionMask;
 
 namespace OpenSim.Region.Framework.Scenes
 {
     public partial class Scene
     {
-        private static readonly ILog m_log
-            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        //private static readonly string LogHeader = "[SCENE INVENTORY]";
 
         /// <summary>
         /// Allows asynchronous derezzing of objects from the scene into a client's inventory.
@@ -127,11 +130,16 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public bool AddInventoryItem(InventoryItemBase item)
+        {
+            return AddInventoryItem(item, true);
+        }
+
         /// <summary>
         /// Add the given inventory item to a user's inventory.
         /// </summary>
         /// <param name="item"></param>
-        public bool AddInventoryItem(InventoryItemBase item)
+        public bool AddInventoryItem(InventoryItemBase item, bool trigger)
         {
             if (item.Folder != UUID.Zero && InventoryService.AddItem(item))
             {
@@ -140,14 +148,17 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     userlevel = 1;
                 }
-                EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, (AssetType)item.AssetType, item.AssetID, item.Name, userlevel);
+                if (trigger)
+                    EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, (AssetType)item.AssetType, item.AssetID, item.Name, userlevel);
 
                 return true;
             }
 
             // OK so either the viewer didn't send a folderID or AddItem failed
             UUID originalFolder = item.Folder;
-            InventoryFolderBase f = InventoryService.GetFolderForType(item.Owner, (AssetType)item.AssetType);
+            InventoryFolderBase f = null;
+            if (Enum.IsDefined(typeof(FolderType), (sbyte)item.AssetType))
+                f = InventoryService.GetFolderForType(item.Owner, (FolderType)item.AssetType);
             if (f != null)
             {
                 m_log.DebugFormat(
@@ -179,7 +190,8 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     userlevel = 1;
                 }
-                EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, (AssetType)item.AssetType, item.AssetID, item.Name, userlevel);
+                if (trigger)
+                    EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, (AssetType)item.AssetType, item.AssetID, item.Name, userlevel);
 
                 if (originalFolder != UUID.Zero)
                 {
@@ -529,9 +541,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="recipientClient"></param>
         /// <param name="senderId">ID of the sender of the item</param>
         /// <param name="itemId"></param>
-        public virtual void GiveInventoryItem(IClientAPI recipientClient, UUID senderId, UUID itemId)
+        public virtual void GiveInventoryItem(IClientAPI recipientClient, UUID senderId, UUID itemId, out string message)
         {
-            InventoryItemBase itemCopy = GiveInventoryItem(recipientClient.AgentId, senderId, itemId);
+            InventoryItemBase itemCopy = GiveInventoryItem(recipientClient.AgentId, senderId, itemId, out message);
 
             if (itemCopy != null)
                 recipientClient.SendBulkUpdateInventory(itemCopy);
@@ -544,9 +556,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="senderId">ID of the sender of the item</param>
         /// <param name="itemId"></param>
         /// <returns>The inventory item copy given, null if the give was unsuccessful</returns>
-        public virtual InventoryItemBase GiveInventoryItem(UUID recipient, UUID senderId, UUID itemId)
+        public virtual InventoryItemBase GiveInventoryItem(UUID recipient, UUID senderId, UUID itemId, out string message)
         {
-            return GiveInventoryItem(recipient, senderId, itemId, UUID.Zero);
+            return GiveInventoryItem(recipient, senderId, itemId, UUID.Zero, out message);
         }
 
         /// <summary>
@@ -563,12 +575,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// The inventory item copy given, null if the give was unsuccessful
         /// </returns>
         public virtual InventoryItemBase GiveInventoryItem(
-            UUID recipient, UUID senderId, UUID itemId, UUID recipientFolderId)
+            UUID recipient, UUID senderId, UUID itemId, UUID recipientFolderId, out string message)
         {
             //Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem");
 
             if (!Permissions.CanTransferUserInventory(itemId, senderId, recipient))
+            {
+                message = "Not allowed to transfer this item.";
                 return null;
+            }
 
             InventoryItemBase item = new InventoryItemBase(itemId, senderId);
             item = InventoryService.GetItem(item);
@@ -577,6 +592,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_log.WarnFormat(
                     "[AGENT INVENTORY]: Failed to find item {0} sent by {1} to {2}", itemId, senderId, recipient);
+                message = string.Format("Item not found: {0}.", itemId);
                 return null;
             }
 
@@ -585,6 +601,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.WarnFormat(
                     "[AGENT INVENTORY]: Attempt to send item {0} {1} to {2} failed because sender {3} did not match item owner {4}",
                     item.Name, item.ID, recipient, senderId, item.Owner);
+                message = "Sender did not match item owner.";
                 return null;
             }
 
@@ -595,7 +612,10 @@ namespace OpenSim.Region.Framework.Scenes
             if (!Permissions.BypassPermissions())
             {
                 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
+                {
+                    message = "Item doesn't have the Transfer permission.";
                     return null;
+                }
             }
 
             // Insert a copy of the item into the recipient
@@ -720,7 +740,9 @@ namespace OpenSim.Region.Framework.Scenes
             
             if (itemCopy.Folder == UUID.Zero)
             {
-                InventoryFolderBase folder = InventoryService.GetFolderForType(recipient, (AssetType)itemCopy.AssetType);
+                InventoryFolderBase folder = null;
+                if (Enum.IsDefined(typeof(FolderType), (sbyte)item.AssetType))
+                    folder = InventoryService.GetFolderForType(recipient, (FolderType)itemCopy.AssetType);
 
                 if (folder != null)
                 {
@@ -731,9 +753,14 @@ namespace OpenSim.Region.Framework.Scenes
                     InventoryFolderBase root = InventoryService.GetRootFolder(recipient);
 
                     if (root != null)
+                    {
                         itemCopy.Folder = root.ID;
+                    }
                     else
-                        return null; // No destination
+                    {
+                        message = "Can't find a folder to add the item to.";
+                        return null;
+                    }
                 }
             }
 
@@ -746,7 +773,7 @@ namespace OpenSim.Region.Framework.Scenes
             IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
             if (invAccess != null)
                 invAccess.TransferInventoryAssets(itemCopy, senderId, recipient);
-            AddInventoryItem(itemCopy);
+            AddInventoryItem(itemCopy, false);
 
             if (!Permissions.BypassPermissions())
             {
@@ -758,6 +785,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
+            message = null;
             return itemCopy;
         }
 
@@ -775,11 +803,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>
         /// The inventory folder copy given, null if the copy was unsuccessful
         /// </returns>
-        public virtual InventoryFolderBase GiveInventoryFolder(
+        public virtual InventoryFolderBase GiveInventoryFolder(IClientAPI client,
             UUID recipientId, UUID senderId, UUID folderId, UUID recipientParentFolderId)
         {
             //// Retrieve the folder from the sender
-            InventoryFolderBase folder = InventoryService.GetFolder(new InventoryFolderBase(folderId));
+            InventoryFolderBase folder = InventoryService.GetFolder(new InventoryFolderBase(folderId, senderId));
             if (null == folder)
             {
                 m_log.ErrorFormat(
@@ -810,13 +838,18 @@ namespace OpenSim.Region.Framework.Scenes
             InventoryCollection contents = InventoryService.GetFolderContent(senderId, folderId);
             foreach (InventoryFolderBase childFolder in contents.Folders)
             {
-                GiveInventoryFolder(recipientId, senderId, childFolder.ID, newFolder.ID);
+                GiveInventoryFolder(client, recipientId, senderId, childFolder.ID, newFolder.ID);
             }
 
             // Give all the items
             foreach (InventoryItemBase item in contents.Items)
             {
-                GiveInventoryItem(recipientId, senderId, item.ID, newFolder.ID);
+                string message;
+                if (GiveInventoryItem(recipientId, senderId, item.ID, newFolder.ID, out message) == null)
+                {
+                    if (client != null)
+                        client.SendAgentAlertMessage(message, false);
+                }
             }
 
             return newFolder;
@@ -848,53 +881,40 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
             }
 
+<<<<<<< HEAD
+            if (newName == String.Empty)
+                newName = item.Name;
+=======
             if (newName == null) newName = item.Name;
 
             AssetBase asset = AssetService.Get(item.AssetID.ToString());
+>>>>>>> avn/ubitvar
 
-            if (asset != null)
+            if (remoteClient.AgentId == oldAgentID
+                || (LibraryService != null
+                    && LibraryService.LibraryRootFolder != null
+                    && oldAgentID == LibraryService.LibraryRootFolder.Owner))
             {
-                if (newName != String.Empty)
-                {
-                    asset.Name = newName;
-                }
-                else
-                {
-                    newName = item.Name;
-                }
-
-                if (remoteClient.AgentId == oldAgentID
-                    || (LibraryService != null
-                        && LibraryService.LibraryRootFolder != null
-                        && oldAgentID == LibraryService.LibraryRootFolder.Owner))
+                CreateNewInventoryItem(
+                    remoteClient, item.CreatorId, item.CreatorData, newFolderID,
+                    newName, item.Description, item.Flags, callbackID, item.AssetID, (sbyte)item.AssetType, (sbyte)item.InvType,
+                    item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions,
+                    item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false);
+            }
+            else
+            {  
+                // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item.
+                if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0)
+                    && (m_permissions.BypassPermissions()
+                        || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID)))
                 {
                     CreateNewInventoryItem(
-                        remoteClient, item.CreatorId, item.CreatorData, newFolderID,
-                        newName, item.Description, item.Flags, callbackID, asset, (sbyte)item.InvType,
-                        item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions,
-                        item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch());
-                }
-                else
-                {  
-                    // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item.
-                    if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0)
-                        && (m_permissions.BypassPermissions()
-                            || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID)))
-                    {
-                        CreateNewInventoryItem(
-                            remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Description, item.Flags, callbackID,
-                            asset, (sbyte) item.InvType,
-                            item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions,
-                            item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch());
-                    }
+                        remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Description, item.Flags, callbackID,
+                        item.AssetID, (sbyte)item.AssetType, (sbyte) item.InvType,
+                        item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions,
+                        item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false);
                 }
             }
-            else
-            {
-                m_log.ErrorFormat(
-                    "[AGENT INVENTORY]: Could not copy item {0} since asset {1} could not be found",
-                    item.Name, item.AssetID);
-            }
         }
 
         /// <summary>
@@ -962,6 +982,14 @@ namespace OpenSim.Region.Framework.Scenes
         public void CreateNewInventoryItem(
             IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID,
             string name, string description, uint flags, uint callbackID,
+<<<<<<< HEAD
+            UUID assetID, sbyte assetType, sbyte invType, uint nextOwnerMask, int creationDate)
+        {
+            CreateNewInventoryItem(
+                remoteClient, creatorID, creatorData, folderID, name, description, flags, callbackID, assetID, assetType, invType,
+                (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, 0, nextOwnerMask, 0, 
+                creationDate, true);
+=======
             AssetBase asset, sbyte invType, uint nextOwnerMask, int creationDate, UUID transationID)
         {
             CreateNewInventoryItem(
@@ -978,6 +1006,7 @@ namespace OpenSim.Region.Framework.Scenes
             CreateNewInventoryItem(remoteClient, creatorID, creatorData, folderID,
                 name, description, flags, callbackID, asset, invType,
                 baseMask, currentMask, everyoneMask, nextOwnerMask, groupMask, creationDate, UUID.Zero);
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -1001,19 +1030,25 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="creationDate">Unix timestamp at which this item was created.</param>
         private void CreateNewInventoryItem(
             IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID,
+<<<<<<< HEAD
+            string name, string description, uint flags, uint callbackID, UUID assetID, sbyte assetType, sbyte invType,
+            uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate,
+            bool assetUpload)
+=======
             string name, string description, uint flags, uint callbackID, AssetBase asset, sbyte invType,
             uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate,UUID transationID)
+>>>>>>> avn/ubitvar
         {
             InventoryItemBase item = new InventoryItemBase();
             item.Owner = remoteClient.AgentId;
             item.CreatorId = creatorID;
             item.CreatorData = creatorData;
             item.ID = UUID.Random();
-            item.AssetID = asset.FullID;
+            item.AssetID = assetID;
             item.Name = name;
             item.Description = description;
             item.Flags = flags;
-            item.AssetType = asset.Type;
+            item.AssetType = assetType;
             item.InvType = invType;
             item.Folder = folderID;
             item.CurrentPermissions = currentMask;
@@ -1023,11 +1058,15 @@ namespace OpenSim.Region.Framework.Scenes
             item.BasePermissions = baseMask;
             item.CreationDate = creationDate;
 
+<<<<<<< HEAD
+            if (AddInventoryItem(item, assetUpload))
+=======
             // special AnimationSet case
             if (item.InvType == (int)CustomInventoryType.AnimationSet)
                 AnimationSet.enforceItemPermitions(item,true);
 
             if (AddInventoryItem(item))
+>>>>>>> avn/ubitvar
             {
                 remoteClient.SendInventoryItemCreateUpdate(item, transationID, callbackID);
             }
@@ -1090,17 +1129,12 @@ namespace OpenSim.Region.Framework.Scenes
 //                    return;
 //                }
 
-                AssetBase asset = new AssetBase();
-                asset.FullID = olditemID;
-                asset.Type = type;
-                asset.Name = name;
-                asset.Description = description;
-
                 CreateNewInventoryItem(
                     remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
-                    name, description, 0, callbackID, asset, invType,
+                    name, description, 0, callbackID, olditemID, type, invType,
                     (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All,
-                    (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, Util.UnixTimeSinceEpoch());
+                    (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, Util.UnixTimeSinceEpoch(),
+                    false);
             }
             else
             {
@@ -1176,13 +1210,21 @@ namespace OpenSim.Region.Framework.Scenes
                 if (item == null)
                     return;
 
-                InventoryFolderBase destFolder = InventoryService.GetFolderForType(remoteClient.AgentId, AssetType.TrashFolder);
+                InventoryFolderBase destFolder = InventoryService.GetFolderForType(remoteClient.AgentId, FolderType.Trash);
 
-                // Move the item to trash. If this is a copiable item, only
+                // Move the item to trash. If this is a copyable item, only
                 // a copy will be moved and we will still need to delete
-                // the item from the prim. If it was no copy, is will be
+                // the item from the prim. If it was no copy, it will be
                 // deleted by this method.
-                MoveTaskInventoryItem(remoteClient, destFolder.ID, part, itemID);
+                string message;
+                InventoryItemBase item2 = MoveTaskInventoryItem(remoteClient, destFolder.ID, part, itemID, out message);
+
+                if (item2 == null)
+                {
+                    m_log.WarnFormat("[SCENE INVENTORY]: RemoveTaskInventory of item {0} failed: {1}", itemID, message);
+                    remoteClient.SendAgentAlertMessage(message, false);
+                    return;
+                }
 
                 if (group.GetInventoryItem(localID, itemID) != null)
                 {
@@ -1194,11 +1236,16 @@ namespace OpenSim.Region.Framework.Scenes
 
                     group.RemoveInventoryItem(localID, itemID);
                 }
+
                 part.SendPropertiesToClient(remoteClient);
             }
         }
 
-        private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId)
+
+        /// <summary>
+        /// Creates (in memory only) a user inventory item that will contain a copy of a task inventory item.
+        /// </summary>
+        private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId, out string message)
         {
             TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId);
 
@@ -1209,12 +1256,13 @@ namespace OpenSim.Region.Framework.Scenes
                         + " inventory item from a prim's inventory item "
                         + " but the required item does not exist in the prim's inventory",
                     itemId, part.Name, part.UUID);
-
+                message = "Item not found: " + itemId;
                 return null;
             }
 
             if ((destAgent != taskItem.OwnerID) && ((taskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0))
             {
+                message = "Item doesn't have the Transfer permission.";
                 return null;
             }
 
@@ -1236,11 +1284,25 @@ namespace OpenSim.Region.Framework.Scenes
                 agentItem.BasePermissions = taskItem.BasePermissions & (taskItem.NextPermissions | (uint)PermissionMask.Move);
                 if (taskItem.InvType == (int)InventoryType.Object)
                 {
+<<<<<<< HEAD
+                    // Bake the new base permissions from folded permissions
+                    // The folded perms are in the lowest 3 bits of the current perms
+                    // We use base permissions here to avoid baking the "Locked" status
+                    // into the item as it is passed.
+                    uint perms = taskItem.BasePermissions & taskItem.NextPermissions;
+                    PermissionsUtil.ApplyFoldedPermissions(taskItem.CurrentPermissions, ref perms);
+                    // Avoid the "lock trap" - move must always be enabled but the above may remove it
+                    // Add it back here.
+                    agentItem.BasePermissions = perms | (uint)PermissionMask.Move;
+                    // Newly given items cannot be "locked" on rez. Make sure by
+                    // setting current equal to base.
+=======
                     uint perms = taskItem.BasePermissions & taskItem.NextPermissions;
                     PermissionsUtil.ApplyFoldedPermissions(taskItem.CurrentPermissions, ref perms);
 //                    agentItem.BasePermissions = perms | (uint)PermissionMask.Move;
 //                    agentItem.CurrentPermissions = agentItem.BasePermissions;
                     agentItem.BasePermissions = perms | (uint)PermissionMask.Move;
+>>>>>>> avn/ubitvar
                 }
 
                 agentItem.CurrentPermissions = agentItem.BasePermissions;
@@ -1259,11 +1321,24 @@ namespace OpenSim.Region.Framework.Scenes
                 agentItem.GroupPermissions = taskItem.GroupPermissions;
             }
 
+            message = null;
+            return agentItem;
+        }
+
+        /// <summary>
+        /// If the task item is not-copyable then remove it from the prim.
+        /// </summary>
+        private void RemoveNonCopyTaskItemFromPrim(SceneObjectPart part, UUID itemId)
+        {
+            TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId);
+            if (taskItem == null)
+                return;
+
             if (!Permissions.BypassPermissions())
             {
                 if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
                 {
-                    if (taskItem.Type == 10)
+                    if (taskItem.Type == (int)AssetType.LSLText)
                     {
                         part.RemoveScriptEvents(itemId);
                         EventManager.TriggerRemoveScript(part.LocalId, itemId);
@@ -1272,8 +1347,6 @@ namespace OpenSim.Region.Framework.Scenes
                     part.Inventory.RemoveInventoryItem(itemId);
                 }
             }
-
-            return agentItem;
         }
 
         /// <summary>
@@ -1283,19 +1356,22 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="folderID"></param>
         /// <param name="part"></param>
         /// <param name="itemID"></param>
-        public InventoryItemBase MoveTaskInventoryItem(IClientAPI remoteClient, UUID folderId, SceneObjectPart part, UUID itemId)
+        public InventoryItemBase MoveTaskInventoryItem(IClientAPI remoteClient, UUID folderId, SceneObjectPart part, UUID itemId, out string message)
         {
             m_log.DebugFormat(
                 "[PRIM INVENTORY]: Adding item {0} from {1} to folder {2} for {3}", 
                 itemId, part.Name, folderId, remoteClient.Name);
             
-            InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(remoteClient.AgentId, part, itemId);
-
+            InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(remoteClient.AgentId, part, itemId, out message);
             if (agentItem == null)
                 return null;
 
             agentItem.Folder = folderId;
             AddInventoryItem(remoteClient, agentItem);
+
+            RemoveNonCopyTaskItemFromPrim(part, itemId);
+
+            message = null;
             return agentItem;
         }
 
@@ -1350,7 +1426,11 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
             }
 
-            MoveTaskInventoryItem(remoteClient, folderId, part, itemId);
+            string message;
+            InventoryItemBase item = MoveTaskInventoryItem(remoteClient, folderId, part, itemId, out message);
+            
+            if (item == null)
+                remoteClient.SendAgentAlertMessage(message, false);
         }
 
         /// <summary>
@@ -1364,17 +1444,17 @@ namespace OpenSim.Region.Framework.Scenes
         /// </param>
         /// <param name="part"></param>
         /// <param name="itemID"></param>
-        public InventoryItemBase MoveTaskInventoryItem(UUID avatarId, UUID folderId, SceneObjectPart part, UUID itemId)
+        public InventoryItemBase MoveTaskInventoryItem(UUID avatarId, UUID folderId, SceneObjectPart part, UUID itemId, out string message)
         {
             ScenePresence avatar;
 
             if (TryGetScenePresence(avatarId, out avatar))
             {
-                return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId);
+                return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId, out message);
             }
             else
             {
-                InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId);
+                InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId, out message);
 
                 if (agentItem == null)
                     return null;
@@ -1383,6 +1463,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                 AddInventoryItem(agentItem);
 
+                RemoveNonCopyTaskItemFromPrim(part, itemId);
+
                 return agentItem;
             }
         }
@@ -1495,6 +1577,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         public UUID MoveTaskInventoryItems(UUID destID, string category, SceneObjectPart host, List<UUID> items)
         {
+<<<<<<< HEAD
+            ScenePresence avatar;
+            IClientAPI remoteClient = null;
+            if (TryGetScenePresence(destID, out avatar))
+                remoteClient = avatar.ControllingClient;
+=======
             SceneObjectPart destPart = GetSceneObjectPart(destID);
             if (destPart != null) // Move into a prim
             {
@@ -1502,6 +1590,7 @@ namespace OpenSim.Region.Framework.Scenes
                     MoveTaskInventoryItem(destID, host, itemID);
                 return destID; // Prim folder ID == prim ID
             }
+>>>>>>> avn/ubitvar
 
             InventoryFolderBase rootFolder = InventoryService.GetRootFolder(destID);
 
@@ -1512,26 +1601,28 @@ namespace OpenSim.Region.Framework.Scenes
 
             foreach (UUID itemID in items)
             {
-                InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(destID, host, itemID);
+                string message;
+                InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(destID, host, itemID, out message);
 
                 if (agentItem != null)
                 {
                     agentItem.Folder = newFolderID;
 
                     AddInventoryItem(agentItem);
+
+                    RemoveNonCopyTaskItemFromPrim(host, itemID);
+                }
+                else
+                {
+                    if (remoteClient != null)
+                        remoteClient.SendAgentAlertMessage(message, false);
                 }
             }
 
-            ScenePresence avatar = null;
-            if (TryGetScenePresence(destID, out avatar))
+            if (remoteClient != null)
             {
-                //profile.SendInventoryDecendents(avatar.ControllingClient,
-                //        profile.RootFolder.ID, true, false);
-                //profile.SendInventoryDecendents(avatar.ControllingClient,
-                //        newFolderID, false, true);
-
-                SendInventoryUpdate(avatar.ControllingClient, rootFolder, true, false);
-                SendInventoryUpdate(avatar.ControllingClient, newFolder, false, true);
+                SendInventoryUpdate(remoteClient, rootFolder, true, false);
+                SendInventoryUpdate(remoteClient, newFolder, false, true);
             }
 
             return newFolderID;
@@ -1935,8 +2026,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// Rez a script into a prim's inventory from another prim
         /// </summary>
         /// <param name="remoteClient"></param>
-        /// <param name="itemID"> </param>
-        /// <param name="localID"></param>
+        /// <param name="srcPart"> </param>
+        /// <param name="destId"> </param>
+        /// <param name="pin"></param>
+        /// <param name="running"></param>
+        /// <param name="start_param"></param>
         public void RezScriptFromPrim(UUID srcId, SceneObjectPart srcPart, UUID destId, int pin, int running, int start_param)
         {
             TaskInventoryItem srcTaskItem = srcPart.Inventory.GetInventoryItem(srcId);
@@ -1956,12 +2050,11 @@ namespace OpenSim.Region.Framework.Scenes
             if (destPart == null)
             {
                 m_log.ErrorFormat(
-                        "[PRIM INVENTORY]: " +
-                        "Could not find script for ID {0}",
-                        destId);
+                    "[PRIM INVENTORY]: Could not find part {0} to insert script item {1} from {2} {3} in {4}",
+                    destId, srcId, srcPart.Name, srcPart.UUID, Name);
                 return;
             }
-        
+
             // Must own the object, and have modify rights
             if (srcPart.OwnerID != destPart.OwnerID)
             {
@@ -1969,7 +2062,9 @@ namespace OpenSim.Region.Framework.Scenes
                 if ((destPart.GroupID == UUID.Zero) || (destPart.GroupID != srcPart.GroupID) ||
                     ((destPart.GroupMask & (uint)PermissionMask.Modify) == 0))
                     return;
-            } else {
+            } 
+            else 
+            {
                 if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
                     return;
             }
@@ -2094,7 +2189,7 @@ namespace OpenSim.Region.Framework.Scenes
                 SceneObjectGroup grp = part.ParentGroup;
 
                 // If child prims have invalid perms, fix them
-                grp.AdjustChildPrimPermissions();
+                grp.AdjustChildPrimPermissions(false);
 
                 if (remoteClient == null)
                 {
@@ -2192,15 +2287,27 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
+<<<<<<< HEAD
+            // OK, we're done with permissions. Let's check if any part of the code prevents the objects from being deleted
+            bool canDelete = EventManager.TriggerDeRezRequested(remoteClient, deleteGroups, action);
+
+            if (permissionToTake && (action != DeRezAction.Delete || this.m_useTrashOnDelete))
+=======
             SendKillObject(deleteIDs);
 
             if (deleteGroups.Count > 0)
+>>>>>>> avn/ubitvar
             {
                 foreach (SceneObjectGroup g in deleteGroups)
                     deleteIDs.Remove(g.LocalId);
 
                 m_asyncSceneObjectDeleter.DeleteToInventory(
                         action, destinationID, deleteGroups, remoteClient,
+<<<<<<< HEAD
+                        permissionToDelete && canDelete);
+            }
+            else if (permissionToDelete && canDelete)
+=======
                         true);
             }
             if (takeGroups.Count > 0)
@@ -2210,6 +2317,7 @@ namespace OpenSim.Region.Framework.Scenes
                         false);
             }
             if (deleteIDs.Count > 0)
+>>>>>>> avn/ubitvar
             {
                 foreach (SceneObjectGroup g in deleteGroups)
                     DeleteSceneObject(g, true);
@@ -2306,24 +2414,30 @@ namespace OpenSim.Region.Framework.Scenes
         /// Returns one object if the asset is a regular object, and multiple objects for a coalesced object.
         /// </remarks>
         /// <param name="assetData">Asset data</param>
-        /// <param name="attachment">Whether the item is an attachment</param>
+        /// <param name="isAttachment">True if the object is an attachment.</param>
         /// <param name="objlist">The objects included in the asset</param>
         /// <param name="veclist">Relative positions of the objects</param>
         /// <param name="bbox">Bounding box of all the objects</param>
         /// <param name="offsetHeight">Offset in the Z axis from the centre of the bounding box
         /// to the centre of the root prim (relevant only when returning a single object)</param>
-        /// <returns>true = returning a single object; false = multiple objects</returns>
-        public bool GetObjectsToRez(byte[] assetData, bool attachment, out List<SceneObjectGroup> objlist, out List<Vector3> veclist,
+        /// <returns>
+        /// true if returning a single object or deserialization fails, false if returning the coalesced
+        /// list of objects
+        /// </returns>
+        public bool GetObjectsToRez(
+            byte[] assetData, bool isAttachment, out List<SceneObjectGroup> objlist, out List<Vector3> veclist,
             out Vector3 bbox, out float offsetHeight)
         {
             objlist = new List<SceneObjectGroup>();
             veclist = new List<Vector3>();
+            bbox = Vector3.Zero;
+            offsetHeight = 0;
 
-            XmlDocument doc = new XmlDocument();
-            string xmlData = Utils.BytesToString(assetData);
-            doc.LoadXml(xmlData);
-            XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
+            string xmlData = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(assetData));
 
+<<<<<<< HEAD
+            try
+=======
             if (e == null || attachment) // Single
             {
                 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
@@ -2344,17 +2458,75 @@ namespace OpenSim.Region.Framework.Scenes
                 return true;
             }
             else
+>>>>>>> avn/ubitvar
             {
-                XmlElement coll = (XmlElement)e;
-                float bx = Convert.ToSingle(coll.GetAttribute("x"));
-                float by = Convert.ToSingle(coll.GetAttribute("y"));
-                float bz = Convert.ToSingle(coll.GetAttribute("z"));
-                bbox = new Vector3(bx, by, bz);
-                offsetHeight = 0;
-
-                XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
-                foreach (XmlNode n in groups)
+                using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
                 {
+<<<<<<< HEAD
+                    using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment }))
+                    {
+                        reader.Read();
+                        bool isSingleObject = reader.Name != "CoalescedObject";
+
+                        if (isSingleObject || isAttachment)
+                        {
+                            SceneObjectGroup g;
+                            try
+                            {
+                                g = SceneObjectSerializer.FromOriginalXmlFormat(reader);
+                            }
+                            catch (Exception e)
+                            {
+                                m_log.Error("[AGENT INVENTORY]: Deserialization of xml failed ", e);
+                                Util.LogFailedXML("[AGENT INVENTORY]:", xmlData);
+                                g = null;
+                            }
+                            
+                            if (g != null)
+                            {
+                                objlist.Add(g);
+                                veclist.Add(Vector3.Zero);
+                                bbox = g.GetAxisAlignedBoundingBox(out offsetHeight);
+                            }
+
+                            return true;
+                        }
+                        else
+                        {                
+                            XmlDocument doc = new XmlDocument();
+                            doc.LoadXml(xmlData);
+                            XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
+                            XmlElement coll = (XmlElement)e;
+                            float bx = Convert.ToSingle(coll.GetAttribute("x"));
+                            float by = Convert.ToSingle(coll.GetAttribute("y"));
+                            float bz = Convert.ToSingle(coll.GetAttribute("z"));
+                            bbox = new Vector3(bx, by, bz);
+                            offsetHeight = 0;
+
+                            XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
+                            foreach (XmlNode n in groups)
+                            {
+                                SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
+                                if (g != null)
+                                {
+                                    objlist.Add(g);
+
+                                    XmlElement el = (XmlElement)n;
+                                    string rawX = el.GetAttribute("offsetx");
+                                    string rawY = el.GetAttribute("offsety");
+                                    string rawZ = el.GetAttribute("offsetz");
+
+                                    float x = Convert.ToSingle(rawX);
+                                    float y = Convert.ToSingle(rawY);
+                                    float z = Convert.ToSingle(rawZ);
+                                    veclist.Add(new Vector3(x, y, z));
+                                }
+                            }
+
+                            return false;
+                        }
+                    }
+=======
                     SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
 /*
                     g.RootPart.AttachPoint = g.RootPart.Shape.State;
@@ -2375,10 +2547,16 @@ namespace OpenSim.Region.Framework.Scenes
                     float y = Convert.ToSingle(rawY);
                     float z = Convert.ToSingle(rawZ);
                     veclist.Add(new Vector3(x, y, z));
+>>>>>>> avn/ubitvar
                 }
             }
+            catch (Exception e)
+            {
+                m_log.Error("[AGENT INVENTORY]: Deserialization of xml failed when looking for CoalescedObject tag ", e);
+                Util.LogFailedXML("[AGENT INVENTORY]:", xmlData);
+            }
 
-            return false;
+            return true;
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 931093a..3d9c028 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -133,6 +133,21 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
+        ///
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="type"></param>
+        /// <param name="channel"></param>
+        /// <param name="fromPos"></param>
+        /// <param name="fromName"></param>
+        /// <param name="fromAgentID"></param>
+        /// <param name="targetID"></param>
+        public void SimChatToAgent(UUID targetID, byte[] message, int channel, Vector3 fromPos, string fromName, UUID fromID, bool fromAgent)
+        {
+            SimChat(message, ChatTypeEnum.Region, channel, fromPos, fromName, fromID, targetID, fromAgent, false);
+        }
+
+        /// <summary>
         /// Invoked when the client requests a prim.
         /// </summary>
         /// <param name="primLocalID"></param>
@@ -536,8 +551,21 @@ namespace OpenSim.Region.Framework.Scenes
 
         void SendInventoryAsync(IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder)
         {
+<<<<<<< HEAD
+            try
+            {
+                SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems);
+            }
+            catch (Exception e)
+            {
+                m_log.Error(
+                    string.Format(
+                        "[AGENT INVENTORY]: Error in SendInventoryAsync() for {0} with folder ID {1}.  Exception  ", e));
+            }
+=======
             Thread.Sleep(20);
             SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems);
+>>>>>>> avn/ubitvar
         }
 
         void SendInventoryComplete(IAsyncResult iar)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 61e31e4..deb8d39 100644..100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -48,7 +48,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes.Scripting;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Region.Physics.Manager;
-using Timer=System.Timers.Timer;
+using Timer = System.Timers.Timer;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using PermissionMask = OpenSim.Framework.PermissionMask;
@@ -61,6 +61,8 @@ namespace OpenSim.Region.Framework.Scenes
     {
         private const long DEFAULT_MIN_TIME_FOR_PERSISTENCE = 60L;
         private const long DEFAULT_MAX_TIME_FOR_PERSISTENCE = 600L;
+        
+        public const int m_defaultNumberFramesStored = 10;
 
         public delegate void SynchronizeSceneHandler(Scene scene);
 
@@ -103,9 +105,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// If false then physical objects are disabled, though collisions will continue as normal.
         /// </summary>
+<<<<<<< HEAD
+        public bool PhysicsEnabled
+        {
+            get
+=======
         public bool PhysicsEnabled 
         { 
             get 
+>>>>>>> avn/ubitvar
             {
                 return m_physicsEnabled;
             }
@@ -130,10 +138,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// If false then scripts are not enabled on the smiulator
         /// </summary>
-        public bool ScriptsEnabled 
-        { 
+        public bool ScriptsEnabled
+        {
             get { return m_scripts_enabled; }
-            set 
+            set
             {
                 if (m_scripts_enabled != value)
                 {
@@ -151,7 +159,7 @@ namespace OpenSim.Region.Framework.Scenes
                     else
                     {
                         m_log.Info("Starting all Scripts in Scene");
-    
+
                         EntityBase[] entities = Entities.GetEntities();
                         foreach (EntityBase ent in entities)
                         {
@@ -214,7 +222,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Maximum value of the size of a physical prim in each axis
         /// </summary>
-        public float m_maxPhys = 10;
+        public float m_maxPhys = 64;
 
         /// <summary>
         /// Max prims an object will hold
@@ -226,10 +234,16 @@ namespace OpenSim.Region.Framework.Scenes
         public bool m_allowScriptCrossings = true;
 
         /// <summary>
+<<<<<<< HEAD
+        /// Can avatars cross from and to this region?
+        /// </summary>
+        public bool AllowAvatarCrossing { get; set; }
+=======
         /// Max prims an Physical object will hold
         /// </summary>
         /// 
         public int m_linksetPhysCapacity = 0;
+>>>>>>> avn/ubitvar
 
         public bool m_useFlySlow;
         public bool m_useTrashOnDelete = true;
@@ -239,10 +253,45 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public bool SendPeriodicAppearanceUpdates { get; set; }
 
+        /// <summary>
+        /// How much a root agent has to change position before updates are sent to viewers.
+        /// </summary>
+        public float RootPositionUpdateTolerance { get; set; }
+
+        /// <summary>
+        /// How much a root agent has to rotate before updates are sent to viewers.
+        /// </summary>
+        public float RootRotationUpdateTolerance { get; set; }
+
+        /// <summary>
+        /// How much a root agent has to change velocity before updates are sent to viewers.
+        /// </summary>
+        public float RootVelocityUpdateTolerance { get; set; }
+
+        /// <summary>
+        /// If greater than 1, we only send terse updates to other root agents on every n updates.
+        /// </summary>
+        public int RootTerseUpdatePeriod { get; set; }
+
+        /// <summary>
+        /// If greater than 1, we only send terse updates to child agents on every n updates.
+        /// </summary>
+        public int ChildTerseUpdatePeriod { get; set; }
+
         protected float m_defaultDrawDistance = 255.0f;
-        public float DefaultDrawDistance 
+        public float DefaultDrawDistance
         {
-            get { return m_defaultDrawDistance; }
+            // get { return m_defaultDrawDistance; }
+            get
+            {
+                if (RegionInfo != null)
+                {
+                    float largestDimension = Math.Max(RegionInfo.RegionSizeX, RegionInfo.RegionSizeY);
+                    m_defaultDrawDistance = Math.Max(m_defaultDrawDistance, largestDimension);
+
+                }
+                return m_defaultDrawDistance;
+            }
         }
 
         protected float m_maxDrawDistance = 512.0f;
@@ -254,7 +303,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         private List<string> m_AllowedViewers = new List<string>();
         private List<string> m_BannedViewers = new List<string>();
-        
+
         // TODO: need to figure out how allow client agents but deny
         // root agents when ACL denies access to root agent
         public bool m_strictAccessControl = true;
@@ -298,6 +347,7 @@ namespace OpenSim.Region.Framework.Scenes
         protected IUserAccountService m_UserAccountService;
         protected IAvatarService m_AvatarService;
         protected IGridUserService m_GridUserService;
+        protected IAgentPreferencesService m_AgentPreferencesService;
 
         protected IXMLRPC m_xmlrpcModule;
         protected IWorldComm m_worldCommModule;
@@ -311,6 +361,17 @@ namespace OpenSim.Region.Framework.Scenes
         private Dictionary<string, string> m_extraSettings;
 
         /// <summary>
+        /// If true then the next time the scene loop is activated, updates will be performed by firing of a timer
+        /// rather than on a single thread that sleeps.
+        /// </summary>
+        public bool UpdateOnTimer { get; set; }
+
+        /// <summary>
+        /// Only used if we are updating scene on a timer rather than sleeping a thread.
+        /// </summary>
+        private Timer m_sceneUpdateTimer;
+
+        /// <summary>
         /// Current scene frame number
         /// </summary>
         public uint Frame
@@ -325,30 +386,57 @@ namespace OpenSim.Region.Framework.Scenes
         public uint MaintenanceRun { get; private set; }
 
         /// <summary>
-        /// The minimum length of time in seconds that will be taken for a scene frame.  If the frame takes less time then we
+        /// The minimum length of time in milliseconds that will be taken for a scene frame.  If the frame takes less time then we
         /// will sleep for the remaining period.
         /// </summary>
         /// <remarks>
         /// One can tweak this number to experiment.  One current effect of reducing it is to make avatar animations
         /// occur too quickly (viewer 1) or with even more slide (viewer 2).
         /// </remarks>
-        public float MinFrameTime { get; private set; }
+        public int MinFrameTicks
+        {
+            get { return m_minFrameTicks; }
+            private set
+            {
+                m_minFrameTicks = value;
+                MinFrameSeconds = (float)m_minFrameTicks / 1000;
+            }
+        }
+        private int m_minFrameTicks;
+
+        /// <summary>
+        /// The minimum length of time in seconds that will be taken for a scene frame.
+        /// </summary>
+        /// <remarks>
+        /// Always derived from MinFrameTicks.
+        /// </remarks>
+        public float MinFrameSeconds { get; private set; }
 
         /// <summary>
-        /// The minimum length of time in seconds that will be taken for a maintenance run.
+        /// The minimum length of time in milliseconds that will be taken for a scene frame.  If the frame takes less time then we
+        /// will sleep for the remaining period.
         /// </summary>
-        public float MinMaintenanceTime { get; private set; }
+        /// <remarks>
+        /// One can tweak this number to experiment.  One current effect of reducing it is to make avatar animations
+        /// occur too quickly (viewer 1) or with even more slide (viewer 2).
+        /// </remarks>
+        public int MinMaintenanceTicks { get; set; }
 
         private int m_update_physics = 1;
         private int m_update_entitymovement = 1;
         private int m_update_objects = 1;
-        private int m_update_temp_cleaning = 1000;
         private int m_update_presences = 1; // Update scene presence movements
         private int m_update_events = 1;
         private int m_update_backup = 200;
+<<<<<<< HEAD
+        private int m_update_terrain = 50;
+        //        private int m_update_land = 1;
+=======
         private int m_update_terrain = 1000;
         private int m_update_land = 10;
+>>>>>>> avn/ubitvar
         private int m_update_coarse_locations = 50;
+        private int m_update_temp_cleaning = 180;
 
         private int agentMS;
         private int frameMS;
@@ -361,6 +449,17 @@ namespace OpenSim.Region.Framework.Scenes
         private int terrainMS;
         private int landMS;
 
+        // A temporary configuration flag to enable using FireAndForget to process
+        //   collisions from the physics engine. There is a problem with collisions
+        //   stopping sometimes and MB's suspicion is some race condition passing
+        //   collisions from the physics engine callback to the script engine.
+        //   This causes the collision events to be passed with a FireAndForget
+        //   call which should eliminate that linkage. Testers can turn this on
+        //   and see if collisions stop. If they don't, the problem is somewhere else.
+        //   This feature defaults to 'off' so, by default, the simulator operation
+        //   is not changed.
+        public bool ShouldUseFireAndForgetForCollisions = false;
+
         /// <summary>
         /// Tick at which the last frame was processed.
         /// </summary>
@@ -373,12 +472,25 @@ namespace OpenSim.Region.Framework.Scenes
         private int m_lastMaintenanceTick;
 
         /// <summary>
+        /// Total script execution time (in Stopwatch Ticks) since the last frame
+        /// </summary>
+        private long m_scriptExecutionTime = 0;
+
+        /// <summary>
         /// Signals whether temporary objects are currently being cleaned up.  Needed because this is launched
         /// asynchronously from the update loop.
         /// </summary>
         private bool m_cleaningTemps = false;
 
-//        private Object m_heartbeatLock = new Object();
+        /// <summary>
+        /// Used to control main scene thread looping time when not updating via timer.
+        /// </summary>
+        private ManualResetEvent m_updateWaitEvent = new ManualResetEvent(false);
+
+        /// <summary>
+        /// Used to control maintenance thread runs.
+        /// </summary>
+        private ManualResetEvent m_maintenanceWaitEvent = new ManualResetEvent(false);
 
         // TODO: Possibly stop other classes being able to manipulate this directly.
         private SceneGraph m_sceneGraph;
@@ -389,6 +501,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         private string m_defaultScriptEngine;
 
+        private int m_unixStartTime;
+        public int UnixStartTime
+        {
+            get { return m_unixStartTime; }
+        }
+
         /// <summary>
         /// Tick at which the last login occurred.
         /// </summary>
@@ -417,7 +535,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// Is the scene active?
         /// </summary>
         /// <remarks>
-        /// If false, maintenance and update loops are not being run.  Updates can still be triggered manually if
+        /// If false, maintenance and update loops are not being run, though after setting to false update may still
+        /// be active for a period (and IsRunning will still be true).  Updates can still be triggered manually if
         /// the scene is not active.
         /// </remarks>
         public bool Active
@@ -440,6 +559,13 @@ namespace OpenSim.Region.Framework.Scenes
         }
         private volatile bool m_active;
 
+<<<<<<< HEAD
+        /// <summary>
+        /// If true then updates are running.  This may be true for a short period after a scene is de-activated.
+        /// </summary>
+        public bool IsRunning { get { return m_isRunning; } }
+        private volatile bool m_isRunning;
+=======
 //        private int m_lastUpdate;
         private bool m_firstHeartbeat = true;
         
@@ -448,6 +574,7 @@ namespace OpenSim.Region.Framework.Scenes
         private double m_reprioritizationInterval = 5000.0;
         private double m_rootReprioritizationDistance = 10.0;
         private double m_childReprioritizationDistance = 20.0;
+>>>>>>> avn/ubitvar
 
         private Timer m_mapGenerationTimer = new Timer();
         private bool m_generateMaptiles;
@@ -468,6 +595,13 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_sceneGraph.PhysicsScene.TimeDilation; }
         }
 
+        public void setThreadCount(int inUseThreads)
+        {
+            // Just pass the thread count information on its way as the Scene
+            // does not require the value for anything at this time
+            StatsReporter.SetThreadCount(inUseThreads);
+        }
+
         public SceneCommunicationService SceneGridService
         {
             get { return m_sceneGridService; }
@@ -539,7 +673,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return m_AssetService;
             }
         }
-        
+
         public IAuthorizationService AuthorizationService
         {
             get
@@ -667,6 +801,16 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public IAgentPreferencesService AgentPreferencesService
+        {
+            get
+            {
+                if (m_AgentPreferencesService == null)
+                    m_AgentPreferencesService = RequestModuleInterface<IAgentPreferencesService>();
+                return m_AgentPreferencesService;
+            }
+        }
+
         public IAttachmentsModule AttachmentsModule { get; set; }
         public IEntityTransferModule EntityTransferModule { get; private set; }
         public IAgentAssetTransactions AgentTransactionsModule { get; private set; }
@@ -676,7 +820,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get { return m_AvatarFactory; }
         }
-        
+
         public ICapabilitiesModule CapsModule
         {
             get { return m_capsModule; }
@@ -693,11 +837,11 @@ namespace OpenSim.Region.Framework.Scenes
         public int MonitorLandTime { get { return landMS; } }
         public int MonitorLastFrameTick { get { return m_lastFrameTick; } }
 
-        public UpdatePrioritizationSchemes UpdatePrioritizationScheme { get { return m_priorityScheme; } }
-        public bool IsReprioritizationEnabled { get { return m_reprioritizationEnabled; } }
-        public double ReprioritizationInterval { get { return m_reprioritizationInterval; } }
-        public double RootReprioritizationDistance { get { return m_rootReprioritizationDistance; } }
-        public double ChildReprioritizationDistance { get { return m_childReprioritizationDistance; } }
+        public UpdatePrioritizationSchemes UpdatePrioritizationScheme { get; set; }
+        public bool IsReprioritizationEnabled { get; set; }
+        public double ReprioritizationInterval { get; set; }
+        public double RootReprioritizationDistance { get; set; }
+        public double ChildReprioritizationDistance { get; set; }
 
         public AgentCircuitManager AuthenticateHandler
         {
@@ -742,18 +886,20 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_sceneGraph.Entities; }
         }
 
-        
+
         // used in sequence see: SpawnPoint()
         private int m_SpawnPoint;
         // can be closest/random/sequence
         public string SpawnPointRouting
         {
-            get; private set;
+            get;
+            private set;
         }
         // allow landmarks to pass
         public bool TelehubAllowLandmarks
         {
-            get; private set;
+            get;
+            private set;
         }
 
         #endregion Properties
@@ -764,11 +910,11 @@ namespace OpenSim.Region.Framework.Scenes
                      SceneCommunicationService sceneGridService,
                      ISimulationDataService simDataService, IEstateDataService estateDataService,
                      IConfigSource config, string simulatorVersion)
-            : this(regInfo)
+            : this(regInfo, physicsScene)
         {
             m_config = config;
-            MinFrameTime = 0.089f;
-            MinMaintenanceTime = 1;
+            MinFrameTicks = 89;
+            MinMaintenanceTicks = 1000;
             SeeIntoRegion = true;
 
             Random random = new Random();
@@ -778,9 +924,12 @@ namespace OpenSim.Region.Framework.Scenes
             m_sceneGridService = sceneGridService;
             m_SimulationDataService = simDataService;
             m_EstateDataService = estateDataService;
+<<<<<<< HEAD
+=======
             m_regionHandle = RegionInfo.RegionHandle;
             m_lastIncoming = 0;
             m_lastOutgoing = 0;
+>>>>>>> avn/ubitvar
 
             m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
             m_asyncSceneObjectDeleter.Enabled = true;
@@ -839,6 +988,8 @@ namespace OpenSim.Region.Framework.Scenes
             EventManager.OnLandObjectRemoved +=
                 new EventManager.LandObjectRemoved(simDataService.RemoveLandObject);
 
+<<<<<<< HEAD
+=======
             m_sceneGraph = new SceneGraph(this);
             m_sceneGraph.PhysicsScene = physicsScene;
 
@@ -855,6 +1006,7 @@ namespace OpenSim.Region.Framework.Scenes
                         RestartNow(); 
                     };
 
+>>>>>>> avn/ubitvar
             RegisterDefaultSceneEvents();
 
             // XXX: Don't set the public property since we don't want to activate here.  This needs to be handled 
@@ -880,7 +1032,7 @@ namespace OpenSim.Region.Framework.Scenes
                 UseBackup = startupConfig.GetBoolean("UseSceneBackup", UseBackup);
                 if (!UseBackup)
                     m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName);
-                
+
                 //Animation states
                 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
 
@@ -940,10 +1092,10 @@ namespace OpenSim.Region.Framework.Scenes
                 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
                 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
                 m_dontPersistBefore =
-                  startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE);
+                    startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE);
                 m_dontPersistBefore *= 10000000;
                 m_persistAfter =
-                  startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE);
+                    startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE);
                 m_persistAfter *= 10000000;
 
                 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
@@ -955,12 +1107,13 @@ namespace OpenSim.Region.Framework.Scenes
 
                 string[] possibleMapConfigSections = new string[] { "Map", "Startup" };
 
-                m_generateMaptiles 
+                m_generateMaptiles
                     = Util.GetConfigVarFromSections<bool>(config, "GenerateMaptiles", possibleMapConfigSections, true);
 
                 if (m_generateMaptiles)
                 {
-                    int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0);
+                    int maptileRefresh = Util.GetConfigVarFromSections<int>(config, "MaptileRefresh", possibleMapConfigSections, 0);
+                    m_log.InfoFormat("[SCENE]: Region {0}, WORLD MAP refresh time set to {1} seconds", RegionInfo.RegionName, maptileRefresh);
                     if (maptileRefresh != 0)
                     {
                         m_mapGenerationTimer.Interval = maptileRefresh * 1000;
@@ -971,7 +1124,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    string tile 
+                    string tile
                         = Util.GetConfigVarFromSections<string>(
                             config, "MaptileStaticUUID", possibleMapConfigSections, UUID.Zero.ToString());
 
@@ -990,7 +1143,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 string[] possibleAccessControlConfigSections = new string[] { "AccessControl", "Startup" };
 
-                string grant 
+                string grant
                     = Util.GetConfigVarFromSections<string>(
                         config, "AllowedClients", possibleAccessControlConfigSections, "");
 
@@ -1002,7 +1155,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-                grant 
+                grant
                     = Util.GetConfigVarFromSections<string>(
                         config, "BannedClients", possibleAccessControlConfigSections, "");
 
@@ -1014,21 +1167,29 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-                MinFrameTime              = startupConfig.GetFloat( "MinFrameTime",                      MinFrameTime);
-                m_update_backup           = startupConfig.GetInt(   "UpdateStorageEveryNFrames",         m_update_backup);
-                m_update_coarse_locations = startupConfig.GetInt(   "UpdateCoarseLocationsEveryNFrames", m_update_coarse_locations);
-                m_update_entitymovement   = startupConfig.GetInt(   "UpdateEntityMovementEveryNFrames",  m_update_entitymovement);
-                m_update_events           = startupConfig.GetInt(   "UpdateEventsEveryNFrames",          m_update_events);
-                m_update_objects          = startupConfig.GetInt(   "UpdateObjectsEveryNFrames",         m_update_objects);
-                m_update_physics          = startupConfig.GetInt(   "UpdatePhysicsEveryNFrames",         m_update_physics);
-                m_update_presences        = startupConfig.GetInt(   "UpdateAgentsEveryNFrames",          m_update_presences);
-                m_update_terrain          = startupConfig.GetInt(   "UpdateTerrainEveryNFrames",         m_update_terrain);
-                m_update_temp_cleaning    = startupConfig.GetInt(   "UpdateTempCleaningEveryNFrames",    m_update_temp_cleaning);
+                if (startupConfig.Contains("MinFrameTime"))
+                    MinFrameTicks = (int)(startupConfig.GetFloat("MinFrameTime") * 1000);
+
+                m_update_backup           = startupConfig.GetInt("UpdateStorageEveryNFrames",         m_update_backup);
+                m_update_coarse_locations = startupConfig.GetInt("UpdateCoarseLocationsEveryNFrames", m_update_coarse_locations);
+                m_update_entitymovement   = startupConfig.GetInt("UpdateEntityMovementEveryNFrames",  m_update_entitymovement);
+                m_update_events           = startupConfig.GetInt("UpdateEventsEveryNFrames",          m_update_events);
+                m_update_objects          = startupConfig.GetInt("UpdateObjectsEveryNFrames",         m_update_objects);
+                m_update_physics          = startupConfig.GetInt("UpdatePhysicsEveryNFrames",         m_update_physics);
+                m_update_presences        = startupConfig.GetInt("UpdateAgentsEveryNFrames",          m_update_presences);
+                m_update_terrain          = startupConfig.GetInt("UpdateTerrainEveryNFrames",         m_update_terrain);
+                m_update_temp_cleaning    = startupConfig.GetInt("UpdateTempCleaningEveryNSeconds",   m_update_temp_cleaning);
+
+                if (startupConfig.Contains("ShouldUseFireAndForgetForCollisions"))
+                {
+                    ShouldUseFireAndForgetForCollisions = startupConfig.GetBoolean("ShouldUseFireAndForgetForCollisions", false);
+                }
             }
 
+
             // FIXME: Ultimately this should be in a module.
-            SendPeriodicAppearanceUpdates = true;
-            
+            SendPeriodicAppearanceUpdates = false;
+
             IConfig appearanceConfig = m_config.Configs["Appearance"];
             if (appearanceConfig != null)
             {
@@ -1038,6 +1199,12 @@ namespace OpenSim.Region.Framework.Scenes
 
             #endregion Region Config
 
+            IConfig entityTransferConfig = m_config.Configs["EntityTransfer"];
+            if (entityTransferConfig != null)
+            {
+                AllowAvatarCrossing = entityTransferConfig.GetBoolean("AllowAvatarCrossing", AllowAvatarCrossing);
+            }
+
             #region Interest Management
 
             IConfig interestConfig = m_config.Configs["InterestManagement"];
@@ -1047,41 +1214,119 @@ namespace OpenSim.Region.Framework.Scenes
 
                 try
                 {
-                    m_priorityScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true);
+                    UpdatePrioritizationScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true);
                 }
                 catch (Exception)
                 {
                     m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time");
-                    m_priorityScheme = UpdatePrioritizationSchemes.Time;
+                    UpdatePrioritizationScheme = UpdatePrioritizationSchemes.Time;
                 }
 
-                m_reprioritizationEnabled = interestConfig.GetBoolean("ReprioritizationEnabled", true);
-                m_reprioritizationInterval = interestConfig.GetDouble("ReprioritizationInterval", 5000.0);
-                m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0);
-                m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0);
+                IsReprioritizationEnabled
+                    = interestConfig.GetBoolean("ReprioritizationEnabled", IsReprioritizationEnabled);
+                ReprioritizationInterval
+                    = interestConfig.GetDouble("ReprioritizationInterval", ReprioritizationInterval);
+                RootReprioritizationDistance
+                    = interestConfig.GetDouble("RootReprioritizationDistance", RootReprioritizationDistance);
+                ChildReprioritizationDistance
+                    = interestConfig.GetDouble("ChildReprioritizationDistance", ChildReprioritizationDistance);
+
+                RootTerseUpdatePeriod = interestConfig.GetInt("RootTerseUpdatePeriod", RootTerseUpdatePeriod);
+                ChildTerseUpdatePeriod = interestConfig.GetInt("ChildTerseUpdatePeriod", ChildTerseUpdatePeriod);
+
+                RootPositionUpdateTolerance
+                    = interestConfig.GetFloat("RootPositionUpdateTolerance", RootPositionUpdateTolerance);
+                RootRotationUpdateTolerance
+                    = interestConfig.GetFloat("RootRotationUpdateTolerance", RootRotationUpdateTolerance);
+                RootVelocityUpdateTolerance
+                    = interestConfig.GetFloat("RootVelocityUpdateTolerance", RootVelocityUpdateTolerance);
             }
 
-            m_log.DebugFormat("[SCENE]: Using the {0} prioritization scheme", m_priorityScheme);
+            m_log.DebugFormat("[SCENE]: Using the {0} prioritization scheme", UpdatePrioritizationScheme);
 
             #endregion Interest Management
 
-            StatsReporter = new SimStatsReporter(this);
+            // The timer used by the Stopwatch class depends on the system hardware and operating system; inform
+            // if the timer is based on a high-resolution performance counter or based on the system timer;
+            // the performance counter will provide a more precise time than the system timer
+            if (Stopwatch.IsHighResolution)
+                m_log.InfoFormat("[SCENE]: Using high-resolution performance counter for statistics.");
+            else
+                m_log.InfoFormat("[SCENE]: Using system timer for statistics.");
+
+            // Acquire the statistics section of the OpenSim.ini file located
+            // in the bin directory
+            IConfig statisticsConfig = m_config.Configs["Statistics"];
+
+            // Confirm that the statistics section existed in the configuration
+            // file
+            if (statisticsConfig != null)
+            {
+                // Create the StatsReporter using the number of frames to store
+                // for the frame time statistics, or 10 frames if the config
+                // file doesn't contain a value
+                StatsReporter = new SimStatsReporter(this,
+                    statisticsConfig.GetInt("NumberOfFrames", 
+                    m_defaultNumberFramesStored));
+            }
+            else
+            {
+                // Create a StatsReporter with the current scene and a default
+                // 10 frames stored for the frame time statistics
+                StatsReporter = new SimStatsReporter(this);
+            }
+
             StatsReporter.OnSendStatsResult += SendSimStatsPackets;
             StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
 
+<<<<<<< HEAD
+=======
             MainConsole.Instance.Commands.AddCommand("scene", false, "gc collect", "gc collect", "gc collect", "Cause the garbage collector to make a single pass", HandleGcCollect);
+>>>>>>> avn/ubitvar
         }
 
-        public Scene(RegionInfo regInfo) : base(regInfo)
+        public Scene(RegionInfo regInfo, PhysicsScene physicsScene)
+            : base(regInfo)
         {
+            m_sceneGraph = new SceneGraph(this);
+            m_sceneGraph.PhysicsScene = physicsScene;
+
+            // If the scene graph has an Unrecoverable error, restart this sim.
+            // Currently the only thing that causes it to happen is two kinds of specific
+            // Physics based crashes.
+            //
+            // Out of memory
+            // Operating system has killed the plugin
+            m_sceneGraph.UnRecoverableError
+                += () =>
+            {
+                m_log.ErrorFormat("[SCENE]: Restarting region {0} due to unrecoverable physics crash", Name);
+                RestartNow();
+            };
+
             PhysicalPrims = true;
             CollidablePrims = true;
             // this is done above acording to config
  //           PhysicsEnabled = true;
 
+            AllowAvatarCrossing = true;
+
             PeriodicBackup = true;
             UseBackup = true;
 
+<<<<<<< HEAD
+            IsReprioritizationEnabled = true;
+            UpdatePrioritizationScheme = UpdatePrioritizationSchemes.Time;
+            ReprioritizationInterval = 5000;
+
+            RootRotationUpdateTolerance = 0.1f;
+            RootVelocityUpdateTolerance = 0.001f;
+            RootPositionUpdateTolerance = 0.05f;
+            RootReprioritizationDistance = 10.0;
+            ChildReprioritizationDistance = 20.0;
+
+=======
+>>>>>>> avn/ubitvar
             m_eventManager = new EventManager();
 
             m_permissions = new ScenePermissions(this);
@@ -1131,7 +1376,24 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
             {
+<<<<<<< HEAD
+                //// If these are cast to INT because long + negative values + abs returns invalid data
+                //int resultX = Math.Abs((int)xcell - (int)RegionInfo.RegionLocX);
+                //int resultY = Math.Abs((int)ycell - (int)RegionInfo.RegionLocY);
+                //if (resultX <= 1 && resultY <= 1)
+                float dist = (float)Math.Max(DefaultDrawDistance,
+                             (float)Math.Max(RegionInfo.RegionSizeX, RegionInfo.RegionSizeY));
+                uint newRegionX, newRegionY, thisRegionX, thisRegionY;
+                Util.RegionHandleToRegionLoc(otherRegion.RegionHandle, out newRegionX, out newRegionY);
+                Util.RegionHandleToRegionLoc(RegionInfo.RegionHandle, out thisRegionX, out thisRegionY);
+
+                //m_log.InfoFormat("[SCENE]: (on region {0}): Region {1} up in coords {2}-{3}",
+                //    RegionInfo.RegionName, otherRegion.RegionName, newRegionX, newRegionY);
+
+                if (!Util.IsOutsideView(dist, thisRegionX, newRegionX, thisRegionY, newRegionY))
+=======
                 if (isNeighborRegion(otherRegion))
+>>>>>>> avn/ubitvar
                 {
                     // Let the grid service module know, so this can be cached
                     m_eventManager.TriggerOnRegionUp(otherRegion);
@@ -1292,14 +1554,14 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Kick all ROOT agents with the message, 'The simulator is going down'
             ForEachScenePresence(delegate(ScenePresence avatar)
-                                 {
-                                     avatar.RemoveNeighbourRegion(RegionInfo.RegionHandle);
+            {
+                avatar.RemoveNeighbourRegion(RegionInfo.RegionHandle);
 
-                                     if (!avatar.IsChildAgent)
-                                         avatar.ControllingClient.Kick("The simulator is going down.");
+                if (!avatar.IsChildAgent)
+                    avatar.ControllingClient.Kick("The simulator is going down.");
 
-                                     avatar.ControllingClient.SendShutdownConnectionNotice();
-                                 });
+                avatar.ControllingClient.SendShutdownConnectionNotice();
+            });
 
             // Stop updating the scene objects and agents.
             m_shuttingDown = true;
@@ -1352,13 +1614,14 @@ namespace OpenSim.Region.Framework.Scenes
         /// </param> 
         public void Start(bool startScripts)
         {
+            if (IsRunning)
+                return;
+
+            m_isRunning = true;
             m_active = true;
 
+            m_unixStartTime = Util.UnixTimeSinceEpoch();
 //            m_log.DebugFormat("[SCENE]: Starting Heartbeat timer for {0}", RegionInfo.RegionName);
-
-            //m_heartbeatTimer.Enabled = true;
-            //m_heartbeatTimer.Interval = (int)(m_timespan * 1000);
-            //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
             if (m_heartbeatThread != null)
             {
                 m_hbRestarts++;
@@ -1379,14 +1642,13 @@ namespace OpenSim.Region.Framework.Scenes
                 Watchdog.AbortThread(m_heartbeatThread.ManagedThreadId);
                 m_heartbeatThread = null;
             }
-//            m_lastUpdate = Util.EnvironmentTickCount();
 
 //            m_sceneGraph.PreparePhysicsSimulation();
 
 
             m_heartbeatThread
-                = Watchdog.StartThread(
-                    Heartbeat, string.Format("Heartbeat ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, false);
+                = WorkManager.StartThread(
+                    Heartbeat, string.Format("Heartbeat-({0})", RegionInfo.RegionName.Replace(" ", "_")), ThreadPriority.Normal, false, false);
 
             StartScripts();
         }
@@ -1419,15 +1681,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         private void Heartbeat()
         {
-//            if (!Monitor.TryEnter(m_heartbeatLock))
-//            {
-//                Watchdog.RemoveThread();
-//                return;
-//            }
-
-//            try
-//            {
-
             m_eventManager.TriggerOnRegionStarted(this);
 
             // The first frame can take a very long time due to physics actors being added on startup.  Therefore,
@@ -1435,22 +1688,49 @@ namespace OpenSim.Region.Framework.Scenes
             // alarms for scenes with many objects.
             Update(1);
 
-            Watchdog.StartThread(
-                    Maintenance, string.Format("Maintenance ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, true);
+            WorkManager.StartThread(
+                Maintenance, string.Format("Maintenance ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, true);
 
             Watchdog.GetCurrentThreadInfo().AlarmIfTimeout = true;
-            Update(-1);
+            m_lastFrameTick = Util.EnvironmentTickCount();
 
-//                m_lastUpdate = Util.EnvironmentTickCount();
-//                m_firstHeartbeat = false;
-//            }
-//            finally
-//            {
-//                Monitor.Pulse(m_heartbeatLock);
-//                Monitor.Exit(m_heartbeatLock);
-//            }
+            if (UpdateOnTimer)
+            {
+                m_sceneUpdateTimer = new Timer(MinFrameTicks);
+                m_sceneUpdateTimer.AutoReset = true;
+                m_sceneUpdateTimer.Elapsed += Update;
+                m_sceneUpdateTimer.Start();
+            }
+            else
+            {
+                Thread.CurrentThread.Priority = ThreadPriority.Highest;
+                Update(-1);
+                Watchdog.RemoveThread();
+                m_isRunning = false;
+            }
+        }
 
-            Watchdog.RemoveThread();
+        private volatile bool m_isTimerUpdateRunning;
+
+        private void Update(object sender, ElapsedEventArgs e)
+        {
+            if (m_isTimerUpdateRunning)
+                return;
+
+            m_isTimerUpdateRunning = true;
+
+            // If the last frame did not complete on time, then immediately start the next update on the same thread
+            // and ignore further timed updates until we have a frame that had spare time.
+            while (!Update(1) && Active) { }
+
+            if (!Active || m_shuttingDown)
+            {
+                m_sceneUpdateTimer.Stop();
+                m_sceneUpdateTimer = null;
+                m_isRunning = false;
+            }
+
+            m_isTimerUpdateRunning = false;
         }
 
         private void Maintenance()
@@ -1463,7 +1743,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void DoMaintenance(int runs)
         {
             long? endRun = null;
-            int runtc;
+            int runtc, tmpMS;
             int previousMaintenanceTick;
 
             if (runs >= 0)
@@ -1477,6 +1757,8 @@ namespace OpenSim.Region.Framework.Scenes
                 runtc = Util.EnvironmentTickCount();
                 ++MaintenanceRun;
 
+                // m_log.DebugFormat("[SCENE]: Maintenance run {0} in {1}", MaintenanceRun, Name);
+
                 // Coarse locations relate to positions of green dots on the mini-map (on a SecondLife client)
                 if (MaintenanceRun % (m_update_coarse_locations / 10) == 0)
                 {
@@ -1490,7 +1772,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (SendPeriodicAppearanceUpdates && MaintenanceRun % 60 == 0)
                 {
-//                    m_log.DebugFormat("[SCENE]: Sending periodic appearance updates");
+                    // m_log.DebugFormat("[SCENE]: Sending periodic appearance updates");
 
                     if (AvatarFactory != null)
                     {
@@ -1498,29 +1780,44 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
+                // Delete temp-on-rez stuff
+                if (MaintenanceRun % m_update_temp_cleaning == 0 && !m_cleaningTemps)
+                {
+                    // m_log.DebugFormat("[SCENE]: Running temp-on-rez cleaning in {0}", Name);
+                    tmpMS = Util.EnvironmentTickCount();
+                    m_cleaningTemps = true;
+
+                    WorkManager.RunInThread(
+                        delegate { CleanTempObjects(); m_cleaningTemps = false; },
+                        null,
+                        string.Format("CleanTempObjects ({0})", Name));
+
+                    tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpMS);
+                }
+
                 Watchdog.UpdateThread();
 
                 previousMaintenanceTick = m_lastMaintenanceTick;
                 m_lastMaintenanceTick = Util.EnvironmentTickCount();
                 runtc = Util.EnvironmentTickCountSubtract(m_lastMaintenanceTick, runtc);
-                runtc = (int)(MinMaintenanceTime * 1000) - runtc;
-    
+                runtc = MinMaintenanceTicks - runtc;
+
                 if (runtc > 0)
-                    Thread.Sleep(runtc);
-    
+                    m_maintenanceWaitEvent.WaitOne(runtc);
+
                 // Optionally warn if a frame takes double the amount of time that it should.
                 if (DebugUpdates
                     && Util.EnvironmentTickCountSubtract(
-                        m_lastMaintenanceTick, previousMaintenanceTick) > (int)(MinMaintenanceTime * 1000 * 2))
+                        m_lastMaintenanceTick, previousMaintenanceTick) > MinMaintenanceTicks * 2)
                     m_log.WarnFormat(
                         "[SCENE]: Maintenance took {0} ms (desired max {1} ms) in {2}",
                         Util.EnvironmentTickCountSubtract(m_lastMaintenanceTick, previousMaintenanceTick),
-                        MinMaintenanceTime * 1000,
+                        MinMaintenanceTicks,
                         RegionInfo.RegionName);
             }
         }
 
-        public override void Update(int frames)
+        public override bool Update(int frames)
         {
             long? endFrame = null;
 
@@ -1528,20 +1825,43 @@ namespace OpenSim.Region.Framework.Scenes
                 endFrame = Frame + frames;
 
             float physicsFPS = 0f;
+<<<<<<< HEAD
+            int previousFrameTick, tmpMS;
+
+            // These variables will be used to save the precise frame time using the
+            // Stopwatch class of Microsoft SDK; the times are recorded at the start
+            // and end of a particular section of code, and then used to calculate
+            // the frame times, which are the sums of the sections for each given name
+            double preciseTotalFrameTime = 0.0;
+            double preciseSimFrameTime = 0.0;
+            double precisePhysicsFrameTime = 0.0;
+            Stopwatch totalFrameStopwatch = new Stopwatch();
+            Stopwatch simFrameStopwatch = new Stopwatch();
+            Stopwatch physicsFrameStopwatch = new Stopwatch();
+
+            // Begin the stopwatch to keep track of the time that the frame
+            // started running to determine how long the frame took to complete
+            totalFrameStopwatch.Start();
+=======
             int tmpMS;
             int previousFrameTick;
             int maintc;
             int sleepMS;
             int framestart;
+>>>>>>> avn/ubitvar
 
             while (!m_shuttingDown && ((endFrame == null && Active) || Frame < endFrame))
             {
                 framestart = Util.EnvironmentTickCount();
                 ++Frame;
 
-//            m_log.DebugFormat("[SCENE]: Processing frame {0} in {1}", Frame, RegionInfo.RegionName);
+                // m_log.DebugFormat("[SCENE]: Processing frame {0} in {1}", Frame, RegionInfo.RegionName);
 
+<<<<<<< HEAD
+                agentMS = eventMS = backupMS = terrainMS = landMS = spareMS = 0;
+=======
                 agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0;
+>>>>>>> avn/ubitvar
 
                 try
                 {
@@ -1557,52 +1877,112 @@ namespace OpenSim.Region.Framework.Scenes
 
                     if (Frame % m_update_terrain == 0)
                     {
+<<<<<<< HEAD
+                        // At several points inside the code there was a need to
+                        // create a more precise measurement of time elapsed. 
+                        // This led to the addition of variables that have a 
+                        // similar function and thus remain tightly connected to 
+                        // their original counterparts. However, the original 
+                        // code is not receiving comments from our group because 
+                        // we don't feel right modifying the code to that degree 
+                        // at this point in time, the precise values all begin 
+                        // with the keyword precise
+                        tmpMS = Util.EnvironmentTickCount();
+                        simFrameStopwatch.Start();
+                        UpdateTerrain();
+
+                        // Get the simulation frame time that the avatar force 
+                        // input took
+                        simFrameStopwatch.Stop();
+                        preciseSimFrameTime =
+                            simFrameStopwatch.Elapsed.TotalMilliseconds;
+                        terrainMS = Util.EnvironmentTickCountSubtract(tmpMS);
+                    }
+
+                    // At several points inside the code there was a need to
+                    // create a more precise measurement of time elapsed. This
+                    // led to the addition of variables that have a similar
+                    // function and thus remain tightly connected to their
+                    // original counterparts. However, the original code is
+                    // not receiving comments from our group because we don't
+                    // feel right modifying the code to that degree at this
+                    // point in time, the precise values all begin with the
+                    // keyword precise
+=======
                         UpdateTerrain();
                     }
 
                     terrainMS = Util.EnvironmentTickCountSubtract(tmpMS);
+>>>>>>> avn/ubitvar
 
                     tmpMS = Util.EnvironmentTickCount();
+
+                    // Begin the stopwatch to track the time to prepare physics
+                    physicsFrameStopwatch.Start();
                     if (PhysicsEnabled && Frame % m_update_physics == 0)
                         m_sceneGraph.UpdatePreparePhysics();
+
+                    // Get the time it took to prepare the physics, this
+                    // would report the most precise time that physics was
+                    // running on the machine and should the physics not be
+                    // enabled will report the time it took to check if physics
+                    // was enabled
+                    physicsFrameStopwatch.Stop();
+                    precisePhysicsFrameTime = physicsFrameStopwatch.Elapsed.TotalMilliseconds;
                     physicsMS2 = Util.EnvironmentTickCountSubtract(tmpMS);
-    
+
                     // Apply any pending avatar force input to the avatar's velocity
                     tmpMS = Util.EnvironmentTickCount();
+                    simFrameStopwatch.Restart();
                     if (Frame % m_update_entitymovement == 0)
                         m_sceneGraph.UpdateScenePresenceMovement();
+
+                    // Get the simulation frame time that the avatar force input 
+                    // took
+                    simFrameStopwatch.Stop();
+                    preciseSimFrameTime +=
+                        simFrameStopwatch.Elapsed.TotalMilliseconds;
                     agentMS = Util.EnvironmentTickCountSubtract(tmpMS);
-    
+
                     // Perform the main physics update.  This will do the actual work of moving objects and avatars according to their
                     // velocity
                     tmpMS = Util.EnvironmentTickCount();
+                    physicsFrameStopwatch.Restart();
                     if (Frame % m_update_physics == 0)
                     {
                         if (PhysicsEnabled)
-                            physicsFPS = m_sceneGraph.UpdatePhysics(MinFrameTime);
-    
+                            physicsFPS = m_sceneGraph.UpdatePhysics(MinFrameSeconds);
+
                         if (SynchronizeScene != null)
                             SynchronizeScene(this);
                     }
+
+                    // Add the main physics update time to the prepare physics time
+                    physicsFrameStopwatch.Stop();
+                    precisePhysicsFrameTime += physicsFrameStopwatch.Elapsed.TotalMilliseconds;
                     physicsMS = Util.EnvironmentTickCountSubtract(tmpMS);
 
+                    // Start the stopwatch for the remainder of the simulation
+                    simFrameStopwatch.Restart();
                     tmpMS = Util.EnvironmentTickCount();
-    
+
                     // Check if any objects have reached their targets
                     CheckAtTargets();
-    
+
                     // Update SceneObjectGroups that have scheduled themselves for updates
                     // Objects queue their updates onto all scene presences
                     if (Frame % m_update_objects == 0)
                         m_sceneGraph.UpdateObjectGroups();
-    
+
                     // Run through all ScenePresences looking for updates
                     // Presence updates and queued object updates for each presence are sent to clients
                     if (Frame % m_update_presences == 0)
                         m_sceneGraph.UpdatePresences();
-    
+
                     agentMS += Util.EnvironmentTickCountSubtract(tmpMS);
 
+<<<<<<< HEAD
+=======
     
                     // Delete temp-on-rez stuff
                     if (Frame % m_update_temp_cleaning == 0 && !m_cleaningTemps)
@@ -1613,31 +1993,32 @@ namespace OpenSim.Region.Framework.Scenes
                         tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpMS);
                     }
     
+>>>>>>> avn/ubitvar
                     if (Frame % m_update_events == 0)
                     {
                         tmpMS = Util.EnvironmentTickCount();
                         UpdateEvents();
                         eventMS = Util.EnvironmentTickCountSubtract(tmpMS);
                     }
-    
+
                     if (PeriodicBackup && Frame % m_update_backup == 0)
                     {
                         tmpMS = Util.EnvironmentTickCount();
                         UpdateStorageBackup();
                         backupMS = Util.EnvironmentTickCountSubtract(tmpMS);
                     }
-    
+
                     //if (Frame % m_update_land == 0)
                     //{
                     //    int ldMS = Util.EnvironmentTickCount();
                     //    UpdateLand();
                     //    landMS = Util.EnvironmentTickCountSubtract(ldMS);
                     //}
-    
+
                     if (!LoginsEnabled && Frame == 20)
                     {
-    //                    m_log.DebugFormat("{0} {1} {2}", LoginsDisabled, m_sceneGraph.GetActiveScriptsCount(), LoginLock);
-    
+                        // m_log.DebugFormat("{0} {1} {2}", LoginsDisabled, m_sceneGraph.GetActiveScriptsCount(), LoginLock);
+
                         // In 99.9% of cases it is a bad idea to manually force garbage collection. However,
                         // this is a rare case where we know we have just went through a long cycle of heap
                         // allocations, and there is no more work to be done until someone logs in
@@ -1652,7 +2033,7 @@ namespace OpenSim.Region.Framework.Scenes
                             }
 
                             m_sceneGridService.InformNeighborsThatRegionisUp(
-                                RequestModuleInterface<INeighbourService>(), RegionInfo);
+                            RequestModuleInterface<INeighbourService>(), RegionInfo);
 
                             // Region ready should always be set
                             Ready = true;
@@ -1663,7 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes
                             if (m_sceneGraph.GetActiveScriptsCount() == 0)
                             {
                                 // In this case, we leave it to the IRegionReadyModule to enable logins
-                               
+
                                 // LoginLock can currently only be set by a region module implementation.
                                 // If somehow this hasn't been done then the quickest way to bugfix is to see the
                                 // NullReferenceException
@@ -1679,11 +2060,44 @@ namespace OpenSim.Region.Framework.Scenes
                         "[SCENE]: Failed on region {0} with exception {1}{2}",
                         RegionInfo.RegionName, e.Message, e.StackTrace);
                 }
-    
+
                 EventManager.TriggerRegionHeartbeatEnd(this);
+                otherMS = eventMS + backupMS + terrainMS + landMS;
 
-                Watchdog.UpdateThread();
+                // Get the elapsed time for the simulation frame
+                simFrameStopwatch.Stop();
+                preciseSimFrameTime +=
+                    simFrameStopwatch.Elapsed.TotalMilliseconds;
 
+<<<<<<< HEAD
+                if (!UpdateOnTimer)
+                {
+                    Watchdog.UpdateThread();
+
+                    spareMS = MinFrameTicks - Util.EnvironmentTickCountSubtract(m_lastFrameTick);
+
+                    if (spareMS > 0)
+                        m_updateWaitEvent.WaitOne(spareMS);
+                    else
+                        spareMS = 0;
+                }
+                else
+                {
+                    spareMS = Math.Max(0, MinFrameTicks - physicsMS2 - agentMS - physicsMS - otherMS);
+                }
+
+                // Get the total frame time
+                totalFrameStopwatch.Stop();
+                preciseTotalFrameTime =
+                    totalFrameStopwatch.Elapsed.TotalMilliseconds;
+
+                // Restart the stopwatch for the total time of the next frame
+                totalFrameStopwatch.Restart();
+
+                previousFrameTick = m_lastFrameTick;
+                frameMS = Util.EnvironmentTickCountSubtract(m_lastFrameTick);
+                m_lastFrameTick = Util.EnvironmentTickCount();
+=======
                 otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
 
                 StatsReporter.AddPhysicsFPS(physicsFPS);
@@ -1711,22 +2125,67 @@ namespace OpenSim.Region.Framework.Scenes
                 frameMS = Util.EnvironmentTickCountSubtract(framestart);
                 StatsReporter.addSleepMS(sleepMS);
                 StatsReporter.addFrameMS(frameMS);
+>>>>>>> avn/ubitvar
 
                 // if (Frame%m_update_avatars == 0)
                 //   UpdateInWorldTime();
 
+<<<<<<< HEAD
+                StatsReporter.addFrameMS(frameMS);
+                StatsReporter.addAgentMS(agentMS);
+                StatsReporter.addPhysicsMS(physicsMS + physicsMS2);
+                StatsReporter.addOtherMS(otherMS);
+                StatsReporter.AddSpareMS(spareMS);
+                StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
+                StatsReporter.AddScriptMS((int) GetAndResetScriptExecutionTime());
+=======
+>>>>>>> avn/ubitvar
+
+                // Send the correct time values to the stats reporter for the
+                // frame times
+                StatsReporter.addFrameTimeMilliseconds(preciseTotalFrameTime,
+                    preciseSimFrameTime, precisePhysicsFrameTime, 0.0);
 
-               // Optionally warn if a frame takes double the amount of time that it should.
+                // Send the correct number of frames that the physics library
+                // has processed to the stats reporter
+                StatsReporter.addPhysicsFrame(1);
+
+                // Optionally warn if a frame takes double the amount of time that it should.
                 if (DebugUpdates
                     && Util.EnvironmentTickCountSubtract(
-                        m_lastFrameTick, previousFrameTick) > (int)(MinFrameTime * 1000 * 2))
+                        m_lastFrameTick, previousFrameTick) > MinFrameTicks * 2)
                     m_log.WarnFormat(
                         "[SCENE]: Frame took {0} ms (desired max {1} ms) in {2}",
                         Util.EnvironmentTickCountSubtract(m_lastFrameTick, previousFrameTick),
-                        MinFrameTime * 1000,
+                        MinFrameTicks,
                         RegionInfo.RegionName);
             }
-        }        
+
+            // Finished updating scene frame, so stop the total frame's Stopwatch
+            totalFrameStopwatch.Stop();
+
+            return spareMS >= 0;
+        }
+
+        /// <summary>
+        /// Adds the execution time of one script to the total scripts execution time for this region.
+        /// </summary>
+        /// <param name="ticks">Elapsed Stopwatch ticks</param>
+        public void AddScriptExecutionTime(long ticks)
+        {
+            Interlocked.Add(ref m_scriptExecutionTime, ticks);
+        }
+
+        /// <summary>
+        /// Returns the total execution time of all the scripts in the region since the last frame
+        /// (in milliseconds), and clears the value in preparation for the next frame.
+        /// </summary>
+        /// <returns>Time in milliseconds</returns>
+        private long GetAndResetScriptExecutionTime()
+        {
+            long ticks = Interlocked.Exchange(ref m_scriptExecutionTime, 0);
+            return (ticks * 1000) / Stopwatch.Frequency;
+        }
 
         public void AddGroupTarget(SceneObjectGroup grp)
         {
@@ -1796,7 +2255,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (!m_backingup)
             {
                 m_backingup = true;
-                Util.FireAndForget(BackupWaitCallback);
+                WorkManager.RunInThread(o => Backup(false), null, string.Format("BackupWaitCallback ({0})", Name));
             }
         }
 
@@ -1809,16 +2268,12 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Wrapper for Backup() that can be called with Util.FireAndForget()
-        /// </summary>
-        private void BackupWaitCallback(object o)
-        {
-            Backup(false);
-        }
-        
-        /// <summary>
-        /// Backup the scene.  This acts as the main method of the backup thread.
+        /// Backup the scene.
         /// </summary>
+        /// <remarks>
+        /// This acts as the main method of the backup thread.  In a regression test whether the backup thread is not
+        /// running independently this can be invoked directly.
+        /// </remarks>
         /// <param name="forced">
         /// If true, then any changes that have not yet been persisted are persisted.  If false,
         /// then the persistence decision is left to the backup code (in some situations, such as object persistence,
@@ -1857,7 +2312,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     IMessageTransferModule tr = RequestModuleInterface<IMessageTransferModule>();
                     if (tr != null)
-                        tr.SendInstantMessage(msg, delegate(bool success) {});
+                        tr.SendInstantMessage(msg, delegate(bool success) { });
                 }
                 m_returns.Clear();
             }
@@ -1871,6 +2326,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (group != null)
             {
+                group.HasGroupChanged = true;
                 group.ProcessBackup(SimulationDataService, true);
             }
         }
@@ -1964,9 +2420,9 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.WarnFormat(
                     "[TERRAIN]: Scene.cs: LoadWorldMap() - Regenerating as failed with exception {0}{1}",
                     e.Message, e.StackTrace);
-                
+
                 // Non standard region size.    If there's an old terrain in the database, it might read past the buffer
-                #pragma warning disable 0162
+#pragma warning disable 0162
                 if ((int)Constants.RegionSize != 256)
                 {
                     Heightmap = new TerrainChannel();
@@ -1994,15 +2450,16 @@ namespace OpenSim.Region.Framework.Scenes
             //// stored in the GridService, because that's what the world map module uses
             //// to send the map image UUIDs (of other regions) to the viewer...
             if (m_generateMaptiles)
-                RegenerateMaptile();
+            RegenerateMaptile();
 
             GridRegion region = new GridRegion(RegionInfo);
             string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
-            m_log.DebugFormat("{0} RegisterRegionWithGrid. name={1},id={2},loc=<{3},{4}>,size=<{5},{6}>",
-                                LogHeader, m_regionName, 
-                                RegionInfo.RegionID,
-                                RegionInfo.RegionLocX, RegionInfo.RegionLocY,
-                                RegionInfo.RegionSizeX, RegionInfo.RegionSizeY);
+            // m_log.DebugFormat("[SCENE]: RegisterRegionWithGrid. name={0},id={1},loc=<{2},{3}>,size=<{4},{5}>",
+            //                    m_regionName, 
+            //                    RegionInfo.RegionID,
+            //                    RegionInfo.RegionLocX, RegionInfo.RegionLocY,
+            //                    RegionInfo.RegionSizeX, RegionInfo.RegionSizeY);
+
             if (error != String.Empty)
                 throw new Exception(error);
         }
@@ -2063,7 +2520,7 @@ namespace OpenSim.Region.Framework.Scenes
                 rootPart.TrimPermissions();
 
                 // Don't do this here - it will get done later on when sculpt data is loaded.
-//                group.CheckSculptAndLoad();
+                //                group.CheckSculptAndLoad();
             }
 
             LoadingPrims = false;
@@ -2081,7 +2538,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (PhysicsScene == null)
                 return null;
-            return PhysicsScene.RaycastWorld(position, direction, length, Count,filter);
+            return PhysicsScene.RaycastWorld(position, direction, length, Count, filter);
         }
 
         /// <summary>
@@ -2121,8 +2578,8 @@ namespace OpenSim.Region.Framework.Scenes
                 SceneObjectPart target = GetSceneObjectPart(RayTargetID);
 
                 Vector3 direction = Vector3.Normalize(RayEnd - RayStart);
-                Vector3 AXOrigin = new Vector3(RayStart.X, RayStart.Y, RayStart.Z);
-                Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z);
+                Vector3 AXOrigin = RayStart;
+                Vector3 AXdirection = direction;
 
                 if (target != null)
                 {
@@ -2144,13 +2601,13 @@ namespace OpenSim.Region.Framework.Scenes
                     // If we hit something
                     if (ei.HitTF)
                     {
-                        Vector3 scaleComponent = new Vector3(ei.AAfaceNormal.X, ei.AAfaceNormal.Y, ei.AAfaceNormal.Z);
+                        Vector3 scaleComponent = ei.AAfaceNormal;
                         if (scaleComponent.X != 0) ScaleOffset = scale.X;
                         if (scaleComponent.Y != 0) ScaleOffset = scale.Y;
                         if (scaleComponent.Z != 0) ScaleOffset = scale.Z;
                         ScaleOffset = Math.Abs(ScaleOffset);
-                        Vector3 intersectionpoint = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
-                        Vector3 normal = new Vector3(ei.normal.X, ei.normal.Y, ei.normal.Z);
+                        Vector3 intersectionpoint = ei.ipoint;
+                        Vector3 normal = ei.normal;
                         // Set the position to the intersection point
                         Vector3 offset = (normal * (ScaleOffset / 2f));
                         pos = (intersectionpoint + offset);
@@ -2159,7 +2616,7 @@ namespace OpenSim.Region.Framework.Scenes
                         //And in cases when we weren't rezzing from inventory we were re-adding the 0.25 straight after calling this method
                         // Un-offset the prim (it gets offset later by the consumer method)
                         //pos.Z -= 0.25F; 
-                       
+
                     }
                 }
                 else
@@ -2172,8 +2629,13 @@ namespace OpenSim.Region.Framework.Scenes
 
                     if (ei.HitTF)
                     {
+<<<<<<< HEAD
+                        pos = ei.ipoint;
+                    }
+=======
                         pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
                     } 
+>>>>>>> avn/ubitvar
                     else
                     {
                         // fall back to our stupid functionality
@@ -2238,7 +2700,7 @@ namespace OpenSim.Region.Framework.Scenes
             //    "[SCENE]: Scene.AddNewPrim() pcode {0} called for {1} in {2}", shape.PCode, ownerID, RegionInfo.RegionName);
 
             SceneObjectGroup sceneObject = null;
-            
+
             // If an entity creator has been registered for this prim type then use that
             if (m_entityCreators.ContainsKey((PCode)shape.PCode))
             {
@@ -2259,7 +2721,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             return sceneObject;
         }
-        
+
         /// <summary>
         /// Add an object into the scene that has come from storage
         /// </summary>
@@ -2292,7 +2754,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             return false;
         }
-        
+
         /// <summary>
         /// Add an object into the scene that has come from storage
         /// </summary>
@@ -2328,7 +2790,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             return AddNewSceneObject(sceneObject, attachToBackup, true);
         }
-        
+
         /// <summary>
         /// Add a newly created object to the scene
         /// </summary>
@@ -2343,16 +2805,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// </param>
         /// <returns>true if the object was added.  false if not</returns>
         public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
-        {           
+        {
             if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates))
             {
                 EventManager.TriggerObjectAddedToScene(sceneObject);
-                return true;       
+                return true;
             }
-            
+
             return false;
         }
-        
+
         /// <summary>
         /// Add a newly created object to the scene.
         /// </summary>
@@ -2369,7 +2831,7 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel)
         {
             if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel))
-            {            
+            {
                 EventManager.TriggerObjectAddedToScene(sceneObject);
                 return true;
             }
@@ -2439,8 +2901,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="silent">Suppress broadcasting changes to other clients.</param>
         /// <param name="removeScripts">If true, then scripts are removed.  If false, then they are only stopped.</para>
         public void DeleteSceneObject(SceneObjectGroup group, bool silent, bool removeScripts)
-        {            
-//            m_log.DebugFormat("[SCENE]: Deleting scene object {0} {1}", group.Name, group.UUID);
+        {
+            // m_log.DebugFormat("[SCENE]: Deleting scene object {0} {1}", group.Name, group.UUID);
 
             if (removeScripts)
                 group.RemoveScriptInstances(true);
@@ -2485,7 +2947,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (!silent)
                 SendKillObject(new List<uint>() { group.LocalId });
 
-//            m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);            
+            // m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);            
         }
 
         /// <summary>
@@ -2501,17 +2963,16 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (!softDelete)
                 {
-                    // Force a database update so that the scene object group ID is accurate.  It's possible that the
-                    // group has recently been delinked from another group but that this change has not been persisted
-                    // to the DB.
+                    // If the group contains prims whose SceneGroupID is incorrect then force a
+                    // database update, because RemoveObject() works by searching on the SceneGroupID.
                     // This is an expensive thing to do so only do it if absolutely necessary.
-                    if (so.HasGroupChangedDueToDelink)
-                        ForceSceneObjectBackup(so);                
-                    
+                    if (so.GroupContainsForeignPrims)
+                        ForceSceneObjectBackup(so);
+
                     so.DetachFromBackup();
                     SimulationDataService.RemoveObject(so.UUID, RegionInfo.RegionID);
                 }
-                                    
+
                 // We need to keep track of this state in case this group is still queued for further backup.
                 so.IsDeleted = true;
 
@@ -2552,6 +3013,8 @@ namespace OpenSim.Region.Framework.Scenes
                     m_log.Warn("[SCENE]: exception when trying to remove the prim that crossed the border.");
                 }
                 return;
+<<<<<<< HEAD
+=======
             }
 
             if (grp.RootPart.RETURN_AT_EDGE)
@@ -2593,6 +3056,49 @@ namespace OpenSim.Region.Framework.Scenes
                 // Regular region. Just check for region size
                 if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY )
                     ret = true;
+>>>>>>> avn/ubitvar
+            }
+
+            if (grp.RootPart.RETURN_AT_EDGE)
+            {
+<<<<<<< HEAD
+                // We remove the object here
+                try
+                {
+                    List<SceneObjectGroup> objects = new List<SceneObjectGroup>();
+                    objects.Add(grp);
+                    SceneObjectGroup[] objectsArray = objects.ToArray();
+                    returnObjects(objectsArray, UUID.Zero);
+                }
+                catch (Exception)
+                {
+                    m_log.Warn("[SCENE]: exception when trying to return the prim that crossed the border.");
+                }
+                return;
+            }
+
+            if (EntityTransferModule != null)
+                EntityTransferModule.Cross(grp, attemptedPosition, silent);
+        }
+
+        // Simple test to see if a position is in the current region.
+        // This test is mostly used to see if a region crossing is necessary.
+        // Assuming the position is relative to the region so anything outside its bounds.
+        // Return 'true' if position inside region.
+        public bool PositionIsInCurrentRegion(Vector3 pos)
+        {
+            bool ret = false;
+            int xx = (int)Math.Floor(pos.X);
+            int yy = (int)Math.Floor(pos.Y);
+            if (xx < 0 || yy < 0)
+                return false;
+
+            IRegionCombinerModule regionCombinerModule = RequestModuleInterface<IRegionCombinerModule>();
+            if (regionCombinerModule == null)
+            {
+                // Regular region. Just check for region size
+                if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY)
+                    ret = true;
             }
             else
             {
@@ -2604,6 +3110,16 @@ namespace OpenSim.Region.Framework.Scenes
 
         }
 
+=======
+                // We're in a mega-region so see if we are still in that larger region
+                ret = regionCombinerModule.PositionIsInMegaregion(this.RegionInfo.RegionID, xx, yy);
+            }
+
+            return ret;
+
+        }
+
+>>>>>>> avn/ubitvar
         /// <summary>
         /// Called when objects or attachments cross the border, or teleport, between regions.
         /// </summary>
@@ -2625,6 +3141,10 @@ namespace OpenSim.Region.Framework.Scenes
                 return false;
             }
 
+<<<<<<< HEAD
+            if (!EntityTransferModule.HandleIncomingSceneObject(newObject, newPosition))
+                return false;
+=======
             // If the user is banned, we won't let any of their objects
             // enter. Period.
             //
@@ -2669,6 +3189,7 @@ namespace OpenSim.Region.Framework.Scenes
                 //if (newObject.RootPart.KeyframeMotion != null)
                 //    newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject);
             }
+>>>>>>> avn/ubitvar
 
             // Do this as late as possible so that listeners have full access to the incoming object
             EventManager.TriggerOnIncomingSceneObject(newObject);
@@ -2712,7 +3233,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
                 sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
-                      
+
                 // Don't sent a full update here because this will cause full updates to be sent twice for 
                 // attachments on region crossings, resulting in viewer glitches.
                 AddRestoredSceneObject(sceneObject, false, false, false);
@@ -2727,10 +3248,10 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     SceneObjectGroup grp = sceneObject;
 
-//                    m_log.DebugFormat(
-//                        "[ATTACHMENT]: Received attachment {0}, inworld asset id {1}", grp.FromItemID, grp.UUID);
-//                    m_log.DebugFormat(
-//                        "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
+                    // m_log.DebugFormat(
+                    //     "[ATTACHMENT]: Received attachment {0}, inworld asset id {1}", grp.FromItemID, grp.UUID);
+                    // m_log.DebugFormat(
+                    //     "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
 
                     RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
 
@@ -2765,6 +3286,8 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
+<<<<<<< HEAD
+=======
         private int GetStateSource(SceneObjectGroup sog)
         {
             ScenePresence sp = GetScenePresence(sog.OwnerID);
@@ -2793,6 +3316,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return uac.UserFlags;
             //}
         }
+>>>>>>> avn/ubitvar
         #endregion
 
         #region Add/Remove Avatar Methods
@@ -2803,6 +3327,9 @@ namespace OpenSim.Region.Framework.Scenes
             bool vialogin;
             bool reallyNew = true;
 
+            // Update the number of users attempting to login
+            StatsReporter.UpdateUsersLoggingIn(true);
+
             // Validation occurs in LLUDPServer
             //
             // XXX: A race condition exists here where two simultaneous calls to AddNewAgent can interfere with
@@ -2825,9 +3352,15 @@ namespace OpenSim.Region.Framework.Scenes
                 vialogin
                     = (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0
                         || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0;
+<<<<<<< HEAD
+
+                // CheckHeartbeat();
+
+=======
     
                 CheckHeartbeat();
     
+>>>>>>> avn/ubitvar
                 sp = GetScenePresence(client.AgentId);
 
                 // XXX: Not sure how good it is to add a new client if a scene presence already exists.  Possibly this
@@ -2837,6 +3370,29 @@ namespace OpenSim.Region.Framework.Scenes
                 if (sp == null)
                 {
                     m_log.DebugFormat(
+<<<<<<< HEAD
+                        "[SCENE]: Adding new child scene presence {0} {1} to scene {2} at pos {3}",
+                        client.Name, client.AgentId, RegionInfo.RegionName, client.StartPos);
+
+                    sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance, type);
+
+                    // We must set this here so that TriggerOnNewClient and TriggerOnClientLogin can determine whether the
+                    // client is for a root or child agent.
+                    // We must also set this before adding the client to the client manager so that an exception later on
+                    // does not leave a client manager entry without the scene agent set, which will cause other code
+                    // to fail since any entry in the client manager should have a ScenePresence
+                    //
+                    // XXX: This may be better set for a new client before that client is added to the client manager.
+                    // But need to know what happens in the case where a ScenePresence is already present (and if this 
+                    // actually occurs).
+                    client.SceneAgent = sp;
+
+                    m_clientManager.Add(client);
+                    SubscribeToClientEvents(client);
+                    m_eventManager.TriggerOnNewPresence(sp);
+
+                    sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags;
+=======
                         "[SCENE]: Adding new child scene presence {0} {1} to scene {2} at pos {3}, tpflags: {4}",
                         client.Name, client.AgentId, RegionInfo.RegionName, client.StartPos,
                         ((TPFlags)aCircuit.teleportFlags).ToString());
@@ -2859,34 +3415,40 @@ namespace OpenSim.Region.Framework.Scenes
  */
                     m_eventManager.TriggerOnNewPresence(sp);
     
+>>>>>>> avn/ubitvar
                 }
                 else
                 {
+                    // We must set this here so that TriggerOnNewClient and TriggerOnClientLogin can determine whether the
+                    // client is for a root or child agent.
+                    // XXX: This may be better set for a new client before that client is added to the client manager.
+                    // But need to know what happens in the case where a ScenePresence is already present (and if this 
+                    // actually occurs).
+                    client.SceneAgent = sp;
+
                     m_log.WarnFormat(
                         "[SCENE]: Already found {0} scene presence for {1} in {2} when asked to add new scene presence",
                         sp.IsChildAgent ? "child" : "root", sp.Name, RegionInfo.RegionName);
+
                     reallyNew = false;
                 }
-    
-                // We must set this here so that TriggerOnNewClient and TriggerOnClientLogin can determine whether the
-                // client is for a root or child agent.
-                // XXX: This may be better set for a new client before that client is added to the client manager.
-                // But need to know what happens in the case where a ScenePresence is already present (and if this 
-                // actually occurs).
-                client.SceneAgent = sp;
 
                 // This is currently also being done earlier in NewUserConnection for real users to see if this 
                 // resolves problems where HG agents are occasionally seen by others as "Unknown user" in chat and other
                 // places.  However, we still need to do it here for NPCs.
                 CacheUserName(sp, aCircuit);
-    
+
                 if (reallyNew)
                     EventManager.TriggerOnNewClient(client);
-    
+
                 if (vialogin)
                     EventManager.TriggerOnClientLogin(client);
             }
 
+            // User has logged into the scene so update the list of users logging
+            // in
+            StatsReporter.UpdateUsersLoggingIn(false);
+
             m_LastLogin = Util.EnvironmentTickCount();
 
             return sp;
@@ -2902,6 +3464,18 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
+        /// Returns the Home URI of the agent, or null if unknown.
+        /// </summary>
+        public string GetAgentHomeURI(UUID agentID)
+        {
+            AgentCircuitData circuit = AuthenticateHandler.GetAgentCircuitData(agentID);
+            if (circuit != null && circuit.ServiceURLs != null && circuit.ServiceURLs.ContainsKey("HomeURI"))
+                return circuit.ServiceURLs["HomeURI"].ToString();
+            else
+                return null;
+        }
+
+        /// <summary>
         /// Cache the user name for later use.
         /// </summary>
         /// <param name="sp"></param>
@@ -2941,7 +3515,7 @@ namespace OpenSim.Region.Framework.Scenes
         private bool VerifyClient(AgentCircuitData aCircuit, System.Net.IPEndPoint ep, out bool vialogin)
         {
             vialogin = false;
-            
+
             // Do the verification here
             if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0)
             {
@@ -3032,7 +3606,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
 //            client.OnRegionHandShakeReply += SendLayerData;
         }
-        
+
         public virtual void SubscribeToClientPrimEvents(IClientAPI client)
         {
             client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimGroupPosition;
@@ -3044,7 +3618,7 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnUpdatePrimGroupMouseRotation += m_sceneGraph.UpdatePrimGroupRotation;
             client.OnUpdatePrimSingleRotation += m_sceneGraph.UpdatePrimSingleRotation;
             client.OnUpdatePrimSingleRotationPosition += m_sceneGraph.UpdatePrimSingleRotationPosition;
-            
+
             client.OnUpdatePrimScale += m_sceneGraph.UpdatePrimScale;
             client.OnUpdatePrimGroupScale += m_sceneGraph.UpdatePrimGroupScale;
             client.OnUpdateExtraParams += m_sceneGraph.UpdateExtraParam;
@@ -3057,7 +3631,7 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnSpinStart += m_sceneGraph.SpinStart;
             client.OnSpinUpdate += m_sceneGraph.SpinObject;
             client.OnDeRezObject += DeRezObjects;
-            
+
             client.OnObjectName += m_sceneGraph.PrimName;
             client.OnObjectClickAction += m_sceneGraph.PrimClickAction;
             client.OnObjectMaterial += m_sceneGraph.PrimMaterial;
@@ -3069,7 +3643,7 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnRequestObjectPropertiesFamily += m_sceneGraph.RequestObjectPropertiesFamily;
             client.OnObjectPermissions += HandleObjectPermissionsUpdate;
             client.OnGrabObject += ProcessObjectGrab;
-            client.OnGrabUpdate += ProcessObjectGrabUpdate; 
+            client.OnGrabUpdate += ProcessObjectGrabUpdate;
             client.OnDeGrabObject += ProcessObjectDeGrab;
             client.OnUndo += m_sceneGraph.HandleUndo;
             client.OnRedo += m_sceneGraph.HandleRedo;
@@ -3131,7 +3705,7 @@ namespace OpenSim.Region.Framework.Scenes
             //client.OnNameFromUUIDRequest += HandleUUIDNameRequest;
             client.OnMoneyTransferRequest += ProcessMoneyTransferRequest;
         }
-        
+
         public virtual void SubscribeToClientNetworkEvents(IClientAPI client)
         {
             client.OnNetworkStatsUpdate += StatsReporter.AddPacketsStats;
@@ -3325,8 +3899,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (target != null && target2 != null)
             {
                 Vector3 direction = Vector3.Normalize(RayEnd - RayStart);
-                Vector3 AXOrigin = new Vector3(RayStart.X, RayStart.Y, RayStart.Z);
-                Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z);
+                Vector3 AXOrigin = RayStart;
+                Vector3 AXdirection = direction;
 
                 pos = target2.AbsolutePosition;
                 //m_log.Info("[OBJECT_REZ]: TargetPos: " + pos.ToString() + ", RayStart: " + RayStart.ToString() + ", RayEnd: " + RayEnd.ToString() + ", Volume: " + Util.GetDistanceTo(RayStart,RayEnd).ToString() + ", mag1: " + Util.GetMagnitude(RayStart).ToString() + ", mag2: " + Util.GetMagnitude(RayEnd).ToString());
@@ -3347,13 +3921,13 @@ namespace OpenSim.Region.Framework.Scenes
                 if (ei.HitTF)
                 {
                     Vector3 scale = target.Scale;
-                    Vector3 scaleComponent = new Vector3(ei.AAfaceNormal.X, ei.AAfaceNormal.Y, ei.AAfaceNormal.Z);
+                    Vector3 scaleComponent = ei.AAfaceNormal;
                     if (scaleComponent.X != 0) ScaleOffset = scale.X;
                     if (scaleComponent.Y != 0) ScaleOffset = scale.Y;
                     if (scaleComponent.Z != 0) ScaleOffset = scale.Z;
                     ScaleOffset = Math.Abs(ScaleOffset);
-                    Vector3 intersectionpoint = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
-                    Vector3 normal = new Vector3(ei.normal.X, ei.normal.Y, ei.normal.Z);
+                    Vector3 intersectionpoint = ei.ipoint;
+                    Vector3 normal = ei.normal;
                     Vector3 offset = normal * (ScaleOffset / 2f);
                     pos = intersectionpoint + offset;
 
@@ -3373,6 +3947,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         copy = m_sceneGraph.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, Quaternion.Identity);
                     }
+
                     if (copy != null)
                         EventManager.TriggerObjectAddedToScene(copy);
                 }
@@ -3380,7 +3955,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Get the avatar apperance for the given client.
+        /// Get the avatar appearance for the given client.
         /// </summary>
         /// <param name="client"></param>
         /// <param name="appearance"></param>
@@ -3433,18 +4008,19 @@ namespace OpenSim.Region.Framework.Scenes
 
                 return;
             }
-            else
-            {
-                m_authenticateHandler.RemoveCircuit(agentID);
-            }
 
             // TODO: Can we now remove this lock?
+<<<<<<< HEAD
+            lock (acd)
+            {
+=======
             lock (m_removeClientPrivLock)
             {    
+>>>>>>> avn/ubitvar
                 bool isChildAgent = false;
 
                 ScenePresence avatar = GetScenePresence(agentID);
- 
+
                 // Shouldn't be necessary since RemoveClient() is currently only called by IClientAPI.Close() which 
                 // in turn is only called by Scene.IncomingCloseAgent() which checks whether the presence exists or not
                 // However, will keep for now just in case.
@@ -3452,7 +4028,8 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_log.ErrorFormat(
                         "[SCENE]: Called RemoveClient() with agent ID {0} but no such presence is in the scene.", agentID);
-    
+                    m_authenticateHandler.RemoveCircuit(agentID);
+
                     return;
                 }
 
@@ -3463,7 +4040,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_log.DebugFormat(
                         "[SCENE]: Removing {0} agent {1} {2} from {3}",
                         isChildAgent ? "child" : "root", avatar.Name, agentID, Name);
-    
+
                     // Don't do this to root agents, it's not nice for the viewer
                     if (closeChildAgents && isChildAgent)
                     {
@@ -3471,20 +4048,25 @@ namespace OpenSim.Region.Framework.Scenes
                         // Let's do this via UDP
                         avatar.ControllingClient.SendShutdownConnectionNotice();
                     }
-    
+
                     // Only applies to root agents.
                     if (avatar.ParentID != 0)
                     {
                         avatar.StandUp();
                     }
-    
+
                     m_sceneGraph.removeUserCount(!isChildAgent);
-    
+
                     // TODO: We shouldn't use closeChildAgents here - it's being used by the NPC module to stop
                     // unnecessary operations.  This should go away once NPCs have no accompanying IClientAPI
                     if (closeChildAgents && CapsModule != null)
+<<<<<<< HEAD
+                        CapsModule.RemoveCaps(agentID);
+
+=======
                         CapsModule.RemoveCaps(agentID, avatar.ControllingClient.CircuitCode);
     
+>>>>>>> avn/ubitvar
                     if (closeChildAgents && !isChildAgent)
                     {
                         List<ulong> regions = avatar.KnownRegionHandles;
@@ -3493,12 +4075,16 @@ namespace OpenSim.Region.Framework.Scenes
                         // This ends up being done asynchronously so that a logout isn't held up where there are many present but unresponsive neighbours.
                         m_sceneGridService.SendCloseChildAgentConnections(agentID, acd.SessionID.ToString(), regions);
                     }
-    
+
                     m_eventManager.TriggerClientClosed(agentID, this);
 //                    m_log.Debug("[Scene]TriggerClientClosed done");
                     m_eventManager.TriggerOnRemovePresence(agentID);
+<<<<<<< HEAD
+
+=======
 //                    m_log.Debug("[Scene]TriggerOnRemovePresence done");
     
+>>>>>>> avn/ubitvar
                     if (!isChildAgent)
                     {
                         if (AttachmentsModule != null)
@@ -3516,7 +4102,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 catch (NullReferenceException) { }
                             });
                     }
-    
+
                     // It's possible for child agents to have transactions if changes are being made cross-border.
                     if (AgentTransactionsModule != null)
                     {
@@ -3537,9 +4123,10 @@ namespace OpenSim.Region.Framework.Scenes
                         // Always clean these structures up so that any failure above doesn't cause them to remain in the
                         // scene with possibly bad effects (e.g. continually timing out on unacked packets and triggering
                         // the same cleanup exception continually.
+                        m_authenticateHandler.RemoveCircuit(agentID);
                         m_sceneGraph.RemoveScenePresence(agentID);
                         m_clientManager.Remove(agentID);
-        
+
                         avatar.Close();
                     }
                     catch (Exception e)
@@ -3609,12 +4196,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="agent">CircuitData of the agent who is connecting</param>
         /// <param name="teleportFlags"></param>
+        /// <param name="source">Source region (may be null)</param>
         /// <param name="reason">Outputs the reason for the false response on this string</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, uint teleportFlags, out string reason)
+        public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, GridRegion source, out string reason)
         {
-            return NewUserConnection(agent, teleportFlags, out reason, true);
+            return NewUserConnection(agent, teleportFlags, source, out reason, true);
         }
 
         /// <summary>
@@ -3634,15 +4222,20 @@ namespace OpenSim.Region.Framework.Scenes
         /// the LLUDP stack).
         /// </remarks>
         /// <param name="acd">CircuitData of the agent who is connecting</param>
+        /// <param name="source">Source region (may be null)</param>
         /// <param name="reason">Outputs the reason for the false response on this string</param>
         /// <param name="requirePresenceLookup">True for normal presence. False for NPC
         /// or other applications where a full grid/Hypergrid presence may not be required.</param>
         /// <returns>True if the region accepts this agent.  False if it does not.  False will 
         /// also return a reason.</returns>
+<<<<<<< HEAD
+        public bool NewUserConnection(AgentCircuitData acd, uint teleportFlags, GridRegion source, out string reason, bool requirePresenceLookup)
+=======
         /// 
         private object m_newUserConnLock = new object();
 
         public bool NewUserConnection(AgentCircuitData acd, uint teleportFlags, out string reason, bool requirePresenceLookup)
+>>>>>>> avn/ubitvar
         {
             bool vialogin = ((teleportFlags & (uint)TPFlags.ViaLogin) != 0 ||
                 (teleportFlags & (uint)TPFlags.ViaHGLogin) != 0);
@@ -3659,8 +4252,9 @@ namespace OpenSim.Region.Framework.Scenes
             // TeleportFlags.ViaLandmark | TeleportFlags.ViaLocation | TeleportFlags.ViaLandmark | TeleportFlags.Default - Regular Teleport
 
             // Don't disable this log message - it's too helpful
+            string curViewer = Util.GetViewerName(acd);
             m_log.DebugFormat(
-                "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags ({8}), position {9})",
+                "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags ({8}), position {9}. {10}",
                 RegionInfo.RegionName,
                 (acd.child ? "child" : "root"),
                 acd.firstname,
@@ -3668,9 +4262,10 @@ namespace OpenSim.Region.Framework.Scenes
                 acd.AgentID,
                 acd.circuitcode,
                 acd.IPAddress,
-                acd.Viewer,
+                curViewer,
                 ((TPFlags)teleportFlags).ToString(),
-                acd.startpos
+                acd.startpos,
+                (source == null) ? "" : string.Format("From region {0} ({1}){2}", source.RegionName, source.RegionID, (source.RawServerURI == null) ? "" : " @ " + source.ServerURI)
             );
 
 //            m_log.DebugFormat("NewUserConnection stack {0}", Environment.StackTrace);
@@ -3690,7 +4285,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (string viewer in m_AllowedViewers)
                 {
-                    if (viewer == acd.Viewer.Substring(0, viewer.Length).Trim().ToLower())
+                    if (viewer == curViewer.Substring(0, Math.Min(viewer.Length, curViewer.Length)).Trim().ToLower())
                     {
                         ViewerDenied = false;
                         break;
@@ -3707,7 +4302,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (string viewer in m_BannedViewers)
                 {
-                    if (viewer == acd.Viewer.Substring(0, viewer.Length).Trim().ToLower())
+                    if (viewer == curViewer.Substring(0, Math.Min(viewer.Length, curViewer.Length)).Trim().ToLower())
                     {
                         ViewerDenied = true;
                         break;
@@ -3719,7 +4314,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_log.DebugFormat(
                     "[SCENE]: Access denied for {0} {1} using {2}",
-                    acd.firstname, acd.lastname, acd.Viewer);
+                    acd.firstname, acd.lastname, curViewer);
                 reason = "Access denied, your viewer is banned by the region owner";
                 return false;
             }
@@ -3733,12 +4328,12 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // We need to ensure that we are not already removing the scene presence before we ask it not to be 
                 // closed.
-                if (sp != null && sp.IsChildAgent 
-                    && (sp.LifecycleState == ScenePresenceState.Running 
+                if (sp != null && sp.IsChildAgent
+                    && (sp.LifecycleState == ScenePresenceState.Running
                         || sp.LifecycleState == ScenePresenceState.PreRemove))
                 {
                     m_log.DebugFormat(
-                        "[SCENE]: Reusing existing child scene presence for {0}, state {1} in {2}", 
+                        "[SCENE]: Reusing existing child scene presence for {0}, state {1} in {2}",
                         sp.Name, sp.LifecycleState, Name);
 
                     // In the case where, for example, an A B C D region layout, an avatar may
@@ -3838,7 +4433,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_authenticateHandler.AddNewCircuit(acd.circuitcode, acd);
 
                 land = LandChannel.GetLandObject(acd.startpos.X, acd.startpos.Y);
-    
+
                 // On login test land permisions
                 if (vialogin)
                 {
@@ -3895,7 +4490,7 @@ namespace OpenSim.Region.Framework.Scenes
                         "[SCENE]: Region {0} authenticated and authorized incoming {1} agent {2} {3} {4} (circuit code {5})",
                         Name, (acd.child ? "child" : "root"), acd.firstname, acd.lastname,
                         acd.AgentID, acd.circuitcode);
-    
+
                     if (CapsModule != null)
                     {
                         CapsModule.SetAgentCapsSeeds(acd);
@@ -3907,12 +4502,18 @@ namespace OpenSim.Region.Framework.Scenes
                     // Let the SP know how we got here. This has a lot of interesting
                     // uses down the line.
                     sp.TeleportFlags = (TPFlags)teleportFlags;
-    
+
                     if (sp.IsChildAgent)
                     {
                         m_log.DebugFormat(
                             "[SCENE]: Adjusting known seeds for existing agent {0} in {1}",
+<<<<<<< HEAD
+                            acd.AgentID, RegionInfo.RegionName);
+
+                        sp.AdjustKnownSeeds();
+=======
                             acd.AgentID, RegionInfo.RegionName);   
+>>>>>>> avn/ubitvar
 
                         if (CapsModule != null)
                         {
@@ -3982,17 +4583,24 @@ namespace OpenSim.Region.Framework.Scenes
                         else
                         {
                             m_log.DebugFormat(
-                                "[SCENE]: No spawnpoints defined for telehub {0} for {1} in {2}.  Continuing.", 
+                                "[SCENE]: No spawnpoints defined for telehub {0} for {1} in {2}.  Continuing.",
                                 RegionInfo.RegionSettings.TelehubObject, acd.Name, Name);
                         }
                     }
                     else
                     {
                         m_log.DebugFormat(
-                            "[SCENE]: No telehub {0} found to direct {1} in {2}.  Continuing.", 
+                            "[SCENE]: No telehub {0} found to direct {1} in {2}.  Continuing.",
                             RegionInfo.RegionSettings.TelehubObject, acd.Name, Name);
                     }
 
+                    // Final permissions check; this time we don't allow changing the position
+                    if (!IsPositionAllowed(acd.AgentID, acd.startpos, ref reason))
+                    {
+                        m_authenticateHandler.RemoveCircuit(acd.circuitcode);
+                        return false;
+                    }
+
                     return true;
                 }
 
@@ -4004,6 +4612,13 @@ namespace OpenSim.Region.Framework.Scenes
                     if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero)
                     {
                         acd.startpos = land.LandData.UserLocation;
+
+                        // Final permissions check; this time we don't allow changing the position
+                        if (!IsPositionAllowed(acd.AgentID, acd.startpos, ref reason))
+                        {
+                            m_authenticateHandler.RemoveCircuit(acd.circuitcode);
+                            return false;
+                        }
                     }
                 }
                 */// This is now handled properly in ScenePresence.MakeRootAgent
@@ -4012,16 +4627,40 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
+        private bool IsPositionAllowed(UUID agentID, Vector3 pos, ref string reason)
+        {
+            ILandObject land = LandChannel.GetLandObject(pos);
+            if (land == null)
+                return true;
+
+            if (land.IsBannedFromLand(agentID) || land.IsRestrictedFromLand(agentID))
+            {
+                reason = "You are banned from the region.";
+                return false;
+            }
+
+            return true;
+        }
+
         public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY)
         {
             if (posX < 0)
                 posX = 0;
+<<<<<<< HEAD
+            else if (posX >= (float)RegionInfo.RegionSizeX)
+                posX = (float)RegionInfo.RegionSizeX - 0.001f;
+            if (posY < 0)
+                posY = 0;
+            else if (posY >= (float)RegionInfo.RegionSizeY)
+                posY = (float)RegionInfo.RegionSizeY - 0.001f;
+=======
             else if (posX >= RegionInfo.RegionSizeX)
                 posX = RegionInfo.RegionSizeX - 0.5f;
             if (posY < 0)
                 posY = 0;
             else if (posY >= RegionInfo.RegionSizeY)
                 posY = RegionInfo.RegionSizeY - 0.5f;
+>>>>>>> avn/ubitvar
 
             reason = String.Empty;
             if (Permissions.IsGod(agentID))
@@ -4053,7 +4692,7 @@ namespace OpenSim.Region.Framework.Scenes
                     else
                     {
                         reason = String.Format("Denied access to private region {0}: You are not on the access list for that region.",
-                                   RegionInfo.RegionName);
+                            RegionInfo.RegionName);
                     }
                     return false;
                 }
@@ -4110,9 +4749,9 @@ namespace OpenSim.Region.Framework.Scenes
                 if (!AuthorizationService.IsAuthorizedForRegion(
                     agent.AgentID.ToString(), agent.firstname, agent.lastname, RegionInfo.RegionID.ToString(), out reason))
                 {
-                    m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because {4}",
+                    m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because: {4}",
                                      agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName, reason);
-                    
+
                     return false;
                 }
             }
@@ -4332,7 +4971,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             // TODO: This check should probably be in QueryAccess().
-            ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
+            ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, RegionInfo.RegionSizeX / 2, RegionInfo.RegionSizeY / 2);
             if (nearestParcel == null)
             {
                 m_log.InfoFormat(
@@ -4401,7 +5040,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>true if we handled it.</returns>
         public virtual bool IncomingUpdateChildAgent(AgentPosition cAgentData)
         {
-            //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
+//            m_log.DebugFormat(
+//                "[SCENE PRESENCE]: IncomingChildAgentDataUpdate POSITION for {0} in {1}, position {2}", 
+//                cAgentData.AgentID, Name, cAgentData.Position);
+
             ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
             if (childAgentUpdate != null)
             {
@@ -4556,7 +5198,7 @@ namespace OpenSim.Region.Framework.Scenes
             lock (m_removeClientLock)
             {
                 sp = GetScenePresence(agentID);
-    
+
                 if (sp == null)
                 {
                     // If there is no scene presence, we may be handling a dead
@@ -4576,7 +5218,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_log.DebugFormat(
                         "[SCENE]: Called CloseClient() with agent ID {0} but no such presence is in {1}", 
                         agentID, Name);
-    
+
                     return false;
                 }
 
@@ -4607,14 +5249,17 @@ namespace OpenSim.Region.Framework.Scenes
                 sp.LifecycleState = ScenePresenceState.Removing;
             }
 
+<<<<<<< HEAD
+            sp.ControllingClient.Close(force);
+=======
             if (sp != null)
             {
                 sp.ControllingClient.Close(force, force);
                 return true;
             }
+>>>>>>> avn/ubitvar
 
-            // Agent not here 
-            return false;
+            return true;
         }
 
         /// <summary>
@@ -4803,7 +5448,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Script Engine
 
-        private bool ScriptDanger(SceneObjectPart part,Vector3 pos)
+        private bool ScriptDanger(SceneObjectPart part, Vector3 pos)
         {
             ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y);
             if (part != null)
@@ -4814,35 +5459,24 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         return true;
                     }
-                    else if ((parcel.LandData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0)
+                    else if ((part.OwnerID == parcel.LandData.OwnerID) || Permissions.IsGod(part.OwnerID))
                     {
-                        if (part.OwnerID == parcel.LandData.OwnerID
-                            || (parcel.LandData.IsGroupOwned && part.GroupID == parcel.LandData.GroupID)
-                            || Permissions.IsGod(part.OwnerID))
-                        {
-                            return true;
-                        }
-                        else
-                        {
-                            return false;
-                        }
+                        return true;
+                    }
+                    else if (((parcel.LandData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0)
+                        && (parcel.LandData.GroupID != UUID.Zero) && (parcel.LandData.GroupID == part.GroupID))
+                    {
+                        return true;
                     }
                     else
                     {
-                        if (part.OwnerID == parcel.LandData.OwnerID)
-                        {
-                            return true;
-                        }
-                        else
-                        {
-                            return false;
-                        }
+                        return false;
                     }
                 }
                 else
                 {
 
-                    if (pos.X > 0f && pos.X < Constants.RegionSize && pos.Y > 0f && pos.Y < Constants.RegionSize)
+                    if (pos.X > 0f && pos.X < RegionInfo.RegionSizeX && pos.Y > 0f && pos.Y < RegionInfo.RegionSizeY)
                     {
                         // The only time parcel != null when an object is inside a region is when
                         // there is nothing behind the landchannel.  IE, no land plugin loaded.
@@ -5228,6 +5862,9 @@ namespace OpenSim.Region.Framework.Scenes
             // 5 = We have seen a new user enter within the past 4 minutes
             // which can be seen as positive confirmation of sim health
             //
+<<<<<<< HEAD
+            int health = 1; // Start at 1, means we're up
+=======
 
             flags = 0;
             message = String.Empty;
@@ -5243,6 +5880,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             int health=1; // Start at 1, means we're up
+>>>>>>> avn/ubitvar
 
             if ((Util.EnvironmentTickCountSubtract(m_lastFrameTick)) < 1000)
             {
@@ -5315,7 +5953,7 @@ Environment.Exit(1);
                 case PhysicsJointType.Ball:
                     {
                         Vector3 jointAnchor = PhysicsScene.GetJointAnchor(joint);
-                        Vector3 proxyPos = new Vector3(jointAnchor.X, jointAnchor.Y, jointAnchor.Z);
+                        Vector3 proxyPos = jointAnchor;
                         jointProxyObject.ParentGroup.UpdateGroupPosition(proxyPos); // schedules the entire group for a terse update
                     }
                     break;
@@ -5340,7 +5978,7 @@ Environment.Exit(1);
                             jointErrorMessage(joint, "joint.TrackedBodyName is null, joint " + joint.ObjectNameInScene);
                         }
 
-                        Vector3 proxyPos = new Vector3(jointAnchor.X, jointAnchor.Y, jointAnchor.Z);
+                        Vector3 proxyPos = jointAnchor;
                         Quaternion q = trackedBody.RotationOffset * joint.LocalRotation;
 
                         jointProxyObject.ParentGroup.UpdateGroupPosition(proxyPos); // schedules the entire group for a terse update
@@ -5429,6 +6067,10 @@ Environment.Exit(1);
             return null;
         }
 
+        // Get terrain height at the specified <x,y> location.
+        // Presumes the underlying implementation is a heightmap which is a 1m grid.
+        // Finds heightmap grid points before and after the point and
+        //    does a linear approximation of the height at this intermediate point.
         public float GetGroundHeight(float x, float y)
         {
             if (x < 0)
@@ -5441,8 +6083,8 @@ Environment.Exit(1);
                 y = Heightmap.Height - 1;
 
             Vector3 p0 = new Vector3(x, y, (float)Heightmap[(int)x, (int)y]);
-            Vector3 p1 = new Vector3(p0);
-            Vector3 p2 = new Vector3(p0);
+            Vector3 p1 = p0;
+            Vector3 p2 = p0;
 
             p1.X += 1.0f;
             if (p1.X < Heightmap.Width)
@@ -5505,7 +6147,7 @@ Environment.Exit(1);
                 Vector3? nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
                 if (nearestPoint != null)
                 {
-                    Debug.WriteLine("Found a sane previous position based on velocity, sending them to: " + nearestPoint.ToString());
+                    m_log.Debug("Found a sane previous position based on velocity, sending them to: " + nearestPoint.ToString());
                     return nearestPoint.Value;
                 }
 
@@ -5515,16 +6157,16 @@ Environment.Exit(1);
                 nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
                 if (nearestPoint != null)
                 {
-                    Debug.WriteLine("They had a zero velocity, sending them to: " + nearestPoint.ToString());
+                    m_log.Debug("They had a zero velocity, sending them to: " + nearestPoint.ToString());
                     return nearestPoint.Value;
                 }
 
                 ILandObject dest = LandChannel.GetLandObject(avatar.lastKnownAllowedPosition.X, avatar.lastKnownAllowedPosition.Y);
-                if (dest !=  excludeParcel)
+                if (dest != excludeParcel)
                 {
                     // Ultimate backup if we have no idea where they are and
                     // the last allowed position was in another parcel
-                    Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString());
+                    m_log.Debug("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString());
                     return avatar.lastKnownAllowedPosition;
                 }
 
@@ -5534,8 +6176,13 @@ Environment.Exit(1);
             //Go to the edge, this happens in teleporting to a region with no available parcels
             Vector3 nearestRegionEdgePoint = GetNearestRegionEdgePosition(avatar);
 
+<<<<<<< HEAD
+            //m_log.Debug("They are really in a place they don't belong, sending them to: " + nearestRegionEdgePoint.ToString());
+
+=======
             //Debug.WriteLine("They are really in a place they don't belong, sending them to: " + nearestRegionEdgePoint.ToString());
             
+>>>>>>> avn/ubitvar
             return nearestRegionEdgePoint;
         }
 
@@ -5549,7 +6196,7 @@ Environment.Exit(1);
         {
             Vector3 unitDirection = Vector3.Normalize(direction);
             //Making distance to search go through some sane limit of distance
-            for (float distance = 0; distance < Constants.RegionSize * 2; distance += .5f)
+            for (float distance = 0; distance < Math.Max(RegionInfo.RegionSizeX, RegionInfo.RegionSizeY) * 2; distance += .5f)
             {
                 Vector3 testPos = Vector3.Add(pos, Vector3.Multiply(unitDirection, distance));
                 if (parcel.ContainsPoint((int)testPos.X, (int)testPos.Y))
@@ -5603,9 +6250,9 @@ Environment.Exit(1);
             int count = 0;
             int avgx = 0;
             int avgy = 0;
-            for (int x = 0; x < Constants.RegionSize; x++)
+            for (int x = 0; x < RegionInfo.RegionSizeX; x++)
             {
-                for (int y = 0; y < Constants.RegionSize; y++)
+                for (int y = 0; y < RegionInfo.RegionSizeY; y++)
                 {
                     //Just keep a running average as we check if all the points are inside or not
                     if (parcel.ContainsPoint(x, y))
@@ -5629,31 +6276,33 @@ Environment.Exit(1);
 
         private Vector3 GetNearestRegionEdgePosition(ScenePresence avatar)
         {
-            float xdistance = avatar.AbsolutePosition.X < Constants.RegionSize / 2 ? avatar.AbsolutePosition.X : Constants.RegionSize - avatar.AbsolutePosition.X;
-            float ydistance = avatar.AbsolutePosition.Y < Constants.RegionSize / 2 ? avatar.AbsolutePosition.Y : Constants.RegionSize - avatar.AbsolutePosition.Y;
+            float xdistance = avatar.AbsolutePosition.X < RegionInfo.RegionSizeX / 2
+                                ? avatar.AbsolutePosition.X : RegionInfo.RegionSizeX - avatar.AbsolutePosition.X;
+            float ydistance = avatar.AbsolutePosition.Y < RegionInfo.RegionSizeY / 2
+                                ? avatar.AbsolutePosition.Y : RegionInfo.RegionSizeY - avatar.AbsolutePosition.Y;
 
             //find out what vertical edge to go to
             if (xdistance < ydistance)
             {
-                if (avatar.AbsolutePosition.X < Constants.RegionSize / 2)
+                if (avatar.AbsolutePosition.X < RegionInfo.RegionSizeX / 2)
                 {
                     return GetPositionAtAvatarHeightOrGroundHeight(avatar, 0.0f, avatar.AbsolutePosition.Y);
                 }
                 else
                 {
-                    return GetPositionAtAvatarHeightOrGroundHeight(avatar, Constants.RegionSize, avatar.AbsolutePosition.Y);
+                    return GetPositionAtAvatarHeightOrGroundHeight(avatar, RegionInfo.RegionSizeY, avatar.AbsolutePosition.Y);
                 }
             }
             //find out what horizontal edge to go to
             else
             {
-                if (avatar.AbsolutePosition.Y < Constants.RegionSize / 2)
+                if (avatar.AbsolutePosition.Y < RegionInfo.RegionSizeY / 2)
                 {
                     return GetPositionAtAvatarHeightOrGroundHeight(avatar, avatar.AbsolutePosition.X, 0.0f);
                 }
                 else
                 {
-                    return GetPositionAtAvatarHeightOrGroundHeight(avatar, avatar.AbsolutePosition.X, Constants.RegionSize);
+                    return GetPositionAtAvatarHeightOrGroundHeight(avatar, avatar.AbsolutePosition.X, RegionInfo.RegionSizeY);
                 }
             }
         }
@@ -5719,7 +6368,7 @@ Environment.Exit(1);
         /// <param name="maxZ"></param>
         /// <returns></returns>
         public static Vector3[] GetCombinedBoundingBox(
-           List<SceneObjectGroup> objects, 
+           List<SceneObjectGroup> objects,
            out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ)
         {
             minX = float.MaxValue;
@@ -5738,7 +6387,7 @@ Environment.Exit(1);
                 Vector3 vec = g.AbsolutePosition;
 
                 g.GetAxisAlignedBoundingBoxRaw(out ominX, out omaxX, out ominY, out omaxY, out ominZ, out omaxZ);
-               
+
 //                m_log.DebugFormat(
 //                    "[SCENE]: For {0} found AxisAlignedBoundingBoxRaw {1}, {2}", 
 //                    g.Name, new Vector3(ominX, ominY, ominZ), new Vector3(omaxX, omaxY, omaxZ));
@@ -5845,7 +6494,7 @@ Environment.Exit(1);
             // so that all simulators can retrieve it
             string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo));
             if (error != string.Empty)
-                throw new Exception(error);
+            throw new Exception(error);
         }
 
         /// <summary>
@@ -5864,9 +6513,13 @@ Environment.Exit(1);
         /// <param name='position'></param>
         /// <param name='reason'></param>
         /// <returns></returns>
+<<<<<<< HEAD
+        public bool QueryAccess(UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, List<UUID> features, out string reason)
+=======
         public bool QueryAccess(UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, out string reason)
+>>>>>>> avn/ubitvar
         {
-            reason = "You are banned from the region";
+            reason = string.Empty;
 
             if (Permissions.IsGod(agentID))
             {
@@ -5874,9 +6527,14 @@ Environment.Exit(1);
                 return true;
             }
 
+<<<<<<< HEAD
+            if (!AllowAvatarCrossing && !viaTeleport)
+                return false;
+=======
 
 //            if (!AllowAvatarCrossing && !viaTeleport)
 //                return false;
+>>>>>>> avn/ubitvar
 
             // FIXME: Root agent count is currently known to be inaccurate.  This forces a recount before we check.
             // However, the long term fix is to make sure root agent count is always accurate.
@@ -5929,11 +6587,12 @@ Environment.Exit(1);
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[SCENE]: Exception authorizing agent: {0} "+ e.StackTrace, e.Message);
+                m_log.DebugFormat("[SCENE]: Exception authorizing agent: {0} " + e.StackTrace, e.Message);
+                reason = "Error authorizing agent: " + e.Message;
                 return false;
             }
 
-            if (position == Vector3.Zero) // Teleport
+            if (viaTeleport)
             {
                 if (!RegionInfo.EstateSettings.AllowDirectTeleport)
                 {
@@ -5956,7 +6615,7 @@ Environment.Exit(1);
 
                         if (banned)
                         {
-                            if(Permissions.IsAdministrator(agentID) == false || Permissions.IsGridGod(agentID) == false)
+                            if (Permissions.IsAdministrator(agentID) == false || Permissions.IsGridGod(agentID) == false)
                             {
                                 reason = "No suitable landing point found";
                                 return false;
@@ -5973,6 +6632,7 @@ Environment.Exit(1);
                 if (!TestLandRestrictions(agentID, out reason, ref posX, ref posY))
                 {
                     // m_log.DebugFormat("[SCENE]: Denying {0} because they are banned on all parcels", agentID);
+                    reason = "You are banned from the region on all parcels";
                     return false;
                 }
             }
@@ -5980,13 +6640,22 @@ Environment.Exit(1);
             {
                 ILandObject land = LandChannel.GetLandObject(position.X, position.Y);
                 if (land == null)
+                {
+                    reason = "No parcel found";
                     return false;
+                }
 
                 bool banned = land.IsBannedFromLand(agentID);
                 bool restricted = land.IsRestrictedFromLand(agentID);
 
                 if (banned || restricted)
+                {
+                    if (banned)
+                        reason = "You are banned from the parcel";
+                    else
+                        reason = "The parcel is restricted";
                     return false;
+                }
             }
 
             reason = String.Empty;
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 9648030..c4671f0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -1,598 +1,1237 @@
-/*

- * 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;

-using System.Threading;

-using OpenMetaverse;

-using log4net;

-using Nini.Config;

-using OpenSim.Framework;

-using OpenSim.Framework.Console;

-

-using OpenSim.Region.Framework.Interfaces;

-using GridRegion = OpenSim.Services.Interfaces.GridRegion;

-

-namespace OpenSim.Region.Framework.Scenes

-{

-    public abstract class SceneBase : IScene

-    {

-        protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-        protected static readonly string LogHeader = "[SCENE]";

-

-        #region Events

-

-        public event restart OnRestart;

-

-        #endregion

-

-        #region Fields

-

-        public string Name { get { return RegionInfo.RegionName; } }

-        

-        public IConfigSource Config

-        {

-            get { return GetConfig(); }

-        }

-

-        protected virtual IConfigSource GetConfig()

-        {

-            return null;

-        }

-

-        /// <value>

-        /// All the region modules attached to this scene.

-        /// </value>

-        public Dictionary<string, IRegionModuleBase> RegionModules

-        {

-            get { return m_regionModules; }

-        }

-        private Dictionary<string, IRegionModuleBase> m_regionModules = new Dictionary<string, IRegionModuleBase>();

-

-        /// <value>

-        /// The module interfaces available from this scene.

-        /// </value>

-        protected Dictionary<Type, List<object>> ModuleInterfaces = new Dictionary<Type, List<object>>();

-

-        protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>();

-

-        /// <value>

-        /// The module commanders available from this scene

-        /// </value>

-        protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>();

-        

-        /// <value>

-        /// Registered classes that are capable of creating entities.

-        /// </value>

-        protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>();

-

-        /// <summary>

-        /// The last allocated local prim id.  When a new local id is requested, the next number in the sequence is

-        /// dispensed.

-        /// </summary>

-        protected uint m_lastAllocatedLocalId = 720000;

-

-        private readonly Mutex _primAllocateMutex = new Mutex(false);

-        

-        protected readonly ClientManager m_clientManager = new ClientManager();

-

-        public bool LoginsEnabled

-        {

-            get

-            {

-                return m_loginsEnabled;

-            }

-

-            set

-            {

-                if (m_loginsEnabled != value)

-                {

-                    m_loginsEnabled = value;

-                    EventManager.TriggerRegionLoginsStatusChange(this);

-                }

-            }

-        }

-        private bool m_loginsEnabled;

-

-        public bool Ready

-        {

-            get

-            {

-                return m_ready;

-            }

-

-            set

-            {

-                if (m_ready != value)

-                {

-                    m_ready = value;

-                    EventManager.TriggerRegionReadyStatusChange(this);

-                }

-            }

-        }

-        private bool m_ready;

-

-        public float TimeDilation

-        {

-            get { return 1.0f; }

-        }

-

-        protected ulong m_regionHandle;

-        protected string m_regionName;

-

-        public ITerrainChannel Heightmap;

-

-        /// <value>

-        /// Allows retrieval of land information for this scene.

-        /// </value>

-        public ILandChannel LandChannel;

-

-        /// <value>

-        /// Manage events that occur in this scene (avatar movement, script rez, etc.).  Commonly used by region modules

-        /// to subscribe to scene events.

-        /// </value>

-        public EventManager EventManager

-        {

-            get { return m_eventManager; }

-        }

-        protected EventManager m_eventManager;

-

-        protected ScenePermissions m_permissions;

-        public ScenePermissions Permissions

-        {

-            get { return m_permissions; }

-        }

-

-        protected string m_datastore;

-

-         /* Used by the loadbalancer plugin on GForge */

-        protected RegionStatus m_regStatus;

-        public RegionStatus RegionStatus

-        {

-            get { return m_regStatus; }

-            set { m_regStatus = value; }

-        }

-

-        #endregion

-

-        public SceneBase(RegionInfo regInfo)

-        {

-            RegionInfo = regInfo;

-        }

-

-        #region Update Methods

-

-        /// <summary>

-        /// Called to update the scene loop by a number of frames and until shutdown.

-        /// </summary>

-        /// <param name="frames">

-        /// Number of frames to update.  Exits on shutdown even if there are frames remaining.

-        /// If -1 then updates until shutdown.

-        /// </param>

-        public abstract void Update(int frames);

-

-        #endregion

-

-        #region Terrain Methods

-

-        /// <summary>

-        /// Loads the World heightmap

-        /// </summary>

-        public abstract void LoadWorldMap();

-

-        /// <summary>

-        /// Send the region heightmap to the client

-        /// </summary>

-        /// <param name="RemoteClient">Client to send to</param>

-        public virtual void SendLayerData(IClientAPI RemoteClient)

-        {

-//            RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised());

-            ITerrainModule terrModule = RequestModuleInterface<ITerrainModule>();

-            if (terrModule != null)

-            {

-                terrModule.PushTerrain(RemoteClient);

-            }

-        }

-

-        #endregion

-

-        #region Add/Remove Agent/Avatar

-

-        public abstract ISceneAgent AddNewAgent(IClientAPI client, PresenceType type);

-

-        public abstract bool CloseAgent(UUID agentID, bool force);

-

-        public bool TryGetScenePresence(UUID agentID, out object scenePresence)

-        {

-            scenePresence = null;

-            ScenePresence sp = null;

-            if (TryGetScenePresence(agentID, out sp))

-            {

-                scenePresence = sp;

-                return true;

-            }

-

-            return false;

-        }

-

-        /// <summary>

-        /// Try to get a scene presence from the scene

-        /// </summary>

-        /// <param name="agentID"></param>

-        /// <param name="scenePresence">null if there is no scene presence with the given agent id</param>

-        /// <returns>true if there was a scene presence with the given id, false otherwise.</returns>

-        public abstract bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence);

-

-        #endregion

-

-        /// <summary>

-        ///

-        /// </summary>

-        /// <returns></returns>

-        public virtual RegionInfo RegionInfo { get; private set; }

-

-        #region admin stuff

-        

-        public abstract void OtherRegionUp(GridRegion otherRegion);

-

-        public virtual string GetSimulatorVersion()

-        {

-            return "OpenSimulator Server";

-        }

-

-        #endregion

-

-        #region Shutdown

-

-        /// <summary>

-        /// Tidy before shutdown

-        /// </summary>

-        public virtual void Close()

-        {

-            try

-            {

-                EventManager.TriggerShutdown();

-            }

-            catch (Exception e)

-            {

-                m_log.Error(string.Format("[SCENE]: SceneBase.cs: Close() - Failed with exception ", e));

-            }

-        }

-

-        #endregion

-

-        /// <summary>

-        /// Returns a new unallocated local ID

-        /// </summary>

-        /// <returns>A brand new local ID</returns>

-        public uint AllocateLocalId()

-        {

-            uint myID;

-

-            _primAllocateMutex.WaitOne();

-            myID = ++m_lastAllocatedLocalId;

-            _primAllocateMutex.ReleaseMutex();

-

-            return myID;

-        }

-

-        public uint AllocatePresenceLocalId()

-        {

-            uint myID;

-

-            _primAllocateMutex.WaitOne();

-            myID = ++m_lastAllocatedLocalId;

-            ++m_lastAllocatedLocalId;

-            _primAllocateMutex.ReleaseMutex();

-

-            return myID;

-        }

-        

-        #region Module Methods

-

-        /// <summary>

-        /// Add a region-module to this scene. TODO: This will replace AddModule in the future.

-        /// </summary>

-        /// <param name="name"></param>

-        /// <param name="module"></param>

-        public void AddRegionModule(string name, IRegionModuleBase module)

-        {

-            if (!RegionModules.ContainsKey(name))

-            {

-                RegionModules.Add(name, module);

-            }

-        }

-

-        public void RemoveRegionModule(string name)

-        {

-            RegionModules.Remove(name);

-        }

-

-        /// <summary>

-        /// Register a module commander.

-        /// </summary>

-        /// <param name="commander"></param>

-        public void RegisterModuleCommander(ICommander commander)

-        {

-            lock (m_moduleCommanders)

-            {

-                m_moduleCommanders.Add(commander.Name, commander);

-            }

-        }

-

-        /// <summary>

-        /// Unregister a module commander and all its commands

-        /// </summary>

-        /// <param name="name"></param>

-        public void UnregisterModuleCommander(string name)

-        {

-            lock (m_moduleCommanders)

-            {

-                ICommander commander;

-                if (m_moduleCommanders.TryGetValue(name, out commander))

-                    m_moduleCommanders.Remove(name);

-            }

-        }

-

-        /// <summary>

-        /// Get a module commander

-        /// </summary>

-        /// <param name="name"></param>

-        /// <returns>The module commander, null if no module commander with that name was found</returns>

-        public ICommander GetCommander(string name)

-        {

-            lock (m_moduleCommanders)

-            {

-                if (m_moduleCommanders.ContainsKey(name))

-                    return m_moduleCommanders[name];

-            }

-            

-            return null;

-        }

-

-        public Dictionary<string, ICommander> GetCommanders()

-        {

-            return m_moduleCommanders;

-        }

-

-        /// <summary>

-        /// Register an interface to a region module.  This allows module methods to be called directly as

-        /// well as via events.  If there is already a module registered for this interface, it is not replaced

-        /// (is this the best behaviour?)

-        /// </summary>

-        /// <param name="mod"></param>

-        public void RegisterModuleInterface<M>(M mod)

-        {

-//            m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M));

-            

-            List<Object> l = null;

-            if (!ModuleInterfaces.TryGetValue(typeof(M), out l))

-            {

-                l = new List<Object>();

-                ModuleInterfaces.Add(typeof(M), l);

-            }

-

-            if (l.Count > 0)

-                return;

-

-            l.Add(mod);

-

-            if (mod is IEntityCreator)

-            {

-                IEntityCreator entityCreator = (IEntityCreator)mod;

-                foreach (PCode pcode in entityCreator.CreationCapabilities)

-                {

-                    m_entityCreators[pcode] = entityCreator;

-                }

-            }

-        }

-

-        public void UnregisterModuleInterface<M>(M mod)

-        {

-            List<Object> l;

-            if (ModuleInterfaces.TryGetValue(typeof(M), out l))

-            {

-                if (l.Remove(mod))

-                {

-                    if (mod is IEntityCreator)

-                    {

-                        IEntityCreator entityCreator = (IEntityCreator)mod;

-                        foreach (PCode pcode in entityCreator.CreationCapabilities)

-                        {

-                            m_entityCreators[pcode] = null;

-                        }

-                    }

-                }

-            }

-        }

-

-        public void StackModuleInterface<M>(M mod)

-        {

-            List<Object> l;

-            if (ModuleInterfaces.ContainsKey(typeof(M)))

-                l = ModuleInterfaces[typeof(M)];

-            else

-                l = new List<Object>();

-

-            if (l.Contains(mod))

-                return;

-

-            l.Add(mod);

-

-            if (mod is IEntityCreator)

-            {

-                IEntityCreator entityCreator = (IEntityCreator)mod;

-                foreach (PCode pcode in entityCreator.CreationCapabilities)

-                {

-                    m_entityCreators[pcode] = entityCreator;

-                }

-            }

-

-            ModuleInterfaces[typeof(M)] = l;

-        }

-

-        /// <summary>

-        /// For the given interface, retrieve the region module which implements it.

-        /// </summary>

-        /// <returns>null if there is no registered module implementing that interface</returns>

-        public T RequestModuleInterface<T>()

-        {

-            if (ModuleInterfaces.ContainsKey(typeof(T)) &&

-                    (ModuleInterfaces[typeof(T)].Count > 0))

-                return (T)ModuleInterfaces[typeof(T)][0];

-            else

-                return default(T);

-        }

-

-        /// <summary>

-        /// For the given interface, retrieve an array of region modules that implement it.

-        /// </summary>

-        /// <returns>an empty array if there are no registered modules implementing that interface</returns>

-        public T[] RequestModuleInterfaces<T>()

-        {

-            if (ModuleInterfaces.ContainsKey(typeof(T)))

-            {

-                List<T> ret = new List<T>();

-

-                foreach (Object o in ModuleInterfaces[typeof(T)])

-                    ret.Add((T)o);

-                return ret.ToArray();

-            }

-            else

-            {

-                return new T[] {};

-            }

-        }

-        

-        #endregion

-        

-        /// <summary>

-        /// Call this from a region module to add a command to the OpenSim console.

-        /// </summary>

-        /// <param name="mod"></param>

-        /// <param name="command"></param>

-        /// <param name="shorthelp"></param>

-        /// <param name="longhelp"></param>

-        /// <param name="callback"></param>

-        public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)

-        {

-            AddCommand(module, command, shorthelp, longhelp, string.Empty, callback);

-        }

-

-        /// <summary>

-        /// Call this from a region module to add a command to the OpenSim console.

-        /// </summary>

-        /// <param name="mod">

-        /// The use of IRegionModuleBase is a cheap trick to get a different method signature,

-        /// though all new modules should be using interfaces descended from IRegionModuleBase anyway.

-        /// </param>

-        /// <param name="category">

-        /// Category of the command.  This is the section under which it will appear when the user asks for help

-        /// </param>

-        /// <param name="command"></param>

-        /// <param name="shorthelp"></param>

-        /// <param name="longhelp"></param>

-        /// <param name="callback"></param>

-        public void AddCommand(

-            string category, IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)

-        {

-            AddCommand(category, module, command, shorthelp, longhelp, string.Empty, callback);

-        }

-

-        /// <summary>

-        /// Call this from a region module to add a command to the OpenSim console.

-        /// </summary>

-        /// <param name="mod"></param>

-        /// <param name="command"></param>

-        /// <param name="shorthelp"></param>

-        /// <param name="longhelp"></param>

-        /// <param name="descriptivehelp"></param>

-        /// <param name="callback"></param>

-        public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)

-        {

-            string moduleName = "";

-

-            if (module != null)

-                moduleName = module.Name;

-

-            AddCommand(moduleName, module, command, shorthelp, longhelp, descriptivehelp, callback);

-        }

-

-        /// <summary>

-        /// Call this from a region module to add a command to the OpenSim console.

-        /// </summary>

-        /// <param name="category">

-        /// Category of the command.  This is the section under which it will appear when the user asks for help

-        /// </param>

-        /// <param name="mod"></param>

-        /// <param name="command"></param>

-        /// <param name="shorthelp"></param>

-        /// <param name="longhelp"></param>

-        /// <param name="descriptivehelp"></param>

-        /// <param name="callback"></param>

-        public void AddCommand(

-            string category, IRegionModuleBase module, string command,

-            string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)

-        {

-            if (MainConsole.Instance == null)

-                return;

-

-            bool shared = false;

-

-            if (module != null)

-                shared = module is ISharedRegionModule;

-

-            MainConsole.Instance.Commands.AddCommand(

-                category, shared, command, shorthelp, longhelp, descriptivehelp, callback);

-        }

-

-        public virtual ISceneObject DeserializeObject(string representation)

-        {

-            return null;

-        }

-

-        public virtual bool AllowScriptCrossings

-        {

-            get { return false; }

-        }

-

-        public virtual void Start()

-        {

-        }

-

-        public void Restart()

-        {

-            // This has to be here to fire the event

-            restart handlerPhysicsCrash = OnRestart;

-            if (handlerPhysicsCrash != null)

-                handlerPhysicsCrash(RegionInfo);

-        }

-

-        public abstract bool CheckClient(UUID agentID, System.Net.IPEndPoint ep);

-    }

-}

+<<<<<<< HEAD
+/*
+ * 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;
+using System.Threading;
+using OpenMetaverse;
+using log4net;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+
+using OpenSim.Region.Framework.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+    public abstract class SceneBase : IScene
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+#pragma warning disable 414
+        private static readonly string LogHeader = "[SCENE]";
+#pragma warning restore 414
+
+        #region Events
+
+        public event restart OnRestart;
+
+        #endregion
+
+        #region Fields
+
+        public string Name { get { return RegionInfo.RegionName; } }
+        
+        public IConfigSource Config
+        {
+            get { return GetConfig(); }
+        }
+
+        protected virtual IConfigSource GetConfig()
+        {
+            return null;
+        }
+
+        /// <value>
+        /// All the region modules attached to this scene.
+        /// </value>
+        public Dictionary<string, IRegionModuleBase> RegionModules
+        {
+            get { return m_regionModules; }
+        }
+        private Dictionary<string, IRegionModuleBase> m_regionModules = new Dictionary<string, IRegionModuleBase>();
+
+        /// <value>
+        /// The module interfaces available from this scene.
+        /// </value>
+        protected Dictionary<Type, List<object>> ModuleInterfaces = new Dictionary<Type, List<object>>();
+
+        /// <summary>
+        /// These two objects hold the information about any formats used
+        /// by modules that hold agent specific data.
+        /// </summary>
+        protected List<UUID> FormatsOffered = new List<UUID>();
+        protected Dictionary<object, List<UUID>> FormatsWanted = new Dictionary<object, List<UUID>>();
+
+        protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>();
+
+        /// <value>
+        /// The module commanders available from this scene
+        /// </value>
+        protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>();
+        
+        /// <value>
+        /// Registered classes that are capable of creating entities.
+        /// </value>
+        protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>();
+
+        /// <summary>
+        /// The last allocated local prim id.  When a new local id is requested, the next number in the sequence is
+        /// dispensed.
+        /// </summary>
+        protected uint m_lastAllocatedLocalId = 720000;
+
+        private readonly Mutex _primAllocateMutex = new Mutex(false);
+        
+        protected readonly ClientManager m_clientManager = new ClientManager();
+
+        public bool LoginsEnabled
+        {
+            get
+            {
+                return m_loginsEnabled;
+            }
+
+            set
+            {
+                if (m_loginsEnabled != value)
+                {
+                    m_loginsEnabled = value;
+                    EventManager.TriggerRegionLoginsStatusChange(this);
+                }
+            }
+        }
+        private bool m_loginsEnabled;
+
+        public bool Ready
+        {
+            get
+            {
+                return m_ready;
+            }
+
+            set
+            {
+                if (m_ready != value)
+                {
+                    m_ready = value;
+                    EventManager.TriggerRegionReadyStatusChange(this);
+                }
+            }
+        }
+        private bool m_ready;
+
+        public float TimeDilation
+        {
+            get { return 1.0f; }
+        }
+
+        public ITerrainChannel Heightmap;
+
+        /// <value>
+        /// Allows retrieval of land information for this scene.
+        /// </value>
+        public ILandChannel LandChannel;
+
+        /// <value>
+        /// Manage events that occur in this scene (avatar movement, script rez, etc.).  Commonly used by region modules
+        /// to subscribe to scene events.
+        /// </value>
+        public EventManager EventManager
+        {
+            get { return m_eventManager; }
+        }
+        protected EventManager m_eventManager;
+
+        protected ScenePermissions m_permissions;
+        public ScenePermissions Permissions
+        {
+            get { return m_permissions; }
+        }
+
+         /* Used by the loadbalancer plugin on GForge */
+        protected RegionStatus m_regStatus;
+        public RegionStatus RegionStatus
+        {
+            get { return m_regStatus; }
+            set { m_regStatus = value; }
+        }
+
+        #endregion
+
+        public SceneBase(RegionInfo regInfo)
+        {
+            RegionInfo = regInfo;
+        }
+
+        #region Update Methods
+
+        /// <summary>
+        /// Called to update the scene loop by a number of frames and until shutdown.
+        /// </summary>
+        /// <param name="frames">
+        /// Number of frames to update.  Exits on shutdown even if there are frames remaining.
+        /// If -1 then updates until shutdown.
+        /// </param>
+        /// <returns>true if update completed within minimum frame time, false otherwise.</returns>
+        public abstract bool Update(int frames);
+
+        #endregion
+
+        #region Terrain Methods
+
+        /// <summary>
+        /// Loads the World heightmap
+        /// </summary>
+        public abstract void LoadWorldMap();
+
+        /// <summary>
+        /// Send the region heightmap to the client
+        /// </summary>
+        /// <param name="RemoteClient">Client to send to</param>
+        public virtual void SendLayerData(IClientAPI RemoteClient)
+        {
+            // RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised());
+            ITerrainModule terrModule = RequestModuleInterface<ITerrainModule>();
+            if (terrModule != null)
+            {
+                terrModule.PushTerrain(RemoteClient);
+            }
+        }
+
+        #endregion
+
+        #region Add/Remove Agent/Avatar
+
+        public abstract ISceneAgent AddNewAgent(IClientAPI client, PresenceType type);
+
+        public abstract bool CloseAgent(UUID agentID, bool force);
+
+        public bool TryGetScenePresence(UUID agentID, out object scenePresence)
+        {
+            scenePresence = null;
+            ScenePresence sp = null;
+            if (TryGetScenePresence(agentID, out sp))
+            {
+                scenePresence = sp;
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Try to get a scene presence from the scene
+        /// </summary>
+        /// <param name="agentID"></param>
+        /// <param name="scenePresence">null if there is no scene presence with the given agent id</param>
+        /// <returns>true if there was a scene presence with the given id, false otherwise.</returns>
+        public abstract bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence);
+
+        #endregion
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        public virtual RegionInfo RegionInfo { get; private set; }
+
+        #region admin stuff
+        
+        public abstract void OtherRegionUp(GridRegion otherRegion);
+
+        public virtual string GetSimulatorVersion()
+        {
+            return "OpenSimulator Server";
+        }
+
+        #endregion
+
+        #region Shutdown
+
+        /// <summary>
+        /// Tidy before shutdown
+        /// </summary>
+        public virtual void Close()
+        {
+            try
+            {
+                EventManager.TriggerShutdown();
+            }
+            catch (Exception e)
+            {
+                m_log.Error(string.Format("[SCENE]: SceneBase.cs: Close() - Failed with exception ", e));
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Returns a new unallocated local ID
+        /// </summary>
+        /// <returns>A brand new local ID</returns>
+        public uint AllocateLocalId()
+        {
+            uint myID;
+
+            _primAllocateMutex.WaitOne();
+            myID = ++m_lastAllocatedLocalId;
+            _primAllocateMutex.ReleaseMutex();
+
+            return myID;
+        }
+        
+        #region Module Methods
+
+        /// <summary>
+        /// Add a region-module to this scene. TODO: This will replace AddModule in the future.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="module"></param>
+        public void AddRegionModule(string name, IRegionModuleBase module)
+        {
+            if (!RegionModules.ContainsKey(name))
+            {
+                RegionModules.Add(name, module);
+            }
+        }
+
+        public void RemoveRegionModule(string name)
+        {
+            RegionModules.Remove(name);
+        }
+
+        /// <summary>
+        /// Register a module commander.
+        /// </summary>
+        /// <param name="commander"></param>
+        public void RegisterModuleCommander(ICommander commander)
+        {
+            lock (m_moduleCommanders)
+            {
+                m_moduleCommanders.Add(commander.Name, commander);
+            }
+        }
+
+        /// <summary>
+        /// Unregister a module commander and all its commands
+        /// </summary>
+        /// <param name="name"></param>
+        public void UnregisterModuleCommander(string name)
+        {
+            lock (m_moduleCommanders)
+            {
+                ICommander commander;
+                if (m_moduleCommanders.TryGetValue(name, out commander))
+                    m_moduleCommanders.Remove(name);
+            }
+        }
+
+        /// <summary>
+        /// Get a module commander
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns>The module commander, null if no module commander with that name was found</returns>
+        public ICommander GetCommander(string name)
+        {
+            lock (m_moduleCommanders)
+            {
+                if (m_moduleCommanders.ContainsKey(name))
+                    return m_moduleCommanders[name];
+            }
+            
+            return null;
+        }
+
+        public Dictionary<string, ICommander> GetCommanders()
+        {
+            return m_moduleCommanders;
+        }
+
+        public List<UUID> GetFormatsOffered()
+        {
+            List<UUID> ret = new List<UUID>(FormatsOffered);
+
+            return ret;
+        }
+
+        protected void CheckAndAddAgentDataFormats(object mod)
+        {
+            if (!(mod is IAgentStatefulModule))
+                return;
+
+            IAgentStatefulModule m = (IAgentStatefulModule)mod;
+
+            List<UUID> renderFormats = m.GetRenderStateFormats();
+            List<UUID> acceptFormats = m.GetAcceptStateFormats();
+
+            foreach (UUID render in renderFormats)
+            {
+                if (!(FormatsOffered.Contains(render)))
+                    FormatsOffered.Add(render);
+            }
+
+            if (acceptFormats.Count == 0)
+                return;
+
+            if (FormatsWanted.ContainsKey(mod))
+                return;
+
+            FormatsWanted[mod] = acceptFormats;
+        }
+
+        /// <summary>
+        /// Register an interface to a region module.  This allows module methods to be called directly as
+        /// well as via events.  If there is already a module registered for this interface, it is not replaced
+        /// (is this the best behaviour?)
+        /// </summary>
+        /// <param name="mod"></param>
+        public void RegisterModuleInterface<M>(M mod)
+        {
+//            m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M));
+            
+            List<Object> l = null;
+            if (!ModuleInterfaces.TryGetValue(typeof(M), out l))
+            {
+                l = new List<Object>();
+                ModuleInterfaces.Add(typeof(M), l);
+            }
+
+            if (l.Count > 0)
+                return;
+
+            l.Add(mod);
+
+            CheckAndAddAgentDataFormats(mod);
+
+            if (mod is IEntityCreator)
+            {
+                IEntityCreator entityCreator = (IEntityCreator)mod;
+                foreach (PCode pcode in entityCreator.CreationCapabilities)
+                {
+                    m_entityCreators[pcode] = entityCreator;
+                }
+            }
+        }
+
+        public void UnregisterModuleInterface<M>(M mod)
+        {
+            // We can't unregister agent stateful modules because
+            // that would require much more data to be held about formats
+            // and would make that code slower and less efficient.
+            // No known modules are unregistered anyway, ever, unless
+            // the simulator shuts down anyway.
+            if (mod is IAgentStatefulModule)
+                return;
+
+            List<Object> l;
+            if (ModuleInterfaces.TryGetValue(typeof(M), out l))
+            {
+                if (l.Remove(mod))
+                {
+                    if (mod is IEntityCreator)
+                    {
+                        IEntityCreator entityCreator = (IEntityCreator)mod;
+                        foreach (PCode pcode in entityCreator.CreationCapabilities)
+                        {
+                            m_entityCreators[pcode] = null;
+                        }
+                    }
+                }
+            }
+        }
+
+        public void StackModuleInterface<M>(M mod)
+        {
+            List<Object> l;
+            if (ModuleInterfaces.ContainsKey(typeof(M)))
+                l = ModuleInterfaces[typeof(M)];
+            else
+                l = new List<Object>();
+
+            if (l.Contains(mod))
+                return;
+
+            l.Add(mod);
+
+            CheckAndAddAgentDataFormats(mod);
+
+            if (mod is IEntityCreator)
+            {
+                IEntityCreator entityCreator = (IEntityCreator)mod;
+                foreach (PCode pcode in entityCreator.CreationCapabilities)
+                {
+                    m_entityCreators[pcode] = entityCreator;
+                }
+            }
+
+            ModuleInterfaces[typeof(M)] = l;
+        }
+
+        /// <summary>
+        /// For the given interface, retrieve the region module which implements it.
+        /// </summary>
+        /// <returns>null if there is no registered module implementing that interface</returns>
+        public T RequestModuleInterface<T>()
+        {
+            if (ModuleInterfaces.ContainsKey(typeof(T)) &&
+                    (ModuleInterfaces[typeof(T)].Count > 0))
+                return (T)ModuleInterfaces[typeof(T)][0];
+            else
+                return default(T);
+        }
+
+        /// <summary>
+        /// For the given interface, retrieve an array of region modules that implement it.
+        /// </summary>
+        /// <returns>an empty array if there are no registered modules implementing that interface</returns>
+        public T[] RequestModuleInterfaces<T>()
+        {
+            if (ModuleInterfaces.ContainsKey(typeof(T)))
+            {
+                List<T> ret = new List<T>();
+
+                foreach (Object o in ModuleInterfaces[typeof(T)])
+                    ret.Add((T)o);
+                return ret.ToArray();
+            }
+            else
+            {
+                return new T[] {};
+            }
+        }
+        
+        #endregion
+        
+        /// <summary>
+        /// Call this from a region module to add a command to the OpenSim console.
+        /// </summary>
+        /// <param name="mod"></param>
+        /// <param name="command"></param>
+        /// <param name="shorthelp"></param>
+        /// <param name="longhelp"></param>
+        /// <param name="callback"></param>
+        public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)
+        {
+            AddCommand(module, command, shorthelp, longhelp, string.Empty, callback);
+        }
+
+        /// <summary>
+        /// Call this from a region module to add a command to the OpenSim console.
+        /// </summary>
+        /// <param name="mod">
+        /// The use of IRegionModuleBase is a cheap trick to get a different method signature,
+        /// though all new modules should be using interfaces descended from IRegionModuleBase anyway.
+        /// </param>
+        /// <param name="category">
+        /// Category of the command.  This is the section under which it will appear when the user asks for help
+        /// </param>
+        /// <param name="command"></param>
+        /// <param name="shorthelp"></param>
+        /// <param name="longhelp"></param>
+        /// <param name="callback"></param>
+        public void AddCommand(
+            string category, IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)
+        {
+            AddCommand(category, module, command, shorthelp, longhelp, string.Empty, callback);
+        }
+
+        /// <summary>
+        /// Call this from a region module to add a command to the OpenSim console.
+        /// </summary>
+        /// <param name="mod"></param>
+        /// <param name="command"></param>
+        /// <param name="shorthelp"></param>
+        /// <param name="longhelp"></param>
+        /// <param name="descriptivehelp"></param>
+        /// <param name="callback"></param>
+        public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
+        {
+            string moduleName = "";
+
+            if (module != null)
+                moduleName = module.Name;
+
+            AddCommand(moduleName, module, command, shorthelp, longhelp, descriptivehelp, callback);
+        }
+
+        /// <summary>
+        /// Call this from a region module to add a command to the OpenSim console.
+        /// </summary>
+        /// <param name="category">
+        /// Category of the command.  This is the section under which it will appear when the user asks for help
+        /// </param>
+        /// <param name="mod"></param>
+        /// <param name="command"></param>
+        /// <param name="shorthelp"></param>
+        /// <param name="longhelp"></param>
+        /// <param name="descriptivehelp"></param>
+        /// <param name="callback"></param>
+        public void AddCommand(
+            string category, IRegionModuleBase module, string command,
+            string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
+        {
+            if (MainConsole.Instance == null)
+                return;
+
+            bool shared = false;
+
+            if (module != null)
+                shared = module is ISharedRegionModule;
+
+            MainConsole.Instance.Commands.AddCommand(
+                category, shared, command, shorthelp, longhelp, descriptivehelp, callback);
+        }
+
+        public virtual ISceneObject DeserializeObject(string representation)
+        {
+            return null;
+        }
+
+        public virtual bool AllowScriptCrossings
+        {
+            get { return false; }
+        }
+
+        public virtual void Start()
+        {
+        }
+
+        public void Restart()
+        {
+            // This has to be here to fire the event
+            restart handlerPhysicsCrash = OnRestart;
+            if (handlerPhysicsCrash != null)
+                handlerPhysicsCrash(RegionInfo);
+        }
+
+        public abstract bool CheckClient(UUID agentID, System.Net.IPEndPoint ep);
+    }
+}
+=======
+/*
+ * 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;
+using System.Threading;
+using OpenMetaverse;
+using log4net;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+
+using OpenSim.Region.Framework.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+    public abstract class SceneBase : IScene
+    {
+        protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        protected static readonly string LogHeader = "[SCENE]";
+
+        #region Events
+
+        public event restart OnRestart;
+
+        #endregion
+
+        #region Fields
+
+        public string Name { get { return RegionInfo.RegionName; } }
+        
+        public IConfigSource Config
+        {
+            get { return GetConfig(); }
+        }
+
+        protected virtual IConfigSource GetConfig()
+        {
+            return null;
+        }
+
+        /// <value>
+        /// All the region modules attached to this scene.
+        /// </value>
+        public Dictionary<string, IRegionModuleBase> RegionModules
+        {
+            get { return m_regionModules; }
+        }
+        private Dictionary<string, IRegionModuleBase> m_regionModules = new Dictionary<string, IRegionModuleBase>();
+
+        /// <value>
+        /// The module interfaces available from this scene.
+        /// </value>
+        protected Dictionary<Type, List<object>> ModuleInterfaces = new Dictionary<Type, List<object>>();
+
+        protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>();
+
+        /// <value>
+        /// The module commanders available from this scene
+        /// </value>
+        protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>();
+        
+        /// <value>
+        /// Registered classes that are capable of creating entities.
+        /// </value>
+        protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>();
+
+        /// <summary>
+        /// The last allocated local prim id.  When a new local id is requested, the next number in the sequence is
+        /// dispensed.
+        /// </summary>
+        protected uint m_lastAllocatedLocalId = 720000;
+
+        private readonly Mutex _primAllocateMutex = new Mutex(false);
+        
+        protected readonly ClientManager m_clientManager = new ClientManager();
+
+        public bool LoginsEnabled
+        {
+            get
+            {
+                return m_loginsEnabled;
+            }
+
+            set
+            {
+                if (m_loginsEnabled != value)
+                {
+                    m_loginsEnabled = value;
+                    EventManager.TriggerRegionLoginsStatusChange(this);
+                }
+            }
+        }
+        private bool m_loginsEnabled;
+
+        public bool Ready
+        {
+            get
+            {
+                return m_ready;
+            }
+
+            set
+            {
+                if (m_ready != value)
+                {
+                    m_ready = value;
+                    EventManager.TriggerRegionReadyStatusChange(this);
+                }
+            }
+        }
+        private bool m_ready;
+
+        public float TimeDilation
+        {
+            get { return 1.0f; }
+        }
+
+        protected ulong m_regionHandle;
+        protected string m_regionName;
+
+        public ITerrainChannel Heightmap;
+
+        /// <value>
+        /// Allows retrieval of land information for this scene.
+        /// </value>
+        public ILandChannel LandChannel;
+
+        /// <value>
+        /// Manage events that occur in this scene (avatar movement, script rez, etc.).  Commonly used by region modules
+        /// to subscribe to scene events.
+        /// </value>
+        public EventManager EventManager
+        {
+            get { return m_eventManager; }
+        }
+        protected EventManager m_eventManager;
+
+        protected ScenePermissions m_permissions;
+        public ScenePermissions Permissions
+        {
+            get { return m_permissions; }
+        }
+
+        protected string m_datastore;
+
+         /* Used by the loadbalancer plugin on GForge */
+        protected RegionStatus m_regStatus;
+        public RegionStatus RegionStatus
+        {
+            get { return m_regStatus; }
+            set { m_regStatus = value; }
+        }
+
+        #endregion
+
+        public SceneBase(RegionInfo regInfo)
+        {
+            RegionInfo = regInfo;
+        }
+
+        #region Update Methods
+
+        /// <summary>
+        /// Called to update the scene loop by a number of frames and until shutdown.
+        /// </summary>
+        /// <param name="frames">
+        /// Number of frames to update.  Exits on shutdown even if there are frames remaining.
+        /// If -1 then updates until shutdown.
+        /// </param>
+        public abstract void Update(int frames);
+
+        #endregion
+
+        #region Terrain Methods
+
+        /// <summary>
+        /// Loads the World heightmap
+        /// </summary>
+        public abstract void LoadWorldMap();
+
+        /// <summary>
+        /// Send the region heightmap to the client
+        /// </summary>
+        /// <param name="RemoteClient">Client to send to</param>
+        public virtual void SendLayerData(IClientAPI RemoteClient)
+        {
+//            RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised());
+            ITerrainModule terrModule = RequestModuleInterface<ITerrainModule>();
+            if (terrModule != null)
+            {
+                terrModule.PushTerrain(RemoteClient);
+            }
+        }
+
+        #endregion
+
+        #region Add/Remove Agent/Avatar
+
+        public abstract ISceneAgent AddNewAgent(IClientAPI client, PresenceType type);
+
+        public abstract bool CloseAgent(UUID agentID, bool force);
+
+        public bool TryGetScenePresence(UUID agentID, out object scenePresence)
+        {
+            scenePresence = null;
+            ScenePresence sp = null;
+            if (TryGetScenePresence(agentID, out sp))
+            {
+                scenePresence = sp;
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Try to get a scene presence from the scene
+        /// </summary>
+        /// <param name="agentID"></param>
+        /// <param name="scenePresence">null if there is no scene presence with the given agent id</param>
+        /// <returns>true if there was a scene presence with the given id, false otherwise.</returns>
+        public abstract bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence);
+
+        #endregion
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        public virtual RegionInfo RegionInfo { get; private set; }
+
+        #region admin stuff
+        
+        public abstract void OtherRegionUp(GridRegion otherRegion);
+
+        public virtual string GetSimulatorVersion()
+        {
+            return "OpenSimulator Server";
+        }
+
+        #endregion
+
+        #region Shutdown
+
+        /// <summary>
+        /// Tidy before shutdown
+        /// </summary>
+        public virtual void Close()
+        {
+            try
+            {
+                EventManager.TriggerShutdown();
+            }
+            catch (Exception e)
+            {
+                m_log.Error(string.Format("[SCENE]: SceneBase.cs: Close() - Failed with exception ", e));
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Returns a new unallocated local ID
+        /// </summary>
+        /// <returns>A brand new local ID</returns>
+        public uint AllocateLocalId()
+        {
+            uint myID;
+
+            _primAllocateMutex.WaitOne();
+            myID = ++m_lastAllocatedLocalId;
+            _primAllocateMutex.ReleaseMutex();
+
+            return myID;
+        }
+
+        public uint AllocatePresenceLocalId()
+        {
+            uint myID;
+
+            _primAllocateMutex.WaitOne();
+            myID = ++m_lastAllocatedLocalId;
+            ++m_lastAllocatedLocalId;
+            _primAllocateMutex.ReleaseMutex();
+
+            return myID;
+        }
+        
+        #region Module Methods
+
+        /// <summary>
+        /// Add a region-module to this scene. TODO: This will replace AddModule in the future.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="module"></param>
+        public void AddRegionModule(string name, IRegionModuleBase module)
+        {
+            if (!RegionModules.ContainsKey(name))
+            {
+                RegionModules.Add(name, module);
+            }
+        }
+
+        public void RemoveRegionModule(string name)
+        {
+            RegionModules.Remove(name);
+        }
+
+        /// <summary>
+        /// Register a module commander.
+        /// </summary>
+        /// <param name="commander"></param>
+        public void RegisterModuleCommander(ICommander commander)
+        {
+            lock (m_moduleCommanders)
+            {
+                m_moduleCommanders.Add(commander.Name, commander);
+            }
+        }
+
+        /// <summary>
+        /// Unregister a module commander and all its commands
+        /// </summary>
+        /// <param name="name"></param>
+        public void UnregisterModuleCommander(string name)
+        {
+            lock (m_moduleCommanders)
+            {
+                ICommander commander;
+                if (m_moduleCommanders.TryGetValue(name, out commander))
+                    m_moduleCommanders.Remove(name);
+            }
+        }
+
+        /// <summary>
+        /// Get a module commander
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns>The module commander, null if no module commander with that name was found</returns>
+        public ICommander GetCommander(string name)
+        {
+            lock (m_moduleCommanders)
+            {
+                if (m_moduleCommanders.ContainsKey(name))
+                    return m_moduleCommanders[name];
+            }
+            
+            return null;
+        }
+
+        public Dictionary<string, ICommander> GetCommanders()
+        {
+            return m_moduleCommanders;
+        }
+
+        /// <summary>
+        /// Register an interface to a region module.  This allows module methods to be called directly as
+        /// well as via events.  If there is already a module registered for this interface, it is not replaced
+        /// (is this the best behaviour?)
+        /// </summary>
+        /// <param name="mod"></param>
+        public void RegisterModuleInterface<M>(M mod)
+        {
+//            m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M));
+            
+            List<Object> l = null;
+            if (!ModuleInterfaces.TryGetValue(typeof(M), out l))
+            {
+                l = new List<Object>();
+                ModuleInterfaces.Add(typeof(M), l);
+            }
+
+            if (l.Count > 0)
+                return;
+
+            l.Add(mod);
+
+            if (mod is IEntityCreator)
+            {
+                IEntityCreator entityCreator = (IEntityCreator)mod;
+                foreach (PCode pcode in entityCreator.CreationCapabilities)
+                {
+                    m_entityCreators[pcode] = entityCreator;
+                }
+            }
+        }
+
+        public void UnregisterModuleInterface<M>(M mod)
+        {
+            List<Object> l;
+            if (ModuleInterfaces.TryGetValue(typeof(M), out l))
+            {
+                if (l.Remove(mod))
+                {
+                    if (mod is IEntityCreator)
+                    {
+                        IEntityCreator entityCreator = (IEntityCreator)mod;
+                        foreach (PCode pcode in entityCreator.CreationCapabilities)
+                        {
+                            m_entityCreators[pcode] = null;
+                        }
+                    }
+                }
+            }
+        }
+
+        public void StackModuleInterface<M>(M mod)
+        {
+            List<Object> l;
+            if (ModuleInterfaces.ContainsKey(typeof(M)))
+                l = ModuleInterfaces[typeof(M)];
+            else
+                l = new List<Object>();
+
+            if (l.Contains(mod))
+                return;
+
+            l.Add(mod);
+
+            if (mod is IEntityCreator)
+            {
+                IEntityCreator entityCreator = (IEntityCreator)mod;
+                foreach (PCode pcode in entityCreator.CreationCapabilities)
+                {
+                    m_entityCreators[pcode] = entityCreator;
+                }
+            }
+
+            ModuleInterfaces[typeof(M)] = l;
+        }
+
+        /// <summary>
+        /// For the given interface, retrieve the region module which implements it.
+        /// </summary>
+        /// <returns>null if there is no registered module implementing that interface</returns>
+        public T RequestModuleInterface<T>()
+        {
+            if (ModuleInterfaces.ContainsKey(typeof(T)) &&
+                    (ModuleInterfaces[typeof(T)].Count > 0))
+                return (T)ModuleInterfaces[typeof(T)][0];
+            else
+                return default(T);
+        }
+
+        /// <summary>
+        /// For the given interface, retrieve an array of region modules that implement it.
+        /// </summary>
+        /// <returns>an empty array if there are no registered modules implementing that interface</returns>
+        public T[] RequestModuleInterfaces<T>()
+        {
+            if (ModuleInterfaces.ContainsKey(typeof(T)))
+            {
+                List<T> ret = new List<T>();
+
+                foreach (Object o in ModuleInterfaces[typeof(T)])
+                    ret.Add((T)o);
+                return ret.ToArray();
+            }
+            else
+            {
+                return new T[] {};
+            }
+        }
+        
+        #endregion
+        
+        /// <summary>
+        /// Call this from a region module to add a command to the OpenSim console.
+        /// </summary>
+        /// <param name="mod"></param>
+        /// <param name="command"></param>
+        /// <param name="shorthelp"></param>
+        /// <param name="longhelp"></param>
+        /// <param name="callback"></param>
+        public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)
+        {
+            AddCommand(module, command, shorthelp, longhelp, string.Empty, callback);
+        }
+
+        /// <summary>
+        /// Call this from a region module to add a command to the OpenSim console.
+        /// </summary>
+        /// <param name="mod">
+        /// The use of IRegionModuleBase is a cheap trick to get a different method signature,
+        /// though all new modules should be using interfaces descended from IRegionModuleBase anyway.
+        /// </param>
+        /// <param name="category">
+        /// Category of the command.  This is the section under which it will appear when the user asks for help
+        /// </param>
+        /// <param name="command"></param>
+        /// <param name="shorthelp"></param>
+        /// <param name="longhelp"></param>
+        /// <param name="callback"></param>
+        public void AddCommand(
+            string category, IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)
+        {
+            AddCommand(category, module, command, shorthelp, longhelp, string.Empty, callback);
+        }
+
+        /// <summary>
+        /// Call this from a region module to add a command to the OpenSim console.
+        /// </summary>
+        /// <param name="mod"></param>
+        /// <param name="command"></param>
+        /// <param name="shorthelp"></param>
+        /// <param name="longhelp"></param>
+        /// <param name="descriptivehelp"></param>
+        /// <param name="callback"></param>
+        public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
+        {
+            string moduleName = "";
+
+            if (module != null)
+                moduleName = module.Name;
+
+            AddCommand(moduleName, module, command, shorthelp, longhelp, descriptivehelp, callback);
+        }
+
+        /// <summary>
+        /// Call this from a region module to add a command to the OpenSim console.
+        /// </summary>
+        /// <param name="category">
+        /// Category of the command.  This is the section under which it will appear when the user asks for help
+        /// </param>
+        /// <param name="mod"></param>
+        /// <param name="command"></param>
+        /// <param name="shorthelp"></param>
+        /// <param name="longhelp"></param>
+        /// <param name="descriptivehelp"></param>
+        /// <param name="callback"></param>
+        public void AddCommand(
+            string category, IRegionModuleBase module, string command,
+            string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
+        {
+            if (MainConsole.Instance == null)
+                return;
+
+            bool shared = false;
+
+            if (module != null)
+                shared = module is ISharedRegionModule;
+
+            MainConsole.Instance.Commands.AddCommand(
+                category, shared, command, shorthelp, longhelp, descriptivehelp, callback);
+        }
+
+        public virtual ISceneObject DeserializeObject(string representation)
+        {
+            return null;
+        }
+
+        public virtual bool AllowScriptCrossings
+        {
+            get { return false; }
+        }
+
+        public virtual void Start()
+        {
+        }
+
+        public void Restart()
+        {
+            // This has to be here to fire the event
+            restart handlerPhysicsCrash = OnRestart;
+            if (handlerPhysicsCrash != null)
+                handlerPhysicsCrash(RegionInfo);
+        }
+
+        public abstract bool CheckClient(UUID agentID, System.Net.IPEndPoint ep);
+    }
+}
+>>>>>>> avn/ubitvar
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index a2625c4..df7a72a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -85,15 +85,12 @@ namespace OpenSim.Region.Framework.Scenes
             if (neighbourService != null)
                 neighbour = neighbourService.HelloNeighbour(regionhandle, region);
             else
-                m_log.DebugFormat(
-                    "[SCENE COMMUNICATION SERVICE]: No neighbour service provided for region {0} to inform neigbhours of status",
-                    m_scene.Name);
+                m_log.DebugFormat( "{0} neighbour service provided for region {0} to inform neigbhours of status", LogHeader, m_scene.Name);
 
             if (neighbour != null)
             {
-                m_log.DebugFormat(
-                    "[SCENE COMMUNICATION SERVICE]: Region {0} successfully informed neighbour {1} at {2}-{3} that it is up",
-                    m_scene.Name, neighbour.RegionName, x / Constants.RegionSize, y / Constants.RegionSize);
+                m_log.DebugFormat( "{0} Region {1} successfully informed neighbour {2} at {3}-{4} that it is up",
+                    LogHeader, m_scene.Name, neighbour.RegionName, Util.WorldToRegionLoc(x), Util.WorldToRegionLoc(y));
 
                 m_scene.EventManager.TriggerOnRegionUp(neighbour);
             }
@@ -112,12 +109,35 @@ namespace OpenSim.Region.Framework.Scenes
             List<GridRegion> neighbours
                 = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID);
 
-            m_log.DebugFormat(
-                "[SCENE COMMUNICATION SERVICE]: Informing {0} neighbours that region {1} is up",
-                neighbours.Count, m_scene.Name);
+            List<GridRegion> onlineNeighbours = new List<GridRegion>();
 
             foreach (GridRegion n in neighbours)
             {
+                OpenSim.Framework.RegionFlags? regionFlags = n.RegionFlags;
+
+//                m_log.DebugFormat(
+//                    "{0}: Region flags for {1} as seen by {2} are {3}", 
+//                    LogHeader, n.RegionName, m_scene.Name, regionFlags != null ? regionFlags.ToString() : "not present");
+
+                // Robust services before 2015-01-14 do not return the regionFlags information.  In this case, we could
+                // make a separate RegionFlags call but this would involve a network call for each neighbour.
+                if (regionFlags != null)
+                {
+                    if ((regionFlags & OpenSim.Framework.RegionFlags.RegionOnline) != 0)
+                        onlineNeighbours.Add(n);
+                }
+                else
+                {
+                    onlineNeighbours.Add(n);
+                }
+            }
+
+            m_log.DebugFormat(
+                "{0} Informing {1} neighbours that region {2} is up", 
+                LogHeader, onlineNeighbours.Count, m_scene.Name);
+
+            foreach (GridRegion n in onlineNeighbours)
+            {
                 InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
                 d.BeginInvoke(neighbourService, region, n.RegionHandle,
                               InformNeighborsThatRegionisUpCompleted,
@@ -155,6 +175,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SendChildAgentDataUpdate(AgentPosition cAgentData, ScenePresence presence)
         {
+//            m_log.DebugFormat(
+//                "[SCENE COMMUNICATION SERVICE]: Sending child agent position updates for {0} in {1}", 
+//                presence.Name, m_scene.Name);
+
             // This assumes that we know what our neighbors are.
             try
             {
@@ -230,7 +254,10 @@ namespace OpenSim.Region.Framework.Scenes
                 // We must take a copy here since handle acts like a reference when used in an iterator.
                 // This leads to race conditions if directly passed to SendCloseChildAgent with more than one neighbour region.
                 ulong handleCopy = handle;
-                Util.FireAndForget((o) => { SendCloseChildAgent(agentID, handleCopy, auth_code); });
+                Util.FireAndForget(
+                    o => SendCloseChildAgent(agentID, handleCopy, auth_code), 
+                    null, 
+                    "SceneCommunicationService.SendCloseChildAgentConnections");
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 92ce411..3f6a7f8 100644..100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -77,7 +77,9 @@ namespace OpenSim.Region.Framework.Scenes
         protected Scene m_parentScene;
         protected Dictionary<UUID, SceneObjectGroup> m_updateList = new Dictionary<UUID, SceneObjectGroup>();
         protected int m_numRootAgents = 0;
+        protected int m_numTotalPrim = 0;
         protected int m_numPrim = 0;
+        protected int m_numMesh = 0;
         protected int m_numChildAgents = 0;
         protected int m_physicalPrim = 0;
 
@@ -432,7 +434,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             SceneObjectPart[] parts = sceneObject.Parts;
 
-            // Clamp child prim sizes and add child prims to the m_numPrim count
+            // Clamp the sizes (scales) of the child prims and add the child prims to the count of all primitives
+            // (meshes and geometric primitives) in the scene; add child prims to m_numTotalPrim count
             if (m_parentScene.m_clampPrimSize)
             {
                 foreach (SceneObjectPart part in parts)
@@ -446,7 +449,19 @@ namespace OpenSim.Region.Framework.Scenes
                     part.Shape.Scale = scale;
                 }
             }
-            m_numPrim += parts.Length;
+            m_numTotalPrim += parts.Length;
+
+            // Go through all parts (geometric primitives and meshes) of this Scene Object
+            foreach (SceneObjectPart part in parts)
+            {
+                // Keep track of the total number of meshes or geometric primitives now in the scene;
+                // determine which object this is based on its primitive type: sculpted (sculpt) prim refers to
+                // a mesh and all other prims (i.e. box, sphere, etc) are geometric primitives
+                if (part.GetPrimType() == PrimType.SCULPT)
+                    m_numMesh++;
+                else
+                    m_numPrim++;
+            }
 
             sceneObject.AttachToScene(m_parentScene);
 
@@ -504,7 +519,21 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (!resultOfObjectLinked)
             {
-                m_numPrim -= grp.PrimCount;
+                // Decrement the total number of primitives (meshes and geometric primitives)
+                // that are part of the Scene Object being removed
+                m_numTotalPrim -= grp.PrimCount;
+
+                // Go through all parts (primitives and meshes) of this Scene Object
+                foreach (SceneObjectPart part in grp.Parts)
+                {
+                    // Keep track of the total number of meshes or geometric primitives left in the scene;
+                    // determine which object this is based on its primitive type: sculpted (sculpt) prim refers to
+                    // a mesh and all other prims (i.e. box, sphere, etc) are geometric primitives
+                    if (part.GetPrimType() == PrimType.SCULPT)
+                        m_numMesh--;
+                    else
+                        m_numPrim--;
+                }
 
                 if ((grp.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
                     RemovePhysicalPrim(grp.PrimCount);
@@ -786,9 +815,19 @@ namespace OpenSim.Region.Framework.Scenes
 
         public int GetTotalObjectsCount()
         {
+            return m_numTotalPrim;
+        }
+
+        public int GetTotalPrimObjectsCount()
+        {
             return m_numPrim;
         }
 
+        public int GetTotalMeshObjectsCount()
+        {
+            return m_numMesh;
+        }
+
         public int GetActiveObjectsCount()
         {
             return m_physicalPrim;
@@ -871,7 +910,8 @@ namespace OpenSim.Region.Framework.Scenes
             List<ScenePresence> presences = GetScenePresences();
             foreach (ScenePresence presence in presences)
             {
-                if (presence.Firstname == firstName && presence.Lastname == lastName)
+                if (string.Equals(presence.Firstname, firstName, StringComparison.CurrentCultureIgnoreCase)
+                    && string.Equals(presence.Lastname, lastName, StringComparison.CurrentCultureIgnoreCase))
                     return presence;
             }
             return null;
@@ -1491,12 +1531,23 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Update the position of the given group.
         /// </summary>
-        /// <param name="localID"></param>
+        /// <param name="localId"></param>
         /// <param name="pos"></param>
         /// <param name="remoteClient"></param>
-        public void UpdatePrimGroupPosition(uint localID, Vector3 pos, IClientAPI remoteClient)
+        public void UpdatePrimGroupPosition(uint localId, Vector3 pos, IClientAPI remoteClient)
         {
-            SceneObjectGroup group = GetGroupByPrim(localID);
+            UpdatePrimGroupPosition(localId, pos, remoteClient.AgentId);
+        }
+
+        /// <summary>
+        /// Update the position of the given group.
+        /// </summary>
+        /// <param name="localId"></param>
+        /// <param name="pos"></param>
+        /// <param name="updatingAgentId"></param>
+        public void UpdatePrimGroupPosition(uint localId, Vector3 pos, UUID updatingAgentId)
+        {
+            SceneObjectGroup group = GetGroupByPrim(localId);
             
             if (group != null)
             {
@@ -1512,7 +1563,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) 
+                    if (m_parentScene.Permissions.CanMoveObject(group.UUID, updatingAgentId) 
                         && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos))
                     {
                         group.UpdateGroupPosition(pos);
@@ -1612,8 +1663,9 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))// && PermissionsMngr.)
                 {
-                    group.GrabMovement(offset, pos, remoteClient);
+                    group.GrabMovement(objectID, offset, pos, remoteClient);
                 }
+
                 // This is outside the above permissions condition
                 // so that if the object is locked the client moving the object
                 // get's it's position on the simulator even if it was the same as before
@@ -2102,8 +2154,13 @@ namespace OpenSim.Region.Framework.Scenes
                 if (m_parentScene.Permissions.CanDuplicateObject(
                     original.PrimCount, original.UUID, AgentID, original.AbsolutePosition))
                 {
+<<<<<<< HEAD
+                    m_log.WarnFormat(
+                        "[SCENEGRAPH]: Attempt to duplicate nonexistent prim id {0} by {1}", originalPrimID, AgentID);
+=======
                     SceneObjectGroup copy = original.Copy(true);
                     copy.AbsolutePosition = copy.AbsolutePosition + offset;
+>>>>>>> avn/ubitvar
 
                     if (original.OwnerID != AgentID)
                     {
@@ -2140,12 +2197,63 @@ namespace OpenSim.Region.Framework.Scenes
 
                     // PROBABLE END OF FIXME
 
+<<<<<<< HEAD
+                // FIXME: This section needs to be refactored so that it just calls AddSceneObject()
+                Entities.Add(copy);
+                
+                lock (SceneObjectGroupsByFullID)
+                    SceneObjectGroupsByFullID[copy.UUID] = copy;
+                
+                SceneObjectPart[] children = copy.Parts;
+                
+                lock (SceneObjectGroupsByFullPartID)
+                {
+                    SceneObjectGroupsByFullPartID[copy.UUID] = copy;
+                    foreach (SceneObjectPart part in children)
+                        SceneObjectGroupsByFullPartID[part.UUID] = copy;
+                }
+    
+                lock (SceneObjectGroupsByLocalPartID)
+                {
+                    SceneObjectGroupsByLocalPartID[copy.LocalId] = copy;
+                    foreach (SceneObjectPart part in children)
+                        SceneObjectGroupsByLocalPartID[part.LocalId] = copy;
+                }   
+                // PROBABLE END OF FIXME
+
+                // Since we copy from a source group that is in selected
+                // state, but the copy is shown deselected in the viewer,
+                // We need to clear the selection flag here, else that
+                // prim never gets persisted at all. The client doesn't
+                // think it's selected, so it will never send a deselect...
+                copy.IsSelected = false;
+
+                m_numTotalPrim += copy.Parts.Length;
+
+                // Go through all parts (primitives and meshes) of this Scene Object
+                foreach (SceneObjectPart part in copy.Parts)
+                {
+                    // Keep track of the total number of meshes or geometric primitives now in the scene;
+                    // determine which object this is based on its primitive type: sculpted (sculpt) prim refers to
+                    // a mesh and all other prims (i.e. box, sphere, etc) are geometric primitives
+                    if (part.GetPrimType() == PrimType.SCULPT)
+                        m_numMesh++;
+                    else
+                        m_numPrim++;
+                }
+
+                if (rot != Quaternion.Identity)
+                {
+                    copy.UpdateGroupRotationR(rot);
+                }
+=======
                     // Since we copy from a source group that is in selected
                     // state, but the copy is shown deselected in the viewer,
                     // We need to clear the selection flag here, else that
                     // prim never gets persisted at all. The client doesn't
                     // think it's selected, so it will never send a deselect...
                     copy.IsSelected = false;
+>>>>>>> avn/ubitvar
 
                     m_numPrim += copy.Parts.Length;
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 8c50a81..79de6c0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -266,10 +266,15 @@ namespace OpenSim.Region.Framework.Scenes
             for (int i = 0; i < parts.Length; i++)
             {
                 SceneObjectPart part = parts[i];
+<<<<<<< HEAD
+//                m_log.DebugFormat("[SCENE OBJECT GROUP INVENTORY]: Effective perms of {0} are {1}", part.Name, (OpenMetaverse.PermissionMask)part.OwnerMask);
+                ownerMask &= part.OwnerMask;
+=======
                 if (useBase)
                     ownerMask &= part.BaseMask;
                 else
                     ownerMask &= part.OwnerMask;
+>>>>>>> avn/ubitvar
                 perms &= part.Inventory.MaskEffectivePermissions();
             }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 1bb5854..a703377 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -77,6 +77,7 @@ namespace OpenSim.Region.Framework.Scenes
         touch = 8,
         touch_end = 536870912,
         touch_start = 2097152,
+        transaction_result = 33554432,
         object_rez = 4194304
     }
 
@@ -121,12 +122,17 @@ namespace OpenSim.Region.Framework.Scenes
         /// since the group's last persistent backup
         /// </summary>
         private bool m_hasGroupChanged = false;
+<<<<<<< HEAD
+        private long timeFirstChanged;
+        private long timeLastChanged;
+=======
         private long timeFirstChanged = 0;
         private long timeLastChanged = 0;
         private long m_maxPersistTime = 0;
         private long m_minPersistTime = 0;
 //        private Random m_rand;
         private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>();
+>>>>>>> avn/ubitvar
 
         /// <summary>
         /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage
@@ -190,12 +196,31 @@ namespace OpenSim.Region.Framework.Scenes
 
             get { return m_hasGroupChanged; }
         }
+
+        private bool m_groupContainsForeignPrims = false;
         
         /// <summary>
-        /// Has the group changed due to an unlink operation?  We record this in order to optimize deletion, since
-        /// an unlinked group currently has to be persisted to the database before we can perform an unlink operation.
+        /// Whether the group contains prims that came from a different group. This happens when
+        /// linking or delinking groups. The implication is that until the group is persisted,
+        /// the prims in the database still use the old SceneGroupID. That's a problem if the group
+        /// is deleted, because we delete groups by searching for prims by their SceneGroupID.
         /// </summary>
+<<<<<<< HEAD
+        public bool GroupContainsForeignPrims
+        {
+            private set
+            {
+                m_groupContainsForeignPrims = value;
+                if (m_groupContainsForeignPrims)
+                    HasGroupChanged = true;
+            }
+
+            get { return m_groupContainsForeignPrims; }
+        }
+
+=======
         public bool HasGroupChangedDueToDelink { get; set; }
+>>>>>>> avn/ubitvar
 
         private bool isTimeToPersist()
         {
@@ -325,7 +350,17 @@ namespace OpenSim.Region.Framework.Scenes
             get { return RootPart.VolumeDetectActive; }
         }
 
+<<<<<<< HEAD
+        private Vector3 lastPhysGroupPos;
+        private Quaternion lastPhysGroupRot;
+
+        /// <summary>
+        /// Is this entity set to be saved in persistent storage?
+        /// </summary>
+        public bool Backup { get; private set; }
+=======
         private bool m_isBackedUp;
+>>>>>>> avn/ubitvar
 
         public bool IsBackedUp
         {
@@ -507,7 +542,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public bool IsAttachmentCheckFull()
         {
-            return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0));
+            return (IsAttachment || (m_rootPart.Shape.PCode == (byte)PCodeEnum.Primitive && m_rootPart.Shape.State != 0));
         }
         
         private struct avtocrossInfo
@@ -535,11 +570,146 @@ namespace OpenSim.Region.Framework.Scenes
                         && !Scene.LoadingPrims
                     )
                 {
+<<<<<<< HEAD
+                    if (
+                        !Scene.PositionIsInCurrentRegion(val)
+                                && !IsAttachmentCheckFull()
+                                && (!Scene.LoadingPrims)
+                        )
+                    {
+                        IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
+                        string version = String.Empty;
+                        Vector3 newpos = Vector3.Zero;
+                        string failureReason = String.Empty;
+                        OpenSim.Services.Interfaces.GridRegion destination = null;
+
+                        if (m_rootPart.KeyframeMotion != null)
+                            m_rootPart.KeyframeMotion.StartCrossingCheck();
+
+                        bool canCross = true;
+                        foreach (ScenePresence av in GetSittingAvatars())
+                        {
+                            // We need to cross these agents. First, let's find
+                            // out if any of them can't cross for some reason.
+                            // We have to deny the crossing entirely if any
+                            // of them are banned. Alternatively, we could
+                            // unsit banned agents....
+
+
+                            // We set the avatar position as being the object
+                            // position to get the region to send to
+                            if ((destination = entityTransfer.GetDestination(m_scene, av.UUID, val, out version, out newpos, out failureReason)) == null)
+                            {
+                                canCross = false;
+                                break;
+                            }
+
+                            m_log.DebugFormat("[SCENE OBJECT]: Avatar {0} needs to be crossed to {1}", av.Name, destination.RegionName);
+                        }
+
+                        if (canCross)
+                        {
+                            // We unparent the SP quietly so that it won't
+                            // be made to stand up
+
+                            List<avtocrossInfo> avsToCross = new List<avtocrossInfo>();
+
+                            foreach (ScenePresence av in GetSittingAvatars())
+                            {
+                                avtocrossInfo avinfo = new avtocrossInfo();
+                                SceneObjectPart parentPart = m_scene.GetSceneObjectPart(av.ParentID);
+                                if (parentPart != null)
+                                    av.ParentUUID = parentPart.UUID;
+
+                                avinfo.av = av;
+                                avinfo.ParentID = av.ParentID;
+                                avsToCross.Add(avinfo);
+
+                                av.PrevSitOffset = av.OffsetPosition;
+                                av.ParentID = 0;
+                            }
+
+                            m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
+
+                            // Normalize
+                            if (val.X >= m_scene.RegionInfo.RegionSizeX)
+                                val.X -= m_scene.RegionInfo.RegionSizeX;
+                            if (val.Y >= m_scene.RegionInfo.RegionSizeY)
+                                val.Y -= m_scene.RegionInfo.RegionSizeY;
+                            if (val.X < 0)
+                                val.X += m_scene.RegionInfo.RegionSizeX;
+                            if (val.Y < 0)
+                                val.Y += m_scene.RegionInfo.RegionSizeY;
+
+                            // If it's deleted, crossing was successful
+                            if (IsDeleted)
+                            {
+                                foreach (avtocrossInfo avinfo in avsToCross)
+                                {
+                                    ScenePresence av = avinfo.av;
+                                    if (!av.IsInTransit) // just in case...
+                                    {
+                                        m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar {0} to {1}", av.Name, val);
+
+                                        av.IsInTransit = true;
+
+                                        // A temporary measure to allow regression tests to work.
+                                        // Quite possibly, all BeginInvoke() calls should be replaced by Util.FireAndForget
+                                        // or similar since BeginInvoke() always uses the system threadpool to launch
+                                        // threads rather than any replace threadpool that we might be using.
+                                        if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)
+                                        { 
+                                            entityTransfer.CrossAgentToNewRegionAsync(av, val, destination, av.Flying, version);
+                                            CrossAgentToNewRegionCompleted(av);
+                                        }
+                                        else
+                                        {
+                                            CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync;
+                                            d.BeginInvoke(
+                                                av, val, destination, av.Flying, version, 
+                                                ar => CrossAgentToNewRegionCompleted(d.EndInvoke(ar)), null);
+                                        }
+                                    }
+                                    else
+                                    {
+                                        m_log.DebugFormat("[SCENE OBJECT]: Not crossing avatar {0} to {1} because it's already in transit", av.Name, val);
+                                    }
+                                }
+
+                                return;
+                            }
+                            else // cross failed, put avas back ??
+                            {
+                                foreach (avtocrossInfo avinfo in avsToCross)
+                                {
+                                    ScenePresence av = avinfo.av;
+                                    av.ParentUUID = UUID.Zero;
+                                    av.ParentID = avinfo.ParentID;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (m_rootPart.KeyframeMotion != null)
+                                m_rootPart.KeyframeMotion.CrossingFailure();
+
+                            if (RootPart.PhysActor != null)
+                            {
+                                RootPart.PhysActor.CrossingFailure();
+                            }
+                        }
+
+                        Vector3 oldp = AbsolutePosition;
+                        val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)m_scene.RegionInfo.RegionSizeX - 0.5f);
+                        val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)m_scene.RegionInfo.RegionSizeY - 0.5f);
+                        val.Z = Util.Clamp<float>(oldp.Z, 0.5f, Constants.RegionHeight);
+=======
                     if (!inTransit)
                     {
                         inTransit = true;
                         SOGCrossDelegate d = CrossAsync;
                         d.BeginInvoke(this, val, CrossAsyncCompleted, d);
+>>>>>>> avn/ubitvar
                     }
                     return;
                 }
@@ -780,11 +950,8 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
+        private void CrossAgentToNewRegionCompleted(ScenePresence agent)
         {
-            CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
-            ScenePresence agent = icon.EndInvoke(iar);
-
             //// If the cross was successful, this agent is a child agent
             if (agent.IsChildAgent)
             {
@@ -871,7 +1038,11 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_rootPart.Text = value; }
         }
 
-        protected virtual bool InSceneBackup
+        /// <summary>
+        /// If set to true then the scene object can be backed up in principle, though this will only actually occur
+        /// if Backup is set.  If false then the scene object will never be backed up, Backup will always be false.
+        /// </summary>
+        protected virtual bool CanBeBackedUp
         {
             get { return true; }
         }
@@ -1014,6 +1185,12 @@ namespace OpenSim.Region.Framework.Scenes
         public UUID FromFolderID { get; set; }
 
         /// <summary>
+        /// If true then grabs are blocked no matter what the individual part BlockGrab setting.
+        /// </summary>
+        /// <value><c>true</c> if block grab override; otherwise, <c>false</c>.</value>
+        public bool BlockGrabOverride { get; set; }
+
+        /// <summary>
         /// IDs of all avatars sat on this scene object.
         /// </summary>
         /// <remarks>
@@ -1023,7 +1200,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// No avatar should appear more than once in this list.
         /// Do not manipulate this list directly - use the Add/Remove sitting avatar methods on SceneObjectPart.
         /// </remarks>
-        protected internal List<UUID> m_sittingAvatars = new List<UUID>();
+        protected internal List<ScenePresence> m_sittingAvatars = new List<ScenePresence>();
 
         #endregion
 
@@ -1089,23 +1266,67 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public void LoadScriptState(XmlReader reader)
+        {
+//            m_log.DebugFormat("[SCENE OBJECT GROUP]: Looking for script state for {0}", Name);
+
+            while (true)
+            {
+                if (reader.Name == "SavedScriptState" && reader.NodeType == XmlNodeType.Element)
+                {
+//                    m_log.DebugFormat("[SCENE OBJECT GROUP]: Loading script state for {0}", Name);
+
+                    if (m_savedScriptState == null)
+                        m_savedScriptState = new Dictionary<UUID, string>();
+
+                    string uuid = reader.GetAttribute("UUID");
+
+                    // Even if there is no UUID attribute for some strange reason, we must always read the inner XML
+                    // so we don't continually keep checking the same SavedScriptedState element.
+                    string innerXml = reader.ReadInnerXml();
+
+                    if (uuid != null)
+                    {
+//                        m_log.DebugFormat("[SCENE OBJECT GROUP]: Found state for item ID {0} in object {1}", uuid, Name);
+
+                        UUID itemid = new UUID(uuid);
+                        if (itemid != UUID.Zero)
+                            m_savedScriptState[itemid] = innerXml;
+                    }
+                    else
+                    {
+                        m_log.WarnFormat("[SCENE OBJECT GROUP]: SavedScriptState element had no UUID in object {0}", Name);
+                    }
+                }
+                else
+                {
+                    if (!reader.Read())
+                        break;
+                }
+            }
+        }
+
         /// <summary>
         /// Hooks this object up to the backup event so that it is persisted to the database when the update thread executes.
         /// </summary>
         public virtual void AttachToBackup()
         {
+<<<<<<< HEAD
+            if (CanBeBackedUp)
+=======
             if (IsAttachment) return;
             m_scene.SceneGraph.FireAttachToBackup(this);
 
             if (InSceneBackup)
+>>>>>>> avn/ubitvar
             {
-                //m_log.DebugFormat(
-                //    "[SCENE OBJECT GROUP]: Attaching object {0} {1} to scene presistence sweep", Name, UUID);
+//                m_log.DebugFormat(
+//                    "[SCENE OBJECT GROUP]: Attaching object {0} {1} to scene presistence sweep", Name, UUID);
 
-                if (!m_isBackedUp)
+                if (!Backup)
                     m_scene.EventManager.OnBackup += ProcessBackup;
                 
-                m_isBackedUp = true;
+                Backup = true;
             }
         }
         
@@ -1210,12 +1431,21 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public void GetAxisAlignedBoundingBoxRaw(out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ)
         {
+<<<<<<< HEAD
+            maxX = -256f;
+            maxY = -256f;
+            maxZ = -256f;
+            minX = 10000f;
+            minY = 10000f;
+            minZ = 10000f;
+=======
             maxX = float.MinValue;
             maxY = float.MinValue;
             maxZ = float.MinValue;
             minX = float.MaxValue;
             minY = float.MaxValue;
             minZ = float.MaxValue;
+>>>>>>> avn/ubitvar
 
             SceneObjectPart[] parts = m_parts.GetArray();
             foreach (SceneObjectPart part in parts)
@@ -1613,6 +1843,17 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+<<<<<<< HEAD
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="part"></param>
+        private void SetPartAsNonRoot(SceneObjectPart part)
+        {
+            part.ParentID = m_rootPart.LocalId;
+            part.ClearUndoState();
+=======
         /// <summary>
         /// Add the avatar to this linkset (avatar is sat).
         /// </summary>
@@ -1652,6 +1893,7 @@ namespace OpenSim.Region.Framework.Scenes
         public List<ScenePresence> GetLinkedAvatars()
         {
             return m_linkedAvatars;
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -1955,7 +2197,14 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (Scene != null)
                 {
+<<<<<<< HEAD
+                    if (!sp.IsChildAgent && sp.ParentID == part.LocalId)
+                        sp.StandUp();
+
+                    if (!silent)
+=======
                     Scene.ForEachRootScenePresence(delegate(ScenePresence avatar)
+>>>>>>> avn/ubitvar
                     {
                         if (avatar.ParentID == LocalId)
                             avatar.StandUp();
@@ -2097,7 +2346,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="datastore"></param>
         public virtual void ProcessBackup(ISimulationDataService datastore, bool forcedBackup)
         {
-            if (!m_isBackedUp)
+            if (!Backup)
             {
 //                m_log.DebugFormat(
 //                    "[WATER WARS]: Ignoring backup of {0} {1} since object is not marked to be backed up", Name, UUID);
@@ -2187,7 +2436,7 @@ namespace OpenSim.Region.Framework.Scenes
                         backup_group.RootPart.AngularVelocity = RootPart.AngularVelocity;
                         backup_group.RootPart.ParticleSystem = RootPart.ParticleSystem;
                         HasGroupChanged = false;
-                        HasGroupChangedDueToDelink = false;
+                        GroupContainsForeignPrims = false;
 
                         m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
 
@@ -2255,6 +2504,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public SceneObjectGroup Copy(bool userExposed)
         {
+<<<<<<< HEAD
+            // FIXME: This is dangerous since it's easy to forget to reset some references when necessary and end up 
+            // with bugs that only occur in some circumstances (e.g. crossing between regions on the same simulator
+            // but not between regions on different simulators).  Really, all copying should be done explicitly.
+            SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
+
+            dupe.Backup = false;
+            dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
+            dupe.m_sittingAvatars = new List<ScenePresence>();
+=======
             m_dupeInProgress = true;
             SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
             dupe.m_isBackedUp = false;
@@ -2266,6 +2525,7 @@ namespace OpenSim.Region.Framework.Scenes
             dupe.m_linkedAvatars = new List<ScenePresence>();
             dupe.m_sittingAvatars = new List<UUID>();
 
+>>>>>>> avn/ubitvar
             dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
             dupe.m_rootPart.LinkNum = m_rootPart.LinkNum;
             
@@ -2440,16 +2700,19 @@ namespace OpenSim.Region.Framework.Scenes
             return RootPart.Torque;
         }
 
+<<<<<<< HEAD
+        public void MoveToTarget(Vector3 target, float tau)
+=======
          // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object
         public void moveToTarget(Vector3 target, float tau)
+>>>>>>> avn/ubitvar
         {
             if (IsAttachment)
             {
                 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
+
                 if (avatar != null)
-                {
                     avatar.MoveToTarget(target, false, false);
-                }
             }
             else
             {
@@ -2464,11 +2727,26 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public void stopMoveToTarget()
+        public void StopMoveToTarget()
         {
             if (IsAttachment)
             {
                 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
+<<<<<<< HEAD
+
+                if (avatar != null)
+                    avatar.ResetMoveToTarget();
+            }
+            else
+            {
+                PhysicsActor pa = RootPart.PhysActor;
+
+                if (pa != null && pa.PIDActive)
+                {
+                    pa.PIDActive = false;
+                    
+                    ScheduleGroupForTerseUpdate();
+=======
                 if (avatar != null)
                 {
                     avatar.ResetMoveToTarget();
@@ -2508,6 +2786,7 @@ namespace OpenSim.Region.Framework.Scenes
                         rootpart.PhysActor.APIDDamping = damping;
                         rootpart.PhysActor.APIDActive = true;
                     }
+>>>>>>> avn/ubitvar
                 }
             }
         }
@@ -3055,7 +3334,9 @@ namespace OpenSim.Region.Framework.Scenes
 //            objectGroup.m_rootPart = null;
 
             // If linking prims with different permissions, fix them
-            AdjustChildPrimPermissions();
+            AdjustChildPrimPermissions(false);
+
+            GroupContainsForeignPrims = true;
 
             AttachToBackup();
 
@@ -3203,6 +3484,18 @@ namespace OpenSim.Region.Framework.Scenes
 
             linkPart.Rezzed = RootPart.Rezzed;
 
+<<<<<<< HEAD
+            // We must persist the delinked group to the database immediately, for safety. The problem
+            // is that although in memory the new group has a new SceneGroupID, in the database it
+            // still has the parent group's SceneGroupID (until the next backup). This means that if the
+            // parent group is deleted then the delinked group will also be deleted from the database.
+            // This problem will disappear if the region remains alive long enough for another backup,
+            // since at that time the delinked group's new SceneGroupID will be written to the database.
+            // But if the region crashes before that then the prims will be permanently gone, and this must
+            // not happen. (We can't use a just-in-time trick like GroupContainsForeignPrims in this case
+            // because the delinked group doesn't know when the source group is deleted.)
+            m_scene.ForceSceneObjectBackup(objectGroup);
+=======
             // When we delete a group, we currently have to force persist to the database if the object id has changed
             // (since delete works by deleting all rows which have a given object id)
 
@@ -3214,6 +3507,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_rootPart.PhysActor.Building = false;
 
             objectGroup.HasGroupChangedDueToDelink = true;
+>>>>>>> avn/ubitvar
 
             if (sendEvents)
                 linkPart.TriggerScriptChangedEvent(Changed.LINK);
@@ -3227,12 +3521,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="objectGroup"></param>
         public virtual void DetachFromBackup()
         {
+<<<<<<< HEAD
+            if (Backup && Scene != null)
+=======
             if (m_scene != null)
                 m_scene.SceneGraph.FireDetachFromBackup(this);
             if (m_isBackedUp && Scene != null)
+>>>>>>> avn/ubitvar
                 m_scene.EventManager.OnBackup -= ProcessBackup;
             
-            m_isBackedUp = false;
+            Backup = false;
         }
 
         // This links an SOP from a previous linkset into my linkset.
@@ -3295,20 +3593,26 @@ namespace OpenSim.Region.Framework.Scenes
         /// If object is physical, apply force to move it around
         /// If object is not physical, just put it at the resulting location
         /// </summary>
+        /// <param name="partID">Part ID to check for grab</param>
         /// <param name="offset">Always seems to be 0,0,0, so ignoring</param>
         /// <param name="pos">New position.  We do the math here to turn it into a force</param>
         /// <param name="remoteClient"></param>
-        public void GrabMovement(Vector3 offset, Vector3 pos, IClientAPI remoteClient)
+        public void GrabMovement(UUID partID, Vector3 offset, Vector3 pos, IClientAPI remoteClient)
         {
             if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
             {
+                SceneObjectPart part = GetPart(partID);
+
+                if (part == null)
+                    return;
+
                 PhysicsActor pa = m_rootPart.PhysActor;
 
                 if (pa != null)
                 {
                     if (pa.IsPhysical)
                     {
-                        if (!m_rootPart.BlockGrab)
+                        if (!BlockGrabOverride && !part.BlockGrab)
                         {
 /*                            Vector3 llmoveforce = pos - AbsolutePosition;
                             Vector3 grabforce = llmoveforce;
@@ -3323,20 +3627,27 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     else
                     {
-                        //NonPhysicalGrabMovement(pos);
+                        NonPhysicalGrabMovement(pos);
                     }
                 }
                 else
                 {
-                    //NonPhysicalGrabMovement(pos);
+                    NonPhysicalGrabMovement(pos);
                 }
             }
         }
 
+        /// <summary>
+        /// Apply possition for grabbing non-physical linksets (Ctrl+Drag)
+        /// This MUST be blocked for linksets that contain touch scripts because the viewer triggers grab on the touch
+        /// event (Viewer Bug?) This would allow anyone to drag a linkset with a touch script. SL behaviour is also to
+        /// block grab on prims with touch events.
+        /// </summary>
+        /// <param name="pos">New Position</param>
         public void NonPhysicalGrabMovement(Vector3 pos)
         {
-            AbsolutePosition = pos;
-            m_rootPart.SendTerseUpdateToAllClients();
+            if(!IsAttachment && ScriptCount() == 0)
+                UpdateGroupPosition(pos);
         }
 
         /// <summary>
@@ -3432,17 +3743,28 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     else
                     {
-                        //NonPhysicalSpinMovement(pos);
+                        NonPhysicalSpinMovement(newOrientation);
                     }
                 }
                 else
                 {
-                    //NonPhysicalSpinMovement(pos);
+                    NonPhysicalSpinMovement(newOrientation);
                 }
             }
         }
 
         /// <summary>
+        /// Apply rotation for spinning non-physical linksets (Ctrl+Shift+Drag)
+        /// As with dragging, scripted objects must be blocked from spinning
+        /// </summary>
+        /// <param name="newOrientation">New Rotation</param>
+        private void NonPhysicalSpinMovement(Quaternion newOrientation)
+        {
+            if(!IsAttachment && ScriptCount() == 0)
+                UpdateGroupRotationR(newOrientation);
+        }
+
+        /// <summary>
         /// Set the name of a prim
         /// </summary>
         /// <param name="name"></param>
@@ -3517,12 +3839,22 @@ namespace OpenSim.Region.Framework.Scenes
 
             SceneObjectPart selectionPart = GetPart(localID);
 
-            if (SetTemporary && Scene != null)
+            if (Scene != null)
             {
-                DetachFromBackup();
-                // Remove from database and parcel prim count
-                //
-                m_scene.DeleteFromStorage(UUID);
+                if (SetTemporary)
+                {
+                    DetachFromBackup();
+                    // Remove from database and parcel prim count
+                    //
+                    m_scene.DeleteFromStorage(UUID);
+                }
+                else if (!Backup)
+                {
+                    // Previously been temporary now switching back so make it
+                    // available for persisting again
+                    AttachToBackup();
+                }
+
                 m_scene.EventManager.TriggerParcelPrimCountTainted();
             }
 
@@ -3611,7 +3943,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public void AdjustChildPrimPermissions()
+        public void AdjustChildPrimPermissions(bool forceTaskInventoryPermissive)
         {
             uint newOwnerMask = (uint)(PermissionMask.All | PermissionMask.Export) & 0xfffffff8; // Mask folded bits
             uint foldedPerms = RootPart.OwnerMask & 3;
@@ -3621,11 +3953,18 @@ namespace OpenSim.Region.Framework.Scenes
                 newOwnerMask &= part.BaseMask;
                 if (part != RootPart)
                     part.ClonePermissions(RootPart);
+                if (forceTaskInventoryPermissive)
+                    part.Inventory.ApplyGodPermissions(part.BaseMask);
             });
 
             uint lockMask = ~(uint)(PermissionMask.Move | PermissionMask.Modify);
             uint lockBit = RootPart.OwnerMask & (uint)(PermissionMask.Move | PermissionMask.Modify);
             RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask);
+
+//            m_log.DebugFormat(
+//                "[SCENE OBJECT GROUP]: RootPart.OwnerMask now {0} for {1} in {2}", 
+//                (OpenMetaverse.PermissionMask)RootPart.OwnerMask, Name, Scene.Name);
+
             RootPart.ScheduleFullUpdate();
         }
 
@@ -3634,6 +3973,9 @@ namespace OpenSim.Region.Framework.Scenes
         {
             RootPart.UpdatePermissions(AgentID, field, localID, mask, addRemTF);
 
+<<<<<<< HEAD
+            AdjustChildPrimPermissions(Scene.Permissions.IsGod(AgentID));
+=======
             bool god = Scene.Permissions.IsGod(AgentID);
 
             if (field == 1 && god)
@@ -3645,6 +3987,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             AdjustChildPrimPermissions();
+>>>>>>> avn/ubitvar
 
             if (field == 1 && god) // Base mask was set. Update all child part inventories
             {
@@ -4694,10 +5037,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// down after it move one place down the list.
         /// </remarks>
         /// <returns>A list of the sitting avatars.  Returns an empty list if there are no sitting avatars.</returns>
-        public List<UUID> GetSittingAvatars()
+        public List<ScenePresence> GetSittingAvatars()
         {
             lock (m_sittingAvatars)
-                return new List<UUID>(m_sittingAvatars);
+                return new List<ScenePresence>(m_sittingAvatars);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8979659..1cfa8ed 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -198,7 +198,7 @@ namespace OpenSim.Region.Framework.Scenes
         
         public bool RETURN_AT_EDGE;
         
-        public bool BlockGrab;
+        public bool BlockGrab { get; set; }
 
         public bool StatusSandbox;
 
@@ -286,7 +286,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public Quaternion SpinOldOrientation = Quaternion.Identity;
 
-        protected int m_APIDIterations = 0;
+        protected bool m_APIDActive = false;
         protected Quaternion m_APIDTarget = Quaternion.Identity;
         protected float m_APIDDamp = 0;
         protected float m_APIDStrength = 0;
@@ -680,6 +680,12 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        protected bool APIDActive
+        {
+            get { return m_APIDActive; }
+            set { m_APIDActive = value; }
+        }
+
         protected Quaternion APIDTarget
         {
             get { return m_APIDTarget; }
@@ -1001,14 +1007,17 @@ namespace OpenSim.Region.Framework.Scenes
 
             set
             {
-                m_velocity = value;
+                if (Util.IsNanOrInfinity(value))
+                    m_velocity = Vector3.Zero;
+                else
+                    m_velocity = value;
 
                 PhysicsActor actor = PhysActor;
                 if (actor != null)
                 {
                     if (actor.IsPhysical)
                     {
-                        actor.Velocity = value;
+                        actor.Velocity = m_velocity;
                         ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
                     }
                 }
@@ -1037,18 +1046,39 @@ namespace OpenSim.Region.Framework.Scenes
             }
             set
             {
+<<<<<<< HEAD
+                if (Util.IsNanOrInfinity(value))
+                    m_angularVelocity = Vector3.Zero;
+                else
+                    m_angularVelocity = value;
+
+                PhysicsActor actor = PhysActor;
+                if ((actor != null) && actor.IsPhysical)
+                    actor.RotationalVelocity = m_angularVelocity;
+=======
                 m_angularVelocity = value;
                 PhysicsActor actor = PhysActor;
                 if ((actor != null) && actor.IsPhysical && ParentGroup.RootPart == this && VehicleType == (int)Vehicle.TYPE_NONE)
                 {
                     actor.RotationalVelocity = m_angularVelocity;
                 }                       
+>>>>>>> avn/ubitvar
             }
         }
 
         /// <summary></summary>
         public Vector3 Acceleration
         {
+<<<<<<< HEAD
+            get { return m_acceleration; }
+            set 
+            {
+                if (Util.IsNanOrInfinity(value))
+                    m_acceleration = Vector3.Zero;
+                else
+                    m_acceleration = value;
+            }
+=======
                         get 
                         { 
                 PhysicsActor actor = PhysActor;
@@ -1060,6 +1090,7 @@ namespace OpenSim.Region.Framework.Scenes
                         } 
             
             set { m_acceleration = value; }
+>>>>>>> avn/ubitvar
         }
 
         public string Description { get; set; }
@@ -1400,7 +1431,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <value>
         /// null if there are no sitting avatars.  This is to save us create a hashset for every prim in a scene.
         /// </value>
-        private HashSet<UUID> m_sittingAvatars;
+        private HashSet<ScenePresence> m_sittingAvatars;
 
         public virtual UUID RegionID
         {
@@ -1901,11 +1932,25 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void AddTextureAnimation(Primitive.TextureAnimation pTexAnim)
         {
+<<<<<<< HEAD
+            byte[] data;
+
+            if (pTexAnim.Flags == Primitive.TextureAnimMode.ANIM_OFF)
+            {
+                data = Utils.EmptyBytes;
+            }
+            else
+            {
+                data = new byte[16];
+                int pos = 0;
+
+=======
             if (((int)pTexAnim.Flags & 1) != 0) // ANIM_ON
             {
                 byte[] data = new byte[16];
                 int pos = 0;
 
+>>>>>>> avn/ubitvar
                 // The flags don't like conversion from uint to byte, so we have to do
                 // it the crappy way.  See the above function :(
 
@@ -1917,6 +1962,10 @@ namespace OpenSim.Region.Framework.Scenes
                 Utils.FloatToBytes(pTexAnim.Start).CopyTo(data, pos);
                 Utils.FloatToBytes(pTexAnim.Length).CopyTo(data, pos + 4);
                 Utils.FloatToBytes(pTexAnim.Rate).CopyTo(data, pos + 8);
+<<<<<<< HEAD
+            }
+=======
+>>>>>>> avn/ubitvar
 
                 m_TextureAnimation = data;
             }
@@ -2134,7 +2183,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public SceneObjectPart Copy(uint plocalID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed)
         {
+            // FIXME: This is dangerous since it's easy to forget to reset some references when necessary and end up 
+            // with bugs that only occur in some circumstances (e.g. crossing between regions on the same simulator
+            // but not between regions on different simulators).  Really, all copying should be done explicitly.
             SceneObjectPart dupe = (SceneObjectPart)MemberwiseClone();
+
             dupe.m_shape = m_shape.Copy();
             dupe.m_regionHandle = m_regionHandle;
             if (userExposed)
@@ -2187,6 +2240,8 @@ namespace OpenSim.Region.Framework.Scenes
             Array.Copy(Shape.ExtraParams, extraP, extraP.Length);
             dupe.Shape.ExtraParams = extraP;
 
+            dupe.m_sittingAvatars = new HashSet<ScenePresence>();
+
             // safeguard  actual copy is done in sog.copy
             dupe.KeyframeMotion = null;
             dupe.PayPrice = (int[])PayPrice.Clone();
@@ -2436,7 +2491,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="xmlReader"></param>
         /// <returns></returns>
-        public static SceneObjectPart FromXml(XmlTextReader xmlReader)
+        public static SceneObjectPart FromXml(XmlReader xmlReader)
         {
             SceneObjectPart part = SceneObjectSerializer.Xml2ToSOP(xmlReader);
 
@@ -2471,22 +2526,6 @@ namespace OpenSim.Region.Framework.Scenes
             ParentGroup.RootPart.RETURN_AT_EDGE = p;
         }
 
-        public bool GetBlockGrab()
-        {
-            if (ParentGroup.IsDeleted)
-                return false;
-
-            return ParentGroup.RootPart.BlockGrab;
-        }
-
-        public void SetBlockGrab(bool p)
-        {
-            if (ParentGroup.IsDeleted)
-                return;
-
-            ParentGroup.RootPart.BlockGrab = p;
-        }
-
         public void SetStatusSandbox(bool p)
         {
             if (ParentGroup.IsDeleted)
@@ -2649,7 +2688,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (tau > 0)
             {
-                ParentGroup.moveToTarget(target, tau);
+                ParentGroup.MoveToTarget(target, tau);
             }
             else
             {
@@ -2790,7 +2829,7 @@ namespace OpenSim.Region.Framework.Scenes
                     CollidingMessage = CreateColliderArgs(this, colliders);
 
                     if (CollidingMessage.Colliders.Count > 0)
-                        notify(LocalId, CollidingMessage);
+                        DoNotify(notify, LocalId, CollidingMessage);
 
                     if (PassCollisions)
                         sendToRoot = true;
@@ -2804,7 +2843,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     CollidingMessage = CreateColliderArgs(ParentGroup.RootPart, colliders);
                     if (CollidingMessage.Colliders.Count > 0)
-                        notify(ParentGroup.RootPart.LocalId, CollidingMessage);
+                        DoNotify(notify, ParentGroup.RootPart.LocalId, CollidingMessage);
                 }
             }
         }
@@ -2819,6 +2858,35 @@ namespace OpenSim.Region.Framework.Scenes
             colliding.Add(CreateDetObjectForGround());
             LandCollidingMessage.Colliders = colliding;
 
+<<<<<<< HEAD
+                DoNotify(notify, LocalId, LandCollidingMessage);
+            }
+        }
+
+        private void DoNotify(ScriptCollidingNotification notify, uint id, ColliderArgs collargs)
+        {
+            if (m_parentGroup != null && ParentGroup.Scene != null && ParentGroup.Scene.ShouldUseFireAndForgetForCollisions)
+            {
+                // For those learning C#, FireAndForget takes a function, an object to pass
+                //    to that function and an ID string. The "oo => {}" construct is a lambda expression
+                //    for a function with one arguement ('oo'). The 'new Object[] {}" construct creates an Object
+                //    that is an object array and initializes it with three items (the parameters
+                //    being passed). The parameters passed are the function to call ('notify') and
+                //    its two arguements. Finally, once in the function (called later by the FireAndForget
+                //    thread scheduler), the passed object is cast to an object array and then each
+                //    of its items (aoo[0] to aoo[2]) are individually cast to what they are and
+                //    then used in a call of the passed ScriptCollidingNotification function.
+                Util.FireAndForget(oo =>
+                {
+                    Object[] aoo = (Object[])oo;
+                    ((ScriptCollidingNotification)aoo[0])((uint)aoo[1], (ColliderArgs)aoo[2]);
+
+                }, new Object[] { notify, id, collargs }, "SOP.Collision");
+            }
+            else
+            {
+                notify(id, collargs);
+=======
             if (Inventory.ContainsScripts())
             {
                 if (!PassCollisions)
@@ -2830,6 +2898,7 @@ namespace OpenSim.Region.Framework.Scenes
             if ((ParentGroup.RootPart.ScriptEvents & ev) != 0 && sendToRoot)
             {
                 notify(ParentGroup.RootPart.LocalId, LandCollidingMessage);
+>>>>>>> avn/ubitvar
             }
         }
 
@@ -2977,10 +3046,15 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (pa != null)
             {
+<<<<<<< HEAD
+                Vector3 newpos = pa.Position;
+=======
                 Vector3 newpos = new Vector3(pa.Position.GetBytes(), 0);
                 
+>>>>>>> avn/ubitvar
                 if (!ParentGroup.Scene.PositionIsInCurrentRegion(newpos))
                 {
+                    // Setting position outside current region will start region crossing
                     ParentGroup.AbsolutePosition = newpos;
                     return;
                 }
@@ -3109,7 +3183,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
                 }
                 
-                m_APIDIterations = 1 + (int)(Math.PI * APIDStrength);
+                APIDActive = true;
             }
 
             // Necessary to get the lookat deltas applied
@@ -3123,7 +3197,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void StopLookAt()
         {
-            APIDTarget = Quaternion.Identity;
+            APIDActive = false;
         }
 
 
@@ -3922,10 +3996,14 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
 
         public void StopMoveToTarget()
         {
+<<<<<<< HEAD
+            ParentGroup.StopMoveToTarget();
+=======
             ParentGroup.stopMoveToTarget();
 
 //            ParentGroup.ScheduleGroupForTerseUpdate();
             //ParentGroup.ScheduleGroupForFullUpdate();
+>>>>>>> avn/ubitvar
         }
 
         public void StoreUndoState(ObjectChangeType change)
@@ -4773,6 +4851,12 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                     }
                     else // it already has a physical representation
                     {
+<<<<<<< HEAD
+                        pa.SetMaterial(Material);
+                        pa.Position = GetWorldPosition();
+                        pa.Orientation = GetWorldRotation();
+                        DoPhysicsPropertyUpdate(UsePhysics, true);
+=======
                         DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status.
 /* moved into DoPhysicsPropertyUpdate
                         if(VolumeDetectActive)
@@ -4780,6 +4864,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                         else
                             pa.SetVolumeDetect(0);
 */
+>>>>>>> avn/ubitvar
 
                         if (pa.Building != building)
                             pa.Building = building;
@@ -5434,7 +5519,10 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
             if (OwnerID != item.Owner)
             {
                 //LogPermissions("Before ApplyNextOwnerPermissions");
-                ApplyNextOwnerPermissions();
+
+                if (scene.Permissions.PropagatePermissions())
+                    ApplyNextOwnerPermissions();
+
                 //LogPermissions("After ApplyNextOwnerPermissions");
 
                 LastOwnerID = OwnerID;
@@ -5468,20 +5556,34 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         {
             try
             {
-                if (APIDTarget != Quaternion.Identity)
+                if (APIDActive)
                 {
-                    if (m_APIDIterations <= 1)
+                    PhysicsActor pa = ParentGroup.RootPart.PhysActor;
+                    if (pa == null || !pa.IsPhysical || APIDStrength < 0.04)
                     {
-                        UpdateRotation(APIDTarget);
-                        APIDTarget = Quaternion.Identity;
+                        StopLookAt();
                         return;
                     }
 
-                    Quaternion rot = Quaternion.Slerp(RotationOffset,APIDTarget,1.0f/(float)m_APIDIterations);
-                    rot.Normalize();
-                    UpdateRotation(rot);
+                    Quaternion currRot = GetWorldRotation();
+                    currRot.Normalize();
+
+                    // difference between current orientation and desired orientation
+                    Quaternion dR = currRot / APIDTarget;
+
+                    // find axis and angle of rotation to rotate to desired orientation
+                    Vector3 axis = Vector3.UnitX;
+                    float angle;
+                    dR.GetAxisAngle(out axis, out angle);
+                    axis = axis * currRot;
+
+                    // clamp strength to avoid overshoot
+                    float strength = 1.0f / APIDStrength;
+                    if (strength > 1.0) strength = 1.0f;
 
-                    m_APIDIterations--;
+                    // set angular velocity to rotate to desired orientation
+                    // with velocity proportional to strength and angle
+                    AngularVelocity = axis * angle * strength * (float)Math.PI;
 
                     // This ensures that we'll check this object on the next iteration
                     ParentGroup.QueueForUpdateCheck();
@@ -5519,19 +5621,19 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         /// true if the avatar was not already recorded, false otherwise.
         /// </returns>
         /// <param name='avatarId'></param>
-        protected internal bool AddSittingAvatar(UUID avatarId)
+        protected internal bool AddSittingAvatar(ScenePresence sp)
         {
             lock (ParentGroup.m_sittingAvatars)
             {
                 if (IsSitTargetSet && SitTargetAvatar == UUID.Zero)
-                    SitTargetAvatar = avatarId;
+                    SitTargetAvatar = sp.UUID;
 
                 if (m_sittingAvatars == null)
-                    m_sittingAvatars = new HashSet<UUID>();
+                    m_sittingAvatars = new HashSet<ScenePresence>();
 
-                if (m_sittingAvatars.Add(avatarId))
+                if (m_sittingAvatars.Add(sp))
                 {
-                    ParentGroup.m_sittingAvatars.Add(avatarId);
+                    ParentGroup.m_sittingAvatars.Add(sp);
 
                     return true;
                 }
@@ -5548,22 +5650,22 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         /// true if the avatar was present and removed, false if it was not present.
         /// </returns>
         /// <param name='avatarId'></param>
-        protected internal bool RemoveSittingAvatar(UUID avatarId)
+        protected internal bool RemoveSittingAvatar(ScenePresence sp)
         {
             lock (ParentGroup.m_sittingAvatars)
             {
-                if (SitTargetAvatar == avatarId)
+                if (SitTargetAvatar == sp.UUID)
                     SitTargetAvatar = UUID.Zero;
 
                 if (m_sittingAvatars == null)
                     return false;
 
-                if (m_sittingAvatars.Remove(avatarId))
+                if (m_sittingAvatars.Remove(sp))
                 {
                     if (m_sittingAvatars.Count == 0)
                         m_sittingAvatars = null;
 
-                    ParentGroup.m_sittingAvatars.Remove(avatarId);
+                    ParentGroup.m_sittingAvatars.Remove(sp);
 
                     return true;
                 }
@@ -5577,14 +5679,14 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
         /// </summary>
         /// <remarks>This applies to all sitting avatars whether there is a sit target set or not.</remarks>
         /// <returns>A hashset of the sitting avatars.  Returns null if there are no sitting avatars.</returns>
-        public HashSet<UUID> GetSittingAvatars()
+        public HashSet<ScenePresence> GetSittingAvatars()
         {
             lock (ParentGroup.m_sittingAvatars)
             {
                 if (m_sittingAvatars == null)
                     return null;
                 else
-                    return new HashSet<UUID>(m_sittingAvatars);
+                    return new HashSet<ScenePresence>(m_sittingAvatars);
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index b9f3f94..7af0b20 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -424,6 +424,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         private UUID RestoreSavedScriptState(UUID loadedID, UUID oldID, UUID newID)
         {
+//            m_log.DebugFormat(
+//                "[PRIM INVENTORY]: Restoring scripted state for item {0}, oldID {1}, loadedID {2}", 
+//                newID, oldID, loadedID);
+
             IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
             if (engines.Length == 0) // No engine at all
                 return oldID;
@@ -436,7 +440,7 @@ namespace OpenSim.Region.Framework.Scenes
                 XmlDocument doc = new XmlDocument();
 
                 doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]);
-                
+
                 ////////// CRUFT WARNING ///////////////////////////////////
                 //
                 // Old objects will have <ScriptState><State> ...
@@ -466,6 +470,8 @@ namespace OpenSim.Region.Framework.Scenes
                     // This created document has only the minimun data
                     // necessary for XEngine to parse it successfully
 
+//                    m_log.DebugFormat("[PRIM INVENTORY]: Adding legacy state {0} in {1}", stateID, newID);
+
                     m_part.ParentGroup.m_savedScriptState[stateID] = newDoc.OuterXml;
                 }
                 
@@ -886,8 +892,16 @@ namespace OpenSim.Region.Framework.Scenes
                 offsetHeight = 0;
                 return false;
             }
+<<<<<<< HEAD
+
+            Vector3 bbox;
+            float offsetHeight;
+
+            m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight);
+=======
           
             bool single = m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight);
+>>>>>>> avn/ubitvar
 
             for (int i = 0; i < objlist.Count; i++)
             {
@@ -1054,7 +1068,12 @@ namespace OpenSim.Region.Framework.Scenes
                 m_items.LockItemsForRead(false);
                 if (type == 10) // Script
                 {
+<<<<<<< HEAD
+                    // route it through here, to handle script cleanup tasks
+                    RemoveScriptInstance(itemID, false);
+=======
                     m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
+>>>>>>> avn/ubitvar
                 }
                 m_items.LockItemsForWrite(true);
                 m_items.Remove(itemID);
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6390d26..4bccb7d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -37,6 +37,7 @@ using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes.Animation;
 using OpenSim.Region.Framework.Scenes.Types;
@@ -76,6 +77,7 @@ namespace OpenSim.Region.Framework.Scenes
     public class ScenePresence : EntityBase, IScenePresence
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly String LogHeader = "[SCENE PRESENCE]";
 
 //        ~ScenePresence()
 //        {
@@ -297,7 +299,6 @@ namespace OpenSim.Region.Framework.Scenes
 //        private int m_lastColCount = -1;              //KF: Look for Collision chnages
 //        private int m_updateCount = 0;                        //KF: Update Anims for a while
 //        private static readonly int UPDATE_COUNT = 10;                // how many frames to update for
-        private List<uint> m_lastColliders = new List<uint>();
 
         private TeleportFlags m_teleportFlags;
         public TeleportFlags TeleportFlags
@@ -360,9 +361,6 @@ namespace OpenSim.Region.Framework.Scenes
         //private int m_moveToPositionStateStatus;
         //*****************************************************
 
-        private bool m_collisionEventFlag = false;
-        private object m_collisionEventLock = new Object();
-
         private int m_movementAnimationUpdateCounter = 0;
 
         public Vector3 PrevSitOffset { get; set; }
@@ -379,6 +377,8 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public bool SentInitialDataToClient { get; private set; }
+
         /// <summary>
         /// Copy of the script states while the agent is in transit. This state may
         /// need to be placed back in case of transfer fail.
@@ -438,6 +438,12 @@ namespace OpenSim.Region.Framework.Scenes
         private object m_originRegionIDAccessLock = new object();
 
         /// <summary>
+        /// Triggered on entity transfer after to allow CompleteMovement() to proceed after we have received an
+        /// UpdateAgent from the originating region.ddkjjkj
+        /// </summary>
+        private AutoResetEvent m_updateAgentReceivedAfterTransferEvent = new AutoResetEvent(false);
+
+        /// <summary>
         /// Used by the entity transfer module to signal when the presence should not be closed because a subsequent
         /// teleport is reusing the connection.
         /// </summary>
@@ -464,6 +470,11 @@ namespace OpenSim.Region.Framework.Scenes
         public uint MovementFlag { get; private set; }
 
         /// <summary>
+        /// Set this if we need to force a movement update on the next received AgentUpdate from the viewer.
+        /// </summary>
+        private const uint ForceUpdateMovementFlagValue = uint.MaxValue;
+
+        /// <summary>
         /// Is the agent stop control flag currently active?
         /// </summary>
         public bool AgentControlStopActive { get; private set; }
@@ -545,7 +556,19 @@ namespace OpenSim.Region.Framework.Scenes
         public string Firstname { get; private set; }
         public string Lastname { get; private set; }
 
-        public string Grouptitle { get; set; }
+        public string Grouptitle
+        {
+            get { return UseFakeGroupTitle ? "(Loading)" : m_groupTitle; }
+            set { m_groupTitle = value; }
+        }
+        private string m_groupTitle;
+
+        /// <summary>
+        /// When this is 'true', return a dummy group title instead of the real group title. This is
+        /// used as part of a hack to force viewers to update the displayed avatar name.
+        /// </summary>
+        public bool UseFakeGroupTitle { get; set; }
+
 
         // Agent's Draw distance.
         public float DrawDistance { get; set; }
@@ -630,6 +653,12 @@ namespace OpenSim.Region.Framework.Scenes
                     // in the sim unless the avatar is on a sit target. While
                     // on a sit target, m_pos will contain the desired offset
                     // without the parent rotation applied.
+<<<<<<< HEAD
+                    SceneObjectPart sitPart = ParentPart;
+
+                    if (sitPart != null)
+                        return sitPart.ParentGroup.AbsolutePosition + (m_pos * sitPart.GetWorldRotation());
+=======
                     if (ParentPart != null)
                     {
                         SceneObjectPart rootPart = ParentPart.ParentGroup.RootPart;
@@ -638,6 +667,7 @@ namespace OpenSim.Region.Framework.Scenes
                         if (rootPart != null)
                             return rootPart.AbsolutePosition + (m_pos * rootPart.GetWorldRotation());
                     }
+>>>>>>> avn/ubitvar
                 }
                 
                 return m_pos;
@@ -691,8 +721,11 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Current velocity of the avatar.
+        /// Velocity of the avatar with respect to its local reference frame.
         /// </summary>
+        /// <remarks>
+        /// So when sat on a vehicle this will be 0.  To get velocity with respect to the world use GetWorldVelocity()
+        /// </remarks>
         public override Vector3 Velocity
         {
             get
@@ -705,11 +738,21 @@ namespace OpenSim.Region.Framework.Scenes
 //                        "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",
 //                        m_velocity, Name, Scene.RegionInfo.RegionName);
                 }
+//                else if (ParentPart != null)
+//                {
+//                    return ParentPart.ParentGroup.Velocity;
+//                }
 
                 return m_velocity;
             }
+
             set
             {
+//                Util.PrintCallStack();
+//                m_log.DebugFormat(
+//                    "[SCENE PRESENCE]: In {0} set velocity of {1} to {2}",
+//                    Scene.RegionInfo.RegionName, Name, value);  
+
                 if (PhysicsActor != null)
                 {
                     try
@@ -722,11 +765,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-                m_velocity = value;
-
-//                m_log.DebugFormat(
-//                    "[SCENE PRESENCE]: In {0} set velocity of {1} to {2}",
-//                    Scene.RegionInfo.RegionName, Name, m_velocity);
+                m_velocity = value;                                            
             }
         }
 
@@ -810,25 +849,32 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Gets the world rotation of this presence.
+        /// Get rotation relative to the world.
         /// </summary>
-        /// <remarks>
-        /// Unlike Rotation, this returns the world rotation no matter whether the avatar is sitting on a prim or not.
-        /// </remarks>
         /// <returns></returns>
         public Quaternion GetWorldRotation()
         {
-            if (IsSatOnObject)
-            {
-                SceneObjectPart sitPart = ParentPart;
+            SceneObjectPart sitPart = ParentPart;
 
-                if (sitPart != null)
-                    return sitPart.GetWorldRotation() * Rotation;
-            }
+            if (sitPart != null)
+                return sitPart.GetWorldRotation() * Rotation;
 
             return Rotation;
         }
 
+        /// <summary>
+        /// Get velocity relative to the world.
+        /// </summary>
+        public Vector3 GetWorldVelocity()
+        {
+            SceneObjectPart sitPart = ParentPart;
+
+            if (sitPart != null)
+                return sitPart.ParentGroup.Velocity;
+
+            return Velocity;
+        }
+
         public void AdjustKnownSeeds()
         {
             Dictionary<ulong, string> seeds;
@@ -844,8 +890,13 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 uint x, y;
                 Util.RegionHandleToRegionLoc(handle, out x, out y);
+<<<<<<< HEAD
+
+                if (Util.IsOutsideView(DrawDistance, x, Scene.RegionInfo.RegionLocX, y, Scene.RegionInfo.RegionLocY))
+=======
 no information to check this
 //                if (Util.IsOutsideView(DrawDistance, x, Scene.RegionInfo.RegionLocX, y, Scene.RegionInfo.RegionLocY,))
+>>>>>>> avn/ubitvar
                 {
                     old.Add(handle);
                 }
@@ -873,7 +924,7 @@ no information to check this
         }
 
         private bool m_mouseLook;
-        private bool m_leftButtonDown;
+//        private bool m_leftButtonDown;
 
         private bool m_inTransit;
 
@@ -938,9 +989,14 @@ no information to check this
 
         public string Viewer
         {
-            get { return m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode).Viewer; }
+            get { return Util.GetViewerName(m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode)); }
         }
 
+        /// <summary>
+        /// Count of how many terse updates we have sent out.  It doesn't matter if this overflows.
+        /// </summary>
+        private int m_terseUpdateCount;
+
         #endregion
 
         #region Constructor(s)
@@ -956,7 +1012,8 @@ no information to check this
             Animator = new ScenePresenceAnimator(this);
             Overrides = new MovementAnimationOverrides();
             PresenceType = type;
-            DrawDistance = world.DefaultDrawDistance;
+            // DrawDistance = world.DefaultDrawDistance;
+            DrawDistance = Constants.RegionSize;
             RegionHandle = world.RegionInfo.RegionHandle;
             ControllingClient = client;
             Firstname = ControllingClient.FirstName;
@@ -1046,6 +1103,21 @@ no information to check this
 
         private void SetDirectionVectors()
         {
+<<<<<<< HEAD
+            Dir_Vectors[0] = Vector3.UnitX; //FORWARD
+            Dir_Vectors[1] = -Vector3.UnitX; //BACK
+            Dir_Vectors[2] = Vector3.UnitY; //LEFT
+            Dir_Vectors[3] = -Vector3.UnitY; //RIGHT
+            Dir_Vectors[4] = Vector3.UnitZ; //UP
+            Dir_Vectors[5] = -Vector3.UnitZ; //DOWN
+            Dir_Vectors[6] = new Vector3(0.5f, 0f, 0f); //FORWARD_NUDGE
+            Dir_Vectors[7] = new Vector3(-0.5f, 0f, 0f);  //BACK_NUDGE
+            Dir_Vectors[8] = new Vector3(0f, 0.5f, 0f);  //LEFT_NUDGE
+            Dir_Vectors[9] = new Vector3(0f, -0.5f, 0f);  //RIGHT_NUDGE
+            Dir_Vectors[10] = new Vector3(0f, 0f, -0.5f); //DOWN_Nudge
+        }
+
+=======
             Dir_Vectors[0] = new Vector3(AgentControlNormalVel,0,0); //FORWARD
             Dir_Vectors[1] = new Vector3(-AgentControlNormalVel,0,0);; //BACK
             Dir_Vectors[2] = new Vector3(0,AgentControlNormalVel,0); //LEFT
@@ -1079,6 +1151,7 @@ no information to check this
             return vector;
         }
 */
+>>>>>>> avn/ubitvar
         #endregion
 
         #region Status Methods
@@ -1130,9 +1203,14 @@ no information to check this
                     }
                     else
                     {
+<<<<<<< HEAD
+                        part.AddSittingAvatar(this);
+    //                    ParentPosition = part.GetWorldPosition();
+=======
                         part.ParentGroup.AddAvatar(UUID);
                         if (part.SitTargetPosition != Vector3.Zero)
                             part.SitTargetAvatar = UUID;
+>>>>>>> avn/ubitvar
                         ParentID = part.LocalId;
                         ParentPart = part;
                         m_pos = PrevSitOffset;
@@ -1159,16 +1237,84 @@ no information to check this
             if (gm != null)
                 Grouptitle = gm.GetGroupTitle(m_uuid);
 
+<<<<<<< HEAD
+            AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode);
+            uint teleportFlags = (aCircuit == null) ? 0 : aCircuit.teleportFlags;
+            if ((teleportFlags & (uint)TeleportFlags.ViaHGLogin) != 0)
+            {
+                // The avatar is arriving from another grid. This means that we may have changed the
+                // avatar's name to or from the special Hypergrid format ("First.Last @grid.example.com").
+                // Unfortunately, due to a viewer bug, viewers don't always show the new name.
+                // But we have a trick that can force them to update the name anyway.
+                ForceViewersUpdateName();
+            }
+=======
             m_log.DebugFormat("[MakeRootAgent] Grouptitle: {0}ms", Util.EnvironmentTickCountSubtract(ts));
+>>>>>>> avn/ubitvar
 
             RegionHandle = m_scene.RegionInfo.RegionHandle;
 
             m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
             m_log.DebugFormat("[MakeRootAgent] TriggerSetRootAgentScene: {0}ms", Util.EnvironmentTickCountSubtract(ts));
 
+<<<<<<< HEAD
+            UUID groupUUID = ControllingClient.ActiveGroupId;
+            string groupName = string.Empty;
+            ulong groupPowers = 0;
+
+            // ----------------------------------
+            // Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status
+            try
+            {
+                if (groupUUID != UUID.Zero && gm != null)
+                {
+                    GroupRecord record = gm.GetGroupRecord(groupUUID);
+                    if (record != null)
+                        groupName = record.GroupName;
+
+                    GroupMembershipData groupMembershipData = gm.GetMembershipData(groupUUID, m_uuid);
+
+                    if (groupMembershipData != null)
+                        groupPowers = groupMembershipData.GroupPowers;
+                }
+
+                ControllingClient.SendAgentDataUpdate(
+                    m_uuid, groupUUID, Firstname, Lastname, groupPowers, groupName, Grouptitle);
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[AGENTUPDATE]: Error ", e);
+            }
+            // ------------------------------------
 
             if (ParentID == 0)
             {
+                // Moved this from SendInitialData to ensure that Appearance is initialized
+                // before the inventory is processed in MakeRootAgent. This fixes a race condition
+                // related to the handling of attachments
+                //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
+
+                /* RA 20140111: Commented out these TestBorderCross's.
+                 * Not sure why this code is here. It is not checking all the borders
+                 * and 'in region' sanity checking is done in CheckAndAdjustLandingPoint and below.
+                if (m_scene.TestBorderCross(pos, Cardinals.E))
+                {
+                    Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
+                    pos.X = crossedBorder.BorderLine.Z - 1;
+                }
+
+                if (m_scene.TestBorderCross(pos, Cardinals.N))
+                {
+                    Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N);
+                    pos.Y = crossedBorder.BorderLine.Z - 1;
+                }
+                 */
+
+=======
+
+            if (ParentID == 0)
+            {
+>>>>>>> avn/ubitvar
                 CheckAndAdjustLandingPoint(ref pos);
 
                 if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
@@ -1198,19 +1344,36 @@ no information to check this
                 }
                 AbsolutePosition = pos;
 
+//                m_log.DebugFormat(
+//                    "Set pos {0}, vel {1} in {1} to {2} from input position of {3} on MakeRootAgent", 
+//                    Name, Scene.Name, AbsolutePosition, pos);
+//
                 if (m_teleportFlags == TeleportFlags.Default)
                 {
-                    Vector3 vel = Velocity;
                     AddToPhysicalScene(isFlying);
-                    if (PhysicsActor != null)
-                        PhysicsActor.SetMomentum(vel);
+//
+//                        Console.WriteLine(
+//                            "Set velocity of {0} in {1} to {2} from input velocity of {3} on MakeRootAgent", 
+//                            Name, Scene.Name, PhysicsActor.Velocity, vel);
+//                    }
                 }
                 else
                 {
                     AddToPhysicalScene(isFlying);
+<<<<<<< HEAD
+                }
+
+                // XXX: This is to trigger any secondary teleport needed for a megaregion when the user has teleported to a 
+                // location outside the 'root region' (the south-west 256x256 corner).  This is the earlist we can do it
+                // since it requires a physics actor to be present.  If it is left any later, then physics appears to reset
+                // the value to a negative position which does not trigger the border cross.
+                // This may not be the best location for this.
+                CheckForBorderCrossing();
+=======
                     // reset camera to avatar pos
                     CameraPosition = pos;
                 }
+>>>>>>> avn/ubitvar
 
                 if (ForceFly)
                 {
@@ -1220,6 +1383,40 @@ no information to check this
                 {
                     Flying = false;
                 }
+<<<<<<< HEAD
+            }
+
+            // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying 
+            // avatar to return to the standing position in mid-air.  On login it looks like this is being sent
+            // elsewhere anyway
+            // Animator.SendAnimPack();
+
+            m_scene.SwapRootAgentCount(false);
+
+            if (Scene.AttachmentsModule != null)
+            {
+                // The initial login scene presence is already root when it gets here
+                // and it has already rezzed the attachments and started their scripts.
+                // We do the following only for non-login agents, because their scripts
+                // haven't started yet.
+                if (PresenceType == PresenceType.Npc || IsRealLogin(m_teleportFlags))
+                {
+                    WorkManager.RunJob(
+                        "RezAttachments",
+                        o => Scene.AttachmentsModule.RezAttachments(this),
+                        null,
+                        string.Format("Rez attachments for {0} in {1}", Name, Scene.Name));
+                }
+                else
+                {
+                    WorkManager.RunJob(
+                        "StartAttachmentScripts",
+                        o => RestartAttachmentScripts(),
+                        null,
+                        string.Format("Start attachment scripts for {0} in {1}", Name, Scene.Name),
+                        true);
+                }
+=======
 
                 // XXX: This is to trigger any secondary teleport needed for a megaregion when the user has teleported to a 
                 // location outside the 'root region' (the south-west 256x256 corner).  This is the earlist we can do it
@@ -1230,17 +1427,28 @@ no information to check this
 
                 // its not               
 //                CheckForBorderCrossing();
+>>>>>>> avn/ubitvar
             }
  
             m_log.DebugFormat("[MakeRootAgent] position and physical: {0}ms", Util.EnvironmentTickCountSubtract(ts));
             m_scene.SwapRootAgentCount(false);
 
+<<<<<<< HEAD
+            SendAvatarDataToAllClients();
+
+            // send the animations of the other presences to me
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
+            {
+                if (presence != this)
+                    presence.Animator.SendAnimPackToClient(ControllingClient);
+            });
+=======
+>>>>>>> avn/ubitvar
 
             // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will
             // stall on the border crossing since the existing child agent will still have the last movement
             // recorded, which stops the input from being processed.
-
-            MovementFlag = 0;
+            MovementFlag = ForceUpdateMovementFlagValue;
 
             m_scene.EventManager.TriggerOnMakeRootAgent(this);
             m_log.DebugFormat("[MakeRootAgent] TriggerOnMakeRootAgent and done: {0}ms", Util.EnvironmentTickCountSubtract(ts));
@@ -1248,6 +1456,70 @@ no information to check this
             return true;
         }
 
+        private void RestartAttachmentScripts()
+        {
+            // We need to restart scripts here so that they receive the correct changed events (CHANGED_TELEPORT
+            // and CHANGED_REGION) when the attachments have been rezzed in the new region.  This cannot currently
+            // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are
+            // not transporting the required data.
+            //
+            // We must take a copy of the attachments list here (rather than locking) to avoid a deadlock where a script in one of
+            // the attachments may start processing an event (which locks ScriptInstance.m_Script) that then calls a method here
+            // which needs to lock m_attachments.  ResumeScripts() needs to take a ScriptInstance.m_Script lock to try to unset the Suspend status.
+            //
+            // FIXME: In theory, this deadlock should not arise since scripts should not be processing events until ResumeScripts().
+            // But XEngine starts all scripts unsuspended.  Starting them suspended will not currently work because script rezzing
+            // is placed in an asynchronous queue in XEngine and so the ResumeScripts() call will almost certainly execute before the
+            // script is rezzed.  This means the ResumeScripts() does absolutely nothing when using XEngine.
+            List<SceneObjectGroup> attachments = GetAttachments();
+
+            m_log.DebugFormat(
+                "[SCENE PRESENCE]: Restarting scripts in {0} attachments for {1} in {2}", attachments.Count, Name, Scene.Name);
+
+            // Resume scripts
+            foreach (SceneObjectGroup sog in attachments)
+            {
+                sog.ScheduleGroupForFullUpdate();
+                sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
+                sog.ResumeScripts();
+            }
+        }
+
+        private static bool IsRealLogin(TeleportFlags teleportFlags)
+        {
+            return ((teleportFlags & TeleportFlags.ViaLogin) != 0) && ((teleportFlags & TeleportFlags.ViaHGLogin) == 0);
+        }
+
+        /// <summary>
+        /// Force viewers to show the avatar's current name.
+        /// </summary>
+        /// <remarks>
+        /// The avatar name that is shown above the avatar in the viewers is sent in ObjectUpdate packets,
+        /// and they get the name from the ScenePresence. Unfortunately, viewers have a bug (as of April 2014)
+        /// where they ignore changes to the avatar name. However, tey don't ignore changes to the avatar's
+        /// Group Title. So the following trick makes viewers update the avatar's name by briefly changing
+        /// the group title (to "(Loading)"), and then restoring it.
+        /// </remarks>
+        public void ForceViewersUpdateName()
+        {
+            m_log.DebugFormat("[SCENE PRESENCE]: Forcing viewers to update the avatar name for " + Name);
+
+            UseFakeGroupTitle = true;
+            SendAvatarDataToAllClients(false);
+
+            Util.FireAndForget(o =>
+            {
+                // Viewers only update the avatar name when idle. Therefore, we must wait long
+                // enough for the viewer to show the fake name that we had set above, and only
+                // then switch back to the true name. This delay was chosen because it has a high
+                // chance of succeeding (we don't want to choose a value that's too low).
+                Thread.Sleep(5000);
+
+                UseFakeGroupTitle = false;
+                SendAvatarDataToAllClients(false);
+            }, null, "Scenepresence.ForceViewersUpdateName");
+        }
+
         public int GetStateSource()
         {
             AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(UUID);
@@ -1285,6 +1557,11 @@ no information to check this
             lock (m_originRegionIDAccessLock)
                 m_originRegionID = UUID.Zero;
 
+            // Reset the m_originRegionID as it has dual use as a flag to signal that the UpdateAgent() call orignating
+            // from the source simulator has completed on a V2 teleport.
+            lock (m_originRegionIDAccessLock)
+                m_originRegionID = UUID.Zero;
+
             // Reset these so that teleporting in and walking out isn't seen
             // as teleporting back
             TeleportFlags = TeleportFlags.Default;
@@ -1332,9 +1609,9 @@ no information to check this
             if (PhysicsActor != null)
             {
 //                PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients;
+                PhysicsActor.UnSubscribeEvents();
                 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall;
                 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate;
-                PhysicsActor.UnSubscribeEvents();
                 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
                 PhysicsActor = null;
             }
@@ -1372,8 +1649,6 @@ no information to check this
                 else
                     PhysicsActor.SetMomentum(vel);
             }
-
-            SendTerseUpdateToAllClients();
         }
 
         public void avnLocalTeleport(Vector3 newpos, Vector3? newvel, bool rotateToVelXY)
@@ -1405,12 +1680,8 @@ no information to check this
                     }
                 }
             }
-
-            SendTerseUpdateToAllClients();
         }
 
-
-
         public void StopFlying()
         {
             if (IsInTransit)
@@ -1644,8 +1915,17 @@ no information to check this
         public void SetSize(Vector3 size, float feetoffset)
         {
             if (PhysicsActor != null && !IsChildAgent)
+<<<<<<< HEAD
+            {
+                // Eventually there will be a physics call that sets avatar size that includes offset info.
+                // For the moment, just set the size as passed.
+                PhysicsActor.Size = size;
+                //  PhysicsActor.setAvatarSize(size, feetoffset);
+            }            
+=======
                 PhysicsActor.setAvatarSize(size, feetoffset);
             
+>>>>>>> avn/ubitvar
         }
 
         private bool WaitForUpdateAgent(IClientAPI client)
@@ -1654,20 +1934,12 @@ no information to check this
             // (which triggers Scene.IncomingUpdateChildAgent(AgentData cAgentData) here in the destination, 
             // m_originRegionID is UUID.Zero; after, it's non-Zero.  The CompleteMovement sequence initiated from the
             // viewer (in turn triggered by the source region sending it a TeleportFinish event) waits until it's non-zero
-            int count = 50;
-            UUID originID;
+            m_updateAgentReceivedAfterTransferEvent.WaitOne(10000);
 
-            lock (m_originRegionIDAccessLock)
-                originID = m_originRegionID;
-
-            while (originID.Equals(UUID.Zero) && count-- > 0)
-            {
-                lock (m_originRegionIDAccessLock)
-                    originID = m_originRegionID;
+            UUID originID = UUID.Zero;           
 
-                m_log.DebugFormat("[SCENE PRESENCE]: Agent {0} waiting for update in {1}", client.Name, Scene.Name);
-                Thread.Sleep(200);
-            }
+            lock (m_originRegionIDAccessLock)
+                originID = m_originRegionID;           
 
             if (originID.Equals(UUID.Zero))
             {
@@ -1698,6 +1970,40 @@ no information to check this
           
             m_inTransit = true;
 
+<<<<<<< HEAD
+            bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);   // Get this ahead of time because IsInTransit modifies 'm_AgentControlFlags'
+
+            IsInTransit = true;
+            try
+            {
+                // Make sure it's not a login agent. We don't want to wait for updates during login
+                if (!(PresenceType == PresenceType.Npc || IsRealLogin(m_teleportFlags)))
+                {
+                    // Let's wait until UpdateAgent (called by departing region) is done
+                    if (!WaitForUpdateAgent(client))
+                        // The sending region never sent the UpdateAgent data, we have to refuse
+                        return;
+                }
+
+                Vector3 look = Velocity;
+
+                //            if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
+                if ((Math.Abs(look.X) < 0.1) && (Math.Abs(look.Y) < 0.1) && (Math.Abs(look.Z) < 0.1))
+                {
+                    look = new Vector3(0.99f, 0.042f, 0);
+                }
+
+                // Prevent teleporting to an underground location
+                // (may crash client otherwise)
+                //
+                Vector3 pos = AbsolutePosition;
+                float ground = m_scene.GetGroundHeight(pos.X, pos.Y);
+                if (pos.Z < ground + 1.5f)
+                {
+                    pos.Z = ground + 1.5f;
+                    AbsolutePosition = pos;
+                }
+=======
             try
             {
                 // Make sure it's not a login agent. We don't want to wait for updates during login
@@ -1713,16 +2019,103 @@ no information to check this
                 m_log.DebugFormat("[CompleteMovement] WaitForUpdateAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
 
                 bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
+>>>>>>> avn/ubitvar
 
                 if (!MakeRootAgent(AbsolutePosition, flying))
                 {
                     m_log.DebugFormat(
+<<<<<<< HEAD
+                        "[SCENE PRESENCE]: Aborting CompleteMovement call for {0} in {1} as they are already root", 
+=======
                         "[SCENE PRESENCE]: Aborting CompleteMovement call for {0} in {1} as they are already root",
+>>>>>>> avn/ubitvar
                         Name, Scene.Name);
 
                     return;
                 }
 
+<<<<<<< HEAD
+                // Tell the client that we're totally ready
+                ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
+
+                // Child agents send initial data up in LLUDPServer.HandleUseCircuitCode()
+                if (!SentInitialDataToClient)
+                    SendInitialDataToClient();
+
+    //            m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
+
+                if (!string.IsNullOrEmpty(m_callbackURI))
+                {
+                    // We cannot sleep here since this would hold up the inbound packet processing thread, as
+                    // CompleteMovement() is executed synchronously.  However, it might be better to delay the release
+                    // here until we know for sure that the agent is active in this region.  Sending AgentMovementComplete
+                    // is not enough for Imprudence clients - there appears to be a small delay (<200ms, <500ms) until they regard this
+                    // region as the current region, meaning that a close sent before then will fail the teleport.
+    //                System.Threading.Thread.Sleep(2000);
+
+                    m_log.DebugFormat(
+                        "[SCENE PRESENCE]: Releasing {0} {1} with callback to {2}",
+                        client.Name, client.AgentId, m_callbackURI);
+
+                    Scene.SimulationService.ReleaseAgent(m_originRegionID, UUID, m_callbackURI);
+                    m_callbackURI = null;
+                }
+    //            else
+    //            {
+    //                m_log.DebugFormat(
+    //                    "[SCENE PRESENCE]: No callback provided on CompleteMovement of {0} {1} to {2}",
+    //                    client.Name, client.AgentId, m_scene.RegionInfo.RegionName);
+    //            }
+
+                ValidateAndSendAppearanceAndAgentData();
+
+                // Create child agents in neighbouring regions
+                if (openChildAgents && !IsChildAgent)
+                {
+                    IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
+                    if (m_agentTransfer != null)
+                    {
+                        // Note: this call can take a while, because it notifies each of the simulator's neighbours.
+                        // It's important that we don't allow the avatar to cross regions meanwhile, as that will
+                        // cause serious errors. We've prevented that from happening by setting IsInTransit=true.
+                        m_agentTransfer.EnableChildAgents(this);
+                    }
+
+                    IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
+                    if (friendsModule != null)
+                        friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
+
+                }
+
+                // XXX: If we force an update after activity has completed, then multiple attachments do appear correctly on a destination region
+                // If we do it a little bit earlier (e.g. when converting the child to a root agent) then this does not work.
+                // This may be due to viewer code or it may be something we're not doing properly simulator side.
+                WorkManager.RunJob(
+                    "ScheduleAttachmentsForFullUpdate", 
+                    o => ScheduleAttachmentsForFullUpdate(),
+                    null,
+                    string.Format("Schedule attachments for full update for {0} in {1}", Name, Scene.Name),
+                    true);
+
+    //            m_log.DebugFormat(
+    //                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
+    //                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
+            }
+            finally
+            {
+                IsInTransit = false;
+            }
+        }
+
+        private void ScheduleAttachmentsForFullUpdate()
+        {
+            lock (m_attachments)
+            {
+                foreach (SceneObjectGroup sog in m_attachments)
+                    sog.ScheduleGroupForFullUpdate();
+            }
+        }
+=======
                 m_log.DebugFormat("[CompleteMovement] MakeRootAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
 
                 Vector3 look = Lookat;
@@ -1804,6 +2197,7 @@ no information to check this
                     // so sequence is clear
 
                     // verify baked textures and cache
+>>>>>>> avn/ubitvar
 
 
                     bool cachedbaked = false;
@@ -2043,13 +2437,13 @@ no information to check this
         /// </summary>
         public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
         {
-            //m_log.DebugFormat(
-            //    "[SCENE PRESENCE]: In {0} received agent update from {1}, flags {2}",
-            //    Scene.RegionInfo.RegionName, remoteClient.Name, (AgentManager.ControlFlags)agentData.ControlFlags);
+//            m_log.DebugFormat(
+//                "[SCENE PRESENCE]: In {0} received agent update from {1}, flags {2}",
+//                Scene.Name, remoteClient.Name, (AgentManager.ControlFlags)agentData.ControlFlags);
 
             if (IsChildAgent)
             {
-            //    // m_log.Debug("DEBUG: HandleAgentUpdate: child agent");
+//                m_log.DebugFormat("DEBUG: HandleAgentUpdate: child agent in {0}", Scene.Name);
                 return;
             }
 
@@ -2090,13 +2484,23 @@ no information to check this
             // When we get to the point of re-computing neighbors everytime this
             // changes, then start using the agent's drawdistance rather than the 
             // region's draw distance.
+<<<<<<< HEAD
+            DrawDistance = agentData.Far;
+            // DrawDistance = Scene.DefaultDrawDistance;
+=======
 
             DrawDistance = Util.Clamp(agentData.Far, 32, m_scene.MaxDrawDistance);
 
 //            DrawDistance = Scene.DefaultDrawDistance;
+>>>>>>> avn/ubitvar
 
             m_mouseLook = (flags & AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0;
-            m_leftButtonDown = (flags & AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0;
+
+            // FIXME: This does not work as intended because the viewer only sends the lbutton down when the button
+            // is first pressed, not whilst it is held down.  If this is required in the future then need to look
+            // for an AGENT_CONTROL_LBUTTON_UP event and make sure to handle cases where an initial DOWN is not 
+            // received (e.g. on holding LMB down on the avatar in a viewer).
+//            m_leftButtonDown = (flags & AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0;
 
             #endregion Inputs
 
@@ -2188,6 +2592,14 @@ no information to check this
 
                 bool update_movementflag = false;
 
+                // If we were just made root agent then we must perform movement updates for the first AgentUpdate that
+                // we get
+                if (MovementFlag == ForceUpdateMovementFlagValue)
+                {
+                    MovementFlag = 0;
+                    update_movementflag = true;
+                }
+
                 if (agentData.UseClientAgentPosition)
                 {
                     MovingToTarget = (agentData.ClientAgentPosition - AbsolutePosition).Length() > 0.2f;
@@ -2219,6 +2631,8 @@ no information to check this
                 {
                     bool bAllowUpdateMoveToPosition = false;
 
+<<<<<<< HEAD
+=======
                     Vector3[] dirVectors;
 
                     // use camera up angle when in mouselook and not flying or when holding the left mouse button down and not flying
@@ -2229,6 +2643,7 @@ no information to check this
                         dirVectors = Dir_Vectors;
 
 
+>>>>>>> avn/ubitvar
                     // A DIR_CONTROL_FLAG occurs when the user is trying to move in a particular direction.
                     foreach (Dir_ControlFlags DCF in DIR_CONTROL_FLAGS)
                     {
@@ -2238,7 +2653,9 @@ no information to check this
 
                             try
                             {
-                                agent_control_v3 += dirVectors[i];
+                                // Don't slide against ground when crouching if camera is panned around avatar
+                                if (Flying || DCF != Dir_ControlFlags.DIR_CONTROL_FLAG_DOWN)
+                                    agent_control_v3 += Dir_Vectors[i];
                                 //m_log.DebugFormat("[Motion]: {0}, {1}",i, dirVectors[i]);
                             }
                             catch (IndexOutOfRangeException)
@@ -2448,7 +2865,12 @@ no information to check this
             // When we get to the point of re-computing neighbors everytime this
             // changes, then start using the agent's drawdistance rather than the 
             // region's draw distance.
+<<<<<<< HEAD
+            DrawDistance = agentData.Far;
+            // DrawDistance = Scene.DefaultDrawDistance;
+=======
             DrawDistance = Util.Clamp(agentData.Far, 32, m_scene.MaxDrawDistance);
+>>>>>>> avn/ubitvar
 
             // Check if Client has camera in 'follow cam' or 'build' mode.
             Vector3 camdif = (Vector3.One * Rotation - Vector3.One * CameraRotation);
@@ -2643,6 +3065,8 @@ no information to check this
                 || pos.Z < 0)
                 return;
 
+            Scene targetScene = m_scene;
+
 //            Vector3 heightAdjust = new Vector3(0, 0, Appearance.AvatarHeight / 2);
 //            pos += heightAdjust;
 //
@@ -2654,6 +3078,8 @@ no information to check this
 //            }
 
             // Get terrain height for sub-region in a megaregion if necessary
+<<<<<<< HEAD
+=======
             int X = (int)((m_scene.RegionInfo.WorldLocX) + pos.X);
             int Y = (int)((m_scene.RegionInfo.WorldLocY) + pos.Y);
             GridRegion target_region = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, X, Y);
@@ -2662,13 +3088,30 @@ no information to check this
                 return;
             UUID target_regionID = target_region.RegionID;
             Scene targetScene = m_scene;
+>>>>>>> avn/ubitvar
+
+                                //COMMENT: If its only nessesary in a megaregion, why do it on normal region's too?
 
-            if (!SceneManager.Instance.TryGetScene(target_regionID, out targetScene))
-                targetScene = m_scene;
+                if (regionCombinerModule != null)
+            {
+                int x = (int)((m_scene.RegionInfo.WorldLocX) + pos.X);
+                int y = (int)((m_scene.RegionInfo.WorldLocY) + pos.Y);
+                GridRegion target_region = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, x, y);
+
+<<<<<<< HEAD
+                // If X and Y is NaN, target_region will be null
+                if (target_region == null)
+                    return;
+               
+                SceneManager.Instance.TryGetScene(target_region.RegionID, out targetScene);
+            }
 
             float terrainHeight = (float)targetScene.Heightmap[(int)(pos.X % regionSize.X), (int)(pos.Y % regionSize.Y)];
+=======
+            float terrainHeight = (float)targetScene.Heightmap[(int)(pos.X % regionSize.X), (int)(pos.Y % regionSize.Y)];
             // dont try to land underground
             terrainHeight += Appearance.AvatarHeight / 2;
+>>>>>>> avn/ubitvar
             pos.Z = Math.Max(terrainHeight, pos.Z);
 
             // Fudge factor.  It appears that if one clicks "go here" on a piece of ground, the go here request is
@@ -2677,16 +3120,26 @@ no information to check this
             if (pos.Z - terrainHeight < 0.2)
                 pos.Z = terrainHeight;
 
+<<<<<<< HEAD
+=======
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}",
 //                Name, pos, terrainHeight, m_scene.RegionInfo.RegionName);
                      
 
+>>>>>>> avn/ubitvar
             if (noFly)
                 Flying = false;
             else if (pos.Z > terrainHeight + Appearance.AvatarHeight / 2 || Flying)
                 Flying = true;
 
+//            m_log.DebugFormat(
+//                "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}",
+//                Name, pos, terrainHeight, m_scene.RegionInfo.RegionName);
+
+                        if (noFly)
+                                Flying = false;
+
             LandAtTarget = landAtTarget;
             MovingToTarget = true;
             MoveToPositionTarget = pos;
@@ -2761,10 +3214,13 @@ no information to check this
                     }
                 }
 
+<<<<<<< HEAD
+=======
                 part.ParentGroup.DeleteAvatar(UUID);
 
                 Quaternion standRotation = part.ParentGroup.RootPart.RotationOffset;
                 Vector3 sitPartWorldPosition = part.ParentGroup.AbsolutePosition + m_pos * standRotation;
+>>>>>>> avn/ubitvar
                 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
 
                 ParentID = 0;
@@ -2792,9 +3248,24 @@ no information to check this
                     standRotationZ.Z = 0f;
                 }
 
+<<<<<<< HEAD
+                //Vector3 standPos = ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
+                //Vector3 standPos = ParentPosition;
+
+//                Vector3 standPositionAdjustment 
+//                    = part.SitTargetPosition + new Vector3(0.5f, 0f, m_sitAvatarHeight / 2f);
+                Vector3 adjustmentForSitPosition = OffsetPosition * part.ParentGroup.GroupRotation - SIT_TARGET_ADJUSTMENT * part.GetWorldRotation();
+
+                // XXX: This is based on the physics capsule sizes.  Need to find a better way to read this rather than
+                // hardcoding here.
+                Vector3 adjustmentForSitPose = new Vector3(0.74f, 0f, 0f) * standRotation;
+
+                Vector3 standPos = part.ParentGroup.AbsolutePosition + adjustmentForSitPosition + adjustmentForSitPose;
+=======
                 Vector3 adjustmentForSitPose = new Vector3(0.75f, 0, m_sitAvatarHeight + .3f) * standRotationZ;
 
                 Vector3 standPos = sitPartWorldPosition + adjustmentForSitPose;
+>>>>>>> avn/ubitvar
 
                 m_pos = standPos;
             }
@@ -2806,8 +3277,16 @@ no information to check this
 
             if (satOnObject)
             {
+<<<<<<< HEAD
+                SendAvatarDataToAllClients();
+                m_requestedSitTargetID = 0;
+
+                part.RemoveSittingAvatar(this);
+
+=======
                 m_requestedSitTargetID = 0;
                 part.RemoveSittingAvatar(UUID);
+>>>>>>> avn/ubitvar
                 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
 
                 SendAvatarDataToAllAgents();
@@ -2907,10 +3386,37 @@ no information to check this
 
                 Velocity = Vector3.Zero;
 
-                part.AddSittingAvatar(UUID);
+                part.AddSittingAvatar(this);
 
                 cameraAtOffset = part.GetCameraAtOffset();
+
+                if (!part.IsRoot && cameraAtOffset == Vector3.Zero)
+                    cameraAtOffset = part.ParentGroup.RootPart.GetCameraAtOffset();
+
+                bool cameraEyeOffsetFromRootForChild = false;
                 cameraEyeOffset = part.GetCameraEyeOffset();
+
+                if (!part.IsRoot && cameraEyeOffset == Vector3.Zero)
+                {                 
+                    cameraEyeOffset = part.ParentGroup.RootPart.GetCameraEyeOffset();
+                    cameraEyeOffsetFromRootForChild = true;
+                }
+
+                if ((cameraEyeOffset != Vector3.Zero && !cameraEyeOffsetFromRootForChild) || cameraAtOffset != Vector3.Zero)
+                {
+                    if (!part.IsRoot)
+                    {
+                        cameraEyeOffset = cameraEyeOffset * part.RotationOffset;
+                        cameraAtOffset += part.OffsetPosition;
+                    }
+
+                    cameraEyeOffset += part.OffsetPosition;
+                }
+
+//                m_log.DebugFormat(
+//                    "[SCENE PRESENCE]: Using cameraAtOffset {0}, cameraEyeOffset {1} for sit on {2} by {3} in {4}", 
+//                    cameraAtOffset, cameraEyeOffset, part.Name, Name, Scene.Name);
+
                 forceMouselook = part.GetForceMouselook();
 
                 if (!part.IsRoot)
@@ -3054,7 +3560,7 @@ no information to check this
             Velocity = Vector3.Zero;
             m_AngularVelocity = Vector3.Zero;
 
-            part.AddSittingAvatar(UUID);
+            part.AddSittingAvatar(this);
 
             Vector3 cameraAtOffset = part.GetCameraAtOffset();
             Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
@@ -3090,7 +3596,6 @@ no information to check this
           
 
             m_requestedSitTargetID = 0;
-            part.ParentGroup.AddAvatar(UUID);
 
             ParentPart = part;
             ParentID = part.LocalId;
@@ -3102,6 +3607,9 @@ no information to check this
                 Animator.TrySetMovementAnimation("SIT_GROUND");
             else
                 Animator.TrySetMovementAnimation("SIT");
+<<<<<<< HEAD
+            SendAvatarDataToAllClients();
+=======
 */
             if (status == 3)
                 sitAnimation = "SIT_GROUND";
@@ -3109,11 +3617,11 @@ no information to check this
                 sitAnimation = "SIT";
 
             Animator.SetMovementAnimations("SIT");
+>>>>>>> avn/ubitvar
 
             part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
         }
 
-
         public void HandleAgentSit(IClientAPI remoteClient, UUID agentID)
         {
             if (IsChildAgent)
@@ -3132,7 +3640,6 @@ no information to check this
                     return;
                 }
 
-
                 if (part.SitTargetAvatar == UUID)
                 {
                     Vector3 sitTargetPos = part.SitTargetPosition;
@@ -3147,28 +3654,40 @@ no information to check this
 
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
-                    double x, y, z, m;
+                    double x, y, z, m1, m2;
 
                     Quaternion r = sitTargetOrient;
-                    m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W;
-
-                    if (Math.Abs(1.0 - m) > 0.000001)
-                    {
-                        m = 1.0 / Math.Sqrt(m);
-                        r.X *= (float)m;
-                        r.Y *= (float)m;
-                        r.Z *= (float)m;
-                        r.W *= (float)m;
-                    }
+                    m1 = r.X * r.X + r.Y * r.Y;
+                    m2 = r.Z * r.Z + r.W * r.W;
 
+                    // Rotate the vector <0, 0, 1>
                     x = 2 * (r.X * r.Z + r.Y * r.W);
                     y = 2 * (-r.X * r.W + r.Y * r.Z);
-                    z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
+                    z = m2 - m1;
+
+                    // Set m to be the square of the norm of r.
+                    double m = m1 + m2;
+
+                    // This constant is emperically determined to be what is used in SL.
+                    // See also http://opensimulator.org/mantis/view.php?id=7096
+                    double offset = 0.05;
+
+                    // Normally m will be ~ 1, but if someone passed a handcrafted quaternion
+                    // to llSitTarget with values so small that squaring them is rounded off
+                    // to zero, then m could be zero. The result of this floating point
+                    // round off error (causing us to skip this impossible normalization)
+                    // is only 5 cm.
+                    if (m > 0.000001)
+                    {
+                        offset /= m;
+                    }
 
                     Vector3 up = new Vector3((float)x, (float)y, (float)z);
-                    Vector3 sitOffset = up * Appearance.AvatarHeight * 0.02638f;
+                    Vector3 sitOffset = up * (float)offset;
 
-                    Vector3 newPos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
+                    // sitOffset is in Avatar Center coordinates: from origin to 'sitTargetPos + SIT_TARGET_ADJUSTMENT'.
+                    // So, we need to _substract_ it to get to the origin of the Avatar Center.
+                    Vector3 newPos = sitTargetPos + SIT_TARGET_ADJUSTMENT - sitOffset;
                     Quaternion newRot;
 
                     if (part.IsRoot)
@@ -3201,8 +3720,7 @@ no information to check this
 //                            Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId);
                 }
 
-                part.ParentGroup.AddAvatar(UUID);
-                ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
+                ParentPart = part;
                 ParentID = m_requestedSitTargetID;
                 m_AngularVelocity = Vector3.Zero;
                 Velocity = Vector3.Zero;
@@ -3215,8 +3733,13 @@ no information to check this
                 {
                     sitAnimation = part.SitAnimation;
                 }
+<<<<<<< HEAD
+                Animator.TrySetMovementAnimation(sitAnimation);
+                SendAvatarDataToAllClients();
+=======
 //                Animator.TrySetMovementAnimation(sitAnimation);
                 Animator.SetMovementAnimations("SIT");
+>>>>>>> avn/ubitvar
                 TriggerScenePresenceUpdated();
             }
         }
@@ -3278,10 +3801,25 @@ no information to check this
             //                "[SCENE PRESENCE]: Adding new movement {0} with rotation {1}, thisAddSpeedModifier {2} for {3}", 
             //                vec, Rotation, thisAddSpeedModifier, Name);
 
+<<<<<<< HEAD
+            Quaternion rot = Rotation;
+            if (!Flying && PresenceType != PresenceType.Npc)
+            {
+                // The only situation in which we care about X and Y is avatar flying.  The rest of the time
+                // these parameters are not relevant for determining avatar movement direction and cause issues such
+                // as wrong walk speed if the camera is rotated.
+                rot.X = 0;
+                rot.Y = 0;
+                rot.Normalize();
+            }
+
+            Vector3 direc = vec * rot;
+=======
             // rotate from avatar coord space to world
             // for now all controls assume this is only a rotation around Z
             // if not all checks below need to be done before this rotation
             Vector3 direc = vec * Rotation;
+>>>>>>> avn/ubitvar
             direc.Normalize();
 
             // mouse look situation ?
@@ -3331,10 +3869,6 @@ no information to check this
 
         public override void Update()
         {
-            const float ROTATION_TOLERANCE = 0.01f;
-            const float VELOCITY_TOLERANCE = 0.001f;
-            const float POSITION_TOLERANCE = 0.05f;
-
             if (IsChildAgent == false)
             {
                 CheckForBorderCrossing();
@@ -3346,11 +3880,21 @@ no information to check this
                 // grab the latest PhysicsActor velocity, whereas m_velocity is often
                 // storing a requested force instead of an actual traveling velocity
                 if (Appearance.AvatarSize != m_lastSize && !IsLoggingIn)
-                    SendAvatarDataToAllAgents();
-
-                if (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
-                    !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
-                    !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE))
+                    SendAvatarDataToAllClients();
+
+                // Allow any updates for sitting avatars to that llSetPrimitiveLinkParams() can work for very
+                // small increments (e.g. sit position adjusters).  An alternative may be to eliminate the tolerance
+                // checks on all updates but the ramifications of this would need careful consideration.
+                bool updateClients 
+                    = IsSatOnObject && (Rotation != m_lastRotation || Velocity != m_lastVelocity || m_pos != m_lastPosition);
+                                 
+                if (!updateClients)
+                    updateClients 
+                        = !Rotation.ApproxEquals(m_lastRotation, Scene.RootRotationUpdateTolerance) 
+                            || !Velocity.ApproxEquals(m_lastVelocity, Scene.RootVelocityUpdateTolerance)
+                            || !m_pos.ApproxEquals(m_lastPosition, Scene.RootPositionUpdateTolerance);
+
+                if (updateClients)
                 {
                     SendTerseUpdateToAllClients();
 
@@ -3360,6 +3904,12 @@ no information to check this
                     m_lastVelocity = Velocity;
                 }
 
+<<<<<<< HEAD
+                if (Scene.AllowAvatarCrossing)
+                    CheckForBorderCrossing();
+
+=======
+>>>>>>> avn/ubitvar
                 CheckForSignificantMovement(); // sends update to the modules.
             }
         }
@@ -3368,6 +3918,8 @@ no information to check this
 
         #region Update Client(s)
 
+<<<<<<< HEAD
+=======
         public void SendUpdateToAgent(ScenePresence p)
         {
             IClientAPI remoteClient = p.ControllingClient;
@@ -3397,6 +3949,7 @@ no information to check this
             ControllingClient.SendAgentTerseUpdate(p);
         }
 
+>>>>>>> avn/ubitvar
         /// <summary>
         /// Sends a location update to the client connected to this scenePresence
         /// via entity updates
@@ -3408,6 +3961,29 @@ no information to check this
             // server.
             if (remoteClient.IsActive)
             {
+                if (Scene.RootTerseUpdatePeriod > 1)
+                {
+//                    Console.WriteLine(
+//                        "{0} {1} {2} {3} {4} {5} for {6} to {7}", 
+//                        remoteClient.AgentId, UUID, remoteClient.SceneAgent.IsChildAgent, m_terseUpdateCount, Scene.RootTerseUpdatePeriod, Velocity.ApproxEquals(Vector3.Zero, 0.001f), Name, remoteClient.Name);
+                    if (remoteClient.AgentId != UUID
+                        && !remoteClient.SceneAgent.IsChildAgent
+                        && m_terseUpdateCount % Scene.RootTerseUpdatePeriod != 0 
+                        && !Velocity.ApproxEquals(Vector3.Zero, 0.001f))
+                    {
+//                        m_log.DebugFormat("[SCENE PRESENCE]: Discarded update from {0} to {1}, args {2} {3} {4} {5} {6} {7}",
+//                            Name, remoteClient.Name, remoteClient.AgentId, UUID, remoteClient.SceneAgent.IsChildAgent, m_terseUpdateCount, Scene.RootTerseUpdatePeriod, Velocity.ApproxEquals(Vector3.Zero, 0.001f));
+
+                        return;
+                    }
+                }
+
+                if (Scene.ChildTerseUpdatePeriod > 1 
+                    && remoteClient.SceneAgent.IsChildAgent
+                    && m_terseUpdateCount % Scene.ChildTerseUpdatePeriod != 0 
+                    && !Velocity.ApproxEquals(Vector3.Zero, 0.001f))
+                        return;
+
                 //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity);
                 remoteClient.SendEntityUpdate(
                     this,
@@ -3476,7 +4052,11 @@ no information to check this
             float distanceError = Vector3.Distance(OffsetPosition, expectedPosition);
 
             float speed = Velocity.Length();
-            float velocidyDiff = Vector3.Distance(lastVelocitySentToAllClients, Velocity);
+            float velocityDiff = Vector3.Distance(lastVelocitySentToAllClients, Velocity);
+
+//            m_log.DebugFormat(
+//                "[SCENE PRESENCE]: Delta-v {0}, lastVelocity {1}, Velocity {2} for {3} in {4}",
+//                velocidyDiff, lastVelocitySentToAllClients, Velocity, Name, Scene.Name);
 
             // assuming 5 ms. worst case precision for timer, use 2x that 
             // for distance error threshold
@@ -3484,12 +4064,18 @@ no information to check this
 
             if (speed < 0.01f // allow rotation updates if avatar position is unchanged
                 || Math.Abs(distanceError) > distanceErrorThreshold
-                || velocidyDiff > 0.01f) // did velocity change from last update?
+                || velocityDiff > 0.01f) // did velocity change from last update?
             {
+//                m_log.DebugFormat(
+//                    "[SCENE PRESENCE]: Update triggered with speed {0}, distanceError {1}, distanceThreshold {2}, delta-v {3} for {4} in {5}", 
+//                    speed, distanceError, distanceErrorThreshold, velocidyDiff, Name, Scene.Name);
+
                 lastVelocitySentToAllClients = Velocity;
                 lastTerseUpdateToAllClientsTick = currentTick;
                 lastPositionSentToAllClients = OffsetPosition;
 
+                m_terseUpdateCount++;
+
 //                Console.WriteLine("Scheduled update for {0} in {1}", Name, Scene.Name);
 //                m_scene.ForEachClient(SendTerseUpdateToClient);
                 m_scene.ForEachScenePresence(SendTerseUpdateToAgent);
@@ -3517,14 +4103,24 @@ no information to check this
             ControllingClient.SendCoarseLocationUpdate(avatarUUIDs, coarseLocations);
         }
 
-        public void SendInitialDataToMe()
+        public void SendInitialDataToClient()
         {
+            SentInitialDataToClient = true;
+
             // Send all scene object to the new client
-            Util.FireAndForget(delegate
+            WorkManager.RunJob("SendInitialDataToClient", delegate
             {
+//                m_log.DebugFormat(
+//                    "[SCENE PRESENCE]: Sending initial data to {0} agent {1} in {2}, tp flags {3}", 
+//                    IsChildAgent ? "child" : "root", Name, Scene.Name, m_teleportFlags);
+
                 // we created a new ScenePresence (a new child agent) in a fresh region.
                 // Request info about all the (root) agents in this region
                 // Note: This won't send data *to* other clients in that region (children don't send)
+<<<<<<< HEAD
+                SendOtherAgentsAvatarDataToClient();
+                SendOtherAgentsAppearanceToClient();
+=======
                 if (m_teleportFlags <= 0)
                 {
                     ILandChannel landch = m_scene.LandChannel;
@@ -3533,6 +4129,7 @@ no information to check this
                         landch.sendClientInitialLandInfo(ControllingClient);
                     }
                 }
+>>>>>>> avn/ubitvar
 
                 SendOtherAgentsAvatarFullToMe();
                 EntityBase[] entities = Scene.Entities.GetEntities();
@@ -3541,7 +4138,11 @@ no information to check this
                     if (e != null && e is SceneObjectGroup && !((SceneObjectGroup)e).IsAttachment)
                         ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
                 }
+<<<<<<< HEAD
+            }, null, string.Format("SendInitialDataToClient ({0} in {1})", Name, Scene.Name), false, true);
+=======
             });
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -3570,6 +4171,17 @@ no information to check this
                 if (m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.QueueAppearanceSave(UUID);
             }
+<<<<<<< HEAD
+            
+            // This agent just became root. We are going to tell everyone about it. The process of
+            // getting other avatars information was initiated elsewhere immediately after the child circuit connected... don't do it
+            // again here... this comes after the cached appearance check because the avatars
+            // appearance goes into the avatar update packet
+            SendAvatarDataToAllClients();
+
+            // This invocation always shows up in the viewer logs as an error.  Is it needed?
+            SendAppearanceToClient(this);
+=======
 
             // send avatar object to all viewers so they cross it into region
             bool newhide = m_currentParcelHide;
@@ -3585,6 +4197,7 @@ no information to check this
             }
 
             SendAppearanceToAgent(this);
+>>>>>>> avn/ubitvar
 
             m_inTransit = false;
 
@@ -3607,6 +4220,13 @@ no information to check this
                 if (p.UUID == UUID)
                     return;
 
+<<<<<<< HEAD
+                // If the avatars baked textures are all in the cache, then we have a 
+                // complete appearance... send it out, if not, then we'll send it when
+                // the avatar finishes updating its appearance
+                SendAppearanceToAllOtherClients();
+            }
+=======
                 // get the avatar, then a kill if can't see it
                 p.SendInitialAvatarDataToAgent(this);
 
@@ -3620,13 +4240,19 @@ no information to check this
             });
 
             m_scene.StatsReporter.AddAgentUpdates(count);
+>>>>>>> avn/ubitvar
+        }
+
+        public void SendAvatarDataToAllClients()
+        {
+            SendAvatarDataToAllClients(true);
         }
 
         /// <summary>
         /// Send this agent's avatar data to all other root and child agents in the scene
         /// This agent must be root. This avatar will receive its own update. 
         /// </summary>
-        public void SendAvatarDataToAllAgents()
+        public void SendAvatarDataToAllClients(bool full)
         {
             //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAllAgents: {0} ({1})", Name, UUID);
             // only send update from root agents to other clients; children are only "listening posts"
@@ -3643,19 +4269,46 @@ no information to check this
 
             m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
             {
+<<<<<<< HEAD
+                if (full)
+                    SendAvatarDataToClient(scenePresence);
+                else
+                    scenePresence.ControllingClient.SendAvatarDataImmediate(this);
+=======
                 SendAvatarDataToAgent(scenePresence);
+>>>>>>> avn/ubitvar
                 count++;
             });
 
             m_scene.StatsReporter.AddAgentUpdates(count);
         }
 
+<<<<<<< HEAD
+        /// <summary>
+        /// Send avatar data for all other root agents to this agent, this agent
+        /// can be either a child or root
+        /// </summary>
+        public void SendOtherAgentsAvatarDataToClient()
+=======
         // sends avatar object to all clients so they cross it into region
         // then sends kills to hide
         public void SendInitialAvatarDataToAllAgents(List<ScenePresence> presences)
+>>>>>>> avn/ubitvar
         {
             m_lastSize = Appearance.AvatarSize;
             int count = 0;
+<<<<<<< HEAD
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
+                        {
+                            // only send information about other root agents
+                            if (scenePresence.UUID == UUID)
+                                return;
+                                             
+                            scenePresence.SendAvatarDataToClient(this);
+                            count++;
+                        });
+=======
+>>>>>>> avn/ubitvar
 
             foreach (ScenePresence p in presences)
             {
@@ -3684,11 +4337,16 @@ no information to check this
         /// Send avatar data to an agent.
         /// </summary>
         /// <param name="avatar"></param>
-        public void SendAvatarDataToAgent(ScenePresence avatar)
+        public void SendAvatarDataToClient(ScenePresence avatar)
         {
+<<<<<<< HEAD
+            //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToClient from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID);
+
+=======
             //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID);
             if (ParcelHideThisAvatar && currentParcelUUID != avatar.currentParcelUUID && avatar.GodLevel < 200)
                 return;
+>>>>>>> avn/ubitvar
             avatar.ControllingClient.SendAvatarDataImmediate(this);
         }
 
@@ -3701,9 +4359,13 @@ no information to check this
         /// Send this agent's appearance to all other root and child agents in the scene
         /// This agent must be root.
         /// </summary>
-        public void SendAppearanceToAllOtherAgents()
+        public void SendAppearanceToAllOtherClients()
         {
+<<<<<<< HEAD
+//            m_log.DebugFormat("[SCENE PRESENCE] SendAppearanceToAllOtherClients: {0} {1}", Name, UUID);
+=======
             //            m_log.DebugFormat("[SCENE PRESENCE] SendAppearanceToAllOtherAgents: {0} {1}", Name, UUID);
+>>>>>>> avn/ubitvar
 
             // only send update from root agents to other clients; children are only "listening posts"
             if (IsChildAgent)
@@ -3722,9 +4384,35 @@ no information to check this
                             if (scenePresence.UUID == UUID)
                                 return;
 
-                            SendAppearanceToAgent(scenePresence);
+                            SendAppearanceToClient(scenePresence);
                             count++;
                         });
+<<<<<<< HEAD
+
+            m_scene.StatsReporter.AddAgentUpdates(count);
+        }
+
+        /// <summary>
+        /// Send appearance from all other root agents to this agent. this agent
+        /// can be either root or child
+        /// </summary>
+        public void SendOtherAgentsAppearanceToClient()
+        {
+//            m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToClient {0} {1}", Name, UUID);
+
+            int count = 0;
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
+                        {
+                            // only send information about other root agents
+                            if (scenePresence.UUID == UUID)
+                                return;
+                                             
+                            scenePresence.SendAppearanceToClient(this);
+                            count++;
+                        });
+
+=======
+>>>>>>> avn/ubitvar
             m_scene.StatsReporter.AddAgentUpdates(count);
         }
 
@@ -3732,7 +4420,7 @@ no information to check this
         /// Send appearance data to an agent.
         /// </summary>
         /// <param name="avatar"></param>
-        public void SendAppearanceToAgent(ScenePresence avatar)
+        public void SendAppearanceToClient(ScenePresence avatar)
         {
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Sending appearance data from {0} {1} to {2} {3}", Name, m_uuid, avatar.Name, avatar.UUID);
@@ -3858,7 +4546,8 @@ no information to check this
 
 
                 // Let's get this out of the update loop
-                Util.FireAndForget(delegate { m_scene.SendOutChildAgentUpdates(agentpos, this); });
+                Util.FireAndForget(
+                    o => m_scene.SendOutChildAgentUpdates(agentpos, this), null, "ScenePresence.SendOutChildAgentUpdates");
             }
         }
 
@@ -3885,6 +4574,81 @@ no information to check this
             if (ParentID != 0 || PhysicsActor == null || ParentUUID != UUID.Zero)
                 return;
 
+<<<<<<< HEAD
+            if (IsInTransit)
+                return;
+
+            Vector3 pos2 = AbsolutePosition;
+            Vector3 origPosition = pos2;
+            Vector3 vel = Velocity;
+
+            // Compute the future avatar position.
+            // If the avatar will be crossing, we force the crossing to happen now
+            //     in the hope that this will make the avatar movement smoother when crossing.
+            pos2 += vel * 0.05f;
+
+            if (m_scene.PositionIsInCurrentRegion(pos2))
+                return;
+
+            m_log.DebugFormat("{0} CheckForBorderCrossing: position outside region. {1} in {2} at pos {3}", 
+                                    LogHeader, Name, Scene.Name, pos2);
+
+            // Disconnect from the current region
+            bool isFlying = Flying;
+            RemoveFromPhysicalScene();
+
+            // pos2 is the forcasted position so make that the 'current' position so the crossing
+            //    code will move us into the newly addressed region.
+            m_pos = pos2;
+
+            if (CrossToNewRegion())
+            {
+                AddToPhysicalScene(isFlying);
+            }
+            else
+            {
+                // Tried to make crossing happen but it failed.
+                if (m_requestedSitTargetUUID == UUID.Zero)
+                {
+                    m_log.DebugFormat("{0} CheckForBorderCrossing: Crossing failed. Restoring old position.", LogHeader);
+
+                    Velocity = Vector3.Zero;
+                    AbsolutePosition = EnforceSanityOnPosition(origPosition);
+
+                    AddToPhysicalScene(isFlying);
+                }
+            }
+        }
+
+        // Given a position, make sure it is within the current region.
+        // If just outside some border, the returned position will be just inside the border on that side.
+        private Vector3 EnforceSanityOnPosition(Vector3 origPosition)
+        {
+            const float borderFudge = 0.1f;
+            Vector3 ret = origPosition;
+
+            // Sanity checking on the position to make sure it is in the region we couldn't cross from
+            float extentX = (float)m_scene.RegionInfo.RegionSizeX;
+            float extentY = (float)m_scene.RegionInfo.RegionSizeY;
+            IRegionCombinerModule combiner = m_scene.RequestModuleInterface<IRegionCombinerModule>();
+            if (combiner != null)
+            {
+                // If a mega-region, the size could be much bigger
+                Vector2 megaExtent = combiner.GetSizeOfMegaregion(m_scene.RegionInfo.RegionID);
+                extentX = megaExtent.X;
+                extentY = megaExtent.Y;
+            }
+            if (ret.X < 0)
+                ret.X = borderFudge;
+            else if (ret.X >= extentX)
+                ret.X = extentX - borderFudge;
+            if (ret.Y < 0)
+                ret.Y = borderFudge;
+            else if (ret.Y >= extentY)
+                ret.Y = extentY - borderFudge;
+
+            return ret;
+=======
             Vector3 pos2 = AbsolutePosition;
             Vector3 vel = Velocity;
 
@@ -3947,6 +4711,7 @@ no information to check this
                 AddToPhysicalScene(isFlying);
             }
 
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -4014,6 +4779,16 @@ no information to check this
                 // Don't close the agent on this region yet
                 if (handle != Scene.RegionInfo.RegionHandle)
                 {
+<<<<<<< HEAD
+                    uint x, y;
+                    Util.RegionHandleToRegionLoc(handle, out x, out y);
+
+//                    m_log.Debug("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX)));
+//                    m_log.Debug("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY)));
+                    float dist = (float)Math.Max(Scene.DefaultDrawDistance,
+                            (float)Math.Max(Scene.RegionInfo.RegionSizeX, Scene.RegionInfo.RegionSizeY));
+                    if (Util.IsOutsideView(dist, x, newRegionX, y, newRegionY))
+=======
                     Util.RegionHandleToRegionLoc(handle, out x, out y);
                     if (m_knownChildRegionsSizeInfo.TryGetValue(handle, out regInfo))
                     {
@@ -4027,6 +4802,7 @@ no information to check this
                         }
                     }
                     else
+>>>>>>> avn/ubitvar
                     {
                         if (Util.IsOutsideView(DrawDistance, x, newRegionX, y, newRegionY,
                             (int)Constants.RegionSize, (int)Constants.RegionSize, newRegionSizeX, newRegionSizeY))
@@ -4099,6 +4875,8 @@ no information to check this
                 return;
 
             CopyFrom(cAgentData);
+
+            m_updateAgentReceivedAfterTransferEvent.Set();
         }
 
         private static Vector3 marker = new Vector3(-1f, -1f, -1f);
@@ -4117,11 +4895,23 @@ no information to check this
             if (!IsChildAgent)
                 return;
 
+<<<<<<< HEAD
+//            m_log.DebugFormat(
+//                "[SCENE PRESENCE]: ChildAgentPositionUpdate for {0} in {1}, tRegion {2},{3}, rRegion {4},{5}, pos {6}",
+//                Name, Scene.Name, tRegionX, tRegionY, rRegionX, rRegionY, cAgentData.Position);
+
+            // Find  the distance (in meters) between the two regions
+            // XXX: We cannot use Util.RegionLocToHandle() here because a negative value will silently overflow the
+            // uint
+            int shiftx = (int)(((int)rRegionX - (int)tRegionX) * Constants.RegionSize);
+            int shifty = (int)(((int)rRegionY - (int)tRegionY) * Constants.RegionSize);
+=======
             RegionHandle = cAgentData.RegionHandle;
 
             //m_log.Debug("   >>> ChildAgentPositionUpdate <<< " + rRegionX + "-" + rRegionY);
             int shiftx = ((int)rRegionX - (int)tRegionX) * (int)Constants.RegionSize;
             int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize;
+>>>>>>> avn/ubitvar
 
             Vector3 offset = new Vector3(shiftx, shifty, 0f);
 
@@ -4129,7 +4919,11 @@ no information to check this
             // changes, then start using the agent's drawdistance rather than the 
             // region's draw distance.
             DrawDistance = cAgentData.Far;
+<<<<<<< HEAD
+            // DrawDistance = Scene.DefaultDrawDistance;
+=======
 //            DrawDistance = Scene.DefaultDrawDistance;
+>>>>>>> avn/ubitvar
 
             if (cAgentData.Position != marker) // UGH!!
                 m_pos = cAgentData.Position + offset;
@@ -4244,7 +5038,10 @@ no information to check this
 
         private void CopyFrom(AgentData cAgent)
         {
+<<<<<<< HEAD
+=======
 
+>>>>>>> avn/ubitvar
             m_callbackURI = cAgent.CallbackURI;
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Set callback for {0} in {1} to {2} in CopyFrom()",
@@ -4263,6 +5060,9 @@ no information to check this
             // changes, then start using the agent's drawdistance rather than the 
             // region's draw distance.
             DrawDistance = cAgent.Far;
+<<<<<<< HEAD
+            // DrawDistance = Scene.DefaultDrawDistance;
+=======
             //DrawDistance = Scene.DefaultDrawDistance;
 
             if (cAgent.ChildrenCapSeeds != null && cAgent.ChildrenCapSeeds.Count > 0)
@@ -4273,6 +5073,7 @@ no information to check this
                 }
                 KnownRegions = cAgent.ChildrenCapSeeds;
             }
+>>>>>>> avn/ubitvar
 
             if ((cAgent.Throttles != null) && cAgent.Throttles.Length > 0)
                 ControllingClient.SetChildAgentThrottle(cAgent.Throttles);
@@ -4334,11 +5135,35 @@ no information to check this
                 Animator.currentControlState = (ScenePresenceAnimator.motionControlStates) cAgent.MotionState;
 
             if (Scene.AttachmentsModule != null)
+<<<<<<< HEAD
+            {
+                // If the JobEngine is running we can schedule this job now and continue rather than waiting for all
+                // attachments to copy, which might take a long time in the Hypergrid case as the entire inventory
+                // graph is inspected for each attachments and assets possibly fetched.
+                // 
+                // We don't need to worry about a race condition as the job to later start the scripts is also 
+                // JobEngine scheduled and so will always occur after this task.
+                // XXX: This will not be true if JobEngine ever gets more than one thread.
+                WorkManager.RunJob(
+                    "CopyAttachments", 
+                    o => Scene.AttachmentsModule.CopyAttachments(cAgent, this), 
+                    null,
+                    string.Format("Copy attachments for {0} entering {1}", Name, Scene.Name),
+                    true);
+            }
+
+            // This must occur after attachments are copied or scheduled to be copied, as it releases the CompleteMovement() calling thread
+            // originating from the client completing a teleport.  Otherwise, CompleteMovement() code to restart
+            // script attachments can outrace this thread.
+            lock (m_originRegionIDAccessLock)
+                m_originRegionID = cAgent.RegionID;
+=======
                 Scene.AttachmentsModule.CopyAttachments(cAgent, this);
 
             lock (m_originRegionIDAccessLock)
                 m_originRegionID = cAgent.RegionID;
             
+>>>>>>> avn/ubitvar
         }
 
         public bool CopyAgent(out IAgentData agent)
@@ -4387,20 +5212,22 @@ no information to check this
             if (Appearance.AvatarHeight == 0)
 //                Appearance.SetHeight();
                 Appearance.SetSize(new Vector3(0.45f,0.6f,1.9f));
-
-            PhysicsScene scene = m_scene.PhysicsScene;
-
-            Vector3 pVec = AbsolutePosition;
-
+                    
 /*
             PhysicsActor = scene.AddAvatar(
                 LocalId, Firstname + "." + Lastname, pVec,
                 new Vector3(0.45f, 0.6f, Appearance.AvatarHeight), isFlying);
 */
 
+<<<<<<< HEAD
+            PhysicsActor = m_scene.PhysicsScene.AddAvatar(
+                LocalId, Firstname + "." + Lastname, AbsolutePosition, Velocity,
+                Appearance.AvatarBoxSize, isFlying);
+=======
             PhysicsActor = scene.AddAvatar(
                 LocalId, Firstname + "." + Lastname, pVec,
                 Appearance.AvatarBoxSize,Appearance.AvatarFeetOffset, isFlying);
+>>>>>>> avn/ubitvar
 
             //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
             PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
@@ -5099,7 +5926,7 @@ no information to check this
                         }
                     }
                 }
-            });
+            }, null, "ScenePresence.SendScriptEventToAttachments");
         }
 
         /// <summary>
@@ -5536,6 +6363,7 @@ no information to check this
             }
         }
 
+        // Modify landing point based on possible banning, telehubs or parcel restrictions.
         private void CheckAndAdjustLandingPoint(ref Vector3 pos)
         {
             string reason;
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index 5cb271d..998789d 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -119,21 +119,22 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 return output;
             }
         }
-        
+
         public static bool TryFromXml(string xml, out CoalescedSceneObjects coa)
         {
 //            m_log.DebugFormat("[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() deserializing {0}", xml);
             
             coa = null;
-            int i = 0;
             
-            using (StringReader sr = new StringReader(xml))
-            {                
-                using (XmlTextReader reader = new XmlTextReader(sr))
-                {
-                    try
+            try
+            {
+                // Quickly check if this is a coalesced object, without fully parsing the XML
+                using (StringReader sr = new StringReader(xml))
+                {                
+                    using (XmlTextReader reader = new XmlTextReader(sr))
                     {
-                        reader.Read();
+                        reader.MoveToContent(); // skip possible xml declaration
+
                         if (reader.Name != "CoalescedObject")
                         {
     //                        m_log.DebugFormat(
@@ -142,49 +143,47 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                             
                             return false;
                         }
-                        
-                        coa = new CoalescedSceneObjects(UUID.Zero);                    
-                        reader.Read();                                            
-                        
-                        while (reader.NodeType != XmlNodeType.EndElement && reader.Name != "CoalescedObject")
-                        {
-                            if (reader.Name == "SceneObjectGroup")
-                            {
-                                string soXml = reader.ReadOuterXml();
-
-                                SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(soXml);
-
-                                if (so != null)
-                                {
-                                    coa.Add(so);
-                                }
-                                else
-                                {
-                                    // XXX: Possibly we should fail outright here rather than continuing if a particular component of the 
-                                    // coalesced object fails to load.
-                                    m_log.WarnFormat(
-                                        "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml for component {0} failed.  Continuing.", 
-                                        i);
-                                }
+                    }
+                }
 
-                                i++;
-                            }
-                        }
+                XmlDocument doc = new XmlDocument();
+                doc.LoadXml(xml);
+                XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
+                if (e == null)
+                    return false;
                         
-                        reader.ReadEndElement(); // CoalescedObject
+                coa = new CoalescedSceneObjects(UUID.Zero);
+
+                XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
+                int i = 0;
+                
+                foreach (XmlNode n in groups)
+                {
+                    SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
+                    if (so != null)
+                    {
+                        coa.Add(so);
                     }
-                    catch (Exception e)
+                    else
                     {
-                        m_log.ErrorFormat(
-                            "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed with {0} {1}", 
-                            e.Message, e.StackTrace);
-                        
-                        return false;
-                    }                        
+                        // XXX: Possibly we should fail outright here rather than continuing if a particular component of the 
+                        // coalesced object fails to load.
+                        m_log.WarnFormat(
+                            "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml for component {0} failed.  Continuing.", 
+                            i);
+                    }
+
+                    i++;
                 }
             }
+            catch (Exception e)
+            {
+                m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ",  e);
+                Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml);
+                return false;
+            }                        
             
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 3d14943..dc5de58 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -38,6 +38,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Serialization.External;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.Framework.Scenes.Serialization
 {
@@ -51,7 +52,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static IUserManagement m_UserManagement;
-        
+
         /// <summary>
         /// Deserialize a scene object from the original xml format
         /// </summary>
@@ -59,57 +60,62 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         /// <returns>The scene object deserialized.  Null on failure.</returns>
         public static SceneObjectGroup FromOriginalXmlFormat(string xmlData)
         {
-            //m_log.DebugFormat("[SOG]: Starting deserialization of SOG");
-            //int time = System.Environment.TickCount;
-
-            try
+            String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData);
+            using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null))
             {
-                StringReader  sr;
-                XmlTextReader reader;
-                XmlNodeList   parts;
-                XmlDocument   doc;
-                int           linkNum;
-
-                doc = new XmlDocument();
-                doc.LoadXml(xmlData);
-                parts = doc.GetElementsByTagName("RootPart");
+                using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment }))
+                {
+                    try {
+                        return FromOriginalXmlFormat(reader);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
+                        Util.LogFailedXML("[SERIALIZER]:", fixedData);
+                        return null;
+                    }
+                }
+            }
+        }
 
-                if (parts.Count == 0)
-                    throw new Exception("Invalid Xml format - no root part");
+        /// <summary>
+        /// Deserialize a scene object from the original xml format
+        /// </summary>
+        /// <param name="xmlData"></param>
+        /// <returns>The scene object deserialized.  Null on failure.</returns>
+        public static SceneObjectGroup FromOriginalXmlFormat(XmlReader reader)
+        {
+            //m_log.DebugFormat("[SOG]: Starting deserialization of SOG");
+            //int time = System.Environment.TickCount;
 
-                sr = new StringReader(parts[0].InnerXml);
-                reader = new XmlTextReader(sr);
-                SceneObjectGroup sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
-                reader.Close();
-                sr.Close();
+            int linkNum;
 
-                parts = doc.GetElementsByTagName("Part");
+            reader.ReadToFollowing("RootPart");
+            reader.ReadToFollowing("SceneObjectPart");
+            SceneObjectGroup sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
+            reader.ReadToFollowing("OtherParts");
 
-                for (int i = 0; i < parts.Count; i++)
+            if (reader.ReadToDescendant("Part"))
+            {
+                do
                 {
-                    sr = new StringReader(parts[i].InnerXml);
-                    reader = new XmlTextReader(sr);
-                    SceneObjectPart part = SceneObjectPart.FromXml(reader);
-                    linkNum = part.LinkNum;
-                    sceneObject.AddPart(part);
-                    part.LinkNum = linkNum;
-                    part.TrimPermissions();
-                    reader.Close();
-                    sr.Close();
-                }
+                    if (reader.ReadToDescendant("SceneObjectPart"))
+                    {
+                        SceneObjectPart part = SceneObjectPart.FromXml(reader);
+                        linkNum = part.LinkNum;
+                        sceneObject.AddPart(part);
+                        part.LinkNum = linkNum;
+                        part.TrimPermissions();
+                    }
+                }                    
+                while (reader.ReadToNextSibling("Part"));
+            }
 
-                // Script state may, or may not, exist. Not having any, is NOT
-                // ever a problem.
-                sceneObject.LoadScriptState(doc);
+            // Script state may, or may not, exist. Not having any, is NOT
+            // ever a problem.
+            sceneObject.LoadScriptState(reader);
 
-                return sceneObject;
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat(
-                    "[SERIALIZER]: Deserialization of xml failed with {0}.  xml was {1}", e, xmlData);
-                return null;
-            }
+            return sceneObject;
         }
 
         /// <summary>
@@ -232,7 +238,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
                 if (parts.Count == 0)
                 {
-                    m_log.ErrorFormat("[SERIALIZER]: Deserialization of xml failed: No SceneObjectPart nodes. xml was " + xmlData);
+                    m_log.Error("[SERIALIZER]: Deserialization of xml failed: No SceneObjectPart nodes");
+                    Util.LogFailedXML("[SERIALIZER]:", xmlData);
                     return null;
                 }
 
@@ -276,7 +283,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[SERIALIZER]: Deserialization of xml failed with {0}.  xml was {1}", e, xmlData);
+                m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
+                Util.LogFailedXML("[SERIALIZER]:", xmlData);
                 return null;
             }
         }
@@ -299,13 +307,21 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
         }
 
+<<<<<<< HEAD
+        
+=======
+>>>>>>> avn/ubitvar
         /// <summary>
         /// Modifies a SceneObjectGroup.
         /// </summary>
         /// <param name="sog">The object</param>
         /// <returns>Whether the object was actually modified</returns>
         public delegate bool SceneObjectModifier(SceneObjectGroup sog);
+<<<<<<< HEAD
+        
+=======
 
+>>>>>>> avn/ubitvar
         /// <summary>
         /// Modifies an object by deserializing it; applying 'modifier' to each SceneObjectGroup; and reserializing.
         /// </summary>
@@ -319,7 +335,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             CoalescedSceneObjects coa = null;
 
             string xmlData = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(data));
+<<<<<<< HEAD
+            
+=======
 
+>>>>>>> avn/ubitvar
             if (CoalescedSceneObjectsSerializer.TryFromXml(xmlData, out coa))
             {
                 // m_log.DebugFormat("[SERIALIZER]: Loaded coalescence {0} has {1} objects", assetId, coa.Count);
@@ -364,17 +384,21 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             return data;
         }
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
 
         #region manual serialization
 
-        private static Dictionary<string, Action<SceneObjectPart, XmlTextReader>> m_SOPXmlProcessors
-            = new Dictionary<string, Action<SceneObjectPart, XmlTextReader>>();
+        private static Dictionary<string, Action<SceneObjectPart, XmlReader>> m_SOPXmlProcessors
+            = new Dictionary<string, Action<SceneObjectPart, XmlReader>>();
 
-        private static Dictionary<string, Action<TaskInventoryItem, XmlTextReader>> m_TaskInventoryXmlProcessors
-            = new Dictionary<string, Action<TaskInventoryItem, XmlTextReader>>();
+        private static Dictionary<string, Action<TaskInventoryItem, XmlReader>> m_TaskInventoryXmlProcessors
+            = new Dictionary<string, Action<TaskInventoryItem, XmlReader>>();
 
-        private static Dictionary<string, Action<PrimitiveBaseShape, XmlTextReader>> m_ShapeXmlProcessors
-            = new Dictionary<string, Action<PrimitiveBaseShape, XmlTextReader>>();
+        private static Dictionary<string, Action<PrimitiveBaseShape, XmlReader>> m_ShapeXmlProcessors
+            = new Dictionary<string, Action<PrimitiveBaseShape, XmlReader>>();
 
         static SceneObjectSerializer()
         {
@@ -521,7 +545,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             m_ShapeXmlProcessors.Add("HollowShape", ProcessShpHollowShape);
             m_ShapeXmlProcessors.Add("SculptTexture", ProcessShpSculptTexture);
             m_ShapeXmlProcessors.Add("SculptType", ProcessShpSculptType);
-            m_ShapeXmlProcessors.Add("SculptData", ProcessShpSculptData);
+            // Ignore "SculptData"; this element is deprecated
             m_ShapeXmlProcessors.Add("FlexiSoftness", ProcessShpFlexiSoftness);
             m_ShapeXmlProcessors.Add("FlexiTension", ProcessShpFlexiTension);
             m_ShapeXmlProcessors.Add("FlexiDrag", ProcessShpFlexiDrag);
@@ -546,112 +570,112 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         }
 
         #region SOPXmlProcessors
-        private static void ProcessAllowedDrop(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessAllowedDrop(SceneObjectPart obj, XmlReader reader)
         {
             obj.AllowedDrop = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessCreatorID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCreatorID(SceneObjectPart obj, XmlReader reader)
         {
             obj.CreatorID = Util.ReadUUID(reader, "CreatorID");
         }
 
-        private static void ProcessCreatorData(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCreatorData(SceneObjectPart obj, XmlReader reader)
         {
             obj.CreatorData = reader.ReadElementContentAsString("CreatorData", String.Empty);
         }
 
-        private static void ProcessFolderID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessFolderID(SceneObjectPart obj, XmlReader reader)
         {
             obj.FolderID = Util.ReadUUID(reader, "FolderID");
         }
 
-        private static void ProcessInventorySerial(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessInventorySerial(SceneObjectPart obj, XmlReader reader)
         {
             obj.InventorySerial = (uint)reader.ReadElementContentAsInt("InventorySerial", String.Empty);
         }
 
-        private static void ProcessTaskInventory(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessTaskInventory(SceneObjectPart obj, XmlReader reader)
         {
             obj.TaskInventory = ReadTaskInventory(reader, "TaskInventory");
         }
 
-        private static void ProcessUUID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessUUID(SceneObjectPart obj, XmlReader reader)
         {
             obj.UUID = Util.ReadUUID(reader, "UUID");
         }
 
-        private static void ProcessLocalId(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessLocalId(SceneObjectPart obj, XmlReader reader)
         {
             obj.LocalId = (uint)reader.ReadElementContentAsLong("LocalId", String.Empty);
         }
 
-        private static void ProcessName(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessName(SceneObjectPart obj, XmlReader reader)
         {
             obj.Name = reader.ReadElementString("Name");
         }
 
-        private static void ProcessMaterial(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessMaterial(SceneObjectPart obj, XmlReader reader)
         {
             obj.Material = (byte)reader.ReadElementContentAsInt("Material", String.Empty);
         }
 
-        private static void ProcessPassTouches(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPassTouches(SceneObjectPart obj, XmlReader reader)
         {
             obj.PassTouches = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessPassCollisions(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPassCollisions(SceneObjectPart obj, XmlReader reader)
         {
             obj.PassCollisions = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessRegionHandle(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessRegionHandle(SceneObjectPart obj, XmlReader reader)
         {
             obj.RegionHandle = (ulong)reader.ReadElementContentAsLong("RegionHandle", String.Empty);
         }
 
-        private static void ProcessScriptAccessPin(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessScriptAccessPin(SceneObjectPart obj, XmlReader reader)
         {
             obj.ScriptAccessPin = reader.ReadElementContentAsInt("ScriptAccessPin", String.Empty);
         }
 
-        private static void ProcessGroupPosition(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessGroupPosition(SceneObjectPart obj, XmlReader reader)
         {
             obj.GroupPosition = Util.ReadVector(reader, "GroupPosition");
         }
 
-        private static void ProcessOffsetPosition(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessOffsetPosition(SceneObjectPart obj, XmlReader reader)
         {
             obj.OffsetPosition = Util.ReadVector(reader, "OffsetPosition"); ;
         }
 
-        private static void ProcessRotationOffset(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessRotationOffset(SceneObjectPart obj, XmlReader reader)
         {
             obj.RotationOffset = Util.ReadQuaternion(reader, "RotationOffset");
         }
 
-        private static void ProcessVelocity(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessVelocity(SceneObjectPart obj, XmlReader reader)
         {
             obj.Velocity = Util.ReadVector(reader, "Velocity");
         }
 
-        private static void ProcessAngularVelocity(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessAngularVelocity(SceneObjectPart obj, XmlReader reader)
         {
             obj.AngularVelocity = Util.ReadVector(reader, "AngularVelocity");
         }
 
-        private static void ProcessAcceleration(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessAcceleration(SceneObjectPart obj, XmlReader reader)
         {
             obj.Acceleration = Util.ReadVector(reader, "Acceleration");
         }
 
-        private static void ProcessDescription(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessDescription(SceneObjectPart obj, XmlReader reader)
         {
             obj.Description = reader.ReadElementString("Description");
         }
 
-        private static void ProcessColor(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessColor(SceneObjectPart obj, XmlReader reader)
         {
             reader.ReadStartElement("Color");
             if (reader.Name == "R")
@@ -665,56 +689,59 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
         }
 
-        private static void ProcessText(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessText(SceneObjectPart obj, XmlReader reader)
         {
             obj.Text = reader.ReadElementString("Text", String.Empty);
         }
 
-        private static void ProcessSitName(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSitName(SceneObjectPart obj, XmlReader reader)
         {
             obj.SitName = reader.ReadElementString("SitName", String.Empty);
         }
 
-        private static void ProcessTouchName(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessTouchName(SceneObjectPart obj, XmlReader reader)
         {
             obj.TouchName = reader.ReadElementString("TouchName", String.Empty);
         }
 
-        private static void ProcessLinkNum(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessLinkNum(SceneObjectPart obj, XmlReader reader)
         {
             obj.LinkNum = reader.ReadElementContentAsInt("LinkNum", String.Empty);
         }
 
-        private static void ProcessClickAction(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessClickAction(SceneObjectPart obj, XmlReader reader)
         {
             obj.ClickAction = (byte)reader.ReadElementContentAsInt("ClickAction", String.Empty);
         }
 
-        private static void ProcessPhysicsShapeType(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPhysicsShapeType(SceneObjectPart obj, XmlReader reader)
         {
             obj.PhysicsShapeType = (byte)reader.ReadElementContentAsInt("PhysicsShapeType", String.Empty);
         }
 
-        private static void ProcessDensity(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessDensity(SceneObjectPart obj, XmlReader reader)
         {
             obj.Density = reader.ReadElementContentAsFloat("Density", String.Empty);
         }
 
-        private static void ProcessFriction(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessFriction(SceneObjectPart obj, XmlReader reader)
         {
             obj.Friction = reader.ReadElementContentAsFloat("Friction", String.Empty);
         }
 
-        private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessBounce(SceneObjectPart obj, XmlReader reader)
         {
             obj.Restitution = reader.ReadElementContentAsFloat("Bounce", String.Empty);
         }
 
-        private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessGravityModifier(SceneObjectPart obj, XmlReader reader)
         {
             obj.GravityModifier = reader.ReadElementContentAsFloat("GravityModifier", String.Empty);
         }
 
+<<<<<<< HEAD
+        private static void ProcessShape(SceneObjectPart obj, XmlReader reader)
+=======
         private static void ProcessCameraEyeOffset(SceneObjectPart obj, XmlTextReader reader)
         {
             obj.SetCameraEyeOffset(Util.ReadVector(reader, "CameraEyeOffset"));
@@ -767,9 +794,10 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         }
                    
         private static void ProcessShape(SceneObjectPart obj, XmlTextReader reader)
+>>>>>>> avn/ubitvar
         {
             List<string> errorNodeNames;
-            obj.Shape = ReadShape(reader, "Shape", out errorNodeNames);
+            obj.Shape = ReadShape(reader, "Shape", out errorNodeNames, obj);
 
             if (errorNodeNames != null)
             {
@@ -779,163 +807,163 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
         }
 
-        private static void ProcessScale(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessScale(SceneObjectPart obj, XmlReader reader)
         {
             obj.Scale = Util.ReadVector(reader, "Scale");
         }
 
-        private static void ProcessSitTargetOrientation(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSitTargetOrientation(SceneObjectPart obj, XmlReader reader)
         {
             obj.SitTargetOrientation = Util.ReadQuaternion(reader, "SitTargetOrientation");
         }
 
-        private static void ProcessSitTargetPosition(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSitTargetPosition(SceneObjectPart obj, XmlReader reader)
         {
             obj.SitTargetPosition = Util.ReadVector(reader, "SitTargetPosition");
         }
 
-        private static void ProcessSitTargetPositionLL(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSitTargetPositionLL(SceneObjectPart obj, XmlReader reader)
         {
             obj.SitTargetPositionLL = Util.ReadVector(reader, "SitTargetPositionLL");
         }
 
-        private static void ProcessSitTargetOrientationLL(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSitTargetOrientationLL(SceneObjectPart obj, XmlReader reader)
         {
             obj.SitTargetOrientationLL = Util.ReadQuaternion(reader, "SitTargetOrientationLL");
         }
 
-        private static void ProcessParentID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessParentID(SceneObjectPart obj, XmlReader reader)
         {
             string str = reader.ReadElementContentAsString("ParentID", String.Empty);
             obj.ParentID = Convert.ToUInt32(str);
         }
 
-        private static void ProcessCreationDate(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCreationDate(SceneObjectPart obj, XmlReader reader)
         {
             obj.CreationDate = reader.ReadElementContentAsInt("CreationDate", String.Empty);
         }
 
-        private static void ProcessCategory(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCategory(SceneObjectPart obj, XmlReader reader)
         {
             obj.Category = (uint)reader.ReadElementContentAsInt("Category", String.Empty);
         }
 
-        private static void ProcessSalePrice(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSalePrice(SceneObjectPart obj, XmlReader reader)
         {
             obj.SalePrice = reader.ReadElementContentAsInt("SalePrice", String.Empty);
         }
 
-        private static void ProcessObjectSaleType(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessObjectSaleType(SceneObjectPart obj, XmlReader reader)
         {
             obj.ObjectSaleType = (byte)reader.ReadElementContentAsInt("ObjectSaleType", String.Empty);
         }
 
-        private static void ProcessOwnershipCost(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessOwnershipCost(SceneObjectPart obj, XmlReader reader)
         {
             obj.OwnershipCost = reader.ReadElementContentAsInt("OwnershipCost", String.Empty);
         }
 
-        private static void ProcessGroupID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessGroupID(SceneObjectPart obj, XmlReader reader)
         {
             obj.GroupID = Util.ReadUUID(reader, "GroupID");
         }
 
-        private static void ProcessOwnerID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessOwnerID(SceneObjectPart obj, XmlReader reader)
         {
             obj.OwnerID = Util.ReadUUID(reader, "OwnerID");
         }
 
-        private static void ProcessLastOwnerID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessLastOwnerID(SceneObjectPart obj, XmlReader reader)
         {
             obj.LastOwnerID = Util.ReadUUID(reader, "LastOwnerID");
         }
 
-        private static void ProcessBaseMask(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessBaseMask(SceneObjectPart obj, XmlReader reader)
         {
             obj.BaseMask = (uint)reader.ReadElementContentAsInt("BaseMask", String.Empty);
         }
 
-        private static void ProcessOwnerMask(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessOwnerMask(SceneObjectPart obj, XmlReader reader)
         {
             obj.OwnerMask = (uint)reader.ReadElementContentAsInt("OwnerMask", String.Empty);
         }
 
-        private static void ProcessGroupMask(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessGroupMask(SceneObjectPart obj, XmlReader reader)
         {
             obj.GroupMask = (uint)reader.ReadElementContentAsInt("GroupMask", String.Empty);
         }
 
-        private static void ProcessEveryoneMask(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessEveryoneMask(SceneObjectPart obj, XmlReader reader)
         {
             obj.EveryoneMask = (uint)reader.ReadElementContentAsInt("EveryoneMask", String.Empty);
         }
 
-        private static void ProcessNextOwnerMask(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessNextOwnerMask(SceneObjectPart obj, XmlReader reader)
         {
             obj.NextOwnerMask = (uint)reader.ReadElementContentAsInt("NextOwnerMask", String.Empty);
         }
 
-        private static void ProcessFlags(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessFlags(SceneObjectPart obj, XmlReader reader)
         {
             obj.Flags = Util.ReadEnum<PrimFlags>(reader, "Flags");
         }
 
-        private static void ProcessCollisionSound(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCollisionSound(SceneObjectPart obj, XmlReader reader)
         {
             obj.CollisionSound = Util.ReadUUID(reader, "CollisionSound");
         }
 
-        private static void ProcessCollisionSoundVolume(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCollisionSoundVolume(SceneObjectPart obj, XmlReader reader)
         {
             obj.CollisionSoundVolume = reader.ReadElementContentAsFloat("CollisionSoundVolume", String.Empty);
         }
 
-        private static void ProcessMediaUrl(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessMediaUrl(SceneObjectPart obj, XmlReader reader)
         {
             obj.MediaUrl = reader.ReadElementContentAsString("MediaUrl", String.Empty);
         }
 
-        private static void ProcessAttachedPos(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessAttachedPos(SceneObjectPart obj, XmlReader reader)
         {
             obj.AttachedPos = Util.ReadVector(reader, "AttachedPos");
         }
 
-        private static void ProcessDynAttrs(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessDynAttrs(SceneObjectPart obj, XmlReader reader)
         {
             obj.DynAttrs.ReadXml(reader);
         }
 
-        private static void ProcessTextureAnimation(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessTextureAnimation(SceneObjectPart obj, XmlReader reader)
         {
             obj.TextureAnimation = Convert.FromBase64String(reader.ReadElementContentAsString("TextureAnimation", String.Empty));
         }
 
-        private static void ProcessParticleSystem(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessParticleSystem(SceneObjectPart obj, XmlReader reader)
         {
             obj.ParticleSystem = Convert.FromBase64String(reader.ReadElementContentAsString("ParticleSystem", String.Empty));
         }
 
-        private static void ProcessPayPrice0(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPayPrice0(SceneObjectPart obj, XmlReader reader)
         {
             obj.PayPrice[0] = (int)reader.ReadElementContentAsInt("PayPrice0", String.Empty);
         }
 
-        private static void ProcessPayPrice1(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPayPrice1(SceneObjectPart obj, XmlReader reader)
         {
             obj.PayPrice[1] = (int)reader.ReadElementContentAsInt("PayPrice1", String.Empty);
         }
 
-        private static void ProcessPayPrice2(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPayPrice2(SceneObjectPart obj, XmlReader reader)
         {
             obj.PayPrice[2] = (int)reader.ReadElementContentAsInt("PayPrice2", String.Empty);
         }
 
-        private static void ProcessPayPrice3(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPayPrice3(SceneObjectPart obj, XmlReader reader)
         {
             obj.PayPrice[3] = (int)reader.ReadElementContentAsInt("PayPrice3", String.Empty);
         }
 
-        private static void ProcessPayPrice4(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPayPrice4(SceneObjectPart obj, XmlReader reader)
         {
             obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty);
         }
@@ -962,122 +990,122 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         #endregion
 
         #region TaskInventoryXmlProcessors
-        private static void ProcessTIAssetID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIAssetID(TaskInventoryItem item, XmlReader reader)
         {
             item.AssetID = Util.ReadUUID(reader, "AssetID");
         }
 
-        private static void ProcessTIBasePermissions(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIBasePermissions(TaskInventoryItem item, XmlReader reader)
         {
             item.BasePermissions = (uint)reader.ReadElementContentAsInt("BasePermissions", String.Empty);
         }
 
-        private static void ProcessTICreationDate(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTICreationDate(TaskInventoryItem item, XmlReader reader)
         {
             item.CreationDate = (uint)reader.ReadElementContentAsInt("CreationDate", String.Empty);
         }
 
-        private static void ProcessTICreatorID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTICreatorID(TaskInventoryItem item, XmlReader reader)
         {
             item.CreatorID = Util.ReadUUID(reader, "CreatorID");
         }
 
-        private static void ProcessTICreatorData(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTICreatorData(TaskInventoryItem item, XmlReader reader)
         {
             item.CreatorData = reader.ReadElementContentAsString("CreatorData", String.Empty);
         }
 
-        private static void ProcessTIDescription(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIDescription(TaskInventoryItem item, XmlReader reader)
         {
             item.Description = reader.ReadElementContentAsString("Description", String.Empty);
         }
 
-        private static void ProcessTIEveryonePermissions(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIEveryonePermissions(TaskInventoryItem item, XmlReader reader)
         {
             item.EveryonePermissions = (uint)reader.ReadElementContentAsInt("EveryonePermissions", String.Empty);
         }
 
-        private static void ProcessTIFlags(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIFlags(TaskInventoryItem item, XmlReader reader)
         {
             item.Flags = (uint)reader.ReadElementContentAsInt("Flags", String.Empty);
         }
 
-        private static void ProcessTIGroupID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIGroupID(TaskInventoryItem item, XmlReader reader)
         {
             item.GroupID = Util.ReadUUID(reader, "GroupID");
         }
 
-        private static void ProcessTIGroupPermissions(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIGroupPermissions(TaskInventoryItem item, XmlReader reader)
         {
             item.GroupPermissions = (uint)reader.ReadElementContentAsInt("GroupPermissions", String.Empty);
         }
 
-        private static void ProcessTIInvType(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIInvType(TaskInventoryItem item, XmlReader reader)
         {
             item.InvType = reader.ReadElementContentAsInt("InvType", String.Empty);
         }
 
-        private static void ProcessTIItemID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIItemID(TaskInventoryItem item, XmlReader reader)
         {
             item.ItemID = Util.ReadUUID(reader, "ItemID");
         }
 
-        private static void ProcessTIOldItemID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIOldItemID(TaskInventoryItem item, XmlReader reader)
         {
             item.OldItemID = Util.ReadUUID(reader, "OldItemID");
         }
 
-        private static void ProcessTILastOwnerID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTILastOwnerID(TaskInventoryItem item, XmlReader reader)
         {
             item.LastOwnerID = Util.ReadUUID(reader, "LastOwnerID");
         }
 
-        private static void ProcessTIName(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIName(TaskInventoryItem item, XmlReader reader)
         {
             item.Name = reader.ReadElementContentAsString("Name", String.Empty);
         }
 
-        private static void ProcessTINextPermissions(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTINextPermissions(TaskInventoryItem item, XmlReader reader)
         {
             item.NextPermissions = (uint)reader.ReadElementContentAsInt("NextPermissions", String.Empty);
         }
 
-        private static void ProcessTIOwnerID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIOwnerID(TaskInventoryItem item, XmlReader reader)
         {
             item.OwnerID = Util.ReadUUID(reader, "OwnerID");
         }
 
-        private static void ProcessTICurrentPermissions(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTICurrentPermissions(TaskInventoryItem item, XmlReader reader)
         {
             item.CurrentPermissions = (uint)reader.ReadElementContentAsInt("CurrentPermissions", String.Empty);
         }
 
-        private static void ProcessTIParentID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIParentID(TaskInventoryItem item, XmlReader reader)
         {
             item.ParentID = Util.ReadUUID(reader, "ParentID");
         }
 
-        private static void ProcessTIParentPartID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIParentPartID(TaskInventoryItem item, XmlReader reader)
         {
             item.ParentPartID = Util.ReadUUID(reader, "ParentPartID");
         }
 
-        private static void ProcessTIPermsGranter(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIPermsGranter(TaskInventoryItem item, XmlReader reader)
         {
             item.PermsGranter = Util.ReadUUID(reader, "PermsGranter");
         }
 
-        private static void ProcessTIPermsMask(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIPermsMask(TaskInventoryItem item, XmlReader reader)
         {
             item.PermsMask = reader.ReadElementContentAsInt("PermsMask", String.Empty);
         }
 
-        private static void ProcessTIType(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIType(TaskInventoryItem item, XmlReader reader)
         {
             item.Type = reader.ReadElementContentAsInt("Type", String.Empty);
         }
 
-        private static void ProcessTIOwnerChanged(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIOwnerChanged(TaskInventoryItem item, XmlReader reader)
         {
             item.OwnerChanged = Util.ReadBoolean(reader);
         }
@@ -1085,250 +1113,243 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         #endregion
 
         #region ShapeXmlProcessors
-        private static void ProcessShpProfileCurve(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpProfileCurve(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ProfileCurve = (byte)reader.ReadElementContentAsInt("ProfileCurve", String.Empty);
         }
 
-        private static void ProcessShpTextureEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpTextureEntry(PrimitiveBaseShape shp, XmlReader reader)
         {
             byte[] teData = Convert.FromBase64String(reader.ReadElementString("TextureEntry"));
             shp.Textures = new Primitive.TextureEntry(teData, 0, teData.Length);
         }
 
-        private static void ProcessShpExtraParams(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpExtraParams(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ExtraParams = Convert.FromBase64String(reader.ReadElementString("ExtraParams"));
         }
 
-        private static void ProcessShpPathBegin(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathBegin(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathBegin = (ushort)reader.ReadElementContentAsInt("PathBegin", String.Empty);
         }
 
-        private static void ProcessShpPathCurve(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathCurve(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathCurve = (byte)reader.ReadElementContentAsInt("PathCurve", String.Empty);
         }
 
-        private static void ProcessShpPathEnd(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathEnd(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathEnd = (ushort)reader.ReadElementContentAsInt("PathEnd", String.Empty);
         }
 
-        private static void ProcessShpPathRadiusOffset(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathRadiusOffset(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathRadiusOffset = (sbyte)reader.ReadElementContentAsInt("PathRadiusOffset", String.Empty);
         }
 
-        private static void ProcessShpPathRevolutions(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathRevolutions(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathRevolutions = (byte)reader.ReadElementContentAsInt("PathRevolutions", String.Empty);
         }
 
-        private static void ProcessShpPathScaleX(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathScaleX(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathScaleX = (byte)reader.ReadElementContentAsInt("PathScaleX", String.Empty);
         }
 
-        private static void ProcessShpPathScaleY(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathScaleY(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathScaleY = (byte)reader.ReadElementContentAsInt("PathScaleY", String.Empty);
         }
 
-        private static void ProcessShpPathShearX(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathShearX(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathShearX = (byte)reader.ReadElementContentAsInt("PathShearX", String.Empty);
         }
 
-        private static void ProcessShpPathShearY(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathShearY(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathShearY = (byte)reader.ReadElementContentAsInt("PathShearY", String.Empty);
         }
 
-        private static void ProcessShpPathSkew(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathSkew(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathSkew = (sbyte)reader.ReadElementContentAsInt("PathSkew", String.Empty);
         }
 
-        private static void ProcessShpPathTaperX(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathTaperX(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathTaperX = (sbyte)reader.ReadElementContentAsInt("PathTaperX", String.Empty);
         }
 
-        private static void ProcessShpPathTaperY(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathTaperY(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathTaperY = (sbyte)reader.ReadElementContentAsInt("PathTaperY", String.Empty);
         }
 
-        private static void ProcessShpPathTwist(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathTwist(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathTwist = (sbyte)reader.ReadElementContentAsInt("PathTwist", String.Empty);
         }
 
-        private static void ProcessShpPathTwistBegin(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathTwistBegin(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathTwistBegin = (sbyte)reader.ReadElementContentAsInt("PathTwistBegin", String.Empty);
         }
 
-        private static void ProcessShpPCode(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPCode(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PCode = (byte)reader.ReadElementContentAsInt("PCode", String.Empty);
         }
 
-        private static void ProcessShpProfileBegin(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpProfileBegin(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ProfileBegin = (ushort)reader.ReadElementContentAsInt("ProfileBegin", String.Empty);
         }
 
-        private static void ProcessShpProfileEnd(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpProfileEnd(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ProfileEnd = (ushort)reader.ReadElementContentAsInt("ProfileEnd", String.Empty);
         }
 
-        private static void ProcessShpProfileHollow(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpProfileHollow(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ProfileHollow = (ushort)reader.ReadElementContentAsInt("ProfileHollow", String.Empty);
         }
 
-        private static void ProcessShpScale(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpScale(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.Scale = Util.ReadVector(reader, "Scale");
         }
 
-        private static void ProcessShpState(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpState(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.State = (byte)reader.ReadElementContentAsInt("State", String.Empty);
         }
 
-        private static void ProcessShpLastAttach(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLastAttach(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LastAttachPoint = (byte)reader.ReadElementContentAsInt("LastAttachPoint", String.Empty);
         }
 
-        private static void ProcessShpProfileShape(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpProfileShape(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ProfileShape = Util.ReadEnum<ProfileShape>(reader, "ProfileShape");
         }
 
-        private static void ProcessShpHollowShape(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpHollowShape(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.HollowShape = Util.ReadEnum<HollowShape>(reader, "HollowShape");
         }
         
-        private static void ProcessShpSculptTexture(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpSculptTexture(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.SculptTexture = Util.ReadUUID(reader, "SculptTexture");
         }
 
-        private static void ProcessShpSculptType(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpSculptType(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.SculptType = (byte)reader.ReadElementContentAsInt("SculptType", String.Empty);
         }
 
-        private static void ProcessShpSculptData(PrimitiveBaseShape shp, XmlTextReader reader)
-        {
-//            m_log.DebugFormat("[SCENE OBJECT SERIALIZER]: Setting sculpt data length {0}", shp.SculptData.Length);
-
-            shp.SculptData = Convert.FromBase64String(reader.ReadElementString("SculptData"));
-        }
-
-        private static void ProcessShpFlexiSoftness(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiSoftness(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiSoftness = reader.ReadElementContentAsInt("FlexiSoftness", String.Empty);
         }
 
-        private static void ProcessShpFlexiTension(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiTension(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiTension = reader.ReadElementContentAsFloat("FlexiTension", String.Empty);
         }
 
-        private static void ProcessShpFlexiDrag(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiDrag(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiDrag = reader.ReadElementContentAsFloat("FlexiDrag", String.Empty);
         }
 
-        private static void ProcessShpFlexiGravity(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiGravity(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiGravity = reader.ReadElementContentAsFloat("FlexiGravity", String.Empty);
         }
 
-        private static void ProcessShpFlexiWind(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiWind(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiWind = reader.ReadElementContentAsFloat("FlexiWind", String.Empty);
         }
 
-        private static void ProcessShpFlexiForceX(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiForceX(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiForceX = reader.ReadElementContentAsFloat("FlexiForceX", String.Empty);
         }
 
-        private static void ProcessShpFlexiForceY(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiForceY(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiForceY = reader.ReadElementContentAsFloat("FlexiForceY", String.Empty);
         }
 
-        private static void ProcessShpFlexiForceZ(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiForceZ(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiForceZ = reader.ReadElementContentAsFloat("FlexiForceZ", String.Empty);
         }
 
-        private static void ProcessShpLightColorR(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightColorR(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightColorR = reader.ReadElementContentAsFloat("LightColorR", String.Empty);
         }
 
-        private static void ProcessShpLightColorG(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightColorG(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightColorG = reader.ReadElementContentAsFloat("LightColorG", String.Empty);
         }
 
-        private static void ProcessShpLightColorB(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightColorB(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightColorB = reader.ReadElementContentAsFloat("LightColorB", String.Empty);
         }
 
-        private static void ProcessShpLightColorA(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightColorA(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightColorA = reader.ReadElementContentAsFloat("LightColorA", String.Empty);
         }
 
-        private static void ProcessShpLightRadius(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightRadius(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightRadius = reader.ReadElementContentAsFloat("LightRadius", String.Empty);
         }
 
-        private static void ProcessShpLightCutoff(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightCutoff(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightCutoff = reader.ReadElementContentAsFloat("LightCutoff", String.Empty);
         }
 
-        private static void ProcessShpLightFalloff(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightFalloff(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightFalloff = reader.ReadElementContentAsFloat("LightFalloff", String.Empty);
         }
 
-        private static void ProcessShpLightIntensity(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightIntensity(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightIntensity = reader.ReadElementContentAsFloat("LightIntensity", String.Empty);
         }
 
-        private static void ProcessShpFlexiEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiEntry(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiEntry = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessShpLightEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightEntry(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightEntry = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessShpSculptEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpSculptEntry(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.SculptEntry = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessShpMedia(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpMedia(PrimitiveBaseShape shp, XmlReader reader)
         {
             string value = reader.ReadElementContentAsString("Media", String.Empty);
             shp.Media = PrimitiveBaseShape.MediaList.FromXml(value);
@@ -1382,7 +1403,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 if (m_UserManagement == null)
                     m_UserManagement = sop.ParentGroup.Scene.RequestModuleInterface<IUserManagement>();
                 string name = m_UserManagement.GetUserName(sop.CreatorID);
-                writer.WriteElementString("CreatorData", (string)options["home"] + ";" + name);
+                writer.WriteElementString("CreatorData", ExternalRepresentationUtils.CalcCreatorData((string)options["home"], name));
             }
 
             WriteUUID(writer, "FolderID", sop.FolderID, options);
@@ -1435,7 +1456,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             writer.WriteElementString("SalePrice", sop.SalePrice.ToString());
             writer.WriteElementString("ObjectSaleType", sop.ObjectSaleType.ToString());
             writer.WriteElementString("OwnershipCost", sop.OwnershipCost.ToString());
-            WriteUUID(writer, "GroupID", sop.GroupID, options);
+
+            UUID groupID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.GroupID;
+            WriteUUID(writer, "GroupID", groupID, options);
 
             UUID ownerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.OwnerID;
             WriteUUID(writer, "OwnerID", ownerID, options);
@@ -1575,13 +1598,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                         if (m_UserManagement == null)
                             m_UserManagement = scene.RequestModuleInterface<IUserManagement>();
                         string name = m_UserManagement.GetUserName(item.CreatorID);
-                        writer.WriteElementString("CreatorData", (string)options["home"] + ";" + name);
+                        writer.WriteElementString("CreatorData", ExternalRepresentationUtils.CalcCreatorData((string)options["home"], name));
                     }
 
                     writer.WriteElementString("Description", item.Description);
                     writer.WriteElementString("EveryonePermissions", item.EveryonePermissions.ToString());
                     writer.WriteElementString("Flags", item.Flags.ToString());
-                    WriteUUID(writer, "GroupID", item.GroupID, options);
+
+                    UUID groupID = options.ContainsKey("wipe-owners") ? UUID.Zero : item.GroupID;
+                    WriteUUID(writer, "GroupID", groupID, options);
+
                     writer.WriteElementString("GroupPermissions", item.GroupPermissions.ToString());
                     writer.WriteElementString("InvType", item.InvType.ToString());
                     WriteUUID(writer, "ItemID", item.ItemID, options);
@@ -1602,7 +1628,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     WriteUUID(writer, "PermsGranter", item.PermsGranter, options);
                     writer.WriteElementString("PermsMask", item.PermsMask.ToString());
                     writer.WriteElementString("Type", item.Type.ToString());
-                    writer.WriteElementString("OwnerChanged", item.OwnerChanged.ToString().ToLower());
+
+                    bool ownerChanged = options.ContainsKey("wipe-owners") ? false : item.OwnerChanged;
+                    writer.WriteElementString("OwnerChanged", ownerChanged.ToString().ToLower());
 
                     writer.WriteEndElement(); // TaskInventoryItem
                 }
@@ -1663,14 +1691,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
                 WriteUUID(writer, "SculptTexture", shp.SculptTexture, options);
                 writer.WriteElementString("SculptType", shp.SculptType.ToString());
-                writer.WriteStartElement("SculptData");
-                byte[] sd;
-                if (shp.SculptData != null)
-                    sd = shp.SculptData;
-                else
-                    sd = Utils.EmptyBytes;
-                writer.WriteBase64(sd, 0, sd.Length);
-                writer.WriteEndElement(); // SculptData
+                // Don't serialize SculptData. It's just a copy of the asset, which can be loaded separately using 'SculptTexture'.
 
                 writer.WriteElementString("FlexiSoftness", shp.FlexiSoftness.ToString());
                 writer.WriteElementString("FlexiTension", shp.FlexiTension.ToString());
@@ -1701,28 +1722,31 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
         }
 
-        public static SceneObjectPart Xml2ToSOP(XmlTextReader reader)
+        public static SceneObjectPart Xml2ToSOP(XmlReader reader)
         {
             SceneObjectPart obj = new SceneObjectPart();
 
             reader.ReadStartElement("SceneObjectPart");
 
-            ExternalRepresentationUtils.ExecuteReadProcessors(
+            bool errors = ExternalRepresentationUtils.ExecuteReadProcessors(
                 obj,
                 m_SOPXmlProcessors,
                 reader,
-                (o, nodeName, e)
-                    => m_log.DebugFormat(
-                        "[SceneObjectSerializer]: Exception while parsing {0} in object {1} {2}: {3}{4}",
-                        ((SceneObjectPart)o).Name, ((SceneObjectPart)o).UUID, nodeName, e.Message, e.StackTrace));
+                (o, nodeName, e) => {
+                    m_log.Debug(string.Format("[SceneObjectSerializer]: Error while parsing element {0} in object {1} {2} ",
+                        nodeName, ((SceneObjectPart)o).Name, ((SceneObjectPart)o).UUID), e);
+                });
+
+            if (errors)
+                throw new XmlException(string.Format("Error parsing object {0} {1}", obj.Name, obj.UUID));
 
             reader.ReadEndElement(); // SceneObjectPart
 
-            //m_log.DebugFormat("[XXX]: parsed SOP {0} - {1}", obj.Name, obj.UUID);
+            // m_log.DebugFormat("[SceneObjectSerializer]: parsed SOP {0} {1}", obj.Name, obj.UUID);
             return obj;
         }
 
-        public static TaskInventoryDictionary ReadTaskInventory(XmlTextReader reader, string name)
+        public static TaskInventoryDictionary ReadTaskInventory(XmlReader reader, string name)
         {
             TaskInventoryDictionary tinv = new TaskInventoryDictionary();
 
@@ -1757,7 +1781,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         /// <param name="name">The name of the xml element containing the shape</param>
         /// <param name="errors">a list containing the failing node names.  If no failures then null.</param>
         /// <returns>The shape parsed</returns>
-        public static PrimitiveBaseShape ReadShape(XmlTextReader reader, string name, out List<string> errorNodeNames)
+        public static PrimitiveBaseShape ReadShape(XmlReader reader, string name, out List<string> errorNodeNames, SceneObjectPart obj)
         {
             List<string> internalErrorNodeNames = null;
 
@@ -1776,18 +1800,14 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 shape,
                 m_ShapeXmlProcessors,
                 reader,
-                (o, nodeName, e)
-                    =>
-                    {
-//                        m_log.DebugFormat(
-//                            "[SceneObjectSerializer]: Exception while parsing Shape property {0}: {1}{2}",
-//                            nodeName, e.Message, e.StackTrace);
-                        if (internalErrorNodeNames == null)
-                            internalErrorNodeNames = new List<string>();
+                (o, nodeName, e) => {
+                    m_log.Debug(string.Format("[SceneObjectSerializer]: Error while parsing element {0} in Shape property of object {1} {2} ",
+                        nodeName, obj.Name, obj.UUID), e);
 
-                        internalErrorNodeNames.Add(nodeName);
-                    }
-            );
+                    if (internalErrorNodeNames == null)
+                            internalErrorNodeNames = new List<string>();
+                    internalErrorNodeNames.Add(nodeName);
+                });
 
             reader.ReadEndElement(); // Shape
 
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index bf32251..52e3ff1 100644..100755
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -61,6 +61,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         private YourStatsAreWrong handlerStatsIncorrect;
 
+        // Determines the size of the array that is used to collect StatBlocks
+        // for sending to the SimStats and SimExtraStatsCollector
+        private const int m_statisticArraySize = 28;
+
         /// <summary>
         /// These are the IDs of stats sent in the StatsPacket to the viewer.
         /// </summary>
@@ -104,7 +108,12 @@ namespace OpenSim.Region.Framework.Scenes
             ScriptEps = 31,
             SimSpareMs = 32,
             SimSleepMs = 33,
-            SimIoPumpTime = 34
+            SimIoPumpTime = 34,
+            FrameDilation = 35,
+            UsersLoggingIn = 36,
+            TotalGeoPrim = 37,
+            TotalMesh = 38,
+            ThreadCount = 39
         }
 
         /// <summary>
@@ -175,7 +184,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         // saved last reported value so there is something available for llGetRegionFPS 
         private float lastReportedSimFPS;
+<<<<<<< HEAD
+        private float[] lastReportedSimStats = new float[m_statisticArraySize];
+=======
         private float[] lastReportedSimStats = new float[23];
+>>>>>>> avn/ubitvar
         private float m_pfps;
 
         /// <summary>
@@ -195,14 +208,20 @@ namespace OpenSim.Region.Framework.Scenes
         private int m_physicsMS;
         private int m_imageMS;
         private int m_otherMS;
+<<<<<<< HEAD
+        private int m_scriptMS;
+=======
         private int m_sleeptimeMS;
 
 //Ckrinke: (3-21-08) Comment out to remove a compiler warning. Bring back into play when needed.
 //Ckrinke        private int m_scriptMS = 0;
+>>>>>>> avn/ubitvar
 
         private int m_rootAgents;
         private int m_childAgents;
         private int m_numPrim;
+        private int m_numGeoPrim;
+        private int m_numMesh;
         private int m_inPacketsPerSecond;
         private int m_outPacketsPerSecond;
         private int m_activePrim;
@@ -214,6 +233,34 @@ namespace OpenSim.Region.Framework.Scenes
 
         private int m_objectCapacity = 45000;
 
+        // This is the number of frames that will be stored and then averaged for
+        // the Total, Simulation, Physics, and Network Frame Time; It is set to
+        // 10 by default but can be changed by the OpenSim.ini configuration file
+        // NumberOfFrames parameter
+        private int m_numberFramesStored;
+
+        // The arrays that will hold the time it took to run the past N frames,
+        // where N is the num_frames_to_average given by the configuration file
+        private double[] m_totalFrameTimeMilliseconds;
+        private double[] m_simulationFrameTimeMilliseconds;
+        private double[] m_physicsFrameTimeMilliseconds;
+        private double[] m_networkFrameTimeMilliseconds;
+
+        // The location of the next time in milliseconds that will be
+        // (over)written when the next frame completes
+        private int m_nextLocation = 0;
+
+        // The correct number of frames that have completed since the last stats
+        // update for physics
+        private int m_numberPhysicsFrames;
+
+        // The current number of users attempting to login to the region
+        private int m_usersLoggingIn;
+
+        // The last reported value of threads from the SmartThreadPool inside of
+        // XEngine
+        private int m_inUseThreads;
+
         private Scene m_scene;
 
         private RegionInfo ReportingRegion;
@@ -223,9 +270,26 @@ namespace OpenSim.Region.Framework.Scenes
         private IEstateModule estateModule;
 
         public SimStatsReporter(Scene scene)
+            : this(scene, Scene.m_defaultNumberFramesStored)
         {
+        }
+
+        public SimStatsReporter(Scene scene, int numberOfFrames)
+        {
+            // Store the number of frames from the OpenSim.ini configuration file
+            m_numberFramesStored = numberOfFrames;
+
+            // Initialize the different frame time arrays to the correct sizes
+            m_totalFrameTimeMilliseconds = new double[m_numberFramesStored];
+            m_simulationFrameTimeMilliseconds = new double[m_numberFramesStored];
+            m_physicsFrameTimeMilliseconds = new double[m_numberFramesStored];
+            m_networkFrameTimeMilliseconds = new double[m_numberFramesStored];
+
+            // Initialize the current number of users logging into the region
+            m_usersLoggingIn = 0;
+
             m_scene = scene;
-            m_reportedFpsCorrectionFactor = scene.MinFrameTime * m_nominalReportedFps;
+            m_reportedFpsCorrectionFactor = scene.MinFrameSeconds * m_nominalReportedFps;
             m_statsUpdateFactor = (float)(m_statsUpdatesEveryMS / 1000);
             ReportingRegion = scene.RegionInfo;
 
@@ -240,7 +304,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             /// At the moment, we'll only report if a frame is over 120% of target, since commonly frames are a bit
             /// longer than ideal (which in itself is a concern).
-            SlowFramesStatReportThreshold = (int)Math.Ceiling(m_scene.MinFrameTime * 1000 * 1.2);
+            SlowFramesStatReportThreshold = (int)Math.Ceiling(scene.MinFrameTicks * 1.2);
 
             SlowFramesStat
                 = new Stat(
@@ -255,8 +319,10 @@ namespace OpenSim.Region.Framework.Scenes
                     StatVerbosity.Info);
 
             StatsManager.RegisterStat(SlowFramesStat);
+
         }
 
+
         public void Close()
         {
             m_report.Elapsed -= TriggerStatsHeartbeat;
@@ -290,10 +356,25 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void statsHeartBeat(object sender, EventArgs e)
         {
+            double totalSumFrameTime;
+            double simulationSumFrameTime;
+            double physicsSumFrameTime;
+            double networkSumFrameTime;
+            float frameDilation;
+            int currentFrame;
+
             if (!m_scene.Active)
                 return;
 
+<<<<<<< HEAD
+            // Create arrays to hold the statistics for this current scene,
+            // these will be passed to the SimExtraStatsCollector, they are also
+            // sent to the SimStats class
+            SimStatsPacket.StatBlock[] sb = new
+                SimStatsPacket.StatBlock[m_statisticArraySize];
+=======
             SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[23];
+>>>>>>> avn/ubitvar
             SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock();
             
             // Know what's not thread safe in Mono... modifying timers.
@@ -315,14 +396,21 @@ namespace OpenSim.Region.Framework.Scenes
 
 #region various statistic googly moogly
 
+               // ORIGINAL code commented out until we have time to add our own
+               // statistics to the statistics window, this will be done as a
+               // new section given the title of our current project
                 // We're going to lie about the FPS because we've been lying since 2008.  The actual FPS is currently
                 // locked at a maximum of 11.  Maybe at some point this can change so that we're not lying.
-                int reportedFPS = (int)(m_fps * m_reportedFpsCorrectionFactor);
+                //int reportedFPS = (int)(m_fps * m_reportedFpsCorrectionFactor);
+               int reportedFPS = m_fps;
 
                 // save the reported value so there is something available for llGetRegionFPS 
                 lastReportedSimFPS = reportedFPS / m_statsUpdateFactor;
 
-                float physfps = ((m_pfps / 1000));
+               // ORIGINAL code commented out until we have time to add our own
+               // statistics to the statistics window
+                //float physfps = ((m_pfps / 1000));
+               float physfps = m_numberPhysicsFrames;
 
                 //if (physfps > 600)
                 //physfps = physfps - (physfps - 600);
@@ -364,6 +452,8 @@ namespace OpenSim.Region.Framework.Scenes
                 m_rootAgents = m_scene.SceneGraph.GetRootAgentCount();
                 m_childAgents = m_scene.SceneGraph.GetChildAgentCount();
                 m_numPrim = m_scene.SceneGraph.GetTotalObjectsCount();
+                m_numGeoPrim = m_scene.SceneGraph.GetTotalPrimObjectsCount();
+                m_numMesh = m_scene.SceneGraph.GetTotalMeshObjectsCount();
                 m_activePrim = m_scene.SceneGraph.GetActiveObjectsCount();
                 m_activeScripts = m_scene.SceneGraph.GetActiveScriptsCount();
 
@@ -375,15 +465,61 @@ namespace OpenSim.Region.Framework.Scenes
                 //                m_otherMS = m_frameMS - m_physicsMS - m_imageMS - m_netMS - m_agentMS;
                 // m_imageMS  m_netMS are not included in m_frameMS
 
+<<<<<<< HEAD
+                uint thisFrame = m_scene.Frame;
+                uint numFrames = thisFrame - m_lastUpdateFrame;
+                float framesUpdated = (float)numFrames * m_reportedFpsCorrectionFactor;
+                m_lastUpdateFrame = thisFrame;
+
+                // Avoid div-by-zero if somehow we've not updated any frames.
+                if (framesUpdated == 0)
+                    framesUpdated = 1;
+
+                for (int i = 0; i < m_statisticArraySize; i++)
+=======
                 m_otherMS = m_frameMS - m_physicsMS -  m_agentMS - m_sleeptimeMS;
                 if (m_otherMS < 0)
                     m_otherMS = 0;
 
                 for (int i = 0; i < 23; i++)
+>>>>>>> avn/ubitvar
                 {
                     sb[i] = new SimStatsPacket.StatBlock();
                 }
-                
+
+                // Resetting the sums of the frame times to prevent any errors
+                // in calculating the moving average for frame time
+                totalSumFrameTime = 0;
+                simulationSumFrameTime = 0;
+                physicsSumFrameTime = 0;
+                networkSumFrameTime = 0;
+
+                // Loop through all the frames that were stored for the current
+                // heartbeat to process the moving average of frame times
+                for (int i = 0; i < m_numberFramesStored; i++)
+                {
+                    // Sum up each frame time in order to calculate the moving
+                    // average of frame time
+                    totalSumFrameTime += m_totalFrameTimeMilliseconds[i];
+                    simulationSumFrameTime +=
+                        m_simulationFrameTimeMilliseconds[i];
+                    physicsSumFrameTime += m_physicsFrameTimeMilliseconds[i];
+                    networkSumFrameTime += m_networkFrameTimeMilliseconds[i];
+                }
+
+                // Get the index that represents the current frame based on the next one known; go back
+                // to the last index if next one is stated to restart at 0
+                if (m_nextLocation == 0)
+                    currentFrame = m_numberFramesStored - 1;
+                else
+                    currentFrame = m_nextLocation - 1;
+
+                // Calculate the frame dilation; which is currently based on the ratio between the sum of the
+                // physics and simulation rate, and the set minimum time to run a scene's frame
+                frameDilation = (float)(m_simulationFrameTimeMilliseconds[currentFrame] +
+                   m_physicsFrameTimeMilliseconds[currentFrame]) / m_scene.MinFrameTicks;
+
+                // ORIGINAL code commented out until we have time to add our own
                 sb[0].StatID = (uint) Stats.TimeDilation;
                 sb[0].StatValue = (Single.IsNaN(m_timeDilation)) ? 0.1f : m_timeDilation ; //((((m_timeDilation + (0.10f * statsUpdateFactor)) /10)  / statsUpdateFactor));
 
@@ -408,7 +544,21 @@ namespace OpenSim.Region.Framework.Scenes
                 sb[7].StatID = (uint) Stats.ActivePrim;
                 sb[7].StatValue = m_activePrim;
 
+               // ORIGINAL code commented out until we have time to add our own
+               // statistics to the statistics window
                 sb[8].StatID = (uint)Stats.FrameMS;
+<<<<<<< HEAD
+                //sb[8].StatValue = m_frameMS / framesUpdated;
+                sb[8].StatValue = (float) totalSumFrameTime / m_numberFramesStored;
+
+                sb[9].StatID = (uint)Stats.NetMS;
+                //sb[9].StatValue = m_netMS / framesUpdated;
+                sb[9].StatValue = (float) networkSumFrameTime / m_numberFramesStored;
+
+                sb[10].StatID = (uint)Stats.PhysicsMS;
+                //sb[10].StatValue = m_physicsMS / framesUpdated;
+                sb[10].StatValue = (float) physicsSumFrameTime / m_numberFramesStored;
+=======
                 sb[8].StatValue = TotalFrameTime;
 
                 sb[9].StatID = (uint)Stats.NetMS;
@@ -416,12 +566,18 @@ namespace OpenSim.Region.Framework.Scenes
 
                 sb[10].StatID = (uint)Stats.PhysicsMS;
                 sb[10].StatValue = m_physicsMS * perframe;
+>>>>>>> avn/ubitvar
 
                 sb[11].StatID = (uint)Stats.ImageMS ;
                 sb[11].StatValue = m_imageMS * perframe;
 
                 sb[12].StatID = (uint)Stats.OtherMS;
+<<<<<<< HEAD
+                //sb[12].StatValue = m_otherMS / framesUpdated;
+                sb[12].StatValue = (float) simulationSumFrameTime / m_numberFramesStored;
+=======
                 sb[12].StatValue = m_otherMS * perframe;
+>>>>>>> avn/ubitvar
 
                 sb[13].StatID = (uint)Stats.InPacketsPerSecond;
                 sb[13].StatValue = (m_inPacketsPerSecond / m_statsUpdateFactor);
@@ -453,7 +609,31 @@ namespace OpenSim.Region.Framework.Scenes
                 sb[22].StatID = (uint)Stats.SimSleepMs;
                 sb[22].StatValue = sleeptime;
 
-                for (int i = 0; i < 22; i++)
+                // Current ratio between the sum of physics and sim rate, and the
+                // minimum time to run a scene's frame
+                sb[22].StatID = (uint)Stats.FrameDilation;
+                sb[22].StatValue = frameDilation;
+
+                // Current number of users currently attemptint to login to region
+                sb[23].StatID = (uint)Stats.UsersLoggingIn;
+                sb[23].StatValue = m_usersLoggingIn;
+
+                // Total number of geometric primitives in the scene
+                sb[24].StatID = (uint)Stats.TotalGeoPrim;
+                sb[24].StatValue = m_numGeoPrim;
+
+                // Total number of mesh objects in the scene
+                sb[25].StatID = (uint)Stats.TotalMesh;
+                sb[25].StatValue = m_numMesh;
+
+                // Current number of threads that XEngine is using
+                sb[26].StatID = (uint)Stats.ThreadCount;
+                sb[26].StatValue = m_inUseThreads;
+
+                sb[27].StatID = (uint)Stats.ScriptMS;
+                sb[27].StatValue = (numFrames <= 0) ? 0 : ((float)m_scriptMS / numFrames);
+
+                for (int i = 0; i < m_statisticArraySize; i++)
                 {
                     lastReportedSimStats[i] = sb[i].StatValue;
                 }
@@ -502,6 +682,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void ResetValues()
         {
+            // Reset the number of frames that the physics library has
+            // processed since the last stats report
+            m_numberPhysicsFrames = 0;
+
             m_timeDilation = 0;
             m_fps = 0;
             m_pfps = 0;
@@ -518,11 +702,16 @@ namespace OpenSim.Region.Framework.Scenes
             m_physicsMS = 0;
             m_imageMS = 0;
             m_otherMS = 0;
+<<<<<<< HEAD
+            m_scriptMS = 0;
+            m_spareMS = 0;
+=======
 //            m_spareMS = 0;
             m_sleeptimeMS = 0;
 
 //Ckrinke This variable is not used, so comment to remove compiler warning until it is used.
 //Ckrinke            m_scriptMS = 0;
+>>>>>>> avn/ubitvar
         }
 
         # region methods called from Scene
@@ -628,9 +817,41 @@ namespace OpenSim.Region.Framework.Scenes
             m_otherMS += ms;
         }
 
+<<<<<<< HEAD
+        public void AddScriptMS(int ms)
+        {
+            m_scriptMS += ms;
+        }
+
+        public void addPhysicsFrame(int frames)
+        {
+            // Add the number of physics frames to the correct total physics
+            // frames
+            m_numberPhysicsFrames += frames;
+        }
+
+        public void addFrameTimeMilliseconds(double total, double simulation,
+            double physics, double network)
+        {
+            // Save the frame times from the current frame into the appropriate
+            // arrays
+            m_totalFrameTimeMilliseconds[m_nextLocation] = total;
+            m_simulationFrameTimeMilliseconds[m_nextLocation] = simulation;
+            m_physicsFrameTimeMilliseconds[m_nextLocation] = physics;
+            m_networkFrameTimeMilliseconds[m_nextLocation] = network;
+
+            // Update to the next location in the list
+            m_nextLocation++;
+
+            // Since the list will begin to overwrite the oldest frame values
+            // first, the next location needs to loop back to the beginning of the
+            // list whenever it reaches the end
+            m_nextLocation = m_nextLocation % m_numberFramesStored;
+=======
         public void addSleepMS(int ms)
         {
             m_sleeptimeMS += ms;
+>>>>>>> avn/ubitvar
         }
 
         public void AddPendingDownloads(int count)
@@ -655,6 +876,31 @@ namespace OpenSim.Region.Framework.Scenes
             AddunAckedBytes(unAckedBytes);
         }
 
+        public void UpdateUsersLoggingIn(bool isLoggingIn)
+        {
+            // Determine whether the user has started logging in or has completed
+            // logging into the region
+            if (isLoggingIn)
+            {
+                // The user is starting to login to the region so increment the
+                // number of users attempting to login to the region
+                m_usersLoggingIn++;
+            }
+            else
+            {
+                // The user has finished logging into the region so decrement the
+                // number of users logging into the region
+                m_usersLoggingIn--;
+            }
+        }
+
+        public void SetThreadCount(int inUseThreads)
+        {
+            // Save the new number of threads to our member variable to send to
+            // the extra stats collector
+            m_inUseThreads = inUseThreads;
+        }
+
         #endregion
 
         public Dictionary<string, float> GetExtraSimStats()
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 6abdc29..6fd9096 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Region.Framework.Scenes
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static string LogHeader = "[TERRAIN CHANNEL]";
+<<<<<<< HEAD
 
         protected TerrainData m_terrainData;
 
@@ -57,6 +58,16 @@ namespace OpenSim.Region.Framework.Scenes
         public int Height { get { return m_terrainData.SizeY; } } // Y dimension
         public int Altitude { get { return m_terrainData.SizeZ; } } // Y dimension
 
+=======
+
+        protected TerrainData m_terrainData;
+
+        public int Width { get { return m_terrainData.SizeX; } }  // X dimension
+        // Unfortunately, for historical reasons, in this module 'Width' is X and 'Height' is Y
+        public int Height { get { return m_terrainData.SizeY; } } // Y dimension
+        public int Altitude { get { return m_terrainData.SizeZ; } } // Y dimension
+
+>>>>>>> avn/ubitvar
         // Default, not-often-used builder
         public TerrainChannel()
         {
@@ -157,11 +168,15 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (Double.IsNaN(value) || Double.IsInfinity(value))
                     return;
+<<<<<<< HEAD
+
+=======
                 if (value < 0)
                     value = 0;
                 else
                     if (value > 655.35)
                         value = 655.35;
+>>>>>>> avn/ubitvar
                 m_terrainData[x, y] = (float)value;
             }
         }
@@ -367,8 +382,13 @@ namespace OpenSim.Region.Framework.Scenes
             public int SizeY;
             public int SizeZ;
             public float CompressionFactor;
+<<<<<<< HEAD
+            public int[] Map;
+            public TerrainChannelXMLPackage(int pX, int pY, int pZ, float pCompressionFactor, int[] pMap)
+=======
             public float[] Map;
             public TerrainChannelXMLPackage(int pX, int pY, int pZ, float pCompressionFactor, float[] pMap)
+>>>>>>> avn/ubitvar
             {
                 Version = 1;
                 SizeX = pX;
@@ -399,13 +419,25 @@ namespace OpenSim.Region.Framework.Scenes
         // Fill the heightmap with the center bump terrain
         private void PinHeadIsland()
         {
+<<<<<<< HEAD
+=======
             float cx = m_terrainData.SizeX * 0.5f;
             float cy = m_terrainData.SizeY * 0.5f;
             float h;
+>>>>>>> avn/ubitvar
             for (int x = 0; x < Width; x++)
             {
                 for (int y = 0; y < Height; y++)
                 {
+<<<<<<< HEAD
+                    m_terrainData[x, y] = (float)TerrainUtil.PerlinNoise2D(x, y, 2, 0.125) * 10;
+                    float spherFacA = (float)(TerrainUtil.SphericalFactor(x, y, m_terrainData.SizeX / 2.0, m_terrainData.SizeY / 2.0, 50) * 0.01d);
+                    float spherFacB = (float)(TerrainUtil.SphericalFactor(x, y, m_terrainData.SizeX / 2.0, m_terrainData.SizeY / 2.0, 100) * 0.001d);
+                    if (m_terrainData[x, y]< spherFacA)
+                        m_terrainData[x, y]= spherFacA;
+                    if (m_terrainData[x, y]< spherFacB)
+                        m_terrainData[x, y] = spherFacB;
+=======
  //                   h = (float)TerrainUtil.PerlinNoise2D(x, y, 2, 0.125) * 10;
                     h = 1.0f;
                     float spherFacA = (float)(TerrainUtil.SphericalFactor(x, y, cx, cy, 50) * 0.01d);
@@ -415,6 +447,7 @@ namespace OpenSim.Region.Framework.Scenes
                     if (h < spherFacB)
                         h = spherFacB;
                     m_terrainData[x, y] = h;
+>>>>>>> avn/ubitvar
                 }
             }
         }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
index 575a081..b6b3344 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs
index 2d831fa..6118004 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs
@@ -36,7 +36,6 @@ using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index a07d64c..bdf0700 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -37,7 +37,6 @@ using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs
new file mode 100644
index 0000000..1d41d33
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs
@@ -0,0 +1,347 @@
+/*
+ * 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;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.CoreModules.Framework.EntityTransfer;
+using OpenSim.Region.CoreModules.Framework.InventoryAccess;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
+using OpenSim.Region.CoreModules.World.Permissions;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    /// <summary>
+    /// Test copying of scene objects.
+    /// </summary>
+    /// <remarks>
+    /// This is at a level above the SceneObjectBasicTests, which act on the scene directly.
+    /// </remarks>
+    [TestFixture]
+    public class SceneObjectCopyTests : OpenSimTestCase
+    {
+        [TestFixtureSetUp]
+        public void FixtureInit()
+        {
+            // Don't allow tests to be bamboozled by asynchronous events.  Execute everything on the same thread.
+            // This facility was added after the original async delete tests were written, so it may be possible now
+            // to not bother explicitly disabling their async (since everything will be running sync).
+            Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest;
+        }
+
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+            // threads.  Possibly, later tests should be rewritten so none of them require async stuff (which regression
+            // tests really shouldn't).
+            Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+        }
+
+        [Test]
+        public void TestTakeCopyWhenCopierIsOwnerWithPerms()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
+
+            TestScene scene = new SceneHelpers().SetupScene("s1", TestHelpers.ParseTail(0x99), 1000, 1000, config);
+            SceneHelpers.SetupSceneModules(scene, config, new PermissionsModule(), new BasicInventoryAccessModule());
+            UserAccount ua = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(0x1));
+            TestClient client = (TestClient)SceneHelpers.AddScenePresence(scene, ua.PrincipalID).ControllingClient;
+
+            // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
+            AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
+            sogd.Enabled = false;            
+
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID);
+            uint soLocalId = so.LocalId;
+//            so.UpdatePermissions(
+//                ua.PrincipalID, (byte)PermissionWho.Owner, so.LocalId, (uint)OpenMetaverse.PermissionMask.Copy, 1);
+//            so.UpdatePermissions(
+//                ua.PrincipalID, (byte)PermissionWho.Owner, so.LocalId, (uint)OpenMetaverse.PermissionMask.Transfer, 0);
+//            so.UpdatePermissions(
+//                ua.PrincipalID, (byte)PermissionWho.Base, so.LocalId, (uint)OpenMetaverse.PermissionMask.Transfer, 0);
+//            scene.HandleObjectPermissionsUpdate(client, client.AgentId, client.SessionId, (byte)PermissionWho.Owner, so.LocalId, (uint)OpenMetaverse.PermissionMask.Transfer, 0);
+
+            // Ideally we might change these via client-focussed method calls as commented out above.  However, this
+            // becomes very convoluted so we will set only the copy perm directly.
+            so.RootPart.BaseMask = (uint)OpenMetaverse.PermissionMask.Copy;
+//            so.RootPart.OwnerMask = (uint)OpenMetaverse.PermissionMask.Copy;
+
+            List<uint> localIds = new List<uint>();
+            localIds.Add(so.LocalId);
+
+            // Specifying a UUID.Zero in this case will currently plop it in Lost and Found
+            scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.TakeCopy, UUID.Zero);
+
+            // Check that object isn't copied until we crank the sogd handle.
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
+            Assert.That(retrievedPart, Is.Not.Null);
+            Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False);
+
+            sogd.InventoryDeQueueAndDelete();
+
+            // Check that object is still there.
+            SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
+            Assert.That(retrievedPart2, Is.Not.Null);              
+            Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
+
+            // Check that we have a copy in inventory
+            InventoryItemBase item 
+                = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1");
+            Assert.That(item, Is.Not.Null);
+        }
+
+        [Test]
+        public void TestTakeCopyWhenCopierIsOwnerWithoutPerms()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
+
+            TestScene scene = new SceneHelpers().SetupScene("s1", TestHelpers.ParseTail(0x99), 1000, 1000, config);
+            SceneHelpers.SetupSceneModules(scene, config, new PermissionsModule(), new BasicInventoryAccessModule());
+            UserAccount ua = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(0x1));
+            TestClient client = (TestClient)SceneHelpers.AddScenePresence(scene, ua.PrincipalID).ControllingClient;
+
+            // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
+            AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
+            sogd.Enabled = false;            
+
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID);
+            uint soLocalId = so.LocalId;
+
+            so.RootPart.BaseMask = (uint)(OpenMetaverse.PermissionMask.All & ~OpenMetaverse.PermissionMask.Copy);
+            //so.RootPart.OwnerMask = (uint)(OpenMetaverse.PermissionMask.Copy & ~OpenMetaverse.PermissionMask.Copy);
+
+            List<uint> localIds = new List<uint>();
+            localIds.Add(so.LocalId);
+
+            // Specifying a UUID.Zero in this case will currently plop it in Lost and Found
+            scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.TakeCopy, UUID.Zero);
+
+            // Check that object isn't copied until we crank the sogd handle.
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
+            Assert.That(retrievedPart, Is.Not.Null);
+            Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False);
+
+            sogd.InventoryDeQueueAndDelete();
+
+            // Check that object is still there.
+            SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
+            Assert.That(retrievedPart2, Is.Not.Null);              
+            Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
+
+            // Check that we do not have a copy in inventory
+            InventoryItemBase item 
+                = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1");
+            Assert.That(item, Is.Null);
+        }
+
+        [Test]
+        public void TestTakeCopyWhenCopierIsNotOwnerWithPerms()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
+
+            TestScene scene = new SceneHelpers().SetupScene("s1", TestHelpers.ParseTail(0x99), 1000, 1000, config);
+            SceneHelpers.SetupSceneModules(scene, config, new PermissionsModule(), new BasicInventoryAccessModule());
+            UserAccount ua = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(0x1));
+            TestClient client = (TestClient)SceneHelpers.AddScenePresence(scene, ua.PrincipalID).ControllingClient;
+
+            // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
+            AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
+            sogd.Enabled = false;            
+
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2));
+            uint soLocalId = so.LocalId;
+
+            // Base must allow transfer and copy
+            so.RootPart.BaseMask = (uint)(OpenMetaverse.PermissionMask.Copy | OpenMetaverse.PermissionMask.Transfer);
+            // Must be set so anyone can copy
+            so.RootPart.EveryoneMask = (uint)OpenMetaverse.PermissionMask.Copy;
+
+            List<uint> localIds = new List<uint>();
+            localIds.Add(so.LocalId);
+
+            // Specifying a UUID.Zero in this case will plop it in the Objects folder
+            scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.TakeCopy, UUID.Zero);
+
+            // Check that object isn't copied until we crank the sogd handle.
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
+            Assert.That(retrievedPart, Is.Not.Null);
+            Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False);
+
+            sogd.InventoryDeQueueAndDelete();
+
+            // Check that object is still there.
+            SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
+            Assert.That(retrievedPart2, Is.Not.Null);              
+            Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
+
+            // Check that we have a copy in inventory
+            InventoryItemBase item 
+                = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
+            Assert.That(item, Is.Not.Null);
+        }
+
+        [Test]
+        public void TestTakeCopyWhenCopierIsNotOwnerWithoutPerms()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
+
+            TestScene scene = new SceneHelpers().SetupScene("s1", TestHelpers.ParseTail(0x99), 1000, 1000, config);
+            SceneHelpers.SetupSceneModules(scene, config, new PermissionsModule(), new BasicInventoryAccessModule());
+            UserAccount ua = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(0x1));
+            TestClient client = (TestClient)SceneHelpers.AddScenePresence(scene, ua.PrincipalID).ControllingClient;
+
+            // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
+            AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
+            sogd.Enabled = false;            
+
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2));
+            uint soLocalId = so.LocalId;
+
+            {
+                // Check that object is not copied if copy base perms is missing.
+                // Should not allow copy if base does not have this.
+                so.RootPart.BaseMask = (uint)OpenMetaverse.PermissionMask.Transfer;
+                // Must be set so anyone can copy
+                so.RootPart.EveryoneMask = (uint)OpenMetaverse.PermissionMask.Copy;
+
+                // Check that object is not copied
+                List<uint> localIds = new List<uint>();
+                localIds.Add(so.LocalId);
+
+                // Specifying a UUID.Zero in this case will plop it in the Objects folder if we have perms
+                scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.TakeCopy, UUID.Zero);
+
+                // Check that object isn't copied until we crank the sogd handle.
+                SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
+                Assert.That(retrievedPart, Is.Not.Null);
+                Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False);
+
+                sogd.InventoryDeQueueAndDelete();
+                // Check that object is still there.
+                SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
+                Assert.That(retrievedPart2, Is.Not.Null);              
+                Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
+
+                // Check that we have a copy in inventory
+                InventoryItemBase item 
+                    = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
+                Assert.That(item, Is.Null);
+            }
+
+            {
+                // Check that object is not copied if copy trans perms is missing.
+                // Should not allow copy if base does not have this.
+                so.RootPart.BaseMask = (uint)OpenMetaverse.PermissionMask.Copy;
+                // Must be set so anyone can copy
+                so.RootPart.EveryoneMask = (uint)OpenMetaverse.PermissionMask.Copy;
+
+                // Check that object is not copied
+                List<uint> localIds = new List<uint>();
+                localIds.Add(so.LocalId);
+
+                // Specifying a UUID.Zero in this case will plop it in the Objects folder if we have perms
+                scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.TakeCopy, UUID.Zero);
+
+                // Check that object isn't copied until we crank the sogd handle.
+                SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
+                Assert.That(retrievedPart, Is.Not.Null);
+                Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False);
+
+                sogd.InventoryDeQueueAndDelete();
+                // Check that object is still there.
+                SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
+                Assert.That(retrievedPart2, Is.Not.Null);              
+                Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
+
+                // Check that we have a copy in inventory
+                InventoryItemBase item 
+                    = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
+                Assert.That(item, Is.Null);
+            }
+
+            {
+                // Check that object is not copied if everyone copy perms is missing.
+                // Should not allow copy if base does not have this.
+                so.RootPart.BaseMask = (uint)(OpenMetaverse.PermissionMask.Copy | OpenMetaverse.PermissionMask.Transfer);
+                // Make sure everyone perm does not allow copy
+                so.RootPart.EveryoneMask = (uint)(OpenMetaverse.PermissionMask.All & ~OpenMetaverse.PermissionMask.Copy);
+
+                // Check that object is not copied
+                List<uint> localIds = new List<uint>();
+                localIds.Add(so.LocalId);
+
+                // Specifying a UUID.Zero in this case will plop it in the Objects folder if we have perms
+                scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.TakeCopy, UUID.Zero);
+
+                // Check that object isn't copied until we crank the sogd handle.
+                SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
+                Assert.That(retrievedPart, Is.Not.Null);
+                Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False);
+
+                sogd.InventoryDeQueueAndDelete();
+                // Check that object is still there.
+                SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
+                Assert.That(retrievedPart2, Is.Not.Null);              
+                Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
+
+                // Check that we have a copy in inventory
+                InventoryItemBase item 
+                    = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
+                Assert.That(item, Is.Null);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
new file mode 100644
index 0000000..5635c20
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
@@ -0,0 +1,259 @@
+/*
+ * 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 Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Framework;
+using OpenSim.Region.CoreModules.Framework.EntityTransfer;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
+using OpenSim.Region.CoreModules.World.Land;
+using OpenSim.Region.OptionalModules;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    public class SceneObjectCrossingTests : OpenSimTestCase
+    {
+        [TestFixtureSetUp]
+        public void FixtureInit()
+        {
+            // Don't allow tests to be bamboozled by asynchronous events.  Execute everything on the same thread.
+            Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest;
+        }
+
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+            // threads.  Possibly, later tests should be rewritten so none of them require async stuff (which regression
+            // tests really shouldn't).
+            Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+        }
+
+        /// <summary>
+        /// Test cross with no prim limit module.
+        /// </summary>
+        [Test]
+        public void TestCrossOnSameSimulator()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+            int sceneObjectIdTail = 0x2;
+
+            EntityTransferModule etmA = new EntityTransferModule();
+            EntityTransferModule etmB = new EntityTransferModule();
+            LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+
+            IConfigSource config = new IniConfigSource();
+            IConfig modulesConfig = config.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etmA.Name);
+            modulesConfig.Set("SimulationServices", lscm.Name);
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+            TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1000, 999);
+
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
+            SceneHelpers.SetupSceneModules(sceneA, config, etmA);
+            SceneHelpers.SetupSceneModules(sceneB, config, etmB);
+
+            SceneObjectGroup so1 = SceneHelpers.AddSceneObject(sceneA, 1, userId, "", sceneObjectIdTail);
+            UUID so1Id = so1.UUID;
+            so1.AbsolutePosition = new Vector3(128, 10, 20);
+
+            // Cross with a negative value
+            so1.AbsolutePosition = new Vector3(128, -10, 20);
+
+            Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id));
+            Assert.NotNull(sceneB.GetSceneObjectGroup(so1Id));
+        }
+
+        /// <summary>
+        /// Test cross with no prim limit module.
+        /// </summary>
+        /// <remarks>
+        /// Possibly this should belong in ScenePresenceCrossingTests, though here it is the object that is being moved
+        /// where the avatar is just a passenger.
+        /// </remarks>
+        [Test]
+        public void TestCrossOnSameSimulatorWithSittingAvatar()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+            int sceneObjectIdTail = 0x2;
+            Vector3 so1StartPos = new Vector3(128, 10, 20);
+
+            EntityTransferModule etmA = new EntityTransferModule();
+            EntityTransferModule etmB = new EntityTransferModule();
+            LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+
+            IConfigSource config = new IniConfigSource();
+            IConfig modulesConfig = config.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etmA.Name);
+            modulesConfig.Set("SimulationServices", lscm.Name);
+            IConfig entityTransferConfig = config.AddConfig("EntityTransfer");
+
+            // In order to run a single threaded regression test we do not want the entity transfer module waiting
+            // for a callback from the destination scene before removing its avatar data.
+            entityTransferConfig.Set("wait_for_callback", false);
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+            TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1000, 999);
+
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
+            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA);
+            SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB);
+
+            SceneObjectGroup so1 = SceneHelpers.AddSceneObject(sceneA, 1, userId, "", sceneObjectIdTail);
+            UUID so1Id = so1.UUID;
+            so1.AbsolutePosition = so1StartPos;
+
+            AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
+            TestClient tc = new TestClient(acd, sceneA);
+            List<TestClient> destinationTestClients = new List<TestClient>();
+            EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients);
+
+            ScenePresence sp1SceneA = SceneHelpers.AddScenePresence(sceneA, tc, acd);
+            sp1SceneA.AbsolutePosition = so1StartPos;
+            sp1SceneA.HandleAgentRequestSit(sp1SceneA.ControllingClient, sp1SceneA.UUID, so1.UUID, Vector3.Zero);
+
+            // Cross
+            sceneA.SceneGraph.UpdatePrimGroupPosition(
+                so1.LocalId, new Vector3(so1StartPos.X, so1StartPos.Y - 20, so1StartPos.Z), userId);
+
+            SceneObjectGroup so1PostCross;
+
+            {
+                ScenePresence sp1SceneAPostCross = sceneA.GetScenePresence(userId);
+                Assert.IsTrue(sp1SceneAPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly false");
+
+                ScenePresence sp1SceneBPostCross = sceneB.GetScenePresence(userId);
+                TestClient sceneBTc = ((TestClient)sp1SceneBPostCross.ControllingClient);
+                sceneBTc.CompleteMovement();
+
+                Assert.IsFalse(sp1SceneBPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly true");
+                Assert.IsTrue(sp1SceneBPostCross.IsSatOnObject);
+
+                Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id), "uck");
+                so1PostCross = sceneB.GetSceneObjectGroup(so1Id);
+                Assert.NotNull(so1PostCross);
+                Assert.AreEqual(1, so1PostCross.GetSittingAvatarsCount());
+            }
+
+            Vector3 so1PostCrossPos = so1PostCross.AbsolutePosition;
+
+//            Console.WriteLine("CRISSCROSS");
+
+            // Recross
+            sceneB.SceneGraph.UpdatePrimGroupPosition(
+                so1PostCross.LocalId, new Vector3(so1PostCrossPos.X, so1PostCrossPos.Y + 20, so1PostCrossPos.Z), userId);
+
+            {
+                ScenePresence sp1SceneBPostReCross = sceneB.GetScenePresence(userId);
+                Assert.IsTrue(sp1SceneBPostReCross.IsChildAgent, "sp1SceneBPostReCross.IsChildAgent unexpectedly false");
+
+                ScenePresence sp1SceneAPostReCross = sceneA.GetScenePresence(userId);
+                TestClient sceneATc = ((TestClient)sp1SceneAPostReCross.ControllingClient);
+                sceneATc.CompleteMovement();
+
+                Assert.IsFalse(sp1SceneAPostReCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly true");
+                Assert.IsTrue(sp1SceneAPostReCross.IsSatOnObject);
+
+                Assert.IsNull(sceneB.GetSceneObjectGroup(so1Id), "uck2");
+                SceneObjectGroup so1PostReCross = sceneA.GetSceneObjectGroup(so1Id);
+                Assert.NotNull(so1PostReCross);
+                Assert.AreEqual(1, so1PostReCross.GetSittingAvatarsCount());
+            }
+        }
+
+        /// <summary>
+        /// Test cross with no prim limit module.
+        /// </summary>
+        /// <remarks>
+        /// XXX: This test may FCbe better off in a specific PrimLimitsModuleTest class in optional module tests in the
+        /// future (though it is configured as active by default, so not really optional).
+        /// </remarks>
+        [Test]
+        public void TestCrossOnSameSimulatorPrimLimitsOkay()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+            int sceneObjectIdTail = 0x2;
+
+            EntityTransferModule etmA = new EntityTransferModule();
+            EntityTransferModule etmB = new EntityTransferModule();
+            LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+            LandManagementModule lmmA = new LandManagementModule();
+            LandManagementModule lmmB = new LandManagementModule();
+
+            IConfigSource config = new IniConfigSource();
+            IConfig modulesConfig = config.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etmA.Name);
+            modulesConfig.Set("SimulationServices", lscm.Name);
+
+            IConfig permissionsConfig = config.AddConfig("Permissions");
+            permissionsConfig.Set("permissionmodules", "PrimLimitsModule");
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+            TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1000, 999);
+
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
+            SceneHelpers.SetupSceneModules(
+                sceneA, config, etmA, lmmA, new PrimLimitsModule(), new PrimCountModule());
+            SceneHelpers.SetupSceneModules(
+                sceneB, config, etmB, lmmB, new PrimLimitsModule(), new PrimCountModule());
+
+            // We must set up the parcel for this to work.  Normally this is taken care of by OpenSimulator startup
+            // code which is not yet easily invoked by tests.
+            lmmA.EventManagerOnNoLandDataFromStorage();
+            lmmB.EventManagerOnNoLandDataFromStorage();
+
+            SceneObjectGroup so1 = SceneHelpers.AddSceneObject(sceneA, 1, userId, "", sceneObjectIdTail);
+            UUID so1Id = so1.UUID;
+            so1.AbsolutePosition = new Vector3(128, 10, 20);
+
+            // Cross with a negative value.  We must make this call rather than setting AbsolutePosition directly
+            // because only this will execute permission checks in the source region.
+            sceneA.SceneGraph.UpdatePrimGroupPosition(so1.LocalId, new Vector3(128, -10, 20), userId);
+
+            Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id));
+            Assert.NotNull(sceneB.GetSceneObjectGroup(so1Id));
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index 95b30d5..b7e9499 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -40,7 +40,6 @@ using OpenSim.Region.CoreModules.World.Permissions;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 9378e20..c2e0ae3 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -34,7 +34,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 using log4net;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
@@ -91,7 +90,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             grp2.RootPart.ClearUpdateSchedule();
 
             // Link grp2 to grp1.   part2 becomes child prim to grp1. grp2 is eliminated.
+            Assert.IsFalse(grp1.GroupContainsForeignPrims);
             grp1.LinkToGroup(grp2);
+            Assert.IsTrue(grp1.GroupContainsForeignPrims);
+
+            scene.Backup(true);
+            Assert.IsFalse(grp1.GroupContainsForeignPrims);
 
             // FIXME: Can't do this test yet since group 2 still has its root part!  We can't yet null this since
             // it might cause SOG.ProcessBackup() to fail due to the race condition.  This really needs to be fixed.
@@ -143,7 +147,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             Assert.That(grp1.Parts.Length, Is.EqualTo(1), "Group 1 still contained part2 after delink.");
             Assert.That(part2.AbsolutePosition == Vector3.Zero, "The absolute position should be zero");
-            Assert.That(grp3.HasGroupChangedDueToDelink, Is.True);
+            Assert.NotNull(grp3);
         }
 
         [Test]
@@ -335,30 +339,34 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             SceneObjectPart rootPart
                 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
                     { Name = rootPartName, UUID = rootPartUuid };
+            
             SceneObjectPart linkPart
                 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
                     { Name = linkPartName, UUID = linkPartUuid };
+            SceneObjectGroup linkGroup = new SceneObjectGroup(linkPart);
+            scene.AddNewSceneObject(linkGroup, true);
 
             SceneObjectGroup sog = new SceneObjectGroup(rootPart);
-            sog.AddPart(linkPart);
-            scene.AddNewSceneObject(sog, true);            
-            
-            // In a test, we have to crank the backup handle manually.  Normally this would be done by the timer invoked
-            // scene backup thread.
+            scene.AddNewSceneObject(sog, true);
+
+            Assert.IsFalse(sog.GroupContainsForeignPrims);
+            sog.LinkToGroup(linkGroup);
+            Assert.IsTrue(sog.GroupContainsForeignPrims);
+
             scene.Backup(true);
-                        
+            Assert.AreEqual(1, scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID).Count);
+
             // These changes should occur immediately without waiting for a backup pass
             SceneObjectGroup groupToDelete = sog.DelinkFromGroup(linkPart, false);
-            
-            Assert.That(groupToDelete.HasGroupChangedDueToDelink, Is.True);
+            Assert.IsFalse(groupToDelete.GroupContainsForeignPrims);
+
             scene.DeleteSceneObject(groupToDelete, false);
-            Assert.That(groupToDelete.HasGroupChangedDueToDelink, Is.False);
             
             List<SceneObjectGroup> storedObjects = scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID);
-            
-            Assert.That(storedObjects.Count, Is.EqualTo(1));
-            Assert.That(storedObjects[0].Parts.Length, Is.EqualTo(1));
-            Assert.That(storedObjects[0].ContainsPart(rootPartUuid));
+
+            Assert.AreEqual(1, storedObjects.Count);
+            Assert.AreEqual(1, storedObjects[0].Parts.Length);
+            Assert.IsTrue(storedObjects[0].ContainsPart(rootPartUuid));
         }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
index 1182c96..ce7fc0e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
@@ -33,7 +33,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
index a58e735..fdbe7ae 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSerializationTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSerializationTests.cs
new file mode 100644
index 0000000..927d8e8
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSerializationTests.cs
@@ -0,0 +1,136 @@
+/*
+ * 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;
+using System.Threading;
+using System.Xml;
+using System.Linq;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Serialization.External;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Serialization;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    /// <summary>
+    /// Basic scene object serialization tests.
+    /// </summary>
+    [TestFixture]
+    public class SceneObjectSerializationTests : OpenSimTestCase
+    {
+
+        /// <summary>
+        /// Serialize and deserialize.
+        /// </summary>
+        [Test]
+        public void TestSerialDeserial()
+        {
+            TestHelpers.InMethod();
+
+            Scene scene = new SceneHelpers().SetupScene();
+            int partsToTestCount = 3;
+
+            SceneObjectGroup so
+                = SceneHelpers.CreateSceneObject(partsToTestCount, TestHelpers.ParseTail(0x1), "obj1", 0x10);
+            SceneObjectPart[] parts = so.Parts;
+            so.Name = "obj1";
+            so.Description = "xpto";
+
+            string xml = SceneObjectSerializer.ToXml2Format(so);
+            Assert.That(!string.IsNullOrEmpty(xml), "SOG serialization resulted in empty or null string");
+
+            XmlDocument doc = new XmlDocument();
+            doc.LoadXml(xml);
+            XmlNodeList nodes = doc.GetElementsByTagName("SceneObjectPart");
+            Assert.That(nodes.Count, Is.EqualTo(3), "SOG serialization resulted in wrong number of SOPs");
+
+            SceneObjectGroup so2 = SceneObjectSerializer.FromXml2Format(xml);
+            Assert.IsNotNull(so2, "SOG deserialization resulted in null object");
+            Assert.That(so2.Name == so.Name, "Name of deserialized object does not match original name");
+            Assert.That(so2.Description == so.Description, "Description of deserialized object does not match original name");
+        }
+
+        /// <summary>
+        /// This checks for a bug reported in mantis #7514
+        /// </summary>
+        [Test]
+        public void TestNamespaceAttribute()
+        {
+            TestHelpers.InMethod();
+
+            Scene scene = new SceneHelpers().SetupScene();
+            UserAccount account = new UserAccount(UUID.Zero, UUID.Random(), "Test", "User", string.Empty);
+            scene.UserAccountService.StoreUserAccount(account);
+            int partsToTestCount = 1;
+
+            SceneObjectGroup so
+                = SceneHelpers.CreateSceneObject(partsToTestCount, TestHelpers.ParseTail(0x1), "obj1", 0x10);
+            SceneObjectPart[] parts = so.Parts;
+            so.Name = "obj1";
+            so.Description = "xpto";
+            so.OwnerID = account.PrincipalID;
+            so.RootPart.CreatorID = so.OwnerID;
+
+            string xml = SceneObjectSerializer.ToXml2Format(so);
+            Assert.That(!string.IsNullOrEmpty(xml), "SOG serialization resulted in empty or null string");
+
+            xml = ExternalRepresentationUtils.RewriteSOP(xml, "Test Scene", "http://localhost", scene.UserAccountService, UUID.Zero);
+            //Console.WriteLine(xml);
+
+            XmlDocument doc = new XmlDocument();
+            doc.LoadXml(xml);
+
+            XmlNodeList nodes = doc.GetElementsByTagName("SceneObjectPart");
+            Assert.That(nodes.Count, Is.GreaterThan(0), "SOG serialization resulted in no SOPs");
+            foreach (XmlAttribute a in nodes[0].Attributes)
+            {
+                int count = a.Name.Count(c => c == ':');
+                Assert.That(count, Is.EqualTo(1), "Cannot have multiple ':' in attribute name in SOP");
+            }
+            nodes = doc.GetElementsByTagName("CreatorData");
+            Assert.That(nodes.Count, Is.GreaterThan(0), "SOG serialization resulted in no CreatorData");
+            foreach (XmlAttribute a in nodes[0].Attributes)
+            {
+                int count = a.Name.Count(c => c == ':');
+                Assert.That(count, Is.EqualTo(1), "Cannot have multiple ':' in attribute name in CreatorData");
+            }
+
+            SceneObjectGroup so2 = SceneObjectSerializer.FromXml2Format(xml);
+            Assert.IsNotNull(so2, "SOG deserialization resulted in null object");
+            Assert.AreNotEqual(so.RootPart.CreatorIdentification, so2.RootPart.CreatorIdentification, "RewriteSOP failed to transform CreatorData.");
+            Assert.That(so2.RootPart.CreatorIdentification.Contains("http://"), "RewriteSOP failed to add the homeURL to CreatorData");
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
index abaa1d1..974529a 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
@@ -34,7 +34,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
index 8eb3191..5ba754c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
@@ -34,7 +34,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
@@ -58,6 +57,25 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         }
 
         [Test]
+        public void TestSetTemporary()
+        {
+            TestHelpers.InMethod();
+
+            m_scene.AddSceneObject(m_so1);
+            m_so1.ScriptSetTemporaryStatus(true);
+
+            // Is this really the correct flag?
+            Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.TemporaryOnRez));
+            Assert.That(m_so1.Backup, Is.False);
+
+            // Test setting back to non-temporary
+            m_so1.ScriptSetTemporaryStatus(false);
+
+            Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.None));
+            Assert.That(m_so1.Backup, Is.True);          
+        }
+
+        [Test]
         public void TestSetPhantomSinglePrim()
         {
             TestHelpers.InMethod();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
new file mode 100644
index 0000000..cdebe25
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
@@ -0,0 +1,183 @@
+/*
+ * 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.Reflection;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    /// <summary>
+    /// Tests for undo/redo
+    /// </summary>
+    public class SceneObjectUndoRedoTests : OpenSimTestCase
+    {
+        [Test]
+        public void TestUndoRedoResizeSceneObject()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            Vector3 firstSize = new Vector3(2, 3, 4);
+            Vector3 secondSize = new Vector3(5, 6, 7);
+
+            Scene scene = new SceneHelpers().SetupScene();
+            scene.MaxUndoCount = 20;
+            SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
+
+            // TODO: It happens to be the case that we are not storing undo states for SOPs which are not yet in a SOG,
+            // which is the way that AddSceneObject() sets up the object (i.e. it creates the SOP first).  However,
+            // this is somewhat by chance.  Really, we shouldn't be storing undo states at all if the object is not
+            // in a scene.
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+
+            g1.GroupResize(firstSize);
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
+
+            g1.GroupResize(secondSize);
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(2));
+
+            g1.RootPart.Undo();
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
+            Assert.That(g1.GroupScale, Is.EqualTo(firstSize));
+
+            g1.RootPart.Redo();
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(2));
+            Assert.That(g1.GroupScale, Is.EqualTo(secondSize));
+        }
+
+        [Test]
+        public void TestUndoLimit()
+        {
+            TestHelpers.InMethod();
+
+            Vector3 firstSize = new Vector3(2, 3, 4);
+            Vector3 secondSize = new Vector3(5, 6, 7);
+            Vector3 thirdSize = new Vector3(8, 9, 10);
+            Vector3 fourthSize = new Vector3(11, 12, 13);
+
+            Scene scene = new SceneHelpers().SetupScene();
+            scene.MaxUndoCount = 2;
+            SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
+
+            g1.GroupResize(firstSize);
+            g1.GroupResize(secondSize);
+            g1.GroupResize(thirdSize);
+            g1.GroupResize(fourthSize);
+
+            g1.RootPart.Undo();
+            g1.RootPart.Undo();
+            g1.RootPart.Undo();
+
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+            Assert.That(g1.GroupScale, Is.EqualTo(secondSize));
+        }
+
+        [Test]
+        public void TestNoUndoOnObjectsNotInScene()
+        {
+            TestHelpers.InMethod();
+
+            Vector3 firstSize = new Vector3(2, 3, 4);
+            Vector3 secondSize = new Vector3(5, 6, 7);
+//            Vector3 thirdSize = new Vector3(8, 9, 10);
+//            Vector3 fourthSize = new Vector3(11, 12, 13);
+
+            Scene scene = new SceneHelpers().SetupScene();
+            scene.MaxUndoCount = 20;
+            SceneObjectGroup g1 = SceneHelpers.CreateSceneObject(1, TestHelpers.ParseTail(0x1));
+
+            g1.GroupResize(firstSize);
+            g1.GroupResize(secondSize);
+
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+
+            g1.RootPart.Undo();
+
+            Assert.That(g1.GroupScale, Is.EqualTo(secondSize));
+        }
+
+        [Test]
+        public void TestUndoBeyondAvailable()
+        {
+            TestHelpers.InMethod();
+
+            Vector3 newSize = new Vector3(2, 3, 4);
+
+            Scene scene = new SceneHelpers().SetupScene();
+            scene.MaxUndoCount = 20;
+            SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
+            Vector3 originalSize = g1.GroupScale;
+
+            g1.RootPart.Undo();
+
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+            Assert.That(g1.GroupScale, Is.EqualTo(originalSize));
+
+            g1.GroupResize(newSize);
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
+            Assert.That(g1.GroupScale, Is.EqualTo(newSize));
+
+            g1.RootPart.Undo();
+            g1.RootPart.Undo();
+
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+            Assert.That(g1.GroupScale, Is.EqualTo(originalSize));
+        }
+
+        [Test]
+        public void TestRedoBeyondAvailable()
+        {
+            TestHelpers.InMethod();
+
+            Vector3 newSize = new Vector3(2, 3, 4);
+
+            Scene scene = new SceneHelpers().SetupScene();
+            scene.MaxUndoCount = 20;
+            SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
+            Vector3 originalSize = g1.GroupScale;
+
+            g1.RootPart.Redo();
+
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+            Assert.That(g1.GroupScale, Is.EqualTo(originalSize));
+
+            g1.GroupResize(newSize);
+            g1.RootPart.Undo();
+            g1.RootPart.Redo();
+            g1.RootPart.Redo();
+
+            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
+            Assert.That(g1.GroupScale, Is.EqualTo(newSize));
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index e7a1fe0..32d6649 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -39,7 +39,6 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index 1ff1329..06e6423 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -44,7 +44,6 @@ using OpenSim.Region.CoreModules.Framework.EntityTransfer;
 using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
@@ -228,7 +227,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // *** This is the first stage, when a neighbouring region is told that a viewer is about to try and
             // establish a child scene presence.  We pass in the circuit code that the client has to connect with ***
             // XXX: ViaLogin may not be correct here.
-            scene.SimulationService.CreateAgent(region, acd, (uint)TeleportFlags.ViaLogin, out reason);
+            scene.SimulationService.CreateAgent(null, region, acd, (uint)TeleportFlags.ViaLogin, out reason);
 
             Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(agentId), Is.Not.Null);
             Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs
index 1cd8ae9..42cfa1b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Region.Physics.Manager;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
index d80afd3..c6e3b8b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
@@ -37,7 +37,6 @@ using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
index 9fa0a71..45bfbff 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
@@ -47,7 +47,6 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
index b806a97..c193a97 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
@@ -40,7 +40,6 @@ using OpenSim.Region.CoreModules.Framework.EntityTransfer;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Region.CoreModules.World.Permissions;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
index 0911f00..b775178 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -37,7 +37,6 @@ using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 using System.Threading;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
@@ -73,6 +72,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(0));
             Assert.That(part.GetSittingAvatars(), Is.Null);
             Assert.That(m_sp.ParentID, Is.EqualTo(0));
+            Assert.AreEqual(startPos, m_sp.AbsolutePosition);
         }
 
         [Test]
@@ -87,15 +87,21 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
 
+            // We need to preserve this here because phys actor is removed by the sit.
+            Vector3 spPhysActorSize = m_sp.PhysicsActor.Size;
             m_sp.HandleAgentRequestSit(m_sp.ControllingClient, m_sp.UUID, part.UUID, Vector3.Zero);
 
             Assert.That(m_sp.PhysicsActor, Is.Null);
 
+            Assert.That(
+                m_sp.AbsolutePosition,
+                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, spPhysActorSize.Z / 2)));
+
             Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
             Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1));
-            HashSet<UUID> sittingAvatars = part.GetSittingAvatars();
+            HashSet<ScenePresence> sittingAvatars = part.GetSittingAvatars();
             Assert.That(sittingAvatars.Count, Is.EqualTo(1));
-            Assert.That(sittingAvatars.Contains(m_sp.UUID));
+            Assert.That(sittingAvatars.Contains(m_sp));
             Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId));
         }
 
@@ -129,6 +135,36 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         }
 
         [Test]
+        public void TestSitAndStandWithNoSitTargetChildPrim()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            // Make sure we're within range to sit
+            Vector3 startPos = new Vector3(1, 1, 1);
+            m_sp.AbsolutePosition = startPos;
+
+            SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene, 2, m_sp.UUID, "part", 0x10).Parts[1];
+            part.OffsetPosition = new Vector3(2, 3, 4);
+
+            // We need to preserve this here because phys actor is removed by the sit.
+            Vector3 spPhysActorSize = m_sp.PhysicsActor.Size;
+            m_sp.HandleAgentRequestSit(m_sp.ControllingClient, m_sp.UUID, part.UUID, Vector3.Zero);
+
+            Assert.That(
+                m_sp.AbsolutePosition,
+                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, spPhysActorSize.Z / 2)));
+
+            m_sp.StandUp();
+
+            Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
+            Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(0));
+            Assert.That(part.GetSittingAvatars(), Is.Null);
+            Assert.That(m_sp.ParentID, Is.EqualTo(0));
+            Assert.That(m_sp.PhysicsActor, Is.Not.Null);
+        }
+
+        [Test]
         public void TestSitAndStandWithSitTarget()
         {
             TestHelpers.InMethod();
@@ -145,15 +181,39 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             Assert.That(part.SitTargetAvatar, Is.EqualTo(m_sp.UUID));
             Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId));
-//            Assert.That(
-//                m_sp.AbsolutePosition,
-//                Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition + ScenePresence.SIT_TARGET_ADJUSTMENT));
+
+            // This section is copied from ScenePresence.HandleAgentSit().  Correctness is not guaranteed.
+            double x, y, z, m1, m2;
+
+            Quaternion r = part.SitTargetOrientation;;
+            m1 = r.X * r.X + r.Y * r.Y;
+            m2 = r.Z * r.Z + r.W * r.W;
+
+            // Rotate the vector <0, 0, 1>
+            x = 2 * (r.X * r.Z + r.Y * r.W);
+            y = 2 * (-r.X * r.W + r.Y * r.Z);
+            z = m2 - m1;
+
+            // Set m to be the square of the norm of r.
+            double m = m1 + m2;
+
+            // This constant is emperically determined to be what is used in SL.
+            // See also http://opensimulator.org/mantis/view.php?id=7096
+            double offset = 0.05;
+
+            Vector3 up = new Vector3((float)x, (float)y, (float)z);
+            Vector3 sitOffset = up * (float)offset;
+            // End of copied section.
+
+            Assert.That(
+                m_sp.AbsolutePosition,
+                Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition - sitOffset + ScenePresence.SIT_TARGET_ADJUSTMENT));
             Assert.That(m_sp.PhysicsActor, Is.Null);
 
             Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1));
-            HashSet<UUID> sittingAvatars = part.GetSittingAvatars();
+            HashSet<ScenePresence> sittingAvatars = part.GetSittingAvatars();
             Assert.That(sittingAvatars.Count, Is.EqualTo(1));
-            Assert.That(sittingAvatars.Contains(m_sp.UUID));
+            Assert.That(sittingAvatars.Contains(m_sp));
 
             m_sp.StandUp();
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index fff542b..42276dd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.CoreModules.Framework.EntityTransfer;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Region.CoreModules.World.Permissions;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs
index 1667002..2d36214 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs
@@ -34,7 +34,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs
index 9a97acc..584a03c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs
@@ -32,7 +32,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index 9d8eb0b..33ef83b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -42,7 +42,6 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
@@ -52,6 +51,29 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     [TestFixture]
     public class SceneTests : OpenSimTestCase
     {
+        [Test]
+        public void TestCreateScene()
+        {
+            TestHelpers.InMethod();
+
+            new SceneHelpers().SetupScene();
+        }
+
+        [Test]
+        public void TestCreateVarScene()
+        {
+            TestHelpers.InMethod();
+            UUID regionUuid = TestHelpers.ParseTail(0x1);
+            uint sizeX = 512;
+            uint sizeY = 512;
+
+            Scene scene 
+                = new SceneHelpers().SetupScene("scene", regionUuid, 1000, 1000, sizeX, sizeY, new IniConfigSource());
+
+            Assert.AreEqual(sizeX, scene.RegionInfo.RegionSizeX);
+            Assert.AreEqual(sizeY, scene.RegionInfo.RegionSizeY);
+        }
+
         /// <summary>
         /// Very basic scene update test.  Should become more elaborate with time.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs
new file mode 100644
index 0000000..eeda84f
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs
@@ -0,0 +1,249 @@
+/*
+ * 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.Net;
+using Mono.Addins;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim;
+using OpenSim.ApplicationPlugins.RegionModulesController;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    public class SharedRegionModuleTests : OpenSimTestCase
+    {
+//        [Test]
+        public void TestLifecycle()
+        {
+            TestHelpers.InMethod();
+            TestHelpers.EnableLogging();
+
+            UUID estateOwnerId = TestHelpers.ParseTail(0x1);
+            UUID regionId = TestHelpers.ParseTail(0x10);
+
+            IConfigSource configSource = new IniConfigSource();
+            configSource.AddConfig("Startup");
+            configSource.AddConfig("Modules");
+
+//            // We use this to skip estate questions
+            // Turns out not to be needed is estate owner id is pre-set in region information.
+//            IConfig estateConfig = configSource.AddConfig(OpenSimBase.ESTATE_SECTION_NAME);
+//            estateConfig.Set("DefaultEstateOwnerName", "Zaphod Beeblebrox");
+//            estateConfig.Set("DefaultEstateOwnerUUID", estateOwnerId);
+//            estateConfig.Set("DefaultEstateOwnerEMail", "zaphod@galaxy.com");
+//            estateConfig.Set("DefaultEstateOwnerPassword", "two heads");
+
+            // For grid servic
+            configSource.AddConfig("GridService");
+            configSource.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
+            configSource.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData");
+            configSource.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
+            configSource.Configs["GridService"].Set("ConnectionString", "!static");
+
+            LocalGridServicesConnector gridService = new LocalGridServicesConnector();
+//
+            OpenSim sim = new OpenSim(configSource);
+
+            sim.SuppressExit = true;
+            sim.EnableInitialPluginLoad = false;
+            sim.LoadEstateDataService = false;
+            sim.NetServersInfo.HttpListenerPort = 0;
+
+            IRegistryCore reg = sim.ApplicationRegistry;
+
+            RegionInfo ri = new RegionInfo();
+            ri.RegionID = regionId;
+            ri.EstateSettings.EstateOwner = estateOwnerId;
+            ri.InternalEndPoint = new IPEndPoint(0, 0);
+
+            MockRegionModulesControllerPlugin rmcp = new MockRegionModulesControllerPlugin();
+            sim.m_plugins = new List<IApplicationPlugin>() { rmcp };
+            reg.RegisterInterface<IRegionModulesController>(rmcp);
+
+            // XXX: Have to initialize directly for now
+            rmcp.Initialise(sim);
+
+            rmcp.AddNode(gridService);
+
+            TestSharedRegion tsr = new TestSharedRegion();
+            rmcp.AddNode(tsr);
+
+            // FIXME: Want to use the real one eventually but this is currently directly tied into Mono.Addins
+            // which has been written in such a way that makes it impossible to use for regression tests.
+//            RegionModulesControllerPlugin rmcp = new RegionModulesControllerPlugin();
+//            rmcp.LoadModulesFromAddins = false;
+////            reg.RegisterInterface<IRegionModulesController>(rmcp);
+//            rmcp.Initialise(sim);
+//            rmcp.PostInitialise();           
+//            TypeExtensionNode node = new TypeExtensionNode();
+//            node.
+//            rmcp.AddNode(node, configSource.Configs["Modules"], new Dictionary<RuntimeAddin, IList<int>>());
+
+            sim.Startup();
+            IScene scene;
+            sim.CreateRegion(ri, out scene);
+
+            sim.Shutdown();
+
+            List<string> co = tsr.CallOrder;
+            int expectedEventCount = 6;
+
+            Assert.AreEqual(
+                expectedEventCount, 
+                co.Count, 
+                "Expected {0} events but only got {1} ({2})", 
+                expectedEventCount, co.Count, string.Join(",", co));
+            Assert.AreEqual("Initialise",       co[0]);
+            Assert.AreEqual("PostInitialise",   co[1]);
+            Assert.AreEqual("AddRegion",        co[2]);
+            Assert.AreEqual("RegionLoaded",     co[3]);
+            Assert.AreEqual("RemoveRegion",     co[4]);
+            Assert.AreEqual("Close",            co[5]);
+        }
+    }
+
+    class TestSharedRegion : ISharedRegionModule
+    {
+        // FIXME: Should really use MethodInfo
+        public List<string> CallOrder = new List<string>();
+                
+        public string Name { get { return "TestSharedRegion"; } }
+
+        public Type ReplaceableInterface { get { return null; } }
+
+        public void PostInitialise()
+        {
+            CallOrder.Add("PostInitialise");
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            CallOrder.Add("Initialise");
+        }
+
+        public void Close()
+        {
+            CallOrder.Add("Close");
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            CallOrder.Add("AddRegion");
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            CallOrder.Add("RemoveRegion");
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            CallOrder.Add("RegionLoaded");
+        }
+    }
+
+    class MockRegionModulesControllerPlugin : IRegionModulesController, IApplicationPlugin
+    {
+        // List of shared module instances, for adding to Scenes
+        private List<ISharedRegionModule> m_sharedInstances = new List<ISharedRegionModule>();
+
+        // Config access
+        private OpenSimBase m_openSim;
+
+        public string Version { get { return "0"; } }
+        public string Name { get { return "MockRegionModulesControllerPlugin"; } }
+
+        public void Initialise() {}
+
+        public void Initialise(OpenSimBase sim) 
+        {
+            m_openSim = sim;
+        }
+
+        /// <summary>
+        /// Called when the application loading is completed 
+        /// </summary>
+        public void PostInitialise()
+        {
+            foreach (ISharedRegionModule module in m_sharedInstances)
+                module.PostInitialise();
+        }
+
+        public void AddRegionToModules(Scene scene)
+        {
+            List<ISharedRegionModule> sharedlist = new List<ISharedRegionModule>();
+
+            foreach (ISharedRegionModule module in m_sharedInstances)
+            {
+                module.AddRegion(scene);
+                scene.AddRegionModule(module.Name, module);
+
+                sharedlist.Add(module);
+            }
+
+            foreach (ISharedRegionModule module in sharedlist)
+            {
+                module.RegionLoaded(scene);
+            }
+        }
+
+        public void RemoveRegionFromModules(Scene scene)
+        {
+            foreach (IRegionModuleBase module in scene.RegionModules.Values)
+            {
+//                m_log.DebugFormat("[REGIONMODULE]: Removing scene {0} from module {1}",
+//                                  scene.RegionInfo.RegionName, module.Name);
+                module.RemoveRegion(scene);
+            }
+
+            scene.RegionModules.Clear();
+        }       
+        
+        public void AddNode(ISharedRegionModule module)
+        {
+            m_sharedInstances.Add(module);
+            module.Initialise(m_openSim.ConfigSource.Source);
+        }
+
+        public void Dispose()
+        {
+            // We expect that all regions have been removed already
+            while (m_sharedInstances.Count > 0)
+            {
+                m_sharedInstances[0].Close();
+                m_sharedInstances.RemoveAt(0);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index 020bb6c..3caea8b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -45,7 +45,6 @@ using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Tests
 {
@@ -65,7 +64,7 @@ namespace OpenSim.Region.Framework.Tests
 
             // Create an object embedded inside the first
             UUID taskSceneObjectItemId = UUID.Parse("00000000-0000-0000-0000-100000000000");
-            TaskInventoryHelpers.AddSceneObject(scene, sop1, "tso", taskSceneObjectItemId, user1.PrincipalID);
+            TaskInventoryHelpers.AddSceneObject(scene.AssetService, sop1, "tso", taskSceneObjectItemId, user1.PrincipalID);
 
             TaskInventoryItem addedItem = sop1.Inventory.GetInventoryItem(taskSceneObjectItemId);
             Assert.That(addedItem.ItemID, Is.EqualTo(taskSceneObjectItemId));
@@ -89,7 +88,7 @@ namespace OpenSim.Region.Framework.Tests
             // Create an object embedded inside the first
             UUID taskSceneObjectItemId = UUID.Parse("00000000-0000-0000-0000-100000000000");
             TaskInventoryItem taskSceneObjectItem
-                = TaskInventoryHelpers.AddSceneObject(scene, sop1, "tso", taskSceneObjectItemId, user1.PrincipalID);
+                = TaskInventoryHelpers.AddSceneObject(scene.AssetService, sop1, "tso", taskSceneObjectItemId, user1.PrincipalID);
 
             scene.AddSceneObject(sog1);
 
@@ -130,13 +129,14 @@ namespace OpenSim.Region.Framework.Tests
             SceneObjectPart sop1 = sog1.RootPart;
             TaskInventoryItem sopItem1
                 = TaskInventoryHelpers.AddNotecard(
-                    scene, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
+                    scene.AssetService, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
 
             InventoryFolderBase folder 
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, user1.PrincipalID, "Objects")[0];
             
             // Perform test
-            scene.MoveTaskInventoryItem(user1.PrincipalID, folder.ID, sop1, sopItem1.ItemID);
+            string message;
+            scene.MoveTaskInventoryItem(user1.PrincipalID, folder.ID, sop1, sopItem1.ItemID, out message);
                 
             InventoryItemBase ncUserItem
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Objects/ncItem");
@@ -162,10 +162,11 @@ namespace OpenSim.Region.Framework.Tests
             SceneObjectPart sop1 = sog1.RootPart;
             TaskInventoryItem sopItem1
                 = TaskInventoryHelpers.AddNotecard(
-                    scene, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
+                    scene.AssetService, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
             
             // Perform test
-            scene.MoveTaskInventoryItem(user1.PrincipalID, UUID.Zero, sop1, sopItem1.ItemID);
+            string message;
+            scene.MoveTaskInventoryItem(user1.PrincipalID, UUID.Zero, sop1, sopItem1.ItemID, out message);
                 
             InventoryItemBase ncUserItem
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Notecards/ncItem");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index e50b4da..edc0a52 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -45,7 +45,6 @@ using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Tests
 {
@@ -95,7 +94,9 @@ namespace OpenSim.Region.Framework.Tests
             UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1002));
             InventoryItemBase item1 = UserInventoryHelpers.CreateInventoryItem(scene, "item1", user1.PrincipalID);
 
-            scene.GiveInventoryItem(user2.PrincipalID, user1.PrincipalID, item1.ID);
+            string message;
+
+            scene.GiveInventoryItem(user2.PrincipalID, user1.PrincipalID, item1.ID, out message);
 
             InventoryItemBase retrievedItem1
                 = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, user2.PrincipalID, "Notecards/item1");
@@ -103,7 +104,7 @@ namespace OpenSim.Region.Framework.Tests
             Assert.That(retrievedItem1, Is.Not.Null);
 
             // Try giving back the freshly received item
-            scene.GiveInventoryItem(user1.PrincipalID, user2.PrincipalID, retrievedItem1.ID);
+            scene.GiveInventoryItem(user1.PrincipalID, user2.PrincipalID, retrievedItem1.ID, out message);
 
             List<InventoryItemBase> reretrievedItems
                 = UserInventoryHelpers.GetInventoryItems(scene.InventoryService, user1.PrincipalID, "Notecards/item1");
@@ -123,7 +124,7 @@ namespace OpenSim.Region.Framework.Tests
             InventoryFolderBase folder1
                 = UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, user1.PrincipalID, "folder1", false);
 
-            scene.GiveInventoryFolder(user2.PrincipalID, user1.PrincipalID, folder1.ID, UUID.Zero);
+            scene.GiveInventoryFolder(null, user2.PrincipalID, user1.PrincipalID, folder1.ID, UUID.Zero);
 
             InventoryFolderBase retrievedFolder1
                 = UserInventoryHelpers.GetInventoryFolder(scene.InventoryService, user2.PrincipalID, "folder1");
@@ -131,7 +132,7 @@ namespace OpenSim.Region.Framework.Tests
             Assert.That(retrievedFolder1, Is.Not.Null);
 
             // Try giving back the freshly received folder
-            scene.GiveInventoryFolder(user1.PrincipalID, user2.PrincipalID, retrievedFolder1.ID, UUID.Zero);
+            scene.GiveInventoryFolder(null, user1.PrincipalID, user2.PrincipalID, retrievedFolder1.ID, UUID.Zero);
 
             List<InventoryFolderBase> reretrievedFolders
                 = UserInventoryHelpers.GetInventoryFolders(scene.InventoryService, user1.PrincipalID, "folder1");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index 1e59e3f..937c414 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -33,7 +33,6 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
@@ -62,11 +61,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 = AssetHelpers.CreateAsset(corruptAssetUuid, AssetType.Notecard, "CORRUPT ASSET", UUID.Zero);
             m_assetService.Store(corruptAsset);
 
-            IDictionary<UUID, sbyte> foundAssetUuids = new Dictionary<UUID, sbyte>();
-            m_uuidGatherer.GatherAssetUuids(corruptAssetUuid, (sbyte)AssetType.Object, foundAssetUuids);
+            m_uuidGatherer.AddForInspection(corruptAssetUuid);
+            m_uuidGatherer.GatherAll();
 
             // We count the uuid as gathered even if the asset itself is corrupt.
-            Assert.That(foundAssetUuids.Count, Is.EqualTo(1));
+            Assert.That(m_uuidGatherer.GatheredUuids.Count, Is.EqualTo(1));
         }
         
         /// <summary>
@@ -78,38 +77,82 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelpers.InMethod();
             
             UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
-            IDictionary<UUID, sbyte> foundAssetUuids = new Dictionary<UUID, sbyte>();
-            
-            m_uuidGatherer.GatherAssetUuids(missingAssetUuid, (sbyte)AssetType.Object, foundAssetUuids);
 
-            // We count the uuid as gathered even if the asset itself is missing.
-            Assert.That(foundAssetUuids.Count, Is.EqualTo(1));
+            m_uuidGatherer.AddForInspection(missingAssetUuid);
+            m_uuidGatherer.GatherAll();
+
+            Assert.That(m_uuidGatherer.GatheredUuids.Count, Is.EqualTo(0));
         }
 
         [Test]
         public void TestNotecardAsset()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
-
+//            TestHelpers.EnableLogging();
+                      
             UUID ownerId = TestHelpers.ParseTail(0x10);
-            UUID soAssetId = TestHelpers.ParseTail(0x20);
+            UUID embeddedId = TestHelpers.ParseTail(0x20);
+            UUID secondLevelEmbeddedId = TestHelpers.ParseTail(0x21);
+            UUID missingEmbeddedId = TestHelpers.ParseTail(0x22);
             UUID ncAssetId = TestHelpers.ParseTail(0x30);
 
-            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, ownerId);
-            AssetBase soAsset = AssetHelpers.CreateAsset(soAssetId, so);
-            m_assetService.Store(soAsset);
-
-            AssetBase ncAsset = AssetHelpers.CreateNotecardAsset(ncAssetId, soAssetId.ToString());
+            AssetBase ncAsset 
+                = AssetHelpers.CreateNotecardAsset(
+                    ncAssetId, string.Format("Hello{0}World{1}", embeddedId, missingEmbeddedId));
             m_assetService.Store(ncAsset);
 
-            IDictionary<UUID, sbyte> foundAssetUuids = new Dictionary<UUID, sbyte>();
-            m_uuidGatherer.GatherAssetUuids(ncAssetId, (sbyte)AssetType.Notecard, foundAssetUuids);
+            AssetBase embeddedAsset 
+                = AssetHelpers.CreateNotecardAsset(embeddedId, string.Format("{0} We'll meet again.", secondLevelEmbeddedId));
+            m_assetService.Store(embeddedAsset);
 
-            // We count the uuid as gathered even if the asset itself is corrupt.
-            Assert.That(foundAssetUuids.Count, Is.EqualTo(2));
-            Assert.That(foundAssetUuids.ContainsKey(ncAssetId));
-            Assert.That(foundAssetUuids.ContainsKey(soAssetId));
+            AssetBase secondLevelEmbeddedAsset 
+                = AssetHelpers.CreateNotecardAsset(secondLevelEmbeddedId, "Don't know where, don't know when.");
+            m_assetService.Store(secondLevelEmbeddedAsset);
+
+            m_uuidGatherer.AddForInspection(ncAssetId);
+            m_uuidGatherer.GatherAll();
+
+//            foreach (UUID key in m_uuidGatherer.GatheredUuids.Keys)
+//                System.Console.WriteLine("key : {0}", key);
+
+            Assert.That(m_uuidGatherer.GatheredUuids.Count, Is.EqualTo(3));
+            Assert.That(m_uuidGatherer.GatheredUuids.ContainsKey(ncAssetId));
+            Assert.That(m_uuidGatherer.GatheredUuids.ContainsKey(embeddedId));
+            Assert.That(m_uuidGatherer.GatheredUuids.ContainsKey(secondLevelEmbeddedId));
+        }
+
+        [Test]
+        public void TestTaskItems()
+        {
+            TestHelpers.InMethod();
+//                        TestHelpers.EnableLogging();
+
+            UUID ownerId = TestHelpers.ParseTail(0x10);
+
+            SceneObjectGroup soL0 = SceneHelpers.CreateSceneObject(1, ownerId, "l0", 0x20);
+            SceneObjectGroup soL1 = SceneHelpers.CreateSceneObject(1, ownerId, "l1", 0x21);
+            SceneObjectGroup soL2 = SceneHelpers.CreateSceneObject(1, ownerId, "l2", 0x22);
+
+            TaskInventoryHelpers.AddScript(
+                m_assetService, soL2.RootPart, TestHelpers.ParseTail(0x33), TestHelpers.ParseTail(0x43), "l3-script", "gibberish");
+
+            TaskInventoryHelpers.AddSceneObject(
+                m_assetService, soL1.RootPart, "l2-item", TestHelpers.ParseTail(0x32), soL2, TestHelpers.ParseTail(0x42));
+            TaskInventoryHelpers.AddSceneObject(
+                m_assetService, soL0.RootPart, "l1-item", TestHelpers.ParseTail(0x31), soL1, TestHelpers.ParseTail(0x41));
+
+            m_uuidGatherer.AddForInspection(soL0);
+            m_uuidGatherer.GatherAll();
+
+//                        foreach (UUID key in m_uuidGatherer.GatheredUuids.Keys)
+//                            System.Console.WriteLine("key : {0}", key);
+
+            // We expect to see the default prim texture and the assets of the contained task items
+            Assert.That(m_uuidGatherer.GatheredUuids.Count, Is.EqualTo(4));
+            Assert.That(m_uuidGatherer.GatheredUuids.ContainsKey(new UUID(Constants.DefaultTexture)));
+            Assert.That(m_uuidGatherer.GatheredUuids.ContainsKey(TestHelpers.ParseTail(0x41)));
+            Assert.That(m_uuidGatherer.GatheredUuids.ContainsKey(TestHelpers.ParseTail(0x42)));
+            Assert.That(m_uuidGatherer.GatheredUuids.ContainsKey(TestHelpers.ParseTail(0x43)));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 67655d6..25bbd3a 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -55,37 +55,79 @@ namespace OpenSim.Region.Framework.Scenes
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// Is gathering complete?
+        /// </summary>
+        public bool Complete { get { return m_assetUuidsToInspect.Count <= 0; } }
+
+        /// <summary>
+        /// The dictionary of UUIDs gathered so far.  If Complete == true then this is all the reachable UUIDs.
+        /// </summary>
+        /// <value>The gathered uuids.</value>
+        public IDictionary<UUID, sbyte> GatheredUuids { get; private set; }
+
+        /// <summary>
+        /// Gets the next UUID to inspect.
+        /// </summary>
+        /// <value>If there is no next UUID then returns null</value>
+        public UUID? NextUuidToInspect
+        {
+            get
+            {
+                if (Complete)
+                    return null;
+                else
+                    return m_assetUuidsToInspect.Peek();
+            }
+        }
+
         protected IAssetService m_assetService;
 
-//        /// <summary>
-//        /// Used as a temporary store of an asset which represents an object.  This can be a null if no appropriate
-//        /// asset was found by the asset service.
-//        /// </summary>
-//        private AssetBase m_requestedObjectAsset;
-//
-//        /// <summary>
-//        /// Signal whether we are currently waiting for the asset service to deliver an asset.
-//        /// </summary>
-//        private bool m_waitingForObjectAsset;
-                
-        public UuidGatherer(IAssetService assetService)
+        protected Queue<UUID> m_assetUuidsToInspect;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenSim.Region.Framework.Scenes.UuidGatherer"/> class.
+        /// </summary>
+        /// <remarks>In this case the collection of gathered assets will start out blank.</remarks>
+        /// <param name="assetService">
+        /// Asset service.
+        /// </param>
+        public UuidGatherer(IAssetService assetService) : this(assetService, new Dictionary<UUID, sbyte>()) {}       
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenSim.Region.Framework.Scenes.UuidGatherer"/> class.
+        /// </summary>
+        /// <param name="assetService">
+        /// Asset service.
+        /// </param>
+        /// <param name="collector">
+        /// Gathered UUIDs will be collected in this dictinaory.  
+        /// It can be pre-populated if you want to stop the gatherer from analyzing assets that have already been fetched and inspected.
+        /// </param>
+        public UuidGatherer(IAssetService assetService, IDictionary<UUID, sbyte> collector)
         {
             m_assetService = assetService;
+            GatheredUuids = collector;
+
+            // FIXME: Not efficient for searching, can improve.
+            m_assetUuidsToInspect = new Queue<UUID>();
         }
-                
+
         /// <summary>
-        /// Gather all the asset uuids associated with the asset referenced by a given uuid
+        /// Adds the asset uuid for inspection during the gathering process.
         /// </summary>
-        /// <remarks>
-        /// This includes both those directly associated with
-        /// it (e.g. face textures) and recursively, those of items within it's inventory (e.g. objects contained
-        /// within this object).
-        /// </remarks>
-        /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param>
-        /// <param name="assetType">The type of the asset for the uuid given</param>
-        /// <param name="assetUuids">The assets gathered</param>
-        public void GatherAssetUuids(UUID assetUuid, sbyte assetType, IDictionary<UUID, sbyte> assetUuids)
+        /// <returns><c>true</c>, if for inspection was added, <c>false</c> otherwise.</returns>
+        /// <param name="uuid">UUID.</param>
+        public bool AddForInspection(UUID uuid)
         {
+<<<<<<< HEAD
+            if (m_assetUuidsToInspect.Contains(uuid))
+                return false;
+
+//            m_log.DebugFormat("[UUID GATHERER]: Adding asset {0} for inspection", uuid);
+
+            m_assetUuidsToInspect.Enqueue(uuid);
+=======
             try
             {               
                 assetUuids[assetUuid] = assetType;
@@ -123,7 +165,11 @@ namespace OpenSim.Region.Framework.Scenes
                 throw;
             }
         }
+>>>>>>> avn/ubitvar
 
+            return true;
+        }
+        
         /// <summary>
         /// Gather all the asset uuids associated with a given object.
         /// </summary>
@@ -133,22 +179,18 @@ namespace OpenSim.Region.Framework.Scenes
         /// within this object).
         /// </remarks>
         /// <param name="sceneObject">The scene object for which to gather assets</param>
-        /// <param name="assetUuids">
-        /// A dictionary which is populated with the asset UUIDs gathered and the type of that asset.
-        /// For assets where the type is not clear (e.g. UUIDs extracted from LSL and notecards), the type is Unknown.
-        /// </param>
-        public void GatherAssetUuids(SceneObjectGroup sceneObject, IDictionary<UUID, sbyte> assetUuids)
+        public void AddForInspection(SceneObjectGroup sceneObject)
         {
-//            m_log.DebugFormat(
-//                "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
+            //            m_log.DebugFormat(
+            //                "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
 
             SceneObjectPart[] parts = sceneObject.Parts;
             for (int i = 0; i < parts.Length; i++)
             {
                 SceneObjectPart part = parts[i];
 
-//                m_log.DebugFormat(
-//                    "[ARCHIVER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID);
+                //                m_log.DebugFormat(
+                //                    "[ARCHIVER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID);
 
                 try
                 {
@@ -157,7 +199,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         // Get the prim's default texture.  This will be used for faces which don't have their own texture
                         if (textureEntry.DefaultTexture != null)
-                            assetUuids[textureEntry.DefaultTexture.TextureID] = (sbyte)AssetType.Texture;
+                            RecordTextureEntryAssetUuids(textureEntry.DefaultTexture);
 
                         if (textureEntry.FaceTextures != null)
                         {
@@ -165,20 +207,20 @@ namespace OpenSim.Region.Framework.Scenes
                             foreach (Primitive.TextureEntryFace texture in textureEntry.FaceTextures)
                             {
                                 if (texture != null)
-                                    assetUuids[texture.TextureID] = (sbyte)AssetType.Texture;
+                                    RecordTextureEntryAssetUuids(texture);
                             }
                         }
                     }
-                    
+
                     // If the prim is a sculpt then preserve this information too
                     if (part.Shape.SculptTexture != UUID.Zero)
-                        assetUuids[part.Shape.SculptTexture] = (sbyte)AssetType.Texture;
+                        GatheredUuids[part.Shape.SculptTexture] = (sbyte)AssetType.Texture;
 
                     if (part.Shape.ProjectionTextureUUID != UUID.Zero)
-                        assetUuids[part.Shape.ProjectionTextureUUID] = (sbyte)AssetType.Texture;
+                        GatheredUuids[part.Shape.ProjectionTextureUUID] = (sbyte)AssetType.Texture;
 
                     if (part.CollisionSound != UUID.Zero)
-                        assetUuids[part.CollisionSound] = (sbyte)AssetType.Sound;
+                        GatheredUuids[part.CollisionSound] = (sbyte)AssetType.Sound;
 
                     if (part.ParticleSystem.Length > 0)
                     {
@@ -186,9 +228,9 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0);
                             if (ps.Texture != UUID.Zero)
-                                assetUuids[ps.Texture] = (sbyte)AssetType.Texture;
+                                GatheredUuids[ps.Texture] = (sbyte)AssetType.Texture;
                         }
-                        catch (Exception e)
+                        catch (Exception)
                         {
                             m_log.WarnFormat(
                                 "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt.  Continuing.", 
@@ -197,27 +239,27 @@ namespace OpenSim.Region.Framework.Scenes
                     }
 
                     TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
-                    
+
                     // Now analyze this prim's inventory items to preserve all the uuids that they reference
                     foreach (TaskInventoryItem tii in taskDictionary.Values)
                     {
-//                        m_log.DebugFormat(
-//                            "[ARCHIVER]: Analysing item {0} asset type {1} in {2} {3}", 
-//                            tii.Name, tii.Type, part.Name, part.UUID);
+                        //                        m_log.DebugFormat(
+                        //                            "[ARCHIVER]: Analysing item {0} asset type {1} in {2} {3}", 
+                        //                            tii.Name, tii.Type, part.Name, part.UUID);
 
-                        if (!assetUuids.ContainsKey(tii.AssetID))
-                            GatherAssetUuids(tii.AssetID, (sbyte)tii.Type, assetUuids);
+                        if (!GatheredUuids.ContainsKey(tii.AssetID))
+                            AddForInspection(tii.AssetID, (sbyte)tii.Type);
                     }
 
                     // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed
                     // to be called with scene objects that are in a scene (e.g. in the case of hg asset mapping and
                     // inventory transfer.  There needs to be a way for a module to register a method without assuming a 
                     // Scene.EventManager is present.
-//                    part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
+                    //                    part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
 
 
                     // still needed to retrieve textures used as materials for any parts containing legacy materials stored in DynAttrs
-                    GatherMaterialsUuids(part, assetUuids); 
+                    RecordMaterialsUuids(part); 
                 }
                 catch (Exception e)
                 {
@@ -229,27 +271,144 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-//        /// <summary>
-//        /// The callback made when we request the asset for an object from the asset service.
-//        /// </summary>
-//        private void AssetReceived(string id, Object sender, AssetBase asset)
-//        {
-//            lock (this)
-//            {
-//                m_requestedObjectAsset = asset;
-//                m_waitingForObjectAsset = false;
-//                Monitor.Pulse(this);
-//            }
-//        }
+        /// <summary>
+        /// Gathers the next set of assets returned by the next uuid to get from the asset service.
+        /// </summary>
+        /// <returns>false if gathering is already complete, true otherwise</returns>
+        public bool GatherNext()
+        {
+            if (Complete)
+                return false;
+
+            UUID nextToInspect = m_assetUuidsToInspect.Dequeue();
+
+//            m_log.DebugFormat("[UUID GATHERER]: Inspecting asset {0}", nextToInspect);
+
+            GetAssetUuids(nextToInspect);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Gathers all remaining asset UUIDS no matter how many calls are required to the asset service.
+        /// </summary>
+        /// <returns>false if gathering is already complete, true otherwise</returns>
+        public bool GatherAll()
+        {
+            if (Complete)
+                return false;
+
+            while (GatherNext());
+
+            return true;
+        }
+
+        /// <summary>
+        /// Gather all the asset uuids associated with the asset referenced by a given uuid
+        /// </summary>
+        /// <remarks>
+        /// This includes both those directly associated with
+        /// it (e.g. face textures) and recursively, those of items within it's inventory (e.g. objects contained
+        /// within this object).
+        /// This method assumes that the asset type associated with this asset in persistent storage is correct (which
+        /// should always be the case).  So with this method we always need to retrieve asset data even if the asset
+        /// is of a type which is known not to reference any other assets
+        /// </remarks>
+        /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param>
+        private void GetAssetUuids(UUID assetUuid)
+        {
+            // avoid infinite loops
+            if (GatheredUuids.ContainsKey(assetUuid))
+                return;
+
+            try
+            {              
+                AssetBase assetBase = GetAsset(assetUuid);
+
+                if (null != assetBase)
+                {
+                    sbyte assetType = assetBase.Type;
+                    GatheredUuids[assetUuid] = assetType;
+
+                    if ((sbyte)AssetType.Bodypart == assetType || (sbyte)AssetType.Clothing == assetType)
+                    {
+                        RecordWearableAssetUuids(assetBase);
+                    }
+                    else if ((sbyte)AssetType.Gesture == assetType)
+                    {
+                        RecordGestureAssetUuids(assetBase);
+                    }
+                    else if ((sbyte)AssetType.Notecard == assetType)
+                    {
+                        RecordTextEmbeddedAssetUuids(assetBase);
+                    }
+                    else if ((sbyte)AssetType.LSLText == assetType)
+                    {
+                        RecordTextEmbeddedAssetUuids(assetBase);
+                    }
+                    else if ((sbyte)OpenSimAssetType.Material == assetType)
+                    {
+                        RecordMaterialAssetUuids(assetBase);
+                    }
+                    else if ((sbyte)AssetType.Object == assetType)
+                    {
+                        RecordSceneObjectAssetUuids(assetBase);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                m_log.ErrorFormat("[UUID GATHERER]: Failed to gather uuids for asset id {0}", assetUuid);
+                throw;
+            }
+        }       
+
+        private void AddForInspection(UUID assetUuid, sbyte assetType)
+        {
+            // Here, we want to collect uuids which require further asset fetches but mark the others as gathered
+            try
+            {               
+                if ((sbyte)AssetType.Bodypart == assetType 
+                    || (sbyte)AssetType.Clothing == assetType
+                    || (sbyte)AssetType.Gesture == assetType
+                    || (sbyte)AssetType.Notecard == assetType
+                    || (sbyte)AssetType.LSLText == assetType
+                    || (sbyte)OpenSimAssetType.Material == assetType
+                    || (sbyte)AssetType.Object == assetType)
+                {
+                    AddForInspection(assetUuid);
+                }
+                else
+                {
+                    GatheredUuids[assetUuid] = assetType;
+                }
+            }
+            catch (Exception)
+            {
+                m_log.ErrorFormat(
+                    "[UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}", 
+                    assetUuid, assetType);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Collect all the asset uuids found in one face of a Texture Entry.
+        /// </summary>
+        private void RecordTextureEntryAssetUuids(Primitive.TextureEntryFace texture)
+        {
+            GatheredUuids[texture.TextureID] = (sbyte)AssetType.Texture;
+
+            if (texture.MaterialID != UUID.Zero)
+                AddForInspection(texture.MaterialID);
+        }
 
         /// <summary>
         /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
         /// stored in legacy format in part.DynAttrs
         /// </summary>
         /// <param name="part"></param>
-        /// <param name="assetUuids"></param>
-        //public void GatherMaterialsUuids(SceneObjectPart part, IDictionary<UUID, AssetType> assetUuids)
-        public void GatherMaterialsUuids(SceneObjectPart part, IDictionary<UUID, sbyte> assetUuids)
+        private void RecordMaterialsUuids(SceneObjectPart part)
         {
             // scan thru the dynAttrs map of this part for any textures used as materials
             OSD osdMaterials = null;
@@ -285,7 +444,7 @@ namespace OpenSim.Region.Framework.Scenes
                                         UUID normalMapId = mat["NormMap"].AsUUID();
                                         if (normalMapId != UUID.Zero)
                                         {
-                                            assetUuids[normalMapId] = (sbyte)AssetType.Texture;
+                                            GatheredUuids[normalMapId] = (sbyte)AssetType.Texture;
                                             //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString());
                                         }
                                     }
@@ -294,7 +453,7 @@ namespace OpenSim.Region.Framework.Scenes
                                         UUID specularMapId = mat["SpecMap"].AsUUID();
                                         if (specularMapId != UUID.Zero)
                                         {
-                                            assetUuids[specularMapId] = (sbyte)AssetType.Texture;
+                                            GatheredUuids[specularMapId] = (sbyte)AssetType.Texture;
                                             //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString());
                                         }
                                     }
@@ -310,7 +469,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
-       
+
         /// <summary>
         /// Get an asset synchronously, potentially using an asynchronous callback.  If the
         /// asynchronous callback is used, we will wait for it to complete.
@@ -320,83 +479,45 @@ namespace OpenSim.Region.Framework.Scenes
         protected virtual AssetBase GetAsset(UUID uuid)
         {
             return m_assetService.Get(uuid.ToString());
-
-            // XXX: Switching to do this synchronously where the call was async before but we always waited for it
-            // to complete anyway!
-//            m_waitingForObjectAsset = true;
-//            m_assetCache.Get(uuid.ToString(), this, AssetReceived);
-//
-//            // The asset cache callback can either
-//            //
-//            // 1. Complete on the same thread (if the asset is already in the cache) or
-//            // 2. Come in via a different thread (if we need to go fetch it).
-//            //
-//            // The code below handles both these alternatives.
-//            lock (this)
-//            {
-//                if (m_waitingForObjectAsset)
-//                {
-//                    Monitor.Wait(this);
-//                    m_waitingForObjectAsset = false;
-//                }
-//            }
-//
-//            return m_requestedObjectAsset;
         }
 
         /// <summary>
-        /// Record the asset uuids embedded within the given script.
+        /// Record the asset uuids embedded within the given text (e.g. a script).
         /// </summary>
-        /// <param name="scriptUuid"></param>
-        /// <param name="assetUuids">Dictionary in which to record the references</param>
-        private void GetTextEmbeddedAssetUuids(UUID embeddingAssetId, IDictionary<UUID, sbyte> assetUuids)
+        /// <param name="textAsset"></param>
+        private void RecordTextEmbeddedAssetUuids(AssetBase textAsset)
         {
-//            m_log.DebugFormat("[ASSET GATHERER]: Getting assets for uuid references in asset {0}", embeddingAssetId);
+            //            m_log.DebugFormat("[ASSET GATHERER]: Getting assets for uuid references in asset {0}", embeddingAssetId);
 
-            AssetBase embeddingAsset = GetAsset(embeddingAssetId);
+            string text = Utils.BytesToString(textAsset.Data);
+//            m_log.DebugFormat("[UUID GATHERER]: Text {0}", text);
+            MatchCollection uuidMatches = Util.PermissiveUUIDPattern.Matches(text);
+//            m_log.DebugFormat("[UUID GATHERER]: Found {0} matches in text", uuidMatches.Count);
 
-            if (null != embeddingAsset)
+            foreach (Match uuidMatch in uuidMatches)
             {
-                string script = Utils.BytesToString(embeddingAsset.Data);
-//                m_log.DebugFormat("[ARCHIVER]: Script {0}", script);
-                MatchCollection uuidMatches = Util.PermissiveUUIDPattern.Matches(script);
-//                m_log.DebugFormat("[ARCHIVER]: Found {0} matches in text", uuidMatches.Count);
+                UUID uuid = new UUID(uuidMatch.Value);
+//                m_log.DebugFormat("[UUID GATHERER]: Recording {0} in text", uuid);
 
-                foreach (Match uuidMatch in uuidMatches)
-                {
-                    UUID uuid = new UUID(uuidMatch.Value);
-//                    m_log.DebugFormat("[ARCHIVER]: Recording {0} in text", uuid);
-
-                    // Embedded asset references (if not false positives) could be for many types of asset, so we will
-                    // label these as unknown.
-                    assetUuids[uuid] = (sbyte)AssetType.Unknown;
-                }
+                AddForInspection(uuid);
             }
         }
 
         /// <summary>
         /// Record the uuids referenced by the given wearable asset
         /// </summary>
-        /// <param name="wearableAssetUuid"></param>
-        /// <param name="assetUuids">Dictionary in which to record the references</param>
-        private void GetWearableAssetUuids(UUID wearableAssetUuid, IDictionary<UUID, sbyte> assetUuids)
+        /// <param name="assetBase"></param>
+        private void RecordWearableAssetUuids(AssetBase assetBase)
         {
-            AssetBase assetBase = GetAsset(wearableAssetUuid);
+            //m_log.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data));
+            AssetWearable wearableAsset = new AssetBodypart(assetBase.FullID, assetBase.Data);
+            wearableAsset.Decode();
 
-            if (null != assetBase)
-            {
-                //m_log.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data));
-                AssetWearable wearableAsset = new AssetBodypart(wearableAssetUuid, assetBase.Data);
-                wearableAsset.Decode();
-    
-                //m_log.DebugFormat(
-                //    "[ARCHIVER]: Wearable asset {0} references {1} assets", wearableAssetUuid, wearableAsset.Textures.Count);
-    
-                foreach (UUID uuid in wearableAsset.Textures.Values)
-                {
-                    assetUuids[uuid] = (sbyte)AssetType.Texture;
-                }
-            }
+            //m_log.DebugFormat(
+            //    "[ARCHIVER]: Wearable asset {0} references {1} assets", wearableAssetUuid, wearableAsset.Textures.Count);
+
+            foreach (UUID uuid in wearableAsset.Textures.Values)
+                GatheredUuids[uuid] = (sbyte)AssetType.Texture;
         }
 
         /// <summary>
@@ -404,93 +525,79 @@ namespace OpenSim.Region.Framework.Scenes
         /// it (e.g. face textures) and recursively, those of items within it's inventory (e.g. objects contained
         /// within this object).
         /// </summary>
-        /// <param name="sceneObject"></param>
-        /// <param name="assetUuids"></param>
-        private void GetSceneObjectAssetUuids(UUID sceneObjectUuid, IDictionary<UUID, sbyte> assetUuids)
+        /// <param name="sceneObjectAsset"></param>
+        private void RecordSceneObjectAssetUuids(AssetBase sceneObjectAsset)
         {
-            AssetBase objectAsset = GetAsset(sceneObjectUuid);
+            string xml = Utils.BytesToString(sceneObjectAsset.Data);
 
-            if (null != objectAsset)
+            CoalescedSceneObjects coa;
+            if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
             {
-                string xml = Utils.BytesToString(objectAsset.Data);
-                
-                CoalescedSceneObjects coa;
-                if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
-                {
-                    foreach (SceneObjectGroup sog in coa.Objects)
-                        GatherAssetUuids(sog, assetUuids);
-                }
-                else
-                {
-                    SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
-    
-                    if (null != sog)
-                        GatherAssetUuids(sog, assetUuids);
-                }
+                foreach (SceneObjectGroup sog in coa.Objects)
+                    AddForInspection(sog);
+            }
+            else
+            {
+                SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
+
+                if (null != sog)
+                    AddForInspection(sog);
             }
         }
 
         /// <summary>
         /// Get the asset uuid associated with a gesture
         /// </summary>
-        /// <param name="gestureUuid"></param>
-        /// <param name="assetUuids"></param>
-        private void GetGestureAssetUuids(UUID gestureUuid, IDictionary<UUID, sbyte> assetUuids)
-        {
-            AssetBase assetBase = GetAsset(gestureUuid);
-            if (null == assetBase)
-                return;
-
-            MemoryStream ms = new MemoryStream(assetBase.Data);
-            StreamReader sr = new StreamReader(ms);
-
-            sr.ReadLine(); // Unknown (Version?)
-            sr.ReadLine(); // Unknown
-            sr.ReadLine(); // Unknown
-            sr.ReadLine(); // Name
-            sr.ReadLine(); // Comment ?
-            int count = Convert.ToInt32(sr.ReadLine()); // Item count
-
-            for (int i = 0 ; i < count ; i++)
+        /// <param name="gestureAsset"></param>
+        private void RecordGestureAssetUuids(AssetBase gestureAsset)
+        {           
+            using (MemoryStream ms = new MemoryStream(gestureAsset.Data))
+                using (StreamReader sr = new StreamReader(ms))
             {
-                string type = sr.ReadLine();
-                if (type == null)
-                    break;
-                string name = sr.ReadLine();
-                if (name == null)
-                    break;
-                string id = sr.ReadLine();
-                if (id == null)
-                    break;
-                string unknown = sr.ReadLine();
-                if (unknown == null)
-                    break;
-
-                // If it can be parsed as a UUID, it is an asset ID
-                UUID uuid;
-                if (UUID.TryParse(id, out uuid))
-                    assetUuids[uuid] = (sbyte)AssetType.Animation;
+                sr.ReadLine(); // Unknown (Version?)
+                sr.ReadLine(); // Unknown
+                sr.ReadLine(); // Unknown
+                sr.ReadLine(); // Name
+                sr.ReadLine(); // Comment ?
+                int count = Convert.ToInt32(sr.ReadLine()); // Item count
+
+                for (int i = 0 ; i < count ; i++)
+                {
+                    string type = sr.ReadLine();
+                    if (type == null)
+                        break;
+                    string name = sr.ReadLine();
+                    if (name == null)
+                        break;
+                    string id = sr.ReadLine();
+                    if (id == null)
+                        break;
+                    string unknown = sr.ReadLine();
+                    if (unknown == null)
+                        break;
+
+                    // If it can be parsed as a UUID, it is an asset ID
+                    UUID uuid;
+                    if (UUID.TryParse(id, out uuid))
+                        GatheredUuids[uuid] = (sbyte)AssetType.Animation;    // the asset is either an Animation or a Sound, but this distinction isn't important
+                }
             }
         }
 
         /// <summary>
         /// Get the asset uuid's referenced in a material.
         /// </summary>
-        private void GetMaterialAssetUuids(UUID materialUuid, IDictionary<UUID, sbyte> assetUuids)
+        private void RecordMaterialAssetUuids(AssetBase materialAsset)
         {
-            AssetBase assetBase = GetAsset(materialUuid);
-            if (null == assetBase)
-                return;
-
-            OSDMap mat = (OSDMap)OSDParser.DeserializeLLSDXml(assetBase.Data);
+            OSDMap mat = (OSDMap)OSDParser.DeserializeLLSDXml(materialAsset.Data);
 
             UUID normMap = mat["NormMap"].AsUUID();
             if (normMap != UUID.Zero)
-                assetUuids[normMap] = (sbyte)AssetType.Texture;
+                GatheredUuids[normMap] = (sbyte)AssetType.Texture;
 
             UUID specMap = mat["SpecMap"].AsUUID();
             if (specMap != UUID.Zero)
-                assetUuids[specMap] = (sbyte)AssetType.Texture;
+                GatheredUuids[specMap] = (sbyte)AssetType.Texture;
         }
     }
 
@@ -501,7 +608,10 @@ namespace OpenSim.Region.Framework.Scenes
         protected string m_assetServerURL;
 
         public HGUuidGatherer(IAssetService assetService, string assetServerURL)
-            : base(assetService)
+            : this(assetService, assetServerURL, new Dictionary<UUID, sbyte>()) {}
+
+        public HGUuidGatherer(IAssetService assetService, string assetServerURL, IDictionary<UUID, sbyte> collector)
+            : base(assetService, collector)
         {
             m_assetServerURL = assetServerURL;
             if (!m_assetServerURL.EndsWith("/") && !m_assetServerURL.EndsWith("="))
@@ -518,7 +628,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         public AssetBase FetchAsset(UUID assetID)
         {
-
             // Test if it's already here
             AssetBase asset = m_assetService.Get(assetID.ToString());
             if (asset == null)
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 89e18b0..a34f6ee 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             m_client = client;
             m_scene = scene;
 
-            Watchdog.StartThread(InternalLoop, "IRCClientView", ThreadPriority.Normal, false, true);
+            WorkManager.StartThread(InternalLoop, "IRCClientView", ThreadPriority.Normal, false, true);
         }
 
         private void SendServerCommand(string command)
@@ -1455,9 +1455,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             return new byte[0];
         }
 
+#pragma warning disable 0067
         public event ViewerEffectEventHandler OnViewerEffect;
         public event Action<IClientAPI> OnLogout;
         public event Action<IClientAPI> OnConnectionClosed;
+#pragma warning restore 0067
 
         public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message)
         {
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
index 9d27386..a1682d2 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
             m_listener.Start(50);
 
-            Watchdog.StartThread(ListenLoop, "IRCServer", ThreadPriority.Normal, false, true);
+            WorkManager.StartThread(ListenLoop, "IRCServer", ThreadPriority.Normal, false, true);
             m_baseScene = baseScene;
         }
 
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index ec18db0..08d0fbf 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -487,8 +487,10 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));            
             
             report.AppendFormat(
-                "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n",
-                "Total",
+                "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n",
+                "Max",
+                "Target", 
+                "Actual",
                 "Resend",
                 "Land",
                 "Wind",
@@ -499,7 +501,9 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
     
             report.AppendFormat("{0,-" + totalInfoFieldsLength +  "}", "");
             report.AppendFormat(
-                "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}",
+                "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n",
+                "kb/s",
+                "kb/s",
                 "kb/s",
                 "kb/s",
                 "kb/s",
@@ -511,8 +515,6 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             
             report.AppendLine();
             
-            bool firstClient = true;
-            
             lock (m_scenes)
             {
                 foreach (Scene scene in m_scenes.Values)
@@ -524,12 +526,6 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                             {
                                 LLClientView llClient = client as LLClientView;
 
-                                if (firstClient)
-                                {
-                                    report.AppendLine(GetServerThrottlesReport(llClient.UDPServer));
-                                    firstClient = false;
-                                }
-
                                 bool isChild = client.SceneAgent.IsChildAgent;
                                 if (isChild && !showChildren)
                                     return;
@@ -548,7 +544,11 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                 report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));                                                             
                             
                                 report.AppendFormat(
-                                    "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}",
+                                    "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n",
+                                    ci.maxThrottle > 0 ? ((ci.maxThrottle * 8) / 1000).ToString() : "-",
+                                    llUdpClient.FlowThrottle.AdaptiveEnabled 
+                                        ? ((ci.targetThrottle * 8) / 1000).ToString() 
+                                        : (llUdpClient.FlowThrottle.TotalDripRequest * 8 / 1000).ToString(),
                                     (ci.totalThrottle * 8) / 1000,
                                     (ci.resendThrottle * 8) / 1000,
                                     (ci.landThrottle * 8) / 1000,
@@ -556,9 +556,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                     (ci.cloudThrottle * 8) / 1000,
                                     (ci.taskThrottle * 8) / 1000,
                                     (ci.textureThrottle  * 8) / 1000,
-                                    (ci.assetThrottle  * 8) / 1000);                                                                                      
-                        
-                                report.AppendLine();
+                                    (ci.assetThrottle  * 8) / 1000);
                             }
                         });
                 }
@@ -566,36 +564,6 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
 
             return report.ToString();
         }         
-                
-        protected string GetServerThrottlesReport(LLUDPServer udpServer)
-        {
-            StringBuilder report = new StringBuilder();
-            
-            int columnPadding = 2;
-            int maxNameLength = 18;                                    
-            int maxRegionNameLength = 14;
-            int maxTypeLength = 4;
-            
-            string name = "SERVER AGENT RATES";
-                                
-            report.Append(GetColumnEntry(name, maxNameLength, columnPadding));
-            report.Append(GetColumnEntry("-", maxRegionNameLength, columnPadding));
-            report.Append(GetColumnEntry("-", maxTypeLength, columnPadding));             
-            
-            ThrottleRates throttleRates = udpServer.ThrottleRates;
-            report.AppendFormat(
-                "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}",
-                (throttleRates.Total * 8) / 1000,
-                (throttleRates.Resend * 8) / 1000,
-                (throttleRates.Land * 8) / 1000,
-                (throttleRates.Wind * 8) / 1000,
-                (throttleRates.Cloud * 8) / 1000,
-                (throttleRates.Task * 8) / 1000,
-                (throttleRates.Texture  * 8) / 1000,
-                (throttleRates.Asset  * 8) / 1000);  
-
-            return report.ToString();
-        }
 
         /// <summary>
         /// Show client stats data
@@ -637,7 +605,9 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                          string.Format(
                                             "{0} ({1:0.00}%)", 
                                             llClient.TotalAgentUpdates, 
-                                            (float)cinfo.SyncRequests["AgentUpdate"] / llClient.TotalAgentUpdates * 100));
+                                            cinfo.SyncRequests.ContainsKey("AgentUpdate") 
+                                                ? (float)cinfo.SyncRequests["AgentUpdate"] / llClient.TotalAgentUpdates * 100 
+                                                : 0));
                             }
                         });
                 }
@@ -669,7 +639,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                     aCircuit = new AgentCircuitData();
 
                                 if (!llClient.SceneAgent.IsChildAgent)
-                                    m_log.InfoFormat("[INFO]: {0} # {1} # {2}", llClient.Name, aCircuit.Viewer, aCircuit.Id0);
+                                    m_log.InfoFormat("[INFO]: {0} # {1} # {2}", llClient.Name, Util.GetViewerName(aCircuit), aCircuit.Id0);
 
                                 int avg_reqs = cinfo.AsyncRequests.Values.Sum() + cinfo.GenericRequests.Values.Sum() + cinfo.SyncRequests.Values.Sum();
                                 avg_reqs = avg_reqs / ((DateTime.Now - cinfo.StartedTime).Minutes + 1);
@@ -706,4 +676,4 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             m_log.InfoFormat("[INFO]: {0,25} {1,-6}", "Total", sum);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
index fa35f0f..2f9bb1e 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
@@ -51,7 +51,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
+        private List<Scene> m_scenes = new List<Scene>();
+
 //        private IAvatarFactoryModule m_avatarFactory;
         
         public string Name { get { return "Appearance Information Module"; } }        
@@ -83,7 +84,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
 //            m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
             
             lock (m_scenes)
-                m_scenes.Remove(scene.RegionInfo.RegionID);
+                m_scenes.Remove(scene);
         }        
         
         public void RegionLoaded(Scene scene)
@@ -91,7 +92,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
 //            m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
             
             lock (m_scenes)
-                m_scenes[scene.RegionInfo.RegionID] = scene;
+                m_scenes.Add(scene);
 
             scene.AddCommand(
                 "Users", this, "show appearance",
@@ -102,7 +103,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
             scene.AddCommand(
                 "Users", this, "appearance show",
                 "appearance show [<first-name> <last-name>]",
-                "Show appearance information for each avatar in the simulator.",
+                "Show appearance information for avatars.",
                 "This command checks whether the simulator has all the baked textures required to display an avatar to other viewers.  "
                     + "\nIf not, then appearance is 'corrupt' and other avatars will continue to see it as a cloud."
                     + "\nOptionally, you can view just a particular avatar's appearance information."
@@ -132,6 +133,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
                 "Find out which avatar uses the given asset as a baked texture, if any.",
                 "You can specify just the beginning of the uuid, e.g. 2008a8d.  A longer UUID must be in dashed format.",
                 HandleFindAppearanceCommand);
+
+            scene.AddCommand(
+                "Users", this, "wearables show",
+                "wearables show [<first-name> <last-name>]",
+                "Show information about wearables for avatars.",
+                "If no avatar name is given then a general summary for all avatars in the scene is shown.\n"
+                + "If an avatar name is given then specific information about current wearables is shown.",
+                HandleShowWearablesCommand);
+
+            scene.AddCommand(
+                "Users", this, "wearables check",
+                "wearables check <first-name> <last-name>",
+                "Check that the wearables of a given avatar in the scene are valid.",
+                "This currently checks that the wearable assets themselves and any assets referenced by them exist.",
+                HandleCheckWearablesCommand);
         }
 
         private void HandleSendAppearanceCommand(string module, string[] cmd)
@@ -155,7 +171,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
 
             lock (m_scenes)
             {
-                foreach (Scene scene in m_scenes.Values)
+                foreach (Scene scene in m_scenes)
                 {
                     if (targetNameSupplied)
                     {
@@ -186,7 +202,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
             }
         }
 
-        protected void HandleShowAppearanceCommand(string module, string[] cmd)
+        private void HandleShowAppearanceCommand(string module, string[] cmd)
         {
             if (cmd.Length != 2 && cmd.Length < 4)
             {
@@ -207,7 +223,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
 
             lock (m_scenes)
             {   
-                foreach (Scene scene in m_scenes.Values)
+                foreach (Scene scene in m_scenes)
                 {
                     if (targetNameSupplied)
                     {
@@ -243,7 +259,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
 
             lock (m_scenes)
             {
-                foreach (Scene scene in m_scenes.Values)
+                foreach (Scene scene in m_scenes)
                 {
                     ScenePresence sp = scene.GetScenePresence(firstname, lastname);
                     if (sp != null && !sp.IsChildAgent)
@@ -263,7 +279,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
             }
         }
 
-        protected void HandleFindAppearanceCommand(string module, string[] cmd)
+        private void HandleFindAppearanceCommand(string module, string[] cmd)
         {
             if (cmd.Length != 3)
             {
@@ -277,7 +293,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
 
             lock (m_scenes)
             {
-                foreach (Scene scene in m_scenes.Values)
+                foreach (Scene scene in m_scenes)
                 {
                     scene.ForEachRootScenePresence(
                         sp =>
@@ -304,5 +320,163 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
                     string.Join(", ", matchedAvatars.ToList().ConvertAll<string>(sp => sp.Name).ToArray()));
             }
         }
+
+        protected void HandleShowWearablesCommand(string module, string[] cmd)
+        {
+            if (cmd.Length != 2 && cmd.Length < 4)
+            {
+                MainConsole.Instance.OutputFormat("Usage: wearables show [<first-name> <last-name>]");
+                return;
+            }
+
+            bool targetNameSupplied = false;
+            string optionalTargetFirstName = null;
+            string optionalTargetLastName = null;
+
+            if (cmd.Length >= 4)
+            {
+                targetNameSupplied = true;
+                optionalTargetFirstName = cmd[2];
+                optionalTargetLastName = cmd[3];
+            }
+
+            StringBuilder sb = new StringBuilder();
+
+            if (targetNameSupplied)
+            {
+                lock (m_scenes)   
+                {
+                    foreach (Scene scene in m_scenes)
+                    {
+                        ScenePresence sp = scene.GetScenePresence(optionalTargetFirstName, optionalTargetLastName);
+                        if (sp != null && !sp.IsChildAgent)
+                            AppendWearablesDetailReport(sp, sb);
+                    }
+                }
+            }
+            else
+            {
+                ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+                cdt.AddColumn("Name", ConsoleDisplayUtil.UserNameSize);
+                cdt.AddColumn("Wearables", 2);
+
+                lock (m_scenes)   
+                {
+                    foreach (Scene scene in m_scenes)
+                    {
+                        scene.ForEachRootScenePresence(
+                            sp => 
+                            {
+                                int count = 0;
+
+                                for (int i = (int)WearableType.Shape; i < (int)WearableType.Physics; i++)
+                                    count += sp.Appearance.Wearables[i].Count;
+
+                                cdt.AddRow(sp.Name, count);
+                            }
+                        );
+                    }
+                }
+
+                sb.Append(cdt.ToString());
+            }
+
+            MainConsole.Instance.Output(sb.ToString());
+        }
+
+        private void HandleCheckWearablesCommand(string module, string[] cmd)
+        {
+            if (cmd.Length != 4)
+            {
+                MainConsole.Instance.OutputFormat("Usage: wearables check <first-name> <last-name>");
+                return;
+            }
+
+            string firstname = cmd[2];
+            string lastname = cmd[3];
+
+            StringBuilder sb = new StringBuilder();
+            UuidGatherer uuidGatherer = new UuidGatherer(m_scenes[0].AssetService);
+
+            lock (m_scenes)
+            {
+                foreach (Scene scene in m_scenes)
+                {
+                    ScenePresence sp = scene.GetScenePresence(firstname, lastname);
+                    if (sp != null && !sp.IsChildAgent)
+                    {
+                        sb.AppendFormat("Wearables checks for {0}\n\n", sp.Name);
+
+                        for (int i = (int)WearableType.Shape; i < (int)WearableType.Physics; i++)
+                        {
+                            AvatarWearable aw = sp.Appearance.Wearables[i];
+
+                            if (aw.Count > 0)
+                            {
+                                sb.Append(Enum.GetName(typeof(WearableType), i));
+                                sb.Append("\n");
+
+                                for (int j = 0; j < aw.Count; j++)
+                                {
+                                    WearableItem wi = aw[j];
+
+                                    ConsoleDisplayList cdl = new ConsoleDisplayList();
+                                    cdl.Indent = 2;
+                                    cdl.AddRow("Item UUID", wi.ItemID);
+                                    cdl.AddRow("Assets", "");
+                                    sb.Append(cdl.ToString());
+
+                                    uuidGatherer.AddForInspection(wi.AssetID);
+                                    uuidGatherer.GatherAll();
+                                    string[] assetStrings 
+                                        = Array.ConvertAll<UUID, string>(uuidGatherer.GatheredUuids.Keys.ToArray(), u => u.ToString());
+
+                                    bool[] existChecks = scene.AssetService.AssetsExist(assetStrings);
+
+                                    ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+                                    cdt.Indent = 4;
+                                    cdt.AddColumn("Type", 10);
+                                    cdt.AddColumn("UUID", ConsoleDisplayUtil.UuidSize);
+                                    cdt.AddColumn("Found", 5);
+                                            
+                                    for (int k = 0; k < existChecks.Length; k++)
+                                        cdt.AddRow(
+                                            (AssetType)uuidGatherer.GatheredUuids[new UUID(assetStrings[k])], 
+                                            assetStrings[k], existChecks[k] ? "yes" : "no");
+
+                                    sb.Append(cdt.ToString());
+                                    sb.Append("\n");
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            MainConsole.Instance.Output(sb.ToString());
+        }
+
+        private void AppendWearablesDetailReport(ScenePresence sp, StringBuilder sb)
+        {
+            sb.AppendFormat("\nWearables for {0}\n", sp.Name);
+
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Type", 10);
+            cdt.AddColumn("Item UUID", ConsoleDisplayUtil.UuidSize);
+            cdt.AddColumn("Asset UUID", ConsoleDisplayUtil.UuidSize);
+
+            for (int i = (int)WearableType.Shape; i < (int)WearableType.Physics; i++)
+            {
+                AvatarWearable aw = sp.Appearance.Wearables[i];
+
+                for (int j = 0; j < aw.Count; j++)
+                {
+                    WearableItem wi = aw[j];
+                    cdt.AddRow(Enum.GetName(typeof(WearableType), i), wi.ItemID, wi.AssetID);
+                }
+            }
+
+            sb.Append(cdt.ToString());
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index f5bd44d..6985371 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -109,10 +109,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
         internal int m_resetk = 0;
 
-        // Working threads
-
-        private Thread m_listener = null;
-
         private Object msyncConnect = new Object();
 
         internal bool m_randomizeNick = true; // add random suffix
@@ -363,10 +359,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
                     m_log.InfoFormat("[IRC-Connector-{0}]: Connected to {1}:{2}", idn, m_server, m_port);
 
-                    m_listener = new Thread(new ThreadStart(ListenerRun));
-                    m_listener.Name = "IRCConnectorListenerThread";
-                    m_listener.IsBackground = true;
-                    m_listener.Start();
+                    WorkManager.StartThread(ListenerRun, "IRCConnectionListenerThread", ThreadPriority.Normal, true, false);
 
                     // This is the message order recommended by RFC 2812
                     if (m_password != null)
@@ -510,21 +503,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             {
                 while (m_enabled && m_connected)
                 {
-
                     if ((inputLine = m_reader.ReadLine()) == null)
                         throw new Exception("Listener input socket closed");
 
+                    Watchdog.UpdateThread();
+
                     // m_log.Info("[IRCConnector]: " + inputLine);
 
                     if (inputLine.Contains("PRIVMSG"))
                     {
-
                         Dictionary<string, string> data = ExtractMsg(inputLine);
 
                         // Any chat ???
                         if (data != null)
                         {
-
                             OSChatMessage c = new OSChatMessage();
                             c.Message = data["msg"];
                             c.Type = ChatTypeEnum.Region;
@@ -540,9 +532,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
                                 c.Message = String.Format("/me {0}", c.Message.Substring(8, c.Message.Length - 9));
 
                             ChannelState.OSChat(this, c, false);
-
                         }
-
                     }
                     else
                     {
@@ -562,6 +552,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
             if (m_enabled && (m_resetk == resetk))
                 Reconnect();
+
+            Watchdog.RemoveThread();
         }
 
         private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)",
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 2b33084..3db0781 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         // Capability string prefixes
         private static readonly string m_parcelVoiceInfoRequestPath = "0207/";
         private static readonly string m_provisionVoiceAccountRequestPath = "0208/";
-        private static readonly string m_chatSessionRequestPath = "0209/";
+        //private static readonly string m_chatSessionRequestPath = "0209/";
 
         // Control info
         private static bool   m_Enabled  = false;
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index e6b14c6..f51527e 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         // Capability strings
         private static readonly string m_parcelVoiceInfoRequestPath = "0107/";
         private static readonly string m_provisionVoiceAccountRequestPath = "0108/";
-        private static readonly string m_chatSessionRequestPath = "0109/";
+        //private static readonly string m_chatSessionRequestPath = "0109/";
 
         // Control info, e.g. vivox server, admin user, admin password
         private static bool   m_pluginEnabled  = false;
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index 2802e2f..e1b6abb 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -55,8 +55,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         private IGroupsServicesConnector m_groupData = null;
 
         // Config Options
-        private bool m_groupMessagingEnabled = false;
-        private bool m_debugEnabled = true;
+        private bool m_groupMessagingEnabled;
+        private bool m_debugEnabled;
 
         /// <summary>
         /// If enabled, module only tries to send group IMs to online users by querying cached presence information.
@@ -113,7 +113,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 if (m_messageOnlineAgentsOnly)
                      m_usersOnlineCache = new ExpiringCache<UUID, PresenceInfo[]>();
 
-                m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true);
+                m_debugEnabled = groupsConfig.GetBoolean("MessagingDebugEnabled", m_debugEnabled);
             }
 
             m_log.InfoFormat(
@@ -127,6 +127,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 return;
             
             scene.RegisterModuleInterface<IGroupsMessagingModule>(this);
+
+            scene.AddCommand(
+                "Debug",
+                this,
+                "debug groups messaging verbose",
+                "debug groups messaging verbose <true|false>",
+                "This setting turns on very verbose groups messaging debugging",
+                HandleDebugGroupsMessagingVerbose);
         }
         
         public void RegionLoaded(Scene scene)
@@ -218,6 +226,26 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         #endregion
 
+        private void HandleDebugGroupsMessagingVerbose(object modules, string[] args)
+        {
+            if (args.Length < 5)
+            {
+                MainConsole.Instance.Output("Usage: debug groups messaging verbose <true|false>");
+                return;
+            }
+
+            bool verbose = false;
+            if (!bool.TryParse(args[4], out verbose))
+            {
+                MainConsole.Instance.Output("Usage: debug groups messaging verbose <true|false>");
+                return;
+            }
+
+            m_debugEnabled = verbose;
+
+            MainConsole.Instance.OutputFormat("{0} verbose logging set to {1}", Name, m_debugEnabled);
+        }
+
         /// <summary>
         /// Not really needed, but does confirm that the group exists.
         /// </summary>
@@ -237,11 +265,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 return false;
             }
         }
-        
+
         public void SendMessageToGroup(GridInstantMessage im, UUID groupID)
         {
-            List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(new UUID(im.fromAgentID), groupID);
+            SendMessageToGroup(im, groupID, new UUID(im.fromAgentID), null);
+        }
+        
+        public void SendMessageToGroup(
+            GridInstantMessage im, UUID groupID, UUID sendingAgentForGroupCalls, Func<GroupMembersData, bool> sendCondition)
+        {
+            int requestStartTick = Environment.TickCount;
+
+            List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(sendingAgentForGroupCalls, groupID);
             int groupMembersCount = groupMembers.Count;
+            HashSet<string> attemptDeliveryUuidSet = null;
 
             if (m_messageOnlineAgentsOnly)
             {
@@ -257,10 +294,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     m_usersOnlineCache.Add(groupID, onlineAgents, m_usersOnlineCacheExpirySeconds);
                 }
 
-                HashSet<string> onlineAgentsUuidSet = new HashSet<string>();
-                Array.ForEach<PresenceInfo>(onlineAgents, pi => onlineAgentsUuidSet.Add(pi.UserID));
+                attemptDeliveryUuidSet 
+                    = new HashSet<string>(Array.ConvertAll<PresenceInfo, string>(onlineAgents, pi => pi.UserID));
+
+                //Array.ForEach<PresenceInfo>(onlineAgents, pi => attemptDeliveryUuidSet.Add(pi.UserID));
 
-                groupMembers = groupMembers.Where(gmd => onlineAgentsUuidSet.Contains(gmd.AgentID.ToString())).ToList();
+                //groupMembers = groupMembers.Where(gmd => onlineAgentsUuidSet.Contains(gmd.AgentID.ToString())).ToList();
 
     //            if (m_debugEnabled)
 //                    m_log.DebugFormat(
@@ -269,26 +308,42 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             }
             else
             {
+                attemptDeliveryUuidSet 
+                    = new HashSet<string>(groupMembers.ConvertAll<string>(gmd => gmd.AgentID.ToString()));
+
                 if (m_debugEnabled)
                     m_log.DebugFormat(
                         "[GROUPS-MESSAGING]: SendMessageToGroup called for group {0} with {1} visible members",
                         groupID, groupMembers.Count);
-            }
-
-            int requestStartTick = Environment.TickCount;
+            }           
 
             foreach (GroupMembersData member in groupMembers)
             {
-                if (m_groupData.hasAgentDroppedGroupChatSession(member.AgentID, groupID))
+                if (sendCondition != null)
+                {
+                    if (!sendCondition(member))
+                    {
+                        if (m_debugEnabled) 
+                            m_log.DebugFormat(
+                                "[GROUPS-MESSAGING]: Not sending to {0} as they do not fulfill send condition", 
+                                 member.AgentID);
+
+                        continue;
+                    }
+                }
+                else if (m_groupData.hasAgentDroppedGroupChatSession(member.AgentID, groupID))
                 {
                     // Don't deliver messages to people who have dropped this session
-                    if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: {0} has dropped session, not delivering to them", member.AgentID);
+                    if (m_debugEnabled) 
+                        m_log.DebugFormat(
+                            "[GROUPS-MESSAGING]: {0} has dropped session, not delivering to them", member.AgentID);
+
                     continue;
                 }
 
                 // Copy Message
                 GridInstantMessage msg = new GridInstantMessage();
-                msg.imSessionID = groupID.Guid;
+                msg.imSessionID = im.imSessionID;
                 msg.fromAgentName = im.fromAgentName;
                 msg.message = im.message;
                 msg.dialog = im.dialog;
@@ -304,26 +359,51 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
                 msg.toAgentID = member.AgentID.Guid;
 
-                IClientAPI client = GetActiveClient(member.AgentID);
-                if (client == null)
+                if (attemptDeliveryUuidSet.Contains(member.AgentID.ToString()))
                 {
-                    // If they're not local, forward across the grid
-                    if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Delivering to {0} via Grid", member.AgentID);
-                    m_msgTransferModule.SendInstantMessage(msg, delegate(bool success) { });
+                    IClientAPI client = GetActiveClient(member.AgentID);
+                    if (client == null)
+                    {
+                        int startTick = Environment.TickCount;
+
+                        // If they're not local, forward across the grid
+                        m_msgTransferModule.SendInstantMessage(msg, delegate(bool success) { });
+
+                        if (m_debugEnabled) 
+                            m_log.DebugFormat(
+                                "[GROUPS-MESSAGING]: Delivering to {0} via grid took {1} ms", 
+                                member.AgentID, Environment.TickCount - startTick);
+                    }
+                    else
+                    {
+                        int startTick = Environment.TickCount;
+
+                        ProcessMessageFromGroupSession(msg, client);
+
+                        // Deliver locally, directly
+                        if (m_debugEnabled) 
+                            m_log.DebugFormat(
+                                "[GROUPS-MESSAGING]: Delivering to {0} locally took {1} ms", 
+                                member.AgentID, Environment.TickCount - startTick);
+                    }
                 }
                 else
                 {
-                    // Deliver locally, directly
-                    if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", client.Name);
-                    ProcessMessageFromGroupSession(msg);
+                    int startTick = Environment.TickCount;
+
+                    m_msgTransferModule.HandleUndeliverableMessage(msg, delegate(bool success) { });
+
+                    if (m_debugEnabled) 
+                        m_log.DebugFormat(
+                            "[GROUPS-MESSAGING]: Handling undeliverable message for {0} took {1} ms", 
+                            member.AgentID, Environment.TickCount - startTick);
                 }
             }
 
-            // Temporary for assessing how long it still takes to send messages to large online groups.
-            if (m_messageOnlineAgentsOnly)
+            if (m_debugEnabled)
                 m_log.DebugFormat(
-                    "[GROUPS-MESSAGING]: SendMessageToGroup for group {0} with {1} visible members, {2} online took {3}ms",
-                    groupID, groupMembersCount, groupMembers.Count(), Environment.TickCount - requestStartTick);
+                    "[GROUPS-MESSAGING]: Total SendMessageToGroup for group {0} with {1} members, {2} candidates for delivery took {3} ms",
+                    groupID, groupMembersCount, attemptDeliveryUuidSet.Count(), Environment.TickCount - requestStartTick);
         }
         
         #region SimGridEventHandlers
@@ -348,7 +428,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // Any other message type will not be delivered to a client by the 
             // Instant Message Module
 
-
             if (m_debugEnabled)
             {
                 m_log.DebugFormat("[GROUPS-MESSAGING]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
@@ -362,13 +441,35 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                  || (msg.dialog == (byte)InstantMessageDialog.SessionAdd)
                  || (msg.dialog == (byte)InstantMessageDialog.SessionDrop)))
             {
-                ProcessMessageFromGroupSession(msg);
+                IClientAPI client = null;
+
+                if (msg.dialog == (byte)InstantMessageDialog.SessionSend)
+                {
+                    client = GetActiveClient(new UUID(msg.toAgentID));
+
+                    if (client != null)
+                    {
+                        if (m_debugEnabled) 
+                            m_log.DebugFormat("[GROUPS-MESSAGING]: Delivering to {0} locally", client.Name);
+                    } 
+                    else
+                    {
+                        m_log.WarnFormat("[GROUPS-MESSAGING]: Received a message over the grid for a client that isn't here: {0}", msg.toAgentID);
+
+                        return;
+                    }
+                }
+
+                ProcessMessageFromGroupSession(msg, client);
             }
         }
 
-        private void ProcessMessageFromGroupSession(GridInstantMessage msg)
+        private void ProcessMessageFromGroupSession(GridInstantMessage msg, IClientAPI client)
         {
-            if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Session message from {0} going to agent {1}", msg.fromAgentName, msg.toAgentID);
+            if (m_debugEnabled) 
+                m_log.DebugFormat(
+                    "[GROUPS-MESSAGING]: Session message from {0} going to agent {1}, sessionID {2}, type {3}",
+                    msg.fromAgentName, msg.toAgentID, msg.imSessionID, (InstantMessageDialog)msg.dialog);
 
             UUID AgentID = new UUID(msg.fromAgentID);
             UUID GroupID = new UUID(msg.imSessionID);
@@ -392,74 +493,62 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                         // Add them to the session for now, and Invite them
                         m_groupData.AgentInvitedToGroupChatSession(AgentID, GroupID);
 
-                        UUID toAgentID = new UUID(msg.toAgentID);
-                        IClientAPI activeClient = GetActiveClient(toAgentID);
-                        if (activeClient != null)
+                        GroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero, GroupID, null);
+                        if (groupInfo != null)
                         {
-                            GroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero, GroupID, null);
-                            if (groupInfo != null)
-                            {
-                                if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Sending chatterbox invite instant message");
-
-                                // Force? open the group session dialog???
-                                // and simultanously deliver the message, so we don't need to do a seperate client.SendInstantMessage(msg);
-                                IEventQueue eq = activeClient.Scene.RequestModuleInterface<IEventQueue>();
-                                eq.ChatterboxInvitation(
-                                    GroupID
-                                    , groupInfo.GroupName
-                                    , new UUID(msg.fromAgentID)
-                                    , msg.message
-                                    , new UUID(msg.toAgentID)
-                                    , msg.fromAgentName
-                                    , msg.dialog
-                                    , msg.timestamp
-                                    , msg.offline == 1
-                                    , (int)msg.ParentEstateID
-                                    , msg.Position
-                                    , 1
-                                    , new UUID(msg.imSessionID)
-                                    , msg.fromGroup
-                                    , Utils.StringToBytes(groupInfo.GroupName)
-                                    );
-
-                                eq.ChatterBoxSessionAgentListUpdates(
-                                    new UUID(GroupID)
-                                    , new UUID(msg.fromAgentID)
-                                    , new UUID(msg.toAgentID)
-                                    , false //canVoiceChat
-                                    , false //isModerator
-                                    , false //text mute
-                                    );
-                            }
+                            if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Sending chatterbox invite instant message");
+
+                            // Force? open the group session dialog???
+                            // and simultanously deliver the message, so we don't need to do a seperate client.SendInstantMessage(msg);
+                            IEventQueue eq = client.Scene.RequestModuleInterface<IEventQueue>();
+                            eq.ChatterboxInvitation(
+                                GroupID
+                                , groupInfo.GroupName
+                                , new UUID(msg.fromAgentID)
+                                , msg.message
+                                , new UUID(msg.toAgentID)
+                                , msg.fromAgentName
+                                , msg.dialog
+                                , msg.timestamp
+                                , msg.offline == 1
+                                , (int)msg.ParentEstateID
+                                , msg.Position
+                                , 1
+                                , new UUID(msg.imSessionID)
+                                , msg.fromGroup
+                                , Utils.StringToBytes(groupInfo.GroupName)
+                                );
+
+                            eq.ChatterBoxSessionAgentListUpdates(
+                                new UUID(GroupID)
+                                , new UUID(msg.fromAgentID)
+                                , new UUID(msg.toAgentID)
+                                , false //canVoiceChat
+                                , false //isModerator
+                                , false //text mute
+                                );
                         }
+
+                        break;
                     }
                     else if (!m_groupData.hasAgentDroppedGroupChatSession(AgentID, GroupID))
                     {
                         // User hasn't dropped, so they're in the session, 
                         // maybe we should deliver it.
-                        IClientAPI client = GetActiveClient(new UUID(msg.toAgentID));
-                        if (client != null)
-                        {
-                            // Deliver locally, directly
-                            if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: Delivering to {0} locally", client.Name);
-                            client.SendInstantMessage(msg);
-                        }
-                        else
-                        {
-                            m_log.WarnFormat("[GROUPS-MESSAGING]: Received a message over the grid for a client that isn't here: {0}", msg.toAgentID);
-                        }
+                        client.SendInstantMessage(msg);
                     }
+
                     break;
 
                 default:
-                    m_log.WarnFormat("[GROUPS-MESSAGING]: I don't know how to proccess a {0} message.", ((InstantMessageDialog)msg.dialog).ToString());
-                    break;
+                    client.SendInstantMessage(msg);
+
+                    break;;
             }
         }
 
         #endregion
 
-
         #region ClientEvents
         private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im)
         {
@@ -548,15 +637,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // Don't log any normal IMs (privacy!)
             if (m_debugEnabled && im.dialog != (byte)InstantMessageDialog.MessageFromAgent)
             {
-                m_log.WarnFormat("[GROUPS-MESSAGING]: IM: fromGroup({0})", im.fromGroup ? "True" : "False");
-                m_log.WarnFormat("[GROUPS-MESSAGING]: IM: Dialog({0})", ((InstantMessageDialog)im.dialog).ToString());
-                m_log.WarnFormat("[GROUPS-MESSAGING]: IM: fromAgentID({0})", im.fromAgentID.ToString());
-                m_log.WarnFormat("[GROUPS-MESSAGING]: IM: fromAgentName({0})", im.fromAgentName.ToString());
-                m_log.WarnFormat("[GROUPS-MESSAGING]: IM: imSessionID({0})", im.imSessionID.ToString());
-                m_log.WarnFormat("[GROUPS-MESSAGING]: IM: message({0})", im.message.ToString());
-                m_log.WarnFormat("[GROUPS-MESSAGING]: IM: offline({0})", im.offline.ToString());
-                m_log.WarnFormat("[GROUPS-MESSAGING]: IM: toAgentID({0})", im.toAgentID.ToString());
-                m_log.WarnFormat("[GROUPS-MESSAGING]: IM: binaryBucket({0})", OpenMetaverse.Utils.BytesToHexString(im.binaryBucket, "BinaryBucket"));
+                m_log.DebugFormat("[GROUPS-MESSAGING]: IM: fromGroup({0})", im.fromGroup ? "True" : "False");
+                m_log.DebugFormat("[GROUPS-MESSAGING]: IM: Dialog({0})", (InstantMessageDialog)im.dialog);
+                m_log.DebugFormat("[GROUPS-MESSAGING]: IM: fromAgentID({0})", im.fromAgentID);
+                m_log.DebugFormat("[GROUPS-MESSAGING]: IM: fromAgentName({0})", im.fromAgentName);
+                m_log.DebugFormat("[GROUPS-MESSAGING]: IM: imSessionID({0})", im.imSessionID);
+                m_log.DebugFormat("[GROUPS-MESSAGING]: IM: message({0})", im.message);
+                m_log.DebugFormat("[GROUPS-MESSAGING]: IM: offline({0})", im.offline);
+                m_log.DebugFormat("[GROUPS-MESSAGING]: IM: toAgentID({0})", im.toAgentID);
+                m_log.DebugFormat("[GROUPS-MESSAGING]: IM: binaryBucket({0})", OpenMetaverse.Utils.BytesToHexString(im.binaryBucket, "BinaryBucket"));
             }
         }
 
@@ -567,7 +656,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         /// </summary>
         private IClientAPI GetActiveClient(UUID agentID)
         {
-            if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Looking for local client {0}", agentID);
+            if (m_debugEnabled) 
+                m_log.DebugFormat("[GROUPS-MESSAGING]: Looking for local client {0}", agentID);
 
             IClientAPI child = null;
 
@@ -579,12 +669,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 {
                     if (!sp.IsChildAgent)
                     {
-                        if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Found root agent for client : {0}", sp.ControllingClient.Name);
+                        if (m_debugEnabled) 
+                            m_log.DebugFormat("[GROUPS-MESSAGING]: Found root agent for client : {0}", sp.ControllingClient.Name);
+
                         return sp.ControllingClient;
                     }
                     else
                     {
-                        if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Found child agent for client : {0}", sp.ControllingClient.Name);
+                        if (m_debugEnabled) 
+                            m_log.DebugFormat("[GROUPS-MESSAGING]: Found child agent for client : {0}", sp.ControllingClient.Name);
+
                         child = sp.ControllingClient;
                     }
                 }
@@ -593,12 +687,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // If we didn't find a root, then just return whichever child we found, or null if none
             if (child == null)
             {
-                if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Could not find local client for agent : {0}", agentID);
+                if (m_debugEnabled) 
+                    m_log.DebugFormat("[GROUPS-MESSAGING]: Could not find local client for agent : {0}", agentID);
             }
             else
             {
-                if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Returning child agent for client : {0}", child.Name);
+                if (m_debugEnabled) 
+                    m_log.DebugFormat("[GROUPS-MESSAGING]: Returning child agent for client : {0}", child.Name);
             }
+
             return child;
         }
 
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 2764465..0512e48 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -77,9 +77,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private List<Scene> m_sceneList = new List<Scene>();
 
-        private IMessageTransferModule m_msgTransferModule = null;
+        private IMessageTransferModule m_msgTransferModule;
+
+        private IGroupsMessagingModule m_groupsMessagingModule;
         
-        private IGroupsServicesConnector m_groupData = null;
+        private IGroupsServicesConnector m_groupData;
 
         // Configuration settings
         private bool m_groupsEnabled = false;
@@ -185,10 +187,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 if (m_msgTransferModule == null)
                 {
                     m_groupsEnabled = false;
-                    m_log.Warn("[GROUPS]: Could not get MessageTransferModule");
+                    m_log.Warn("[GROUPS]: Could not get IMessageTransferModule");
                 }
             }
 
+            if (m_groupsMessagingModule == null)
+            {
+                m_groupsMessagingModule = scene.RequestModuleInterface<IGroupsMessagingModule>();
+
+                // No message transfer module, no notices, group invites, rejects, ejects, etc
+                if (m_groupsMessagingModule == null)
+                    m_log.Warn("[GROUPS]: Could not get IGroupsMessagingModule");
+            }
+
             lock (m_sceneList)
             {
                 m_sceneList.Add(scene);
@@ -363,7 +374,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im)
         {
-            if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
+            if (m_debugEnabled) 
+                m_log.DebugFormat(
+                    "[GROUPS]: {0} called for {1}, message type {2}", 
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, remoteClient.Name, (InstantMessageDialog)im.dialog);
 
             // Group invitations
             if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline))
@@ -514,31 +528,38 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                         OnNewGroupNotice(GroupID, NoticeID);
                     }
 
-                    // Send notice out to everyone that wants notices
-                    foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), GroupID))
+                    if (m_debugEnabled)
                     {
-                         if (m_debugEnabled)
+                        foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), GroupID))
                         {
-                            UserAccount targetUser = m_sceneList[0].UserAccountService.GetUserAccount(remoteClient.Scene.RegionInfo.ScopeID, member.AgentID);
-                            if (targetUser != null)
+                            if (m_debugEnabled)
                             {
-                                m_log.DebugFormat("[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", NoticeID, targetUser.FirstName + " " + targetUser.LastName, member.AcceptNotices);
-                            }
-                            else
-                            {
-                                m_log.DebugFormat("[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", NoticeID, member.AgentID, member.AcceptNotices);
+                                UserAccount targetUser
+                                    = m_sceneList[0].UserAccountService.GetUserAccount(
+                                        remoteClient.Scene.RegionInfo.ScopeID, member.AgentID);
+
+                                if (targetUser != null)
+                                {
+                                    m_log.DebugFormat(
+                                        "[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", 
+                                        NoticeID, targetUser.FirstName + " " + targetUser.LastName, member.AcceptNotices);
+                                }
+                                else
+                                {
+                                    m_log.DebugFormat(
+                                        "[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", 
+                                        NoticeID, member.AgentID, member.AcceptNotices);
+                                }
                             }
                         }
+                    }
 
-                       if (member.AcceptNotices)
-                        {
-                            // Build notice IM
-                            GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice);
+                    GridInstantMessage msg 
+                        = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice);
 
-                            msg.toAgentID = member.AgentID.Guid;
-                            OutgoingInstantMessage(msg, member.AgentID);
-                        }
-                    }
+                    if (m_groupsMessagingModule != null)
+                        m_groupsMessagingModule.SendMessageToGroup(
+                            msg, GroupID, remoteClient.AgentId, gmd => gmd.AcceptNotices);
                 }
             }
 
@@ -550,6 +571,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
                 UUID noticeID = new UUID(im.imSessionID);
 
+                if (m_debugEnabled) 
+                    m_log.DebugFormat("[GROUPS]: Requesting notice {0} for {1}", noticeID, remoteClient.AgentId);
+
                 GroupNoticeInfo notice = m_groupData.GetGroupNotice(GetRequestingAgentID(remoteClient), noticeID);
                 if (notice != null)
                 {
@@ -559,17 +583,25 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     if (m_debugEnabled)
                         m_log.DebugFormat("[Groups]: Giving inventory from {0} to {1}", giver, remoteClient.AgentId);
 
+                    string message;
                     InventoryItemBase itemCopy = ((Scene)(remoteClient.Scene)).GiveInventoryItem(remoteClient.AgentId,
-                        giver, attachmentUUID);
+                        giver, attachmentUUID, out message);
 
                     if (itemCopy == null)
                     {
-                        remoteClient.SendAgentAlertMessage("Can't find item to give. Nothing given.", false);
+                        remoteClient.SendAgentAlertMessage(message, false);
                         return;
                     }
 
                     remoteClient.SendInventoryItemCreateUpdate(itemCopy, 0);
                 }
+                else
+                {
+                    if (m_debugEnabled) 
+                        m_log.DebugFormat(
+                            "[GROUPS]: Could not find notice {0} for {1} on GroupNoticeInventoryAccepted.", 
+                            noticeID, remoteClient.AgentId);                   
+                }
             }
 
             // Interop, received special 210 code for ejecting a group member
@@ -1366,7 +1398,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                         presence.Grouptitle = Title;
 
                         if (! presence.IsChildAgent)
-                            presence.SendAvatarDataToAllAgents();
+                            presence.SendAvatarDataToAllClients();
                     }
                 }
             }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
index 26d2597..e03e71d 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 using Nini.Config;
@@ -40,11 +41,11 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.ClientStack.Linden;
+using OpenSim.Region.CoreModules.Avatar.InstantMessage;
 using OpenSim.Region.CoreModules.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
 {
@@ -118,5 +119,150 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
 
             // TODO: More checking of more actual event data.           
         }
+
+        [Test]
+        public void TestSendGroupNotice()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+            
+            TestScene scene = new SceneHelpers().SetupScene();
+
+            MessageTransferModule mtm = new MessageTransferModule();
+            GroupsModule gm = new GroupsModule();
+            GroupsMessagingModule gmm = new GroupsMessagingModule();
+            MockGroupsServicesConnector mgsc = new MockGroupsServicesConnector();
+
+            IConfigSource configSource = new IniConfigSource();
+
+            {
+                IConfig config = configSource.AddConfig("Messaging");            
+                config.Set("MessageTransferModule", mtm.Name);
+            }
+
+            {
+                IConfig config = configSource.AddConfig("Groups");            
+                config.Set("Enabled", true);
+                config.Set("Module", gm.Name);
+                config.Set("DebugEnabled", true);
+                config.Set("MessagingModule", gmm.Name);
+                config.Set("MessagingEnabled", true);
+            }
+
+            SceneHelpers.SetupSceneModules(scene, configSource, mgsc, mtm, gm, gmm);
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+            string subjectText = "newman";
+            string messageText = "Hello";
+            string combinedSubjectMessage = string.Format("{0}|{1}", subjectText, messageText);
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
+            TestClient tc = (TestClient)sp.ControllingClient;
+
+            UUID groupID = gm.CreateGroup(tc, "group1", null, true, UUID.Zero, 0, true, true, true);
+            gm.JoinGroupRequest(tc, groupID);
+
+            // Create a second user who doesn't want to receive notices
+            ScenePresence sp2 = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x2));
+            TestClient tc2 = (TestClient)sp2.ControllingClient;
+            gm.JoinGroupRequest(tc2, groupID);
+            gm.SetGroupAcceptNotices(tc2, groupID, false, true);
+
+            List<GridInstantMessage> spReceivedMessages = new List<GridInstantMessage>();
+            tc.OnReceivedInstantMessage += im => spReceivedMessages.Add(im);
+
+            List<GridInstantMessage> sp2ReceivedMessages = new List<GridInstantMessage>();
+            tc2.OnReceivedInstantMessage += im => sp2ReceivedMessages.Add(im);
+
+            GridInstantMessage noticeIm = new GridInstantMessage();
+            noticeIm.fromAgentID = userId.Guid;
+            noticeIm.toAgentID = groupID.Guid;
+            noticeIm.message = combinedSubjectMessage;
+            noticeIm.dialog = (byte)InstantMessageDialog.GroupNotice;
+
+            tc.HandleImprovedInstantMessage(noticeIm);
+
+            Assert.That(spReceivedMessages.Count, Is.EqualTo(1));
+            Assert.That(spReceivedMessages[0].message, Is.EqualTo(combinedSubjectMessage));
+
+            List<GroupNoticeData> notices = mgsc.GetGroupNotices(UUID.Zero, groupID);
+            Assert.AreEqual(1, notices.Count);
+
+            // OpenSimulator (possibly also SL) transport the notice ID as the session ID!
+            Assert.AreEqual(notices[0].NoticeID.Guid, spReceivedMessages[0].imSessionID);
+
+            Assert.That(sp2ReceivedMessages.Count, Is.EqualTo(0));
+        }
+
+        /// <summary>
+        /// Run test with the MessageOnlineUsersOnly flag set.
+        /// </summary>
+        [Test]
+        public void TestSendGroupNoticeOnlineOnly()
+        {
+            TestHelpers.InMethod();
+            //            TestHelpers.EnableLogging();
+
+            TestScene scene = new SceneHelpers().SetupScene();
+
+            MessageTransferModule mtm = new MessageTransferModule();
+            GroupsModule gm = new GroupsModule();
+            GroupsMessagingModule gmm = new GroupsMessagingModule();
+
+            IConfigSource configSource = new IniConfigSource();
+
+            {
+                IConfig config = configSource.AddConfig("Messaging");
+                config.Set("MessageTransferModule", mtm.Name);
+            }
+
+            {
+                IConfig config = configSource.AddConfig("Groups");
+                config.Set("Enabled", true);
+                config.Set("Module", gm.Name);
+                config.Set("DebugEnabled", true);
+                config.Set("MessagingModule", gmm.Name);
+                config.Set("MessagingEnabled", true);
+                config.Set("MessageOnlineUsersOnly", true);
+            }
+
+            SceneHelpers.SetupSceneModules(scene, configSource, new MockGroupsServicesConnector(), mtm, gm, gmm);
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+            string subjectText = "newman";
+            string messageText = "Hello";
+            string combinedSubjectMessage = string.Format("{0}|{1}", subjectText, messageText);
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
+            TestClient tc = (TestClient)sp.ControllingClient;
+
+            UUID groupID = gm.CreateGroup(tc, "group1", null, true, UUID.Zero, 0, true, true, true);
+            gm.JoinGroupRequest(tc, groupID);
+
+            // Create a second user who doesn't want to receive notices
+            ScenePresence sp2 = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x2));
+            TestClient tc2 = (TestClient)sp2.ControllingClient;
+            gm.JoinGroupRequest(tc2, groupID);
+            gm.SetGroupAcceptNotices(tc2, groupID, false, true);
+
+            List<GridInstantMessage> spReceivedMessages = new List<GridInstantMessage>();
+            tc.OnReceivedInstantMessage += im => spReceivedMessages.Add(im);
+
+            List<GridInstantMessage> sp2ReceivedMessages = new List<GridInstantMessage>();
+            tc2.OnReceivedInstantMessage += im => sp2ReceivedMessages.Add(im);
+
+            GridInstantMessage noticeIm = new GridInstantMessage();
+            noticeIm.fromAgentID = userId.Guid;
+            noticeIm.toAgentID = groupID.Guid;
+            noticeIm.message = combinedSubjectMessage;
+            noticeIm.dialog = (byte)InstantMessageDialog.GroupNotice;
+
+            tc.HandleImprovedInstantMessage(noticeIm);
+
+            Assert.That(spReceivedMessages.Count, Is.EqualTo(1));
+            Assert.That(spReceivedMessages[0].message, Is.EqualTo(combinedSubjectMessage));
+
+            Assert.That(sp2ReceivedMessages.Count, Is.EqualTo(0));
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index e28d0c2..a040f43 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 Hashtable respData = (Hashtable)resp.Value;
                 if (respData.Contains("error") && !respData.Contains("succeed"))
                 {
-                    LogRespDataToConsoleError(respData);
+                    LogRespDataToConsoleError(requestingAgentID, function, param, respData);
                 }
 
                 return respData;
@@ -1040,20 +1040,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             return error;
         }
 
-        private void LogRespDataToConsoleError(Hashtable respData)
+        private void LogRespDataToConsoleError(UUID requestingAgentID, string function, Hashtable param, Hashtable respData)
         {
-            m_log.Error("[XMLRPC-GROUPS-CONNECTOR]: Error:");
-
-            foreach (string key in respData.Keys)
-            {
-                m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: Key: {0}", key);
-
-                string[] lines = respData[key].ToString().Split(new char[] { '\n' });
-                foreach (string line in lines)
-                {
-                    m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0}", line);
-                }
-            }
+            m_log.ErrorFormat(
+                "[XMLRPC-GROUPS-CONNECTOR]: Error when calling {0} for {1} with params {2}.  Response params are {3}", 
+                function, requestingAgentID, Util.PrettyFormatToSingleLine(param), Util.PrettyFormatToSingleLine(respData));
         }
 
         /// <summary>
diff --git a/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs b/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs
index 0615036..bbf7168 100644
--- a/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs
+++ b/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Scenes;
 // specify its assembly.  Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans
 // the available DLLs
 //[assembly: Addin("MyModule", "1.0")]
-//[assembly: AddinDependency("OpenSim", "0.5")]
+//[assembly: AddinDependency("OpenSim", "0.8.1")]
 
 namespace OpenSim.Region.OptionalModules.Example.BareBonesNonShared
 {
diff --git a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
index 811a263..46fea3e 100644
--- a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
+++ b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Scenes;
 // specify its assembly.  Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans
 // the available DLLs
 //[assembly: Addin("MyModule", "1.0")]
-//[assembly: AddinDependency("OpenSim", "0.5")]
+//[assembly: AddinDependency("OpenSim", "0.8.1")]
 
 namespace OpenSim.Region.OptionalModules.Example.BareBonesShared
 {
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index afb788b..e95889d 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -50,7 +50,7 @@ using Ionic.Zlib;
 // specify its assembly.  Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans
 // the available DLLs
 //[assembly: Addin("MaterialsModule", "1.0")]
-//[assembly: AddinDependency("OpenSim", "0.5")]
+//[assembly: AddinDependency("OpenSim", "0.8.1")]
 
 namespace OpenSim.Region.OptionalModules.Materials
 {
@@ -65,20 +65,23 @@ namespace OpenSim.Region.OptionalModules.Materials
 
         private Scene m_scene = null;
         private bool m_enabled = false;
+        private int m_maxMaterialsPerTransaction = 50;
 
         public Dictionary<UUID, OSDMap> m_regionMaterials = new Dictionary<UUID, OSDMap>();
-        
+
         public void Initialise(IConfigSource source)
         {
-            IConfig config = source.Configs["Materials"];
-            if (config == null)
-                return;
+            m_enabled = true; // default is enabled
 
-            m_enabled = config.GetBoolean("enable_materials", true);
-            if (!m_enabled)
-                return;
+            IConfig config = source.Configs["Materials"];
+            if (config != null)
+            {
+                m_enabled = config.GetBoolean("enable_materials", m_enabled);
+                m_maxMaterialsPerTransaction = config.GetInt("MaxMaterialsPerTransaction", m_maxMaterialsPerTransaction);
+            }
 
-            m_log.DebugFormat("[Materials]: Initialized");
+            if (m_enabled)
+                m_log.DebugFormat("[Materials]: Initialized");
         }
         
         public void Close()
@@ -146,6 +149,16 @@ namespace OpenSim.Region.OptionalModules.Materials
         
         public void RegionLoaded(Scene scene)
         {
+            if (!m_enabled) return;
+
+            ISimulatorFeaturesModule featuresModule = scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+            if (featuresModule != null)
+                featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+        }
+
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            features["MaxMaterialsPerTransaction"] = m_maxMaterialsPerTransaction;
         }
 
         /// <summary>
@@ -216,7 +229,12 @@ namespace OpenSim.Region.OptionalModules.Materials
 
             GetLegacyStoredMaterialsInPart(part);
 
-            GetStoredMaterialInFace(part, te.DefaultTexture);
+            if (te.DefaultTexture != null)
+                GetStoredMaterialInFace(part, te.DefaultTexture);
+            else
+                m_log.WarnFormat(
+                    "[Materials]: Default texture for part {0} (part of object {1}) in {2} unexpectedly null.  Ignoring.", 
+                    part.Name, part.ParentGroup.Name, m_scene.Name);
 
             foreach (Primitive.TextureEntryFace face in te.FaceTextures)
             {
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
index 0bf23f1..d3c46c9 100644
--- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
+++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
@@ -26,8 +26,9 @@
  */
 
 using System;
-using System.Reflection;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
@@ -57,12 +58,10 @@ namespace OpenSim.Region.OptionalModules
         
         public void Initialise(IConfigSource config)
         {
-            //IConfig myConfig = config.Configs["Startup"];
-
             string permissionModules = Util.GetConfigVarFromSections<string>(config, "permissionmodules",
                 new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); 
 
-            List<string> modules=new List<string>(permissionModules.Split(','));
+            List<string> modules = new List<string>(permissionModules.Split(',').Select(m => m.Trim()));
 
             if(!modules.Contains("PrimLimitsModule"))
                 return;
@@ -103,20 +102,34 @@ namespace OpenSim.Region.OptionalModules
         public void RegionLoaded(Scene scene)
         {
             m_dialogModule = scene.RequestModuleInterface<IDialogModule>();
-        }                
+        }
 
-        private bool CanRezObject(int objectCount, UUID owner, Vector3 objectPosition, Scene scene)
+        private bool CanRezObject(int objectCount, UUID ownerID, Vector3 objectPosition, Scene scene)
         {
             ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
-            int usedPrims = lo.PrimCounts.Total;
-            int simulatorCapacity = lo.GetSimulatorMaxPrimCount();
 
-            if (objectCount + usedPrims > simulatorCapacity)
+            string response = DoCommonChecks(objectCount, ownerID, lo, scene);
+
+            if (response != null)
             {
-                m_dialogModule.SendAlertToUser(owner, "Unable to rez object because the parcel is too full");
+                m_dialogModule.SendAlertToUser(ownerID, response);
                 return false;
             }
+            return true;
+        }
 
+        //OnDuplicateObject
+        private bool CanDuplicateObject(int objectCount, UUID objectID, UUID ownerID, Scene scene, Vector3 objectPosition)
+        {
+            ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
+
+            string response = DoCommonChecks(objectCount, ownerID, lo, scene);
+
+            if (response != null)
+            {
+                m_dialogModule.SendAlertToUser(ownerID, response);
+                return false;
+            }
             return true;
         }
 
@@ -140,6 +153,14 @@ namespace OpenSim.Region.OptionalModules
 
             ILandObject newParcel = scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y);
 
+<<<<<<< HEAD
+            // newParcel will be null only if it outside of our current region.  If this is the case, then the
+            // receiving permissions will perform the check.
+            if (newParcel == null)
+                return true;
+
+            // The prim hasn't crossed a region boundary so we don't need to worry
+=======
             if (newParcel == null)
                 return true;
 
@@ -147,6 +168,7 @@ namespace OpenSim.Region.OptionalModules
             ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
             
             // The prim hasn't crossed a region boundry so we don't need to worry
+>>>>>>> avn/ubitvar
             // about prim counts here
             if(oldParcel != null && oldParcel.Equals(newParcel))
             {
@@ -158,30 +180,53 @@ namespace OpenSim.Region.OptionalModules
             int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount();
 
             // TODO: Add Special Case here for temporary prims
-            
-            if(objectCount + usedPrims > simulatorCapacity)
+
+            string response = DoCommonChecks(objectCount, obj.OwnerID, newParcel, scene);
+
+            if (response != null)
             {
-                m_dialogModule.SendAlertToUser(obj.OwnerID, "Unable to move object because the destination parcel  is too full");
+                m_dialogModule.SendAlertToUser(obj.OwnerID, response);
                 return false;
             }
-
             return true;
         }
 
-        //OnDuplicateObject
-        private bool CanDuplicateObject(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition)
+        private string DoCommonChecks(int objectCount, UUID ownerID, ILandObject lo, Scene scene)
         {
-            ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
-            int usedPrims = lo.PrimCounts.Total;
-            int simulatorCapacity = lo.GetSimulatorMaxPrimCount();
+            string response = null;
 
-            if(objectCount + usedPrims > simulatorCapacity)
+            int simulatorCapacity = lo.GetSimulatorMaxPrimCount();
+            if ((objectCount + lo.PrimCounts.Total) > simulatorCapacity)
             {
-                m_dialogModule.SendAlertToUser(owner, "Unable to duplicate object because the parcel is too full");
-                return false;
+                response = "Unable to rez object because the parcel is too full";
             }
-
-            return true;
+            else
+            {
+                int maxPrimsPerUser = scene.RegionInfo.MaxPrimsPerUser;
+                if (maxPrimsPerUser >= 0)
+                {
+                    // per-user prim limit is set
+                    if (ownerID != lo.LandData.OwnerID || lo.LandData.IsGroupOwned)
+                    {
+                        // caller is not the sole Parcel owner
+                        EstateSettings estateSettings = scene.RegionInfo.EstateSettings;
+                        if (ownerID != estateSettings.EstateOwner)
+                        {
+                            // caller is NOT the Estate owner
+                            List<UUID> mgrs = new List<UUID>(estateSettings.EstateManagers);
+                            if (!mgrs.Contains(ownerID))
+                            {
+                                // caller is not an Estate Manager
+                                if ((lo.PrimCounts.Users[ownerID] + objectCount) >  maxPrimsPerUser)
+                                {
+                                    response = "Unable to rez object because you have reached your limit";
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return response;
         }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
index ba0b578..f8ad958 100644
--- a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
@@ -30,8 +30,8 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
 
-[assembly: Addin("OpenSim.Region.OptionalModules", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.5")]
+[assembly: Addin("OpenSim.Region.OptionalModules", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index 9daf9d7..ff4afbf 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -66,6 +66,7 @@ public class ExtendedPhysics : INonSharedRegionModule
     public const string PhysFunctChangeLinkType = "BulletSim.ChangeLinkType";
     public const string PhysFunctGetLinkType = "BulletSim.GetLinkType";
     public const string PhysFunctChangeLinkParams = "BulletSim.ChangeLinkParams";
+    public const string PhysFunctAxisLockLimits = "BulletSim.AxisLockLimits";
 
     // =============================================================
 
@@ -176,6 +177,71 @@ public class ExtendedPhysics : INonSharedRegionModule
         return ret;
     }
 
+    // Code for specifying params.
+    // The choice if 14700 is arbitrary and only serves to catch parameter code misuse.
+    [ScriptConstant]
+    public const int PHYS_AXIS_LOCK_LINEAR     = 14700;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LOCK_LINEAR_X   = 14701;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LIMIT_LINEAR_X  = 14702;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LOCK_LINEAR_Y   = 14703;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LIMIT_LINEAR_Y  = 14704;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LOCK_LINEAR_Z   = 14705;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LIMIT_LINEAR_Z  = 14706;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LOCK_ANGULAR    = 14707;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LOCK_ANGULAR_X  = 14708;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LIMIT_ANGULAR_X = 14709;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LOCK_ANGULAR_Y  = 14710;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LIMIT_ANGULAR_Y = 14711;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LOCK_ANGULAR_Z  = 14712;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LIMIT_ANGULAR_Z = 14713;
+    [ScriptConstant]
+    public const int PHYS_AXIS_UNLOCK_LINEAR   = 14714;
+    [ScriptConstant]
+    public const int PHYS_AXIS_UNLOCK_LINEAR_X = 14715;
+    [ScriptConstant]
+    public const int PHYS_AXIS_UNLOCK_LINEAR_Y = 14716;
+    [ScriptConstant]
+    public const int PHYS_AXIS_UNLOCK_LINEAR_Z = 14717;
+    [ScriptConstant]
+    public const int PHYS_AXIS_UNLOCK_ANGULAR  = 14718;
+    [ScriptConstant]
+    public const int PHYS_AXIS_UNLOCK_ANGULAR_X = 14719;
+    [ScriptConstant]
+    public const int PHYS_AXIS_UNLOCK_ANGULAR_Y = 14720;
+    [ScriptConstant]
+    public const int PHYS_AXIS_UNLOCK_ANGULAR_Z = 14721;
+    [ScriptConstant]
+    public const int PHYS_AXIS_UNLOCK           = 14722;
+    // physAxisLockLimits()
+    [ScriptInvocation]
+    public int physAxisLock(UUID hostID, UUID scriptID, object[] parms)
+    {
+        int ret = -1;
+        if (!Enabled) return ret;
+
+        PhysicsActor rootPhysActor;
+        if (GetRootPhysActor(hostID, out rootPhysActor))
+        {
+            object[] parms2 = AddToBeginningOfArray(rootPhysActor, null, parms);
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctAxisLockLimits, parms2));
+        }
+
+        return ret;
+    }
+
     [ScriptConstant]
     public const int PHYS_LINKSET_TYPE_CONSTRAINT  = 0;
     [ScriptConstant]
@@ -187,7 +253,6 @@ public class ExtendedPhysics : INonSharedRegionModule
     public int physSetLinksetType(UUID hostID, UUID scriptID, int linksetType)
     {
         int ret = -1;
-
         if (!Enabled) return ret;
 
         // The part that is requesting the change.
@@ -259,34 +324,11 @@ public class ExtendedPhysics : INonSharedRegionModule
         int ret = -1;
         if (!Enabled) return ret;
 
-        // The part that is requesting the change.
-        SceneObjectPart requestingPart = BaseScene.GetSceneObjectPart(hostID);
-
-        if (requestingPart != null)
+        PhysicsActor rootPhysActor;
+        if (GetRootPhysActor(hostID, out rootPhysActor))
         {
-            // The type is is always on the root of a linkset.
-            SceneObjectGroup containingGroup = requestingPart.ParentGroup;
-            SceneObjectPart rootPart = containingGroup.RootPart;
-
-            if (rootPart != null)
-            {
-                PhysicsActor rootPhysActor = rootPart.PhysActor;
-                if (rootPhysActor != null)
-                {
-                    object[] parms2 = { rootPhysActor, null };
-                    ret = MakeIntError(rootPhysActor.Extension(PhysFunctGetLinksetType, parms2));
-                }
-                else
-                {
-                    m_log.WarnFormat("{0} physGetLinksetType: root part does not have a physics actor. rootName={1}, hostID={2}",
-                                        LogHeader, rootPart.Name, hostID);
-                }
-            }
-            else
-            {
-                m_log.WarnFormat("{0} physGetLinksetType: root part does not exist. RequestingPartName={1}, hostID={2}",
-                                    LogHeader, requestingPart.Name, hostID);
-            }
+            object[] parms2 = { rootPhysActor, null };
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctGetLinksetType, parms2));
         }
         else
         {
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
index e498c6a..c38bb3e 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
@@ -276,7 +276,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 {
                     ovalue = OSDParser.DeserializeJson(value);
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                     if (value.StartsWith("'") && value.EndsWith("'"))
                     {
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
index b502a55..26044f0 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             { 
                 map = new JsonStore(value);
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 m_log.ErrorFormat("[JsonStore]: Unable to initialize store from {0}", value);
                 return false;
@@ -285,8 +285,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
             lock (m_JsonValueStore)
                 return m_JsonValueStore.Remove(storeID);
-            
-            return true;
         }
 
         // -----------------------------------------------------------------
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index 9fbfb66..edf51a2 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -320,10 +320,25 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         /// </summary>
         // -----------------------------------------------------------------
         [ScriptInvocation]
+        public UUID JsonRezAtRoot(UUID hostID, UUID scriptID, string item, Vector3 pos, Vector3 vel, Quaternion rot, string param)
+        {
+            UUID reqID = UUID.Random();
+            Util.FireAndForget(
+                o => DoJsonRezObject(hostID, scriptID, reqID, item, pos, vel, rot, param), null, "JsonStoreScriptModule.DoJsonRezObject");
+            return reqID;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        [ScriptInvocation]
         public UUID JsonReadNotecard(UUID hostID, UUID scriptID, UUID storeID, string path, string notecardIdentifier)
         {
             UUID reqID = UUID.Random();
-            Util.FireAndForget(o => DoJsonReadNotecard(reqID, hostID, scriptID, storeID, path, notecardIdentifier));
+            Util.FireAndForget(
+                o => DoJsonReadNotecard(reqID, hostID, scriptID, storeID, path, notecardIdentifier), null, "JsonStoreScriptModule.JsonReadNotecard");
             return reqID;
         }
         
@@ -336,7 +351,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         public UUID JsonWriteNotecard(UUID hostID, UUID scriptID, UUID storeID, string path, string name)
         {
             UUID reqID = UUID.Random();
-            Util.FireAndForget(delegate(object o) { DoJsonWriteNotecard(reqID,hostID,scriptID,storeID,path,name); });
+            Util.FireAndForget(
+                o => DoJsonWriteNotecard(reqID,hostID,scriptID,storeID,path,name), null, "JsonStoreScriptModule.DoJsonWriteNotecard");
             return reqID;
         }
 
@@ -451,7 +467,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         public UUID JsonTakeValue(UUID hostID, UUID scriptID, UUID storeID, string path)
         {
             UUID reqID = UUID.Random();
-            Util.FireAndForget(delegate(object o) { DoJsonTakeValue(scriptID,reqID,storeID,path,false); });
+            Util.FireAndForget(
+                o => DoJsonTakeValue(scriptID,reqID,storeID,path,false), null, "JsonStoreScriptModule.DoJsonTakeValue");
             return reqID;
         }
 
@@ -459,7 +476,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         public UUID JsonTakeValueJson(UUID hostID, UUID scriptID, UUID storeID, string path)
         {
             UUID reqID = UUID.Random();
-            Util.FireAndForget(delegate(object o) { DoJsonTakeValue(scriptID,reqID,storeID,path,true); });
+            Util.FireAndForget(
+                o => DoJsonTakeValue(scriptID,reqID,storeID,path,true), null, "JsonStoreScriptModule.DoJsonTakeValueJson");
             return reqID;
         }
         
@@ -472,7 +490,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         public UUID JsonReadValue(UUID hostID, UUID scriptID, UUID storeID, string path)
         {
             UUID reqID = UUID.Random();
-            Util.FireAndForget(delegate(object o) { DoJsonReadValue(scriptID,reqID,storeID,path,false); });
+            Util.FireAndForget(
+                o => DoJsonReadValue(scriptID,reqID,storeID,path,false), null, "JsonStoreScriptModule.DoJsonReadValue");
             return reqID;
         }
 
@@ -480,7 +499,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         public UUID JsonReadValueJson(UUID hostID, UUID scriptID, UUID storeID, string path)
         {
             UUID reqID = UUID.Random();
-            Util.FireAndForget(delegate(object o) { DoJsonReadValue(scriptID,reqID,storeID,path,true); });
+            Util.FireAndForget(
+                o => DoJsonReadValue(scriptID,reqID,storeID,path,true), null, "JsonStoreScriptModule.DoJsonReadValueJson");
             return reqID;
         }
         
@@ -575,11 +595,15 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
             try 
             {
-                string jsondata = SLUtil.ParseNotecardToString(Encoding.UTF8.GetString(a.Data));
+                string jsondata = SLUtil.ParseNotecardToString(a.Data);
                 int result = m_store.SetValue(storeID, path, jsondata,true) ? 1 : 0;
                 m_comms.DispatchReply(scriptID, result, "", reqID.ToString());
                 return;
             }
+            catch(SLUtil.NotANotecardFormatException e)
+            {
+                m_log.WarnFormat("[JsonStoreScripts]: Notecard parsing failed; assetId {0} at line number {1}", assetID.ToString(), e.lineNumber);
+            }
             catch (Exception e)
             {
                 m_log.WarnFormat("[JsonStoreScripts]: Json parsing failed; {0}", e.Message);
@@ -682,5 +706,103 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             return path;
         }
         
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        private void DoJsonRezObject(UUID hostID, UUID scriptID, UUID reqID, string name, Vector3 pos, Vector3 vel, Quaternion rot, string param)
+        {
+            if (Double.IsNaN(rot.X) || Double.IsNaN(rot.Y) || Double.IsNaN(rot.Z) || Double.IsNaN(rot.W))
+            {
+                GenerateRuntimeError("Invalid rez rotation");
+                return;
+            }
+
+            SceneObjectGroup host = m_scene.GetSceneObjectGroup(hostID);
+            if (host == null)
+            {
+                GenerateRuntimeError(String.Format("Unable to find rezzing host '{0}'",hostID));
+                return;
+            }
+
+            // hpos = host.RootPart.GetWorldPosition()
+            // float dist = (float)llVecDist(hpos, pos);
+            // if (dist > m_ScriptDistanceFactor * 10.0f)
+            //     return;
+
+            TaskInventoryItem item = host.RootPart.Inventory.GetInventoryItem(name);
+            if (item == null)
+            {
+                GenerateRuntimeError(String.Format("Unable to find object to rez '{0}'",name));
+                return;
+            }
+
+            if (item.InvType != (int)InventoryType.Object)
+            {
+                GenerateRuntimeError("Can't create requested object; object is missing from database");
+                return;
+            }
+
+            List<SceneObjectGroup> objlist;
+            List<Vector3> veclist;
+            
+            bool success = host.RootPart.Inventory.GetRezReadySceneObjects(item, out objlist, out veclist);
+            if (! success)
+            {
+                GenerateRuntimeError("Failed to create object");
+                return;
+            }
+
+            int totalPrims = 0;
+            foreach (SceneObjectGroup group in objlist)
+                totalPrims += group.PrimCount;
+
+            if (! m_scene.Permissions.CanRezObject(totalPrims, item.OwnerID, pos))
+            {
+                GenerateRuntimeError("Not allowed to create the object");
+                return;
+            }
+
+            if (! m_scene.Permissions.BypassPermissions())
+            {
+                if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
+                    host.RootPart.Inventory.RemoveInventoryItem(item.ItemID);
+            }
+
+            for (int i = 0; i < objlist.Count; i++)
+            {
+                SceneObjectGroup group = objlist[i];
+                Vector3 curpos = pos + veclist[i];
+
+                if (group.IsAttachment == false && group.RootPart.Shape.State != 0)
+                {
+                    group.RootPart.AttachedPos = group.AbsolutePosition;
+                    group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint;
+                }
+
+                group.FromPartID = host.RootPart.UUID;
+                m_scene.AddNewSceneObject(group, true, curpos, rot, vel);
+
+                UUID storeID = group.UUID;
+                if (! m_store.CreateStore(param, ref storeID))
+                {
+                    GenerateRuntimeError("Unable to create jsonstore for new object");
+                    continue;
+                }
+
+                // We can only call this after adding the scene object, since the scene object references the scene
+                // to find out if scripts should be activated at all.
+                group.RootPart.SetDieAtEdge(true);
+                group.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 3);
+                group.ResumeScripts();
+
+                group.ScheduleGroupForFullUpdate();
+
+                // send the reply back to the host object, use the integer param to indicate the number 
+                // of remaining objects
+                m_comms.DispatchReply(scriptID, objlist.Count-i-1, group.RootPart.UUID.ToString(), reqID.ToString());
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
index bfa9937..99a7076 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
@@ -40,7 +40,6 @@ using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 {
@@ -465,13 +464,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
                 Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_NODETYPE_VALUE));
             }
 
-            // Test for non-existant path
+            // Test for non-existent path
             {
                 int result = (int)InvokeOp("JsonGetNodeType", storeId, "foo");
                 Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_NODETYPE_UNDEF));
             }
 
-            // Test for non-existant store
+            // Test for non-existent store
             {
                 UUID fakeStoreId = TestHelpers.ParseTail(0x500);
                 int result = (int)InvokeOp("JsonGetNodeType", fakeStoreId, ".");
@@ -898,4 +897,4 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
         public object DummyTestMethod(object o1, object o2, object o3, object o4, object o5) { return null; }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 6fb28e2..4bafe2f 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -180,6 +180,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         /// * Internet
         /// * Everything
         /// </remarks>
+#pragma warning disable 0618
         public static AppDomain CreateRestrictedDomain(string permissionSetName, string appDomainName)
         {
             if (permissionSetName == null)
@@ -240,6 +241,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
             return restrictedDomain;
         }
+#pragma warning restore 0618
 
 
         void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource)
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index 296ab87..870c0bb 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -105,8 +105,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
                 m_scene.LoginLock = true;
                 m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue;
 
-                // Warn level because the region cannot be used while logins are disabled
-                m_log.WarnFormat("[RegionReady]: Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name);
+                // This should always show up to the user but should not trigger warn/errors as these messages are
+                // expected and are not simulator problems.  Ideally, there would be a status level in log4net but 
+                // failing that, we will print out to console instead.
+                MainConsole.Instance.OutputFormat("Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name);
 
                 if (m_uri != string.Empty)
                 {
@@ -304,7 +306,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
             finally
             {
                 if (os != null)
-                    os.Close();
+                    os.Dispose();
             }
         }
     }
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
new file mode 100644
index 0000000..7ae4223
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
@@ -0,0 +1,176 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using System.Text;
+using System.Collections.Generic;
+using System.Threading;
+
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim;
+using OpenSim.Region;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
+//using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Nini.Config;
+using log4net;
+using Mono.Addins;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CameraOnlyMode")]
+    public class CameraOnlyModeModule : INonSharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Scene m_scene;
+        private SimulatorFeaturesHelper m_Helper;
+        private bool m_Enabled;
+        private int m_UserLevel;
+
+        public string Name
+        {
+            get { return "CameraOnlyModeModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void Initialise(IConfigSource config)
+        {
+            IConfig moduleConfig = config.Configs["CameraOnlyModeModule"];
+            if (moduleConfig != null)
+            {
+                m_Enabled = moduleConfig.GetBoolean("enabled", false);
+                if (m_Enabled)
+                {
+                    m_UserLevel = moduleConfig.GetInt("UserLevel", 0);
+                    m_log.Info("[CAMERA-ONLY MODE]: CameraOnlyModeModule enabled");
+                }
+
+            }
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                m_scene = scene;
+                //m_scene.EventManager.OnMakeRootAgent += (OnMakeRootAgent);
+            }
+        }
+
+        //private void OnMakeRootAgent(ScenePresence obj)
+        //{
+        //    throw new NotImplementedException();
+        //}
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                IEntityTransferModule et = m_scene.RequestModuleInterface<IEntityTransferModule>();
+                m_Helper = new SimulatorFeaturesHelper(scene, et);
+
+                ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+                if (featuresModule != null)
+                    featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+            }
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            m_log.DebugFormat("[CAMERA-ONLY MODE]: OnSimulatorFeaturesRequest in {0}", m_scene.RegionInfo.RegionName);
+            if (m_Helper.ShouldSend(agentID) && m_Helper.UserLevel(agentID) <= m_UserLevel)
+            {
+                OSDMap extrasMap;
+                if (features.ContainsKey("OpenSimExtras"))
+                {
+                    extrasMap = (OSDMap)features["OpenSimExtras"];
+                }
+                else
+                {
+                    extrasMap = new OSDMap();
+                    features["OpenSimExtras"] = extrasMap;
+                }
+                extrasMap["camera-only-mode"] = OSDMap.FromString("true");
+                m_log.DebugFormat("[CAMERA-ONLY MODE]: Sent in {0}", m_scene.RegionInfo.RegionName);
+
+                // Detaching attachments doesn't work for HG visitors,
+                // so I'm giving that up.
+                //Util.FireAndForget(delegate { DetachAttachments(agentID); });
+            }
+            else
+                m_log.DebugFormat("[CAMERA-ONLY MODE]: NOT Sending camera-only-mode in {0}", m_scene.RegionInfo.RegionName);
+        }
+
+        private void DetachAttachments(UUID agentID)
+        {
+            ScenePresence sp = m_scene.GetScenePresence(agentID);
+            if ((sp.TeleportFlags & TeleportFlags.ViaLogin) != 0)
+                // Wait a little, cos there's weird stuff going on at  login related to
+                // the Current Outfit Folder
+                Thread.Sleep(8000);
+
+            if (sp != null && m_scene.AttachmentsModule != null)
+            {
+                List<SceneObjectGroup> attachs = sp.GetAttachments();
+                if (attachs != null && attachs.Count > 0)
+                {
+                    foreach (SceneObjectGroup sog in attachs)
+                    {
+                        m_log.DebugFormat("[CAMERA-ONLY MODE]: Forcibly detaching attach {0} from {1} in {2}", 
+                            sog.Name, sp.Name, m_scene.RegionInfo.RegionName);
+
+                        m_scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, sog);
+                    }
+                }
+            }
+        }
+
+    }
+
+}
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
index 3b3b300..fcf5e91 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
@@ -276,7 +276,8 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
             for (int i = 0 ; i < selection.Count ; i++)
                 sel.Add(selection[i].AsUInteger());
 
-            Util.FireAndForget(x => { m_module.HandleMenuSelection(action, m_agentID, sel); });
+            Util.FireAndForget(
+                x => { m_module.HandleMenuSelection(action, m_agentID, sel); }, null, "DynamicMenuModule.HandleMenuSelection");
 
             Encoding encoding = Encoding.UTF8;
             return encoding.GetBytes(OSDParser.SerializeLLSDXmlString(new OSD()));
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
new file mode 100644
index 0000000..e0537a4
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
@@ -0,0 +1,144 @@
+/*
+ * 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;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodNamesModule")]
+    public class GodNamesModule : ISharedRegionModule
+    {
+        // Infrastructure
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        // Configuration
+        private static bool m_enabled = false;
+        private static List<String> m_lastNames = new List<String>();
+        private static List<String> m_fullNames = new List<String>();
+
+        public void Initialise(IConfigSource config) 
+        {
+            IConfig moduleConfig = config.Configs["GodNames"];
+
+            if (moduleConfig == null) {
+                return;
+            }
+
+            if (!moduleConfig.GetBoolean("Enabled", false)) {
+                m_log.Info("[GODNAMES]: Addon is disabled");
+                return;
+            }
+
+            m_log.Info("[GODNAMES]: Enabled");
+            m_enabled = true;
+            string conf_str = moduleConfig.GetString("FullNames", String.Empty);
+            foreach (string strl in conf_str.Split(',')) {
+                string strlan = strl.Trim(" \t".ToCharArray());
+                m_log.DebugFormat("[GODNAMES]: Adding {0} as a God name", strlan);
+                m_fullNames.Add(strlan);
+            }
+
+            conf_str = moduleConfig.GetString("Surnames", String.Empty);
+            foreach (string strl in conf_str.Split(',')) {
+                string strlan = strl.Trim(" \t".ToCharArray());
+                m_log.DebugFormat("[GODNAMES]: Adding {0} as a God last name", strlan);
+                m_lastNames.Add(strlan);
+            }
+        }
+
+        public void AddRegion(Scene scene) {
+            /*no op*/
+        }
+
+        public void RemoveRegion(Scene scene) {
+            /*no op*/
+        }
+
+        public void PostInitialise() {
+            /*no op*/
+        }
+
+        public void Close() {
+            /*no op*/
+        }
+
+        public Type ReplaceableInterface {
+            get { return null; }
+        }
+
+        public string Name {
+            get { return "Godnames"; }
+        }
+
+        public bool IsSharedModule {
+            get { return true; }
+        }
+
+        public virtual void RegionLoaded(Scene scene)
+        {
+            if (!m_enabled)
+                return;
+
+            ISimulatorFeaturesModule featuresModule = scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+
+            if (featuresModule != null)
+                featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+
+        }
+
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            OSD namesmap = new OSDMap();
+            if (features.ContainsKey("god_names"))
+                namesmap = features["god_names"];
+            else
+                features["god_names"] = namesmap;
+
+            OSDArray fnames = new OSDArray();
+            foreach (string name in m_fullNames) {
+                fnames.Add(name);
+            }
+            ((OSDMap)namesmap)["full_names"] = fnames;
+            
+            OSDArray lnames = new OSDArray();
+            foreach (string name in m_lastNames) {
+                lnames.Add(name);
+            }
+            ((OSDMap)namesmap)["last_names"] = lnames;
+        }
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
new file mode 100644
index 0000000..2661522
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
@@ -0,0 +1,171 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using System.Text;
+using System.Collections.Generic;
+using System.Threading;
+
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim;
+using OpenSim.Region;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+//using OpenSim.Framework.Capabilities;
+using Nini.Config;
+using log4net;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+    public class SimulatorFeaturesHelper 
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IEntityTransferModule m_TransferModule;
+        private Scene m_scene;
+
+        private struct RegionSend {
+            public UUID region;
+            public bool send;
+        };
+        // Using a static cache so that we don't have to perform the time-consuming tests
+        // in ShouldSend on Extra SimFeatures that go on the same response but come from
+        // different modules.
+        // This cached is indexed on the agentID and maps to a list of regions
+        private static ExpiringCache<UUID, List<RegionSend>> m_Cache = new ExpiringCache<UUID, List<RegionSend>>();
+        private const double TIMEOUT = 1.0; // time in cache
+
+        public SimulatorFeaturesHelper(Scene scene, IEntityTransferModule et)
+        {
+            m_scene = scene;
+            m_TransferModule = et;
+        }
+
+        public bool ShouldSend(UUID agentID)
+        {
+            List<RegionSend> rsendlist;
+            RegionSend rsend;
+            if (m_Cache.TryGetValue(agentID, out rsendlist))
+            {
+                rsend = rsendlist.Find(r => r.region == m_scene.RegionInfo.RegionID);
+                if (rsend.region != UUID.Zero) // Found it
+                {
+                    return rsend.send;
+                }
+            }
+
+            // Relatively complex logic for deciding whether to send the extra SimFeature or not.
+            // This is because the viewer calls this cap to all sims that it knows about,
+            // including the departing sims and non-neighbors (those that are cached).
+            rsend.region = m_scene.RegionInfo.RegionID;
+            rsend.send = false;
+            IClientAPI client = null;
+            int counter = 200;
+
+            // Let's wait a little to see if we get a client here
+            while (!m_scene.TryGetClient(agentID, out client) && counter-- > 0)
+                Thread.Sleep(50);
+
+            if (client != null)
+            {
+                ScenePresence sp = WaitGetScenePresence(agentID);
+
+                if (sp != null)
+                {
+                    // On the receiving region, the call to this cap may arrive before
+                    // the agent is root. Make sure we only proceed from here when the agent
+                    // has been made root
+                    counter = 200;
+                    while ((sp.IsInTransit || sp.IsChildAgent) && counter-- > 0)
+                    {
+                        Thread.Sleep(50);
+                    }
+
+                    // The viewer calls this cap on the departing sims too. Make sure
+                    // that we only proceed after the agent is not in transit anymore.
+                    // The agent must be root and not going anywhere
+                    if (!sp.IsChildAgent && !m_TransferModule.IsInTransit(agentID))
+                        rsend.send = true;
+
+                }
+            }
+            //else
+            //    m_log.DebugFormat("[XXX]: client is null");
+
+
+            if (rsendlist == null)
+            {
+                rsendlist = new List<RegionSend>();
+                m_Cache.AddOrUpdate(agentID, rsendlist, TIMEOUT);
+            }
+            rsendlist.Add(rsend);
+
+            return rsend.send;
+        }
+
+        public int UserLevel(UUID agentID)
+        {
+            int level = 0;
+            UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, agentID);
+            if (account != null)
+                level = account.UserLevel;
+
+            return level;
+        }
+
+        protected virtual ScenePresence WaitGetScenePresence(UUID agentID)
+        {
+            int ntimes = 20;
+            ScenePresence sp = null;
+            while ((sp = m_scene.GetScenePresence(agentID)) == null && (ntimes-- > 0))
+                Thread.Sleep(1000);
+
+            if (sp == null)
+                m_log.WarnFormat(
+                    "[XXX]: Did not find presence with id {0} in {1} before timeout",
+                    agentID, m_scene.RegionInfo.RegionName);
+            else
+            {
+                ntimes = 10;
+                while (sp.IsInTransit && (ntimes-- > 0))
+                    Thread.Sleep(1000);
+            }
+
+            return sp;
+        }
+
+    }
+
+}
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs
new file mode 100644
index 0000000..3fe922d
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs
@@ -0,0 +1,165 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using System.Text;
+using System.Collections.Generic;
+using System.Threading;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim;
+using OpenSim.Region;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
+//using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Nini.Config;
+using log4net;
+using Mono.Addins;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SpecialUI")]
+    public class SpecialUIModule : INonSharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private const string VIEWER_SUPPORT_DIR = "ViewerSupport";
+
+        private Scene m_scene;
+        private SimulatorFeaturesHelper m_Helper;
+        private bool m_Enabled;
+        private int m_UserLevel;
+
+        public string Name
+        {
+            get { return "SpecialUIModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void Initialise(IConfigSource config)
+        {
+            IConfig moduleConfig = config.Configs["SpecialUIModule"];
+            if (moduleConfig != null)
+            {
+                m_Enabled = moduleConfig.GetBoolean("enabled", false);
+                if (m_Enabled)
+                {
+                    m_UserLevel = moduleConfig.GetInt("UserLevel", 0);
+                    m_log.Info("[SPECIAL UI]: SpecialUIModule enabled");
+                }
+
+            }
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                m_scene = scene;
+            }
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                IEntityTransferModule et = m_scene.RequestModuleInterface<IEntityTransferModule>();
+                m_Helper = new SimulatorFeaturesHelper(scene, et);
+
+                ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+                if (featuresModule != null)
+                    featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+            }
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            m_log.DebugFormat("[SPECIAL UI]: OnSimulatorFeaturesRequest in {0}", m_scene.RegionInfo.RegionName);
+            if (m_Helper.ShouldSend(agentID) && m_Helper.UserLevel(agentID) <= m_UserLevel)
+            {
+                OSDMap extrasMap;
+                OSDMap specialUI = new OSDMap();
+                using (StreamReader s = new StreamReader(Path.Combine(VIEWER_SUPPORT_DIR, "panel_toolbar.xml")))
+                {
+                    if (features.ContainsKey("OpenSimExtras"))
+                        extrasMap = (OSDMap)features["OpenSimExtras"];
+                    else
+                    {
+                        extrasMap = new OSDMap();
+                        features["OpenSimExtras"] = extrasMap;
+                    }
+
+                    specialUI["toolbar"] = OSDMap.FromString(s.ReadToEnd());
+                    extrasMap["special-ui"] = specialUI;
+                }
+                m_log.DebugFormat("[SPECIAL UI]: Sending panel_toolbar.xml in {0}", m_scene.RegionInfo.RegionName);
+
+                if (Directory.Exists(Path.Combine(VIEWER_SUPPORT_DIR, "Floaters")))
+                {
+                    OSDMap floaters = new OSDMap();
+                    uint n = 0;
+                    foreach (String name in Directory.GetFiles(Path.Combine(VIEWER_SUPPORT_DIR, "Floaters"), "*.xml"))
+                    {
+                        using (StreamReader s = new StreamReader(name))
+                        {
+                            string simple_name = Path.GetFileNameWithoutExtension(name);
+                            OSDMap floater = new OSDMap();
+                            floaters[simple_name] = OSDMap.FromString(s.ReadToEnd());
+                            n++;
+                        }
+                    }
+                    specialUI["floaters"] = floaters;
+                    m_log.DebugFormat("[SPECIAL UI]: Sending {0} floaters", n);
+                }
+            }
+            else
+                m_log.DebugFormat("[SPECIAL UI]: NOT Sending panel_toolbar.xml in {0}", m_scene.RegionInfo.RegionName);
+
+        }
+
+    }
+
+}
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
index 1d35c54..ceb3332 100644
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
@@ -76,6 +76,10 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
     /// AutoBackupBusyCheck: True/False. Default: True. 
     ///         If True, we will only take an auto-backup if a set of conditions are met. 
     ///         These conditions are heuristics to try and avoid taking a backup when the sim is busy.
+    /// AutoBackupSkipAssets
+    ///     If true, assets are not saved to the oar file. Considerably reduces impact on simulator when backing up. Intended for when assets db is backed up separately
+    /// AutoBackupKeepFilesForDays
+    ///     Backup files older than this value (in days) are deleted during the current backup process, 0 will disable this and keep all backup files indefinitely
     /// AutoBackupScript: String. Default: not specified (disabled). 
     ///         File path to an executable script or binary to run when an automatic backup is taken.
     ///  The file should really be (Windows) an .exe or .bat, or (Linux/Mac) a shell script or binary.
@@ -111,6 +115,9 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
 
         private delegate T DefaultGetter<T>(string settingName, T defaultValue);
         private bool m_enabled;
+        private ICommandConsole m_console;
+        private List<Scene> m_Scenes = new List<Scene> ();
+
 
         /// <summary>
         /// Whether the shared module should be enabled at all. NOT the same as m_Enabled in AutoBackupModuleState!
@@ -202,8 +209,20 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
         /// Currently a no-op for AutoBackup because we have to wait for region to be fully loaded.
         /// </summary>
         /// <param name="scene"></param>
-        void IRegionModuleBase.AddRegion(Scene scene)
+        void IRegionModuleBase.AddRegion (Scene scene)
         {
+            if (!this.m_enabled) {
+                return;
+            }
+            lock (m_Scenes) {
+                m_Scenes.Add (scene);
+            }
+            m_console = MainConsole.Instance;
+
+            m_console.Commands.AddCommand (
+                "AutoBackup", false, "dobackup",
+                "dobackup",
+                "do backup.", DoBackup);
         }
 
         /// <summary>
@@ -216,7 +235,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
             {
                 return;
             }
-
+            m_Scenes.Remove (scene);
             if (this.m_states.ContainsKey(scene))
             {
                 AutoBackupModuleState abms = this.m_states[scene];
@@ -258,6 +277,8 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
             AutoBackupModuleState abms = this.ParseConfig(scene, false);
             m_log.Debug("[AUTO BACKUP]: Config for " + scene.RegionInfo.RegionName);
             m_log.Debug((abms == null ? "DEFAULT" : abms.ToString()));
+
+            m_states.Add(scene, abms);
         }
 
         /// <summary>
@@ -269,6 +290,28 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
 
         #endregion
 
+        private void DoBackup (string module, string[] args)
+        {
+            if (args.Length != 2) {
+                MainConsole.Instance.OutputFormat ("Usage: dobackup <regionname>");
+                return;
+            }  
+            bool found = false;
+            string name = args [1];
+            lock (m_Scenes) {
+                foreach (Scene s in m_Scenes) {
+                    string test = s.Name.ToString ();
+                    if (test == name) {
+                        found = true;
+                        DoRegionBackup (s);
+                    }
+                }
+                if (!found) {
+                    MainConsole.Instance.OutputFormat ("No such region {0}. Nothing to backup", name);
+                }
+            }
+        }
+
         /// <summary>
         /// Set up internal state for a given scene. Fairly complex code.
         /// When this method returns, we've started auto-backup timers, put members in Dictionaries, and created a State object for this scene.
@@ -334,7 +377,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
             double interval =
                 this.ResolveDouble("AutoBackupInterval", this.m_defaultState.IntervalMinutes,
                  config, regionConfig) * 60000.0;
-            if (state == null && interval != this.m_defaultState.IntervalMinutes*60000.0)
+            if (state == null && interval != this.m_defaultState.IntervalMinutes * 60000.0)
             {
                 state = new AutoBackupModuleState();
             }
@@ -412,6 +455,32 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
                 state.BusyCheck = tmpBusyCheck;
             }
 
+            // Included Option To Skip Assets
+            bool tmpSkipAssets = ResolveBoolean("AutoBackupSkipAssets",
+                                                  this.m_defaultState.SkipAssets, config, regionConfig);
+            if (state == null && tmpSkipAssets != this.m_defaultState.SkipAssets)
+            {
+                state = new AutoBackupModuleState();
+            }
+
+            if (state != null)
+            {
+                state.SkipAssets = tmpSkipAssets;
+            }
+
+            // How long to keep backup files in days, 0 Disables this feature
+            int tmpKeepFilesForDays = ResolveInt("AutoBackupKeepFilesForDays",
+                                                  this.m_defaultState.KeepFilesForDays, config, regionConfig);
+            if (state == null && tmpKeepFilesForDays != this.m_defaultState.KeepFilesForDays)
+            {
+                state = new AutoBackupModuleState();
+            }
+
+            if (state != null)
+            {
+                state.KeepFilesForDays = tmpKeepFilesForDays;
+            }
+
             // Set file naming algorithm
             string stmpNamingType = ResolveString("AutoBackupNaming",
                                                      this.m_defaultState.NamingType.ToString(), config, regionConfig);
@@ -480,7 +549,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
                     catch (Exception e)
                     {
                         m_log.Warn(
-                            "BAD NEWS. You won't be able to save backups to directory " +
+                            "[AUTO BACKUP]: BAD NEWS. You won't be able to save backups to directory " +
                             state.BackupDir +
                             " because it doesn't exist or there's a permissions issue with it. Here's the exception.",
                             e);
@@ -488,6 +557,9 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
                 }
             }
 
+            if(state == null)
+                return m_defaultState;
+
             return state;
         }
 
@@ -594,7 +666,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
             bool heuristicsPassed = false;
             if (!this.m_timerMap.ContainsKey((Timer) sender))
             {
-                m_log.Debug("Code-up error: timerMap doesn't contain timer " + sender);
+                m_log.Debug("[AUTO BACKUP]: Code-up error: timerMap doesn't contain timer " + sender);
             }
 
             List<IScene> tmap = this.m_timerMap[(Timer) sender];
@@ -630,6 +702,9 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
                         }
                         this.DoRegionBackup(scene);
                     }
+
+                    // Remove Old Backups
+                    this.RemoveOldFiles(state);
                 }
             }
         }
@@ -640,7 +715,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
         /// <param name="scene"></param>
         private void DoRegionBackup(IScene scene)
         {
-            if (scene.RegionStatus != RegionStatus.Up)
+            if (!scene.Ready)
             {
                 // We won't backup a region that isn't operating normally.
                 m_log.Warn("[AUTO BACKUP]: Not backing up region " + scene.RegionInfo.RegionName +
@@ -662,7 +737,41 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
             m_pendingSaves.Add(guid, scene);
             state.LiveRequests.Add(guid, savePath);
             ((Scene) scene).EventManager.OnOarFileSaved += new EventManager.OarFileSaved(EventManager_OnOarFileSaved);
-            iram.ArchiveRegion(savePath, guid, null);
+
+            m_log.Info("[AUTO BACKUP]: Backing up region " + scene.RegionInfo.RegionName);
+
+            // Must pass options, even if dictionary is empty!
+            Dictionary<string, object> options = new Dictionary<string, object>();
+
+            if (state.SkipAssets)
+                options["noassets"] = true;
+
+            iram.ArchiveRegion(savePath, guid, options);
+        }
+
+        // For the given state, remove backup files older than the states KeepFilesForDays property
+        private void RemoveOldFiles(AutoBackupModuleState state)
+        {
+            // 0 Means Disabled, Keep Files Indefinitely
+            if (state.KeepFilesForDays > 0)
+            {
+                string[] files = Directory.GetFiles(state.BackupDir, "*.oar");
+                DateTime CuttOffDate = DateTime.Now.AddDays(0 - state.KeepFilesForDays);
+
+                foreach (string file in files)
+                {
+                    try
+                    {
+                        FileInfo fi = new FileInfo(file);
+                        if (fi.CreationTime < CuttOffDate)
+                            fi.Delete();
+                    }
+                    catch (Exception Ex)
+                    {
+                        m_log.Error("[AUTO BACKUP]: Error deleting old backup file '" + file + "': " + Ex.Message);
+                    }
+                }
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
index f9e118b..ce7c368 100644
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
@@ -45,9 +45,11 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
             this.Enabled = false;
             this.BackupDir = ".";
             this.BusyCheck = true;
+            this.SkipAssets = false;
             this.Timer = null;
             this.NamingType = NamingType.Time;
             this.Script = null;
+            this.KeepFilesForDays = 0;
         }
 
         public Dictionary<Guid, string> LiveRequests
@@ -91,6 +93,12 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
             set;
         }
 
+        public bool SkipAssets
+        {
+            get;
+            set;
+        }
+
         public string Script
         {
             get;
@@ -109,6 +117,12 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
             set;
         }
 
+        public int KeepFilesForDays
+        {
+            get;
+            set;
+        }
+
         public new string ToString()
         {
             string retval = "";
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index bcb21d0..8565f5a 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -103,7 +103,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
 
         #region IMoneyModule Members
 
+#pragma warning disable 0067
         public event ObjectPaid OnObjectPaid;
+#pragma warning restore 0067
 
         public int UploadCharge
         {
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index dcd2a52..dc1ea95 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -61,7 +61,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         private readonly string m_firstname;
         private readonly string m_lastname;
         private readonly Vector3 m_startPos;
+<<<<<<< HEAD
+        private readonly UUID m_uuid;
+=======
         private UUID m_uuid = UUID.Random();
+>>>>>>> avn/ubitvar
         private readonly Scene m_scene;
         private readonly UUID m_ownerID;
 
@@ -73,6 +77,19 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             m_firstname = firstname;
             m_lastname = lastname;
             m_startPos = position;
+            m_uuid = UUID.Random();
+            m_scene = scene;
+            m_ownerID = ownerID;
+            SenseAsAgent = senseAsAgent;
+        }
+
+        public NPCAvatar(
+            string firstname, string lastname, UUID agentID, Vector3 position, UUID ownerID, bool senseAsAgent, Scene scene)
+        {
+            m_firstname = firstname;
+            m_lastname = lastname;
+            m_startPos = position;
+            m_uuid = agentID;
             m_scene = scene;
             m_ownerID = ownerID;
             SenseAsAgent = senseAsAgent;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 226608a..2977195 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -140,8 +140,30 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                 Vector3 position, UUID owner, bool senseAsAgent, Scene scene,
                 AvatarAppearance appearance)
         {
-            NPCAvatar npcAvatar = new NPCAvatar(firstname, lastname, position,
-                    owner, senseAsAgent, scene);
+            return CreateNPC(firstname, lastname, position, UUID.Zero, owner, senseAsAgent, scene, appearance);
+        }
+
+        public UUID CreateNPC(string firstname, string lastname,
+                Vector3 position, UUID agentID, UUID owner, bool senseAsAgent, Scene scene,
+                AvatarAppearance appearance)
+        {
+            NPCAvatar npcAvatar = null;
+
+            try
+            {
+                if (agentID == UUID.Zero)
+                    npcAvatar = new NPCAvatar(firstname, lastname, position,
+                            owner, senseAsAgent, scene);
+                else
+                    npcAvatar = new NPCAvatar(firstname, lastname, agentID, position,
+                        owner, senseAsAgent, scene);
+            }
+            catch (Exception e)
+            {
+                m_log.Info("[NPC MODULE]: exception creating NPC avatar: " + e.ToString());
+                return UUID.Zero;
+            }
+
             npcAvatar.CircuitCode = (uint)Util.RandomClass.Next(0,
                     int.MaxValue);
 
@@ -155,8 +177,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             acd.lastname = lastname;
             acd.ServiceURLs = new Dictionary<string, object>();
 
-            AvatarAppearance npcAppearance = new AvatarAppearance(appearance,
-                    true);
+            AvatarAppearance npcAppearance = new AvatarAppearance(appearance, true);
             acd.Appearance = npcAppearance;
 
             /*
@@ -207,6 +228,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     ScenePresence sp;
                     if (scene.TryGetScenePresence(agentID, out sp))
                     {
+                        if (sp.IsSatOnObject || sp.SitGround)
+                            return false;
+
 //                        m_log.DebugFormat(
 //                                "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}",
 //                                sp.Name, pos, scene.RegionInfo.RegionName,
@@ -368,26 +392,30 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         public bool DeleteNPC(UUID agentID, Scene scene)
         {
+            bool doRemove = false;
+            NPCAvatar av;
             lock (m_avatars)
             {
-                NPCAvatar av;
                 if (m_avatars.TryGetValue(agentID, out av))
                 {
                     /*
                     m_log.DebugFormat("[NPC MODULE]: Found {0} {1} to remove",
                             agentID, av.Name);
                     */
+                    doRemove = true;
+                }
+            }
 
-                    scene.CloseAgent(agentID, false);
-
+            if (doRemove)
+            {
+                scene.CloseAgent(agentID, false);
+                lock (m_avatars)
+                {
                     m_avatars.Remove(agentID);
-
-                    /*
-                    m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}",
-                            agentID, av.Name);
-                    */
-                    return true;
                 }
+                m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}",
+                        agentID, av.Name);
+                return true;
             }
             /*
             m_log.DebugFormat("[NPC MODULE]: Could not find {0} to remove",
@@ -417,12 +445,24 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         /// <summary>
         /// Check if the caller has permission to manipulate the given NPC.
         /// </summary>
+        /// <remarks>
+        /// A caller has permission if
+        ///   * The caller UUID given is UUID.Zero.
+        ///   * The avatar is unowned (owner is UUID.Zero).
+        ///   * The avatar is owned and the owner and callerID match.
+        ///   * The avatar is owned and the callerID matches its agentID.
+        /// </remarks>
         /// <param name="av"></param>
         /// <param name="callerID"></param>
         /// <returns>true if they do, false if they don't.</returns>
         private bool CheckPermissions(NPCAvatar av, UUID callerID)
         {
+<<<<<<< HEAD
+            return callerID == UUID.Zero || av.OwnerID == UUID.Zero ||
+                av.OwnerID == callerID  || av.AgentId == callerID;
+=======
             return callerID == UUID.Zero || av.OwnerID == UUID.Zero || av.OwnerID == callerID || av.AgentId == callerID;
+>>>>>>> avn/ubitvar
         }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index 14eb25b..2345e38 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.AvatarService;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.OptionalModules.World.NPC.Tests
 {
@@ -71,11 +70,13 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
         }
 
-        [SetUp]
-        public void Init()
+        public void SetUpScene()
         {
-            base.SetUp();
+            SetUpScene(256, 256);
+        }
 
+        public void SetUpScene(uint sizeX, uint sizeY)
+        {
             IConfigSource config = new IniConfigSource();
             config.AddConfig("NPC");
             config.Configs["NPC"].Set("Enabled", "true");
@@ -87,7 +88,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             m_attMod = new AttachmentsModule();
             m_npcMod = new NPCModule();
 
-            m_scene = new SceneHelpers().SetupScene();
+            m_scene = new SceneHelpers().SetupScene("test scene", UUID.Random(), 1000, 1000, sizeX, sizeY, config);
             SceneHelpers.SetupSceneModules(m_scene, config, m_afMod, m_umMod, m_attMod, m_npcMod, new BasicInventoryAccessModule());
         }
 
@@ -97,6 +98,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
+            SetUpScene();
+
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
 //            ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId);
 
@@ -133,6 +136,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
+            SetUpScene();
+
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
 //            ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId);
 
@@ -157,6 +162,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
+            SetUpScene();
+
             UUID userId = TestHelpers.ParseTail(0x1);
             UserAccountHelpers.CreateUserWithInventory(m_scene, userId);
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
@@ -191,11 +198,66 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
         }
 
         [Test]
+        public void TestCreateWithMultiAttachments()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            SetUpScene();
+//            m_attMod.DebugLevel = 1;
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+            UserAccountHelpers.CreateUserWithInventory(m_scene, userId);
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
+
+            InventoryItemBase att1Item 
+                = UserInventoryHelpers.CreateInventoryItem(
+                    m_scene, "att1", TestHelpers.ParseTail(0x2), TestHelpers.ParseTail(0x3), sp.UUID, InventoryType.Object);
+            InventoryItemBase att2Item 
+                = UserInventoryHelpers.CreateInventoryItem(
+                    m_scene, "att2", TestHelpers.ParseTail(0x12), TestHelpers.ParseTail(0x13), sp.UUID, InventoryType.Object);
+
+            m_attMod.RezSingleAttachmentFromInventory(sp, att1Item.ID, (uint)AttachmentPoint.Chest);
+            m_attMod.RezSingleAttachmentFromInventory(sp, att2Item.ID, (uint)AttachmentPoint.Chest | 0x80);
+
+            UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance);
+
+            ScenePresence npc = m_scene.GetScenePresence(npcId);
+
+            // Check scene presence status
+            Assert.That(npc.HasAttachments(), Is.True);
+            List<SceneObjectGroup> attachments = npc.GetAttachments();
+            Assert.That(attachments.Count, Is.EqualTo(2));
+
+            // Just for now, we won't test the name since this is (wrongly) the asset part name rather than the item
+            // name.  TODO: Do need to fix ultimately since the item may be renamed before being passed on to an NPC.
+//            Assert.That(attSo.Name, Is.EqualTo(attName));
+
+            TestAttachedObject(attachments[0], AttachmentPoint.Chest, npc.UUID);
+            TestAttachedObject(attachments[1], AttachmentPoint.Chest, npc.UUID);
+
+            // Attached objects on the same point must have different FromItemIDs to be shown to other avatars, at least
+            // on Singularity 1.8.5.  Otherwise, only one (the first ObjectUpdate sent) appears.
+            Assert.AreNotEqual(attachments[0].FromItemID, attachments[1].FromItemID);
+        }
+
+        private void TestAttachedObject(SceneObjectGroup attSo, AttachmentPoint attPoint, UUID ownerId)
+        {
+            Assert.That(attSo.AttachmentPoint, Is.EqualTo((byte)attPoint));
+            Assert.That(attSo.IsAttachment);
+            Assert.That(attSo.UsesPhysics, Is.False);
+            Assert.That(attSo.IsTemporary, Is.False);
+            Assert.That(attSo.OwnerID, Is.EqualTo(ownerId));
+        }
+
+        [Test]
         public void TestLoadAppearance()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
+            SetUpScene();
+
             UUID userId = TestHelpers.ParseTail(0x1);
             UserAccountHelpers.CreateUserWithInventory(m_scene, userId);
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
@@ -237,7 +299,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
         public void TestMove()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
+
+            SetUpScene();
 
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
 //            ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId);
@@ -303,11 +367,64 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
         }
 
         [Test]
+        public void TestMoveInVarRegion()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            SetUpScene(512, 512);
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
+//            ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId);
+
+            Vector3 startPos = new Vector3(128, 246, 30);
+            UUID npcId = m_npcMod.CreateNPC("John", "Smith", startPos, UUID.Zero, true, m_scene, sp.Appearance);
+
+            ScenePresence npc = m_scene.GetScenePresence(npcId);
+            Assert.That(npc.AbsolutePosition, Is.EqualTo(startPos));
+
+            // For now, we'll make the scene presence fly to simplify this test, but this needs to change.
+            npc.Flying = true;
+
+            m_scene.Update(1);
+            Assert.That(npc.AbsolutePosition, Is.EqualTo(startPos));
+
+            Vector3 targetPos = startPos + new Vector3(0, 20, 0);
+            m_npcMod.MoveToTarget(npc.UUID, m_scene, targetPos, false, false, false);
+
+            Assert.That(npc.AbsolutePosition, Is.EqualTo(startPos));
+            //Assert.That(npc.Rotation, Is.EqualTo(new Quaternion(0, 0, 0.7071068f, 0.7071068f)));
+            Assert.That(
+                npc.Rotation, new QuaternionToleranceConstraint(new Quaternion(0, 0, 0.7071068f, 0.7071068f), 0.000001));
+
+            m_scene.Update(1);
+
+            // We should really check the exact figure.
+            Assert.That(npc.AbsolutePosition.X, Is.EqualTo(startPos.X));
+            Assert.That(npc.AbsolutePosition.Y, Is.GreaterThan(startPos.Y));
+            Assert.That(npc.AbsolutePosition.Z, Is.EqualTo(startPos.Z));
+            Assert.That(npc.AbsolutePosition.Z, Is.LessThan(targetPos.X));
+
+            for (int i = 0; i < 20; i++)
+            {
+                m_scene.Update(1);
+//                Console.WriteLine("pos: {0}", npc.AbsolutePosition);
+            }
+
+            double distanceToTarget = Util.GetDistanceTo(npc.AbsolutePosition, targetPos);
+            Assert.That(distanceToTarget, Is.LessThan(1), "NPC not within 1 unit of target position on first move");
+            Assert.That(npc.AbsolutePosition, Is.EqualTo(targetPos));
+            Assert.That(npc.AgentControlFlags, Is.EqualTo((uint)AgentManager.ControlFlags.NONE));
+        }
+
+        [Test]
         public void TestSitAndStandWithSitTarget()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
+            SetUpScene();
+
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
 
             Vector3 startPos = new Vector3(128, 128, 30);
@@ -337,6 +454,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
+            SetUpScene();
+
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
 
             // FIXME: To get this to work for now, we are going to place the npc right next to the target so that
diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
index 6cbccc0..a26d145 100644
--- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
@@ -93,28 +94,44 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
                 "Debug", this, "debug scene get",
                 "debug scene get",
                 "List current scene options.",
-                "If active     is false then main scene update and maintenance loops are suspended.\n"
-                    + "If animations is true  then extra animations debug information is logged.\n"
-                    + "If collisions is false then collisions with other objects are turned off.\n"
-                    + "If pbackup    is false then periodic scene backup is turned off.\n"
-                    + "If physics    is false then all physics objects are non-physical.\n"
-                    + "If scripting  is false then no scripting operations happen.\n"
-                    + "If teleport   is true  then some extra teleport debug information is logged.\n"
-                    + "If updates    is true  then any frame which exceeds double the maximum desired frame time is logged.",
+                      "active          - if false then main scene update and maintenance loops are suspended.\n"
+                    + "animations      - if true  then extra animations debug information is logged.\n"
+                    + "appear-refresh  - if true  then appearance is resent to other avatars every 60 seconds.\n"
+                    + "child-repri     - how far an avatar must move in meters before we update the position of its child agents in neighbouring regions.\n"
+                    + "client-pos-upd  - the tolerance before clients are updated with new rotation information for an avatar.\n"
+                    + "client-rot-upd  - the tolerance before clients are updated with new rotation information for an avatar.\n"
+                    + "client-vel-upd  - the tolerance before clients are updated with new velocity information for an avatar.\n"
+                    + "root-upd-per    - if greater than 1, terse updates are only sent to root agents other than the originator on every n updates.\n"
+                    + "child-upd-per   - if greater than 1, terse updates are only sent to child agents on every n updates.\n"                    
+                    + "collisions      - if false then collisions with other objects are turned off.\n"
+                    + "pbackup         - if false then periodic scene backup is turned off.\n"
+                    + "physics         - if false then all physics objects are non-physical.\n"
+                    + "scripting       - if false then no scripting operations happen.\n"
+                    + "teleport        - if true  then some extra teleport debug information is logged.\n"
+                    + "update-on-timer - If true  then the scene is updated via a timer.  If false then a thread with sleep is used.\n"
+                    + "updates         - if true  then any frame which exceeds double the maximum desired frame time is logged.",
                 HandleDebugSceneGetCommand);
 
             scene.AddCommand(
                 "Debug", this, "debug scene set",
-                "debug scene set active|collisions|pbackup|physics|scripting|teleport|updates true|false",
+                "debug scene set <param> <value>",
                 "Turn on scene debugging options.",
-                "If active     is false then main scene update and maintenance loops are suspended.\n"
-                    + "If animations is true  then extra animations debug information is logged.\n"
-                    + "If collisions is false then collisions with other objects are turned off.\n"
-                    + "If pbackup    is false then periodic scene backup is turned off.\n"
-                    + "If physics    is false then all physics objects are non-physical.\n"
-                    + "If scripting  is false then no scripting operations happen.\n"
-                    + "If teleport   is true  then some extra teleport debug information is logged.\n"
-                    + "If updates    is true  then any frame which exceeds double the maximum desired frame time is logged.",
+                      "active          - if false then main scene update and maintenance loops are suspended.\n"
+                    + "animations      - if true  then extra animations debug information is logged.\n"
+                    + "appear-refresh  - if true  then appearance is resent to other avatars every 60 seconds.\n"
+                    + "child-repri     - how far an avatar must move in meters before we update the position of its child agents in neighbouring regions.\n"
+                    + "client-pos-upd  - the tolerance before clients are updated with new rotation information for an avatar.\n"
+                    + "client-rot-upd  - the tolerance before clients are updated with new rotation information for an avatar.\n"
+                    + "client-vel-upd  - the tolerance before clients are updated with new velocity information for an avatar.\n"
+                    + "root-upd-per    - if greater than 1, terse updates are only sent to root agents other than the originator on every n updates.\n"
+                    + "child-upd-per   - if greater than 1, terse updates are only sent to child agents on every n updates.\n"
+                    + "collisions      - if false then collisions with other objects are turned off.\n"
+                    + "pbackup         - if false then periodic scene backup is turned off.\n"
+                    + "physics         - if false then all physics objects are non-physical.\n"
+                    + "scripting       - if false then no scripting operations happen.\n"
+                    + "teleport        - if true  then some extra teleport debug information is logged.\n"
+                    + "update-on-timer - If true  then the scene is updated via a timer.  If false then a thread with sleep is used.\n"
+                    + "updates         - if true  then any frame which exceeds double the maximum desired frame time is logged.",
                 HandleDebugSceneSetCommand);
         }
 
@@ -138,10 +155,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
             ConsoleDisplayList cdl = new ConsoleDisplayList();
             cdl.AddRow("active", m_scene.Active);
             cdl.AddRow("animations", m_scene.DebugAnimations);
+            cdl.AddRow("appear-refresh", m_scene.SendPeriodicAppearanceUpdates);
+            cdl.AddRow("child-repri", m_scene.ChildReprioritizationDistance);
+            cdl.AddRow("client-pos-upd", m_scene.RootPositionUpdateTolerance);
+            cdl.AddRow("client-rot-upd", m_scene.RootRotationUpdateTolerance);
+            cdl.AddRow("client-vel-upd", m_scene.RootVelocityUpdateTolerance);
+            cdl.AddRow("root-upd-per", m_scene.RootTerseUpdatePeriod);
+            cdl.AddRow("child-upd-per", m_scene.ChildTerseUpdatePeriod);
             cdl.AddRow("pbackup", m_scene.PeriodicBackup);
             cdl.AddRow("physics", m_scene.PhysicsEnabled);
             cdl.AddRow("scripting", m_scene.ScriptsEnabled);
             cdl.AddRow("teleport", m_scene.DebugTeleporting);
+            cdl.AddRow("update-on-timer", m_scene.UpdateOnTimer);
             cdl.AddRow("updates", m_scene.DebugUpdates);
 
             MainConsole.Instance.OutputFormat("Scene {0} options:", m_scene.Name);
@@ -163,8 +188,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
             }
             else
             {
-                MainConsole.Instance.Output(
-                    "Usage: debug scene set active|collisions|pbackup|physics|scripting|teleport|updates true|false");
+                MainConsole.Instance.Output("Usage: debug scene set <param> <value>");
             }
         }
 
@@ -186,6 +210,69 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
                     m_scene.DebugAnimations = active;
             }
 
+            if (options.ContainsKey("appear-refresh"))
+            {
+                bool newValue;
+
+                // FIXME: This can only come from the console at the moment but might not always be true.
+                if (ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, options["appear-refresh"], out newValue))
+                    m_scene.SendPeriodicAppearanceUpdates = newValue;     
+            }
+
+            if (options.ContainsKey("child-repri"))
+            {
+                double newValue;
+
+                // FIXME: This can only come from the console at the moment but might not always be true.
+                if (ConsoleUtil.TryParseConsoleDouble(MainConsole.Instance, options["child-repri"], out newValue))
+                    m_scene.ChildReprioritizationDistance = newValue;                
+            }
+
+            if (options.ContainsKey("client-pos-upd"))
+            {
+                float newValue;
+
+                // FIXME: This can only come from the console at the moment but might not always be true.
+                if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-pos-upd"], out newValue))
+                    m_scene.RootPositionUpdateTolerance = newValue;    
+            }
+
+            if (options.ContainsKey("client-rot-upd"))
+            {
+                float newValue;
+
+                // FIXME: This can only come from the console at the moment but might not always be true.
+                if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-rot-upd"], out newValue))
+                    m_scene.RootRotationUpdateTolerance = newValue;    
+            }
+
+            if (options.ContainsKey("client-vel-upd"))
+            {
+                float newValue;
+
+                // FIXME: This can only come from the console at the moment but might not always be true.
+                if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-vel-upd"], out newValue))
+                    m_scene.RootVelocityUpdateTolerance = newValue;    
+            }
+
+            if (options.ContainsKey("root-upd-per"))
+            {
+                int newValue;
+
+                // FIXME: This can only come from the console at the moment but might not always be true.
+                if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, options["root-upd-per"], out newValue))
+                    m_scene.RootTerseUpdatePeriod = newValue;    
+            }
+
+            if (options.ContainsKey("child-upd-per"))
+            {
+                int newValue;
+
+                // FIXME: This can only come from the console at the moment but might not always be true.
+                if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, options["child-upd-per"], out newValue))
+                    m_scene.ChildTerseUpdatePeriod = newValue;    
+            }
+
             if (options.ContainsKey("pbackup"))
             {
                 bool active;
@@ -221,6 +308,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
                     m_scene.DebugTeleporting = enableTeleportDebugging;
             }
 
+            if (options.ContainsKey("update-on-timer"))
+            {
+                bool enableUpdateOnTimer;
+                if (bool.TryParse(options["update-on-timer"], out enableUpdateOnTimer))
+                {
+                    m_scene.UpdateOnTimer = enableUpdateOnTimer;
+                    m_scene.Active = false;
+
+                    while (m_scene.IsRunning)
+                        Thread.Sleep(20);
+
+                    m_scene.Active = true;
+                }
+            }
+
             if (options.ContainsKey("updates"))
             {
                 bool enableUpdateDebugging;
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
index ffcb01e..7d054dd 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.8.0.*")]
+[assembly : AssemblyVersion("0.8.2.*")]
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index 0d17e0e..43fba7b 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -36,8 +36,6 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 {
     public class BasicActor : PhysicsActor
     {
-        private Vector3 _size;
-
         public BasicActor(Vector3 size)
         {
             Size = size;
@@ -240,6 +238,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 
         public override bool PIDActive
         {
+            get { return false; }
             set { return; }
         }
 
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs
index 47d7df3..dfe4c19 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs
@@ -251,6 +251,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 
         public override bool PIDActive
         {
+            get { return false; }
             set { return; }
         }
 
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
index 8e40561..06a205e 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
@@ -80,10 +80,11 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
             return prim;
         }
 
-        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
+        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
         {
             BasicActor act = new BasicActor(size);
             act.Position = position;
+            act.Velocity = velocity;
             act.Flying = isFlying;
             _actors.Add(act);
             return act;
@@ -147,6 +148,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
                     terrainHeight = _heightMap[(int)actor.Position.Y * (int)m_regionExtent.Y + (int)actor.Position.X];
 
                 float height = terrainHeight + actor.Size.Z;
+//                Console.WriteLine("height {0}, actorPosition {1}", height, actorPosition);
 
                 if (actor.Flying)
                 {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index 17ebed2..741f8db 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -658,7 +658,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         IndexedVector3 frame2v = new IndexedVector3(pframe2.X, pframe2.Y, pframe2.Z);
         IndexedQuaternion frame2rot = new IndexedQuaternion(pframe2rot.X, pframe2rot.Y, pframe2rot.Z, pframe2rot.W);
         IndexedMatrix frame2 = IndexedMatrix.CreateFromQuaternion(frame2rot);
-        frame2._origin = frame1v;
+        frame2._origin = frame2v;
         constraint.SetFrames(ref frame1, ref frame2);
         return true;
     }
@@ -1311,7 +1311,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         /* TODO */
         ConfigurationParameters[] configparms = new ConfigurationParameters[1];
         configparms[0] = parms;
-        Vector3 worldExtent = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight);
+        Vector3 worldExtent = maxPosition;
         m_maxCollisions = maxCollisions;
         m_maxUpdatesPerFrame = maxUpdates;
         specialCollisionObjects = new Dictionary<uint, GhostObject>();
@@ -2255,7 +2255,6 @@ private sealed class BulletConstraintXNA : BulletConstraint
             world.LastCollisionDesc = 0;
             world.LastEntityProperty = 0;
             numSimSteps = world.StepSimulation(timeStep, m_maxSubSteps, m_fixedTimeStep);
-            int updates = 0;
 
             PersistentManifold contactManifold;
             CollisionObject objA;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 1bcf879..bde4557 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
+using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
 
 using OMV = OpenMetaverse;
@@ -70,8 +71,7 @@ public class BSActorAvatarMove : BSActor
     public override void Dispose()
     {
         base.SetEnabled(false);
-        // Now that turned off, remove any state we have in the scene.
-        Refresh();
+        DeactivateAvatarMove();
     }
 
     // Called when physical parameters (properties set in Bullet) need to be re-applied.
@@ -109,6 +109,10 @@ public class BSActorAvatarMove : BSActor
         {
             if (m_velocityMotor != null)
             {
+//                    if (targ == OMV.Vector3.Zero)
+//                        Util.PrintCallStack();
+//
+//                    Console.WriteLine("SetVelocityAndTarget, {0} {1}", vel, targ);
                 m_velocityMotor.Reset();
                 m_velocityMotor.SetTarget(targ);
                 m_velocityMotor.SetCurrent(vel);
@@ -205,6 +209,17 @@ public class BSActorAvatarMove : BSActor
                     // Flying and not colliding and velocity nearly zero.
                     m_controllingPrim.ZeroMotion(true /* inTaintTime */);
                 }
+                else
+                {
+                    //We are falling but are not touching any keys make sure not falling too fast
+                    if (m_controllingPrim.RawVelocity.Z < BSParam.AvatarTerminalVelocity)
+                    {
+
+                        OMV.Vector3 slowingForce = new OMV.Vector3(0f, 0f, BSParam.AvatarTerminalVelocity - m_controllingPrim.RawVelocity.Z) * m_controllingPrim.Mass;
+                        m_physicsScene.PE.ApplyCentralImpulse(m_controllingPrim.PhysBody, slowingForce);
+                    }
+
+                }
             }
 
             m_physicsScene.DetailLog("{0},BSCharacter.MoveMotor,taint,stopping,target={1},colliding={2}",
@@ -227,7 +242,6 @@ public class BSActorAvatarMove : BSActor
                 stepVelocity.Z = m_controllingPrim.RawVelocity.Z;
             }
 
-
             // Colliding and not flying with an upward force. The avatar must be trying to jump.
             if (!m_controllingPrim.Flying && m_controllingPrim.IsColliding && stepVelocity.Z > 0)
             {
@@ -253,12 +267,34 @@ public class BSActorAvatarMove : BSActor
                 }
                 else
                 {
-                    // Since we're not affected by anything, whatever vertical motion the avatar has, continue that.
-                    stepVelocity.Z = m_controllingPrim.RawVelocity.Z;
+                    
+                    // Since we're not affected by anything, the avatar must be falling and we do not want that to be too fast.
+                    if (m_controllingPrim.RawVelocity.Z < BSParam.AvatarTerminalVelocity)
+                    {
+                        
+                        stepVelocity.Z = BSParam.AvatarTerminalVelocity;
+                    }
+                    else
+                    {
+                        stepVelocity.Z = m_controllingPrim.RawVelocity.Z;
+                    }
                 }
                 // DetailLog("{0},BSCharacter.MoveMotor,taint,overrideStepZWithWorldZ,stepVel={1}", LocalID, stepVelocity);
             }
 
+            //Alicia: Maintain minimum height when flying.
+            // SL has a flying effect that keeps the avatar flying above the ground by some margin
+            if (m_controllingPrim.Flying)
+            {
+                float hover_height = m_physicsScene.TerrainManager.GetTerrainHeightAtXYZ(m_controllingPrim.RawPosition)
+                                                        + BSParam.AvatarFlyingGroundMargin;
+
+                if( m_controllingPrim.Position.Z < hover_height)
+                {
+                    stepVelocity.Z += BSParam.AvatarFlyingGroundUpForce;
+                }
+            }
+
             // 'stepVelocity' is now the speed we'd like the avatar to move in. Turn that into an instantanous force.
             OMV.Vector3 moveForce = (stepVelocity - m_controllingPrim.RawVelocity) * m_controllingPrim.Mass;
 
@@ -304,7 +340,7 @@ public class BSActorAvatarMove : BSActor
             // float nearFeetHeightMin = m_controllingPrim.RawPosition.Z - (m_controllingPrim.Size.Z / 2f) + 0.05f;
             // Note: there is a problem with the computation of the capsule height. Thus RawPosition is off
             //    from the height. Revisit size and this computation when height is scaled properly.
-            float nearFeetHeightMin = m_controllingPrim.RawPosition.Z - (m_controllingPrim.Size.Z / 2f) - 0.05f;
+            float nearFeetHeightMin = m_controllingPrim.RawPosition.Z - (m_controllingPrim.Size.Z / 2f) - BSParam.AvatarStepGroundFudge;
             float nearFeetHeightMax = nearFeetHeightMin + BSParam.AvatarStepHeight;
 
             // Look for a collision point that is near the character's feet and is oriented the same as the charactor is.
@@ -326,15 +362,25 @@ public class BSActorAvatarMove : BSActor
                             if (touchPosition.Z >= nearFeetHeightMin && touchPosition.Z <= nearFeetHeightMax)
                             {
                                 // This contact is within the 'near the feet' range.
-                                // The normal should be our contact point to the object so it is pointing away
-                                //    thus the difference between our facing orientation and the normal should be small.
+                                // The step is presumed to be more or less vertical. Thus the Z component should
+                                //    be nearly horizontal.
                                 OMV.Vector3 directionFacing = OMV.Vector3.UnitX * m_controllingPrim.RawOrientation;
                                 OMV.Vector3 touchNormal = OMV.Vector3.Normalize(kvp.Value.SurfaceNormal);
-                                float diff = Math.Abs(OMV.Vector3.Distance(directionFacing, touchNormal));
-                                if (diff < BSParam.AvatarStepApproachFactor)
+                                const float PIOver2 = 1.571f; // Used to make unit vector axis into approx radian angles
+                                // m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs,avNormal={1},colNormal={2},diff={3}",
+                                //             m_controllingPrim.LocalID, directionFacing, touchNormal,
+                                //             Math.Abs(OMV.Vector3.Distance(directionFacing, touchNormal)) );
+                                if ((Math.Abs(directionFacing.Z) * PIOver2) < BSParam.AvatarStepAngle
+                                    && (Math.Abs(touchNormal.Z) * PIOver2) < BSParam.AvatarStepAngle)
                                 {
-                                    if (highestTouchPosition.Z < touchPosition.Z)
-                                        highestTouchPosition = touchPosition;
+                                    // The normal should be our contact point to the object so it is pointing away
+                                    //    thus the difference between our facing orientation and the normal should be small.
+                                    float diff = Math.Abs(OMV.Vector3.Distance(directionFacing, touchNormal));
+                                    if (diff < BSParam.AvatarStepApproachFactor)
+                                    {
+                                        if (highestTouchPosition.Z < touchPosition.Z)
+                                            highestTouchPosition = touchPosition;
+                                    }
                                 }
                             }
                         }
@@ -399,8 +445,8 @@ public class BSActorAvatarMove : BSActor
                     m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement;
                 }
             }
-            m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs.ComputeStairCorrection,disp={1},force={2}",
-                                        m_controllingPrim.LocalID, displacement, ret);
+            m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs.ComputeStairCorrection,stepUp={1},isp={2},force={3}",
+                                        m_controllingPrim.LocalID, stepUp, displacement, ret);
 
         }
         return ret;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
index 8a79809..e54c27b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -58,6 +58,7 @@ public class BSActorHover : BSActor
     public override void Dispose()
     {
         Enabled = false;
+        DeactivateHover();
     }
 
     // Called when physical parameters (properties set in Bullet) need to be re-applied.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
index 8b0fdeb..3b3c161 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -36,13 +36,20 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 {
 public class BSActorLockAxis : BSActor
 {
-    BSConstraint LockAxisConstraint = null;
+    private BSConstraint LockAxisConstraint = null;
+    private bool HaveRegisteredForBeforeStepCallback = false;
+
+    // The lock access flags (which axises were locked) when the contraint was built.
+    // Used to see if locking has changed since when the constraint was built.
+    OMV.Vector3 LockAxisLinearFlags;
+    OMV.Vector3 LockAxisAngularFlags;
 
     public BSActorLockAxis(BSScene physicsScene, BSPhysObject pObj, string actorName)
         : base(physicsScene, pObj, actorName)
     {
         m_physicsScene.DetailLog("{0},BSActorLockAxis,constructor", m_controllingPrim.LocalID);
         LockAxisConstraint = null;
+        HaveRegisteredForBeforeStepCallback = false;
     }
 
     // BSActor.isActive
@@ -55,6 +62,8 @@ public class BSActorLockAxis : BSActor
     // BSActor.Dispose()
     public override void Dispose()
     {
+        Enabled = false;
+        UnRegisterForBeforeStepCallback();
         RemoveAxisLockConstraint();
     }
 
@@ -63,22 +72,28 @@ public class BSActorLockAxis : BSActor
     // BSActor.Refresh()
     public override void Refresh()
     {
-        m_physicsScene.DetailLog("{0},BSActorLockAxis,refresh,lockedAxis={1},enabled={2},pActive={3}",
-                                    m_controllingPrim.LocalID, m_controllingPrim.LockedAngularAxis, Enabled, m_controllingPrim.IsPhysicallyActive);
+        // Since the axis logging is done with a constraint, Refresh() time is good for
+        //    changing parameters but this needs to wait until the prim/linkset is physically
+        //    constructed. Therefore, the constraint itself is placed at pre-step time.
+
         // If all the axis are free, we don't need to exist
-        if (m_controllingPrim.LockedAngularAxis == m_controllingPrim.LockedAxisFree)
+        // Refresh() only turns off. Enabling is done by InitializeAxisActor()
+        //      whenever parameters are changed.
+        //      This leaves 'enable' free to turn off an actor when it is not wanted to run.
+        if (m_controllingPrim.LockedAngularAxis == m_controllingPrim.LockedAxisFree
+                && m_controllingPrim.LockedLinearAxis == m_controllingPrim.LockedAxisFree)
         {
             Enabled = false;
         }
 
-        // If the object is physically active, add the axis locking constraint
         if (isActive)
         {
-            AddAxisLockConstraint();
+            RegisterForBeforeStepCallback();
         }
         else
         {
-            RemoveAxisLockConstraint();
+            RemoveDependencies();
+            UnRegisterForBeforeStepCallback();
         }
     }
 
@@ -88,18 +103,56 @@ public class BSActorLockAxis : BSActor
     // BSActor.RemoveDependencies()
     public override void RemoveDependencies()
     {
-        if (LockAxisConstraint != null)
+        RemoveAxisLockConstraint();
+    }
+
+    private void RegisterForBeforeStepCallback()
+    {
+        if (!HaveRegisteredForBeforeStepCallback)
         {
-            // If a constraint is set up, remove it from the physical scene
-            RemoveAxisLockConstraint();
-            // Schedule a call before the next simulation step to restore the constraint.
-            m_physicsScene.PostTaintObject("BSActorLockAxis:" + ActorName, m_controllingPrim.LocalID, delegate()
+            m_physicsScene.BeforeStep += PhysicsScene_BeforeStep;
+            HaveRegisteredForBeforeStepCallback = true;
+        }
+    }
+
+    private void UnRegisterForBeforeStepCallback()
+    {
+        if (HaveRegisteredForBeforeStepCallback)
+        {
+            m_physicsScene.BeforeStep -= PhysicsScene_BeforeStep;
+            HaveRegisteredForBeforeStepCallback = false;
+        }
+    }
+
+    private void PhysicsScene_BeforeStep(float timestep)
+    {
+        // If all the axis are free, we don't need to exist
+        if (m_controllingPrim.LockedAngularAxis == m_controllingPrim.LockedAxisFree
+                && m_controllingPrim.LockedLinearAxis == m_controllingPrim.LockedAxisFree)
+        {
+            Enabled = false;
+        }
+
+        // If the object is physically active, add the axis locking constraint
+        if (isActive)
+        {
+            // Check to see if the locking parameters have changed
+            if (m_controllingPrim.LockedLinearAxis != this.LockAxisLinearFlags
+                || m_controllingPrim.LockedAngularAxis != this.LockAxisAngularFlags)
             {
-                Refresh();
-            });
+                // The locking has changed. Remove the old constraint and build a new one
+                RemoveAxisLockConstraint();
+            }
+
+            AddAxisLockConstraint();
+        }
+        else
+        {
+            RemoveAxisLockConstraint();
         }
     }
 
+    // Note that this relies on being called at TaintTime
     private void AddAxisLockConstraint()
     {
         if (LockAxisConstraint == null)
@@ -118,64 +171,43 @@ public class BSActorLockAxis : BSActor
             LockAxisConstraint = axisConstrainer;
             m_physicsScene.Constraints.AddConstraint(LockAxisConstraint);
 
+            // Remember the clocking being inforced so we can notice if they have changed
+            LockAxisLinearFlags = m_controllingPrim.LockedLinearAxis;
+            LockAxisAngularFlags = m_controllingPrim.LockedAngularAxis;
+
             // The constraint is tied to the world and oriented to the prim.
 
-            // Free to move linearly in the region
-            OMV.Vector3 linearLow = OMV.Vector3.Zero;
-            OMV.Vector3 linearHigh = m_physicsScene.TerrainManager.DefaultRegionSize;
-            if (m_controllingPrim.LockedLinearAxis.X != BSPhysObject.FreeAxis)
+            if (!axisConstrainer.SetLinearLimits(m_controllingPrim.LockedLinearAxisLow, m_controllingPrim.LockedLinearAxisHigh))
             {
-                linearLow.X = m_controllingPrim.RawPosition.X;
-                linearHigh.X = m_controllingPrim.RawPosition.X;
+                m_physicsScene.DetailLog("{0},BSActorLockAxis.AddAxisLockConstraint,failedSetLinearLimits",
+                        m_controllingPrim.LocalID);
             }
-            if (m_controllingPrim.LockedLinearAxis.Y != BSPhysObject.FreeAxis)
-            {
-                linearLow.Y = m_controllingPrim.RawPosition.Y;
-                linearHigh.Y = m_controllingPrim.RawPosition.Y;
-            }
-            if (m_controllingPrim.LockedLinearAxis.Z != BSPhysObject.FreeAxis)
-            {
-                linearLow.Z = m_controllingPrim.RawPosition.Z;
-                linearHigh.Z = m_controllingPrim.RawPosition.Z;
-            }
-            axisConstrainer.SetLinearLimits(linearLow, linearHigh);
 
-            // Angular with some axis locked
-            float fPI = (float)Math.PI;
-            OMV.Vector3 angularLow = new OMV.Vector3(-fPI, -fPI, -fPI);
-            OMV.Vector3 angularHigh = new OMV.Vector3(fPI, fPI, fPI);
-            if (m_controllingPrim.LockedAngularAxis.X != BSPhysObject.FreeAxis)
-            {
-                angularLow.X = 0f;
-                angularHigh.X = 0f;
-            }
-            if (m_controllingPrim.LockedAngularAxis.Y != BSPhysObject.FreeAxis)
+            if (!axisConstrainer.SetAngularLimits(m_controllingPrim.LockedAngularAxisLow, m_controllingPrim.LockedAngularAxisHigh))
             {
-                angularLow.Y = 0f;
-                angularHigh.Y = 0f;
-            }
-            if (m_controllingPrim.LockedAngularAxis.Z != BSPhysObject.FreeAxis)
-            {
-                angularLow.Z = 0f;
-                angularHigh.Z = 0f;
-            }
-            if (!axisConstrainer.SetAngularLimits(angularLow, angularHigh))
-            {
-                m_physicsScene.DetailLog("{0},BSActorLockAxis.AddAxisLockConstraint,failedSetAngularLimits", m_controllingPrim.LocalID);
+                m_physicsScene.DetailLog("{0},BSActorLockAxis.AddAxisLockConstraint,failedSetAngularLimits",
+                        m_controllingPrim.LocalID);
             }
 
             m_physicsScene.DetailLog("{0},BSActorLockAxis.AddAxisLockConstraint,create,linLow={1},linHi={2},angLow={3},angHi={4}",
-                                        m_controllingPrim.LocalID, linearLow, linearHigh, angularLow, angularHigh);
+                                        m_controllingPrim.LocalID,
+                                        m_controllingPrim.LockedLinearAxisLow,
+                                        m_controllingPrim.LockedLinearAxisHigh,
+                                        m_controllingPrim.LockedAngularAxisLow,
+                                        m_controllingPrim.LockedAngularAxisHigh);
 
             // Constants from one of the posts mentioned above and used in Bullet's ConstraintDemo.
             axisConstrainer.TranslationalLimitMotor(true /* enable */, 5.0f, 0.1f);
 
             axisConstrainer.RecomputeConstraintVariables(m_controllingPrim.RawMass);
+
+            RegisterForBeforeStepCallback();
         }
     }
 
     private void RemoveAxisLockConstraint()
     {
+        UnRegisterForBeforeStepCallback();
         if (LockAxisConstraint != null)
         {
             m_physicsScene.Constraints.RemoveAndDestroyConstraint(LockAxisConstraint);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
index bdf4bc0..1145006 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -59,6 +59,7 @@ public class BSActorMoveToTarget : BSActor
     public override void Dispose()
     {
         Enabled = false;
+        DeactivateMoveToTarget();
     }
 
     // Called when physical parameters (properties set in Bullet) need to be re-applied.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
index 96fa0b6..4e81363 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
@@ -58,6 +58,7 @@ public class BSActorSetForce : BSActor
     public override void Dispose()
     {
         Enabled = false;
+        DeactivateSetForce();
     }
 
     // Called when physical parameters (properties set in Bullet) need to be re-applied.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
index 65098e1..79e1d38 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
@@ -58,6 +58,7 @@ public class BSActorSetTorque : BSActor
     public override void Dispose()
     {
         Enabled = false;
+        DeactivateSetTorque();
     }
 
     // Called when physical parameters (properties set in Bullet) need to be re-applied.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index e0ccc50..7f45e2c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -32,12 +32,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 {
 public class BSActorCollection
 {
-    private BSScene m_physicsScene { get; set; }
     private Dictionary<string, BSActor> m_actors;
 
-    public BSActorCollection(BSScene physicsScene)
+    public BSActorCollection()
     {
-        m_physicsScene = physicsScene;
         m_actors = new Dictionary<string, BSActor>();
     }
     public void Add(string name, BSActor actor)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index be6f152..8491c0f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -43,9 +43,11 @@ public enum ConstraintType : int
         SLIDER_CONSTRAINT_TYPE,
         CONTACT_CONSTRAINT_TYPE,
         D6_SPRING_CONSTRAINT_TYPE,
+        GEAR_CONSTRAINT_TYPE,           // added in Bullet 2.82
+        FIXED_CONSTRAINT_TYPE,          // added in Bullet 2.82
         MAX_CONSTRAINT_TYPE,            // last type defined by Bullet
     //
-    FIXED_CONSTRAINT_TYPE = 1234    // BulletSim constraint that is fixed and unmoving
+    BS_FIXED_CONSTRAINT_TYPE = 1234    // BulletSim constraint that is fixed and unmoving
 }
 
 // ===============================================================================
@@ -209,6 +211,21 @@ public struct HACDParams
         public float addNeighboursDistPoints;   // false
         public float addFacesPoints;                    // false
         public float shouldAdjustCollisionMargin;       // false
+    // VHACD
+        public float whichHACD;                             // zero if Bullet HACD, non-zero says VHACD
+        // http://kmamou.blogspot.ca/2014/12/v-hacd-20-parameters-description.html
+        public float vHACDresolution;                   // 100,000 max number of voxels generated during voxelization stage
+        public float vHACDdepth;                                // 20 max number of clipping stages
+        public float vHACDconcavity;                    // 0.0025 maximum concavity
+        public float vHACDplaneDownsampling;    // 4 granularity of search for best clipping plane
+        public float vHACDconvexHullDownsampling;       // 4 precision of hull gen process
+        public float vHACDalpha;                                // 0.05 bias toward clipping along symmetry planes
+        public float vHACDbeta;                             // 0.05 bias toward clipping along revolution axis
+        public float vHACDgamma;                                // 0.00125 max concavity when merging
+        public float vHACDpca;                                  // 0 on/off normalizing mesh before decomp
+        public float vHACDmode;                             // 0 0:voxel based, 1: tetrahedron based
+        public float vHACDmaxNumVerticesPerCH;  // 64 max triangles per convex hull
+        public float vHACDminVolumePerCH;               // 0.0001 sampling of generated convex hulls
 }
 
 // The states a bullet collision object can have
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index fc18960..9c3f160 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -61,18 +61,31 @@ public sealed class BSCharacter : BSPhysObject
     private const string AvatarMoveActorName = "BSCharacter.AvatarMove";
 
     private OMV.Vector3 _PIDTarget;
-    private bool _usePID;
     private float _PIDTau;
 
-    public BSCharacter(uint localID, String avName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size, bool isFlying)
+//        public override OMV.Vector3 RawVelocity 
+//        { get { return base.RawVelocity; } 
+//            set { 
+//                if (value != base.RawVelocity)
+//                    Util.PrintCallStack();
+//                Console.WriteLine("Set rawvel to {0}", value);
+//                base.RawVelocity = value; }
+//        }
+
+    // Avatars are always complete (in the physics engine sense)
+    public override bool IsIncomplete { get { return false; } }
+
+    public BSCharacter(
+            uint localID, String avName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 vel, OMV.Vector3 size, bool isFlying)
+
             : base(parent_scene, localID, avName, "BSCharacter")
     {
         _physicsActorType = (int)ActorTypes.Agent;
-        RawPosition = pos;
+        RawPosition = pos;        
 
         _flying = isFlying;
         RawOrientation = OMV.Quaternion.Identity;
-        RawVelocity = OMV.Vector3.Zero;
+        RawVelocity = vel;
         _buoyancy = ComputeBuoyancyFromFlying(isFlying);
         Friction = BSParam.AvatarStandingFriction;
         Density = BSParam.AvatarDensity;
@@ -89,13 +102,15 @@ public sealed class BSCharacter : BSPhysObject
         // set _avatarVolume and _mass based on capsule size, _density and Scale
         ComputeAvatarVolumeAndMass();
 
-        DetailLog("{0},BSCharacter.create,call,size={1},scale={2},density={3},volume={4},mass={5},pos={6}",
-                            LocalID, _size, Scale, Density, _avatarVolume, RawMass, pos);
+        DetailLog(
+            "{0},BSCharacter.create,call,size={1},scale={2},density={3},volume={4},mass={5},pos={6},vel={7}",
+            LocalID, _size, Scale, Density, _avatarVolume, RawMass, pos, vel);
 
         // do actual creation in taint time
         PhysScene.TaintedObject(LocalID, "BSCharacter.create", delegate()
         {
             DetailLog("{0},BSCharacter.create,taint", LocalID);
+
             // New body and shape into PhysBody and PhysShape
             PhysScene.Shapes.GetBodyAndShape(true, PhysScene.World, this);
 
@@ -134,7 +149,6 @@ public sealed class BSCharacter : BSPhysObject
     {
         PhysScene.PE.RemoveObjectFromWorld(PhysScene.World, PhysBody);
 
-        ZeroMotion(true);
         ForcePosition = RawPosition;
 
         // Set the velocity
@@ -142,6 +156,7 @@ public sealed class BSCharacter : BSPhysObject
             m_moveActor.SetVelocityAndTarget(RawVelocity, RawVelocity, false);
 
         ForceVelocity = RawVelocity;
+        TargetVelocity = RawVelocity;
 
         // This will enable or disable the flying buoyancy of the avatar.
         // Needs to be reset especially when an avatar is recreated after crossing a region boundry.
@@ -174,15 +189,19 @@ public sealed class BSCharacter : BSPhysObject
         PhysScene.PE.UpdateSingleAabb(PhysScene.World, PhysBody);
 
         // Do this after the object has been added to the world
-        PhysBody.collisionType = CollisionType.Avatar;
+        if (BSParam.AvatarToAvatarCollisionsByDefault)
+            PhysBody.collisionType = CollisionType.Avatar;
+        else
+            PhysBody.collisionType = CollisionType.PhantomToOthersAvatar;
+
         PhysBody.ApplyCollisionMask(PhysScene);
     }
 
-
     public override void RequestPhysicsterseUpdate()
     {
         base.RequestPhysicsterseUpdate();
     }
+
     // No one calls this method so I don't know what it could possibly mean
     public override bool Stopped { get { return false; } }
 
@@ -263,6 +282,7 @@ public sealed class BSCharacter : BSPhysObject
                 PhysScene.PE.ClearAllForces(PhysBody);
         });
     }
+
     public override void ZeroAngularMotion(bool inTaintTime)
     {
         _rotationalVelocity = OMV.Vector3.Zero;
@@ -426,7 +446,7 @@ public sealed class BSCharacter : BSPhysObject
             m_targetVelocity = value;
             OMV.Vector3 targetVel = value;
             if (_setAlwaysRun && !_flying)
-                targetVel *= new OMV.Vector3(BSParam.AvatarAlwaysRunFactor, BSParam.AvatarAlwaysRunFactor, 0f);
+                targetVel *= new OMV.Vector3(BSParam.AvatarAlwaysRunFactor, BSParam.AvatarAlwaysRunFactor, 1f);
 
             if (m_moveActor != null)
                 m_moveActor.SetVelocityAndTarget(RawVelocity, targetVel, false /* inTaintTime */);
@@ -437,32 +457,40 @@ public sealed class BSCharacter : BSPhysObject
         get { return RawVelocity; }
         set {
             RawVelocity = value;
-            // m_log.DebugFormat("{0}: set velocity = {1}", LogHeader, RawVelocity);
+                OMV.Vector3 vel = RawVelocity;
+
+            DetailLog("{0}: set Velocity = {1}", LocalID, value);
+
             PhysScene.TaintedObject(LocalID, "BSCharacter.setVelocity", delegate()
             {
                 if (m_moveActor != null)
-                    m_moveActor.SetVelocityAndTarget(RawVelocity, RawVelocity, true /* inTaintTime */);
+                    m_moveActor.SetVelocityAndTarget(vel, vel, true /* inTaintTime */);
 
-                DetailLog("{0},BSCharacter.setVelocity,taint,vel={1}", LocalID, RawVelocity);
-                ForceVelocity = RawVelocity;
+                DetailLog("{0},BSCharacter.setVelocity,taint,vel={1}", LocalID, vel);
+                ForceVelocity = vel;
             });
         }
     }
+
     public override OMV.Vector3 ForceVelocity {
         get { return RawVelocity; }
         set {
             PhysScene.AssertInTaintTime("BSCharacter.ForceVelocity");
+//                Util.PrintCallStack();
+            DetailLog("{0}: set ForceVelocity = {1}", LocalID, value);
 
             RawVelocity = value;
             PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
             PhysScene.PE.Activate(PhysBody, true);
         }
     }
+
     public override OMV.Vector3 Torque {
         get { return RawTorque; }
         set { RawTorque = value;
         }
     }
+
     public override float CollisionScore {
         get { return _collisionScore; }
         set { _collisionScore = value;
@@ -614,9 +642,9 @@ public sealed class BSCharacter : BSPhysObject
     public override OMV.Vector3 PIDTarget {
         set { _PIDTarget = value; }
     }
-    public override bool PIDActive {
-        set { _usePID = value; }
-    }
+
+    public override bool PIDActive { get; set; }
+
     public override float PIDTau {
         set { _PIDTau = value; }
     }
@@ -657,7 +685,7 @@ public sealed class BSCharacter : BSPhysObject
 
     private OMV.Vector3 ComputeAvatarScale(OMV.Vector3 size)
     {
-        OMV.Vector3 newScale;
+        OMV.Vector3 newScale = size;
 
         // Bullet's capsule total height is the "passed height + radius * 2";
         // The base capsule is 1 unit in diameter and 2 units in height (passed radius=0.5, passed height = 1)
@@ -670,8 +698,6 @@ public sealed class BSCharacter : BSPhysObject
         //     for a asymmetrical capsule, other parts of the code presume it is cylindrical.
 
         // Scale is multiplier of radius with one of "0.5"
-        newScale.X = size.X / 2f;
-        newScale.Y = size.Y / 2f;
 
         float heightAdjust = BSParam.AvatarHeightMidFudge;
         if (BSParam.AvatarHeightLowFudge != 0f || BSParam.AvatarHeightHighFudge != 0f)
@@ -692,8 +718,17 @@ public sealed class BSCharacter : BSPhysObject
                 heightAdjust += ((midHeightOffset) / (AVATAR_HI - AVATAR_MID)) * BSParam.AvatarHeightHighFudge;
             }
         }
-        // The total scale height is the central cylindar plus the caps on the two ends.
-        newScale.Z = (size.Z + (Math.Min(size.X, size.Y) * 2) + heightAdjust) / 2f;
+        if (BSParam.AvatarShape == BSShapeCollection.AvatarShapeCapsule)
+        {
+            newScale.X = size.X / 2f;
+            newScale.Y = size.Y / 2f;
+            // The total scale height is the central cylindar plus the caps on the two ends.
+            newScale.Z = (size.Z + (Math.Min(size.X, size.Y) * 2) + heightAdjust) / 2f;
+        }
+        else
+        {
+            newScale.Z = size.Z + heightAdjust;
+        }
         // m_log.DebugFormat("{0} ComputeAvatarScale: size={1},adj={2},scale={3}", LogHeader, size, heightAdjust, newScale);
 
         // If smaller than the endcaps, just fake like we're almost that small
@@ -737,7 +772,18 @@ public sealed class BSCharacter : BSPhysObject
         //    and will send agent updates to the clients if velocity changes by more than
         //    0.001m/s. Bullet introduces a lot of jitter in the velocity which causes many
         //    extra updates.
-        if (!entprop.Velocity.ApproxEquals(RawVelocity, 0.1f))
+        //
+        // XXX: Contrary to the above comment, setting an update threshold here above 0.4 actually introduces jitter to 
+        // avatar movement rather than removes it.  The larger the threshold, the bigger the jitter.
+        // This is most noticeable in level flight and can be seen with
+        // the "show updates" option in a viewer.  With an update threshold, the RawVelocity cycles between a lower
+        // bound and an upper bound, where the difference between the two is enough to trigger a large delta v update
+        // and subsequently trigger an update in ScenePresence.SendTerseUpdateToAllClients().  The cause of this cycle (feedback?)
+        // has not yet been identified.
+        //
+        // If there is a threshold below 0.4 or no threshold check at all (as in ODE), then RawVelocity stays constant and extra
+        // updates are not triggered in ScenePresence.SendTerseUpdateToAllClients().
+//        if (!entprop.Velocity.ApproxEquals(RawVelocity, 0.1f))
             RawVelocity = entprop.Velocity;
 
         _acceleration = entprop.Acceleration;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 7b98f9d..c6d6331 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -42,7 +42,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 {
     public sealed class BSDynamics : BSActor
     {
+#pragma warning disable 414
         private static string LogHeader = "[BULLETSIM VEHICLE]";
+#pragma warning restore 414
 
         // the prim this dynamic controller belongs to
         private BSPrimLinkable ControllingPrim { get; set; }
@@ -74,8 +76,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         private Vector3 m_linearMotorOffset = Vector3.Zero;             // the point of force can be offset from the center
         private Vector3 m_linearMotorDirectionLASTSET = Vector3.Zero;   // velocity requested by LSL
         private Vector3 m_linearFrictionTimescale = Vector3.Zero;
-        private float m_linearMotorDecayTimescale = 0;
-        private float m_linearMotorTimescale = 0;
+        private float m_linearMotorDecayTimescale = 1;
+        private float m_linearMotorTimescale = 1;
         private Vector3 m_lastLinearVelocityVector = Vector3.Zero;
         private Vector3 m_lastPositionVector = Vector3.Zero;
         // private bool m_LinearMotorSetLastFrame = false;
@@ -86,8 +88,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         private Vector3 m_angularMotorDirection = Vector3.Zero;         // angular velocity requested by LSL motor
         // private int m_angularMotorApply = 0;                            // application frame counter
         private Vector3 m_angularMotorVelocity = Vector3.Zero;          // current angular motor velocity
-        private float m_angularMotorTimescale = 0;                      // motor angular velocity ramp up rate
-        private float m_angularMotorDecayTimescale = 0;                 // motor angular velocity decay rate
+        private float m_angularMotorTimescale = 1;                      // motor angular velocity ramp up rate
+        private float m_angularMotorDecayTimescale = 1;                 // motor angular velocity decay rate
         private Vector3 m_angularFrictionTimescale = Vector3.Zero;      // body angular velocity  decay rate
         private Vector3 m_lastAngularVelocity = Vector3.Zero;
         private Vector3 m_lastVertAttractor = Vector3.Zero;             // what VA was last applied to body
@@ -101,7 +103,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
         //Banking properties
         private float m_bankingEfficiency = 0;
-        private float m_bankingMix = 0;
+        private float m_bankingMix = 1;
         private float m_bankingTimescale = 0;
 
         //Hover and Buoyancy properties
@@ -122,8 +124,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         private float m_verticalAttractionTimescale = 510f;
 
         // Just some recomputed constants:
+#pragma warning disable 414
+        static readonly float TwoPI = ((float)Math.PI) * 2f; 
+        static readonly float FourPI = ((float)Math.PI) * 4f; 
         static readonly float PIOverFour = ((float)Math.PI) / 4f;
         static readonly float PIOverTwo = ((float)Math.PI) / 2f;
+#pragma warning restore 414
 
         public BSDynamics(BSScene myScene, BSPrim myPrim, string actorName)
             : base(myScene, myPrim, actorName)
@@ -155,56 +161,58 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         public void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
         {
             VDetailLog("{0},ProcessFloatVehicleParam,param={1},val={2}", ControllingPrim.LocalID, pParam, pValue);
+            float clampTemp;
+
             switch (pParam)
             {
                 case Vehicle.ANGULAR_DEFLECTION_EFFICIENCY:
                     m_angularDeflectionEfficiency = ClampInRange(0f, pValue, 1f);
                     break;
                 case Vehicle.ANGULAR_DEFLECTION_TIMESCALE:
-                    m_angularDeflectionTimescale = Math.Max(pValue, 0.01f);
+                    m_angularDeflectionTimescale = ClampInRange(0.25f, pValue, 120);
                     break;
                 case Vehicle.ANGULAR_MOTOR_DECAY_TIMESCALE:
-                    m_angularMotorDecayTimescale = ClampInRange(0.01f, pValue, 120);
+                    m_angularMotorDecayTimescale = ClampInRange(0.25f, pValue, 120);
                     m_angularMotor.TargetValueDecayTimeScale = m_angularMotorDecayTimescale;
                     break;
                 case Vehicle.ANGULAR_MOTOR_TIMESCALE:
-                    m_angularMotorTimescale = Math.Max(pValue, 0.01f);
+                    m_angularMotorTimescale = ClampInRange(0.25f, pValue, 120);
                     m_angularMotor.TimeScale = m_angularMotorTimescale;
                     break;
                 case Vehicle.BANKING_EFFICIENCY:
                     m_bankingEfficiency = ClampInRange(-1f, pValue, 1f);
                     break;
                 case Vehicle.BANKING_MIX:
-                    m_bankingMix = Math.Max(pValue, 0.01f);
+                    m_bankingMix = ClampInRange(0.01f, pValue, 1);
                     break;
                 case Vehicle.BANKING_TIMESCALE:
-                    m_bankingTimescale = Math.Max(pValue, 0.01f);
+                    m_bankingTimescale = ClampInRange(0.25f, pValue, 120);
                     break;
                 case Vehicle.BUOYANCY:
                     m_VehicleBuoyancy = ClampInRange(-1f, pValue, 1f);
                     m_VehicleGravity = ControllingPrim.ComputeGravity(m_VehicleBuoyancy);
                     break;
                 case Vehicle.HOVER_EFFICIENCY:
-                    m_VhoverEfficiency = ClampInRange(0f, pValue, 1f);
+                    m_VhoverEfficiency = ClampInRange(0.01f, pValue, 1f);
                     break;
                 case Vehicle.HOVER_HEIGHT:
-                    m_VhoverHeight = pValue;
+                    m_VhoverHeight = ClampInRange(0f, pValue, 1000000f);
                     break;
                 case Vehicle.HOVER_TIMESCALE:
-                    m_VhoverTimescale = Math.Max(pValue, 0.01f);
+                    m_VhoverTimescale = ClampInRange(0.01f, pValue, 120);
                     break;
                 case Vehicle.LINEAR_DEFLECTION_EFFICIENCY:
                     m_linearDeflectionEfficiency = ClampInRange(0f, pValue, 1f);
                     break;
                 case Vehicle.LINEAR_DEFLECTION_TIMESCALE:
-                    m_linearDeflectionTimescale = Math.Max(pValue, 0.01f);
+                    m_linearDeflectionTimescale = ClampInRange(0.01f, pValue, 120);
                     break;
                 case Vehicle.LINEAR_MOTOR_DECAY_TIMESCALE:
                     m_linearMotorDecayTimescale = ClampInRange(0.01f, pValue, 120);
                     m_linearMotor.TargetValueDecayTimeScale = m_linearMotorDecayTimescale;
                     break;
                 case Vehicle.LINEAR_MOTOR_TIMESCALE:
-                    m_linearMotorTimescale = Math.Max(pValue, 0.01f);
+                    m_linearMotorTimescale = ClampInRange(0.01f, pValue, 120);
                     m_linearMotor.TimeScale = m_linearMotorTimescale;
                     break;
                 case Vehicle.VERTICAL_ATTRACTION_EFFICIENCY:
@@ -212,30 +220,35 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     m_verticalAttractionMotor.Efficiency = m_verticalAttractionEfficiency;
                     break;
                 case Vehicle.VERTICAL_ATTRACTION_TIMESCALE:
-                    m_verticalAttractionTimescale = Math.Max(pValue, 0.01f);
+                    m_verticalAttractionTimescale = ClampInRange(0.01f, pValue, 120);
                     m_verticalAttractionMotor.TimeScale = m_verticalAttractionTimescale;
                     break;
 
                 // These are vector properties but the engine lets you use a single float value to
                 // set all of the components to the same value
                 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
-                    m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue);
+                    clampTemp = ClampInRange(0.01f, pValue, 120);
+                    m_angularFrictionTimescale = new Vector3(clampTemp, clampTemp, clampTemp);
                     break;
                 case Vehicle.ANGULAR_MOTOR_DIRECTION:
-                    m_angularMotorDirection = new Vector3(pValue, pValue, pValue);
+                    clampTemp = ClampInRange(-TwoPI, pValue, TwoPI);
+                    m_angularMotorDirection = new Vector3(clampTemp, clampTemp, clampTemp);
                     m_angularMotor.Zero();
                     m_angularMotor.SetTarget(m_angularMotorDirection);
                     break;
                 case Vehicle.LINEAR_FRICTION_TIMESCALE:
-                    m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue);
+                    clampTemp = ClampInRange(0.01f, pValue, 120);
+                    m_linearFrictionTimescale = new Vector3(clampTemp, clampTemp, clampTemp);
                     break;
                 case Vehicle.LINEAR_MOTOR_DIRECTION:
-                    m_linearMotorDirection = new Vector3(pValue, pValue, pValue);
-                    m_linearMotorDirectionLASTSET = new Vector3(pValue, pValue, pValue);
+                    clampTemp = ClampInRange(-BSParam.MaxLinearVelocity, pValue, BSParam.MaxLinearVelocity);
+                    m_linearMotorDirection = new Vector3(clampTemp, clampTemp, clampTemp);
+                    m_linearMotorDirectionLASTSET = new Vector3(clampTemp, clampTemp, clampTemp);
                     m_linearMotor.SetTarget(m_linearMotorDirection);
                     break;
                 case Vehicle.LINEAR_MOTOR_OFFSET:
-                    m_linearMotorOffset = new Vector3(pValue, pValue, pValue);
+                    clampTemp = ClampInRange(-1000, pValue, 1000);
+                    m_linearMotorOffset = new Vector3(clampTemp, clampTemp, clampTemp);
                     break;
 
             }
@@ -247,29 +260,46 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             switch (pParam)
             {
                 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
+                    pValue.X = ClampInRange(0.25f, pValue.X, 120);
+                    pValue.Y = ClampInRange(0.25f, pValue.Y, 120);
+                    pValue.Z = ClampInRange(0.25f, pValue.Z, 120);
                     m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
                     break;
                 case Vehicle.ANGULAR_MOTOR_DIRECTION:
                     // Limit requested angular speed to 2 rps= 4 pi rads/sec
-                    pValue.X = ClampInRange(-12.56f, pValue.X, 12.56f);
-                    pValue.Y = ClampInRange(-12.56f, pValue.Y, 12.56f);
-                    pValue.Z = ClampInRange(-12.56f, pValue.Z, 12.56f);
+                    pValue.X = ClampInRange(-FourPI, pValue.X, FourPI);
+                    pValue.Y = ClampInRange(-FourPI, pValue.Y, FourPI);
+                    pValue.Z = ClampInRange(-FourPI, pValue.Z, FourPI);
                     m_angularMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
                     m_angularMotor.Zero();
                     m_angularMotor.SetTarget(m_angularMotorDirection);
                     break;
                 case Vehicle.LINEAR_FRICTION_TIMESCALE:
+                    pValue.X = ClampInRange(0.25f, pValue.X, 120);
+                    pValue.Y = ClampInRange(0.25f, pValue.Y, 120);
+                    pValue.Z = ClampInRange(0.25f, pValue.Z, 120);
                     m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
                     break;
                 case Vehicle.LINEAR_MOTOR_DIRECTION:
+                    pValue.X = ClampInRange(-BSParam.MaxLinearVelocity, pValue.X, BSParam.MaxLinearVelocity);
+                    pValue.Y = ClampInRange(-BSParam.MaxLinearVelocity, pValue.Y, BSParam.MaxLinearVelocity);
+                    pValue.Z = ClampInRange(-BSParam.MaxLinearVelocity, pValue.Z, BSParam.MaxLinearVelocity);
                     m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
                     m_linearMotorDirectionLASTSET = new Vector3(pValue.X, pValue.Y, pValue.Z);
                     m_linearMotor.SetTarget(m_linearMotorDirection);
                     break;
                 case Vehicle.LINEAR_MOTOR_OFFSET:
+                    // Not sure the correct range to limit this variable
+                    pValue.X = ClampInRange(-1000, pValue.X, 1000);
+                    pValue.Y = ClampInRange(-1000, pValue.Y, 1000);
+                    pValue.Z = ClampInRange(-1000, pValue.Z, 1000);
                     m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z);
                     break;
                 case Vehicle.BLOCK_EXIT:
+                    // Not sure the correct range to limit this variable
+                    pValue.X = ClampInRange(-10000, pValue.X, 10000);
+                    pValue.Y = ClampInRange(-10000, pValue.Y, 10000);
+                    pValue.Z = ClampInRange(-10000, pValue.Z, 10000);
                     m_BlockingEndPoint = new Vector3(pValue.X, pValue.Y, pValue.Z);
                     break;
             }
@@ -915,7 +945,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         {
             get
             {
-                return VehicleVelocity * Quaternion.Inverse(Quaternion.Normalize(VehicleOrientation));
+                return VehicleVelocity * Quaternion.Inverse(Quaternion.Normalize(VehicleFrameOrientation));
             }
         }
 
@@ -926,6 +956,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 return VehicleForwardVelocity.X;
             }
         }
+        private Quaternion VehicleFrameOrientation
+        {
+            get
+            {
+                return VehicleOrientation * m_referenceFrame;
+            }
+        }
 
         #endregion // Known vehicle value functions
 
@@ -1011,8 +1048,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 VDetailLog("{0},  MoveLinear,clampMax,origVelW={1},lenSq={2},maxVelSq={3},,newVelW={4}",
                             ControllingPrim.LocalID, origVelW, newVelocityLengthSq, BSParam.VehicleMaxLinearVelocitySquared, VehicleVelocity);
             }
-            else if (newVelocityLengthSq < 0.001f)
+            else if (newVelocityLengthSq < BSParam.VehicleMinLinearVelocitySquared)
+            {
+                Vector3 origVelW = VehicleVelocity;         // DEBUG DEBUG
+                VDetailLog("{0},  MoveLinear,clampMin,origVelW={1},lenSq={2}",
+                            ControllingPrim.LocalID, origVelW, newVelocityLengthSq);
                 VehicleVelocity = Vector3.Zero;
+            }
 
             VDetailLog("{0},  MoveLinear,done,isColl={1},newVel={2}", ControllingPrim.LocalID, ControllingPrim.HasSomeCollision, VehicleVelocity );
 
@@ -1030,7 +1072,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             linearMotorCorrectionV -= (currentVelV * frictionFactorV);
 
             // Motor is vehicle coordinates. Rotate it to world coordinates
-            Vector3 linearMotorVelocityW = linearMotorCorrectionV * VehicleOrientation;
+            Vector3 linearMotorVelocityW = linearMotorCorrectionV * VehicleFrameOrientation;
 
             // If we're a ground vehicle, don't add any upward Z movement
             if ((m_flags & VehicleFlag.LIMIT_MOTOR_UP) != 0)
@@ -1072,7 +1114,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 linearDeflectionV *= new Vector3(1, -1, -1);
 
                 // Correction is vehicle relative. Convert to world coordinates.
-                Vector3 linearDeflectionW = linearDeflectionV * VehicleOrientation;
+                Vector3 linearDeflectionW = linearDeflectionV * VehicleFrameOrientation;
 
                 // Optionally, if not colliding, don't effect world downward velocity. Let falling things fall.
                 if (BSParam.VehicleLinearDeflectionNotCollidingNoZ && !m_controllingPrim.HasSomeCollision)
@@ -1106,7 +1148,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         {
             // m_VhoverEfficiency: 0=bouncy, 1=totally damped
             // m_VhoverTimescale: time to achieve height
-            if ((m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
+            if ((m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0 && (m_VhoverHeight > 0) && (m_VhoverTimescale < 300))
             {
                 // We should hover, get the target height
                 if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) != 0)
@@ -1368,7 +1410,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         {
             // The user wants this many radians per second angular change?
             Vector3 origVehicleRotationalVelocity = VehicleRotationalVelocity;      // DEBUG DEBUG
-            Vector3 currentAngularV = VehicleRotationalVelocity * Quaternion.Inverse(VehicleOrientation);
+            Vector3 currentAngularV = VehicleRotationalVelocity * Quaternion.Inverse(VehicleFrameOrientation);
             Vector3 angularMotorContributionV = m_angularMotor.Step(pTimestep, currentAngularV);
 
             // ==================================================================
@@ -1389,7 +1431,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep);
             angularMotorContributionV -= (currentAngularV * frictionFactorW);
 
-            Vector3 angularMotorContributionW = angularMotorContributionV * VehicleOrientation;
+            Vector3 angularMotorContributionW = angularMotorContributionV * VehicleFrameOrientation;
             VehicleRotationalVelocity += angularMotorContributionW;
 
             VDetailLog("{0},  MoveAngular,angularTurning,curAngVelV={1},origVehRotVel={2},vehRotVel={3},frictFact={4}, angContribV={5},angContribW={6}",
@@ -1410,7 +1452,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             // If vertical attaction timescale is reasonable
             if (BSParam.VehicleEnableAngularVerticalAttraction && m_verticalAttractionTimescale < m_verticalAttractionCutoff)
             {
-                Vector3 vehicleUpAxis = Vector3.UnitZ * VehicleOrientation;
+                Vector3 vehicleUpAxis = Vector3.UnitZ * VehicleFrameOrientation;
                 switch (BSParam.VehicleAngularVerticalAttractionAlgorithm)
                 {
                     case 0:
@@ -1429,6 +1471,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                             // This is only half the distance to the target so it will take 2 seconds to complete the turn.
                             Vector3 torqueVector = Vector3.Cross(predictedUp, Vector3.UnitZ);
 
+                            if ((m_flags & VehicleFlag.LIMIT_ROLL_ONLY) != 0)
+                            {
+                                Vector3 vehicleForwardAxis = Vector3.UnitX * VehicleFrameOrientation;
+                                torqueVector = ProjectVector(torqueVector, vehicleForwardAxis);
+                            }
+
                             // Scale vector by our timescale since it is an acceleration it is r/s^2 or radians a timescale squared
                             Vector3 vertContributionV = torqueVector * verticalAttractionSpeed * verticalAttractionSpeed;
 
@@ -1450,13 +1498,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
                             // Create a rotation that is only the vehicle's rotation around Z
                             Vector3 currentEulerW = Vector3.Zero;
-                            VehicleOrientation.GetEulerAngles(out currentEulerW.X, out currentEulerW.Y, out currentEulerW.Z);
+                            VehicleFrameOrientation.GetEulerAngles(out currentEulerW.X, out currentEulerW.Y, out currentEulerW.Z);
                             Quaternion justZOrientation = Quaternion.CreateFromAxisAngle(Vector3.UnitZ, currentEulerW.Z);
 
                             // Create the axis that is perpendicular to the up vector and the rotated up vector.
-                            Vector3 differenceAxisW = Vector3.Cross(Vector3.UnitZ * justZOrientation, Vector3.UnitZ * VehicleOrientation);
+                            Vector3 differenceAxisW = Vector3.Cross(Vector3.UnitZ * justZOrientation, Vector3.UnitZ * VehicleFrameOrientation);
                             // Compute the angle between those to vectors.
-                            double differenceAngle = Math.Acos((double)Vector3.Dot(Vector3.UnitZ, Vector3.Normalize(Vector3.UnitZ * VehicleOrientation)));
+                            double differenceAngle = Math.Acos((double)Vector3.Dot(Vector3.UnitZ, Vector3.Normalize(Vector3.UnitZ * VehicleFrameOrientation)));
                             // 'differenceAngle' is the angle to rotate and 'differenceAxis' is the plane to rotate in to get the vehicle vertical
 
                             // Reduce the change by the time period it is to change in. Timestep is handled when velocity is applied.
@@ -1489,7 +1537,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                             Vector3 origRotVelW = VehicleRotationalVelocity;        // DEBUG DEBUG
 
                             // Take a vector pointing up and convert it from world to vehicle relative coords.
-                            Vector3 verticalError = Vector3.Normalize(Vector3.UnitZ * VehicleOrientation);
+                            Vector3 verticalError = Vector3.Normalize(Vector3.UnitZ * VehicleFrameOrientation);
 
                             // If vertical attraction correction is needed, the vector that was pointing up (UnitZ)
                             //    is now:
@@ -1520,7 +1568,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                             vertContributionV /= m_verticalAttractionTimescale;
 
                             // Rotate the vehicle rotation to the world coordinates.
-                            VehicleRotationalVelocity += (vertContributionV * VehicleOrientation);
+                            VehicleRotationalVelocity += (vertContributionV * VehicleFrameOrientation);
 
                             VDetailLog("{0},  MoveAngular,verticalAttraction,,upAxis={1},origRotVW={2},vertError={3},unscaledV={4},eff={5},ts={6},vertContribV={7}",
                                             ControllingPrim.LocalID,
@@ -1561,7 +1609,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 movingDirection *= Math.Sign(VehicleForwardSpeed);
 
                 // The direction the vehicle is pointing
-                Vector3 pointingDirection = Vector3.UnitX * VehicleOrientation;
+                Vector3 pointingDirection = Vector3.UnitX * VehicleFrameOrientation;
                 //Predict where the Vehicle will be pointing after AngularVelocity change is applied. This will keep
                 //   from overshooting and allow this correction to merge with the Vertical Attraction peacefully.
                 Vector3 predictedPointingDirection = pointingDirection * Quaternion.CreateFromAxisAngle(VehicleRotationalVelocity, 0f);
@@ -1586,7 +1634,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 deflectContributionV = (-deflectionError) * ClampInRange(0, m_angularDeflectionEfficiency/m_angularDeflectionTimescale,1f);
                 //deflectContributionV /= m_angularDeflectionTimescale;
 
-               // VehicleRotationalVelocity += deflectContributionV * VehicleOrientation;
                 VehicleRotationalVelocity += deflectContributionV;
                 VDetailLog("{0},  MoveAngular,Deflection,movingDir={1},pointingDir={2},deflectError={3},ret={4}",
                     ControllingPrim.LocalID, movingDirection, pointingDirection, deflectionError, deflectContributionV);
@@ -1635,7 +1682,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 // Rotate a UnitZ vector (pointing up) to how the vehicle is oriented.
                 // As the vehicle rolls to the right or left, the Y value will increase from
                 //     zero (straight up) to 1 or -1 (full tilt right  or left)
-                Vector3 rollComponents = Vector3.UnitZ * VehicleOrientation;
+                Vector3 rollComponents = Vector3.UnitZ * VehicleFrameOrientation;
 
                 // Figure out the yaw value for this much roll.
                 float yawAngle = m_angularMotorDirection.X * m_bankingEfficiency;
@@ -1644,7 +1691,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
                 // TODO: the banking effect should not go to infinity but what to limit it to?
                 //     And what should happen when this is being added to a user defined yaw that is already PI*4?
-                mixedYawAngle = ClampInRange(-12, mixedYawAngle, 12);
+                mixedYawAngle = ClampInRange(-FourPI, mixedYawAngle, FourPI);
 
                 // Build the force vector to change rotation from what it is to what it should be
                 bankingContributionV.Z = -mixedYawAngle;
@@ -1652,7 +1699,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 // Don't do it all at once. Fudge because 1 second is too fast with most user defined roll as PI*4.
                 bankingContributionV /= m_bankingTimescale * BSParam.VehicleAngularBankingTimescaleFudge;
 
-                //VehicleRotationalVelocity += bankingContributionV * VehicleOrientation;
                 VehicleRotationalVelocity += bankingContributionV;
 
 
@@ -1730,6 +1776,14 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
         }
 
+        //Given a Vector and a unit vector will return the amount of the vector is on the same axis as the unit.
+        private Vector3 ProjectVector(Vector3 vector, Vector3 onNormal)
+        {
+            float vectorDot = Vector3.Dot(vector, onNormal);
+            return onNormal * vectorDot;
+
+        }
+
         private float ClampInRange(float low, float val, float high)
         {
             return Math.Max(low, Math.Min(val, high));
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 77f69a5..87eba33 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -128,6 +128,7 @@ public abstract class BSLinkset
         m_children = new Dictionary<BSPrimLinkable, BSLinkInfo>();
         LinksetMass = parent.RawMass;
         Rebuilding = false;
+        RebuildScheduled = false;
 
         parent.ClearDisplacement();
     }
@@ -297,8 +298,16 @@ public abstract class BSLinkset
 
     // Flag denoting the linkset is in the process of being rebuilt.
     // Used to know not the schedule a rebuild in the middle of a rebuild.
+    // Because of potential update calls that could want to schedule another rebuild.
     protected bool Rebuilding { get; set; }
 
+    // Flag saying a linkset rebuild has been scheduled.
+    // This is turned on when the rebuild is requested and turned off when
+    //     the rebuild is complete. Used to limit modifications to the
+    //     linkset parameters while the linkset is in an intermediate state.
+    // Protected by a "lock(m_linsetActivityLock)" on the BSLinkset object
+    public bool RebuildScheduled { get; protected set; }
+
     // The object is going dynamic (physical). Do any setup necessary
     //     for a dynamic linkset.
     // Only the state of the passed object can be modified. The rest of the linkset
@@ -307,6 +316,23 @@ public abstract class BSLinkset
     // Called at taint-time!
     public abstract bool MakeDynamic(BSPrimLinkable child);
 
+    public virtual bool AllPartsComplete
+    {
+        get {
+            bool ret = true; 
+            this.ForEachMember((member) =>
+            {
+                if ((!member.IsInitialized) || member.IsIncomplete || member.PrimAssetState == BSPhysObject.PrimAssetCondition.Waiting)
+                {
+                    ret = false;
+                    return true;    // exit loop
+                }
+                return false;       // continue loop
+            });
+            return ret;
+        }
+    }
+
     // The object is going static (non-physical). Do any setup necessary
     //     for a static linkset.
     // Return 'true' if any properties updated on the passed object.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 8f12189..cae9efa 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -37,7 +37,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
 public sealed class BSLinksetCompound : BSLinkset
 {
+#pragma warning disable 414
     private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]";
+#pragma warning restore 414
 
     public BSLinksetCompound(BSScene scene, BSPrimLinkable parent)
         : base(scene, parent)
@@ -98,22 +100,43 @@ public sealed class BSLinksetCompound : BSLinkset
     // Schedule a refresh to happen after all the other taint processing.
     private void ScheduleRebuild(BSPrimLinkable requestor)
     {
-        DetailLog("{0},BSLinksetCompound.ScheduleRebuild,,rebuilding={1},hasChildren={2},actuallyScheduling={3}",
-                            requestor.LocalID, Rebuilding, HasAnyChildren, (!Rebuilding && HasAnyChildren));
-
         // When rebuilding, it is possible to set properties that would normally require a rebuild.
         //    If already rebuilding, don't request another rebuild.
         //    If a linkset with just a root prim (simple non-linked prim) don't bother rebuilding.
-        if (!Rebuilding && HasAnyChildren)
+        lock (m_linksetActivityLock)
         {
-            m_physicsScene.PostTaintObject("BSLinksetCompound.ScheduleRebuild", LinksetRoot.LocalID, delegate()
+            if (!RebuildScheduled && !Rebuilding && HasAnyChildren)
             {
-                if (HasAnyChildren)
-                    RecomputeLinksetCompound();
-            });
+                InternalScheduleRebuild(requestor);
+            }
         }
     }
 
+    // Must be called with m_linksetActivityLock or race conditions will haunt you.
+    private void InternalScheduleRebuild(BSPrimLinkable requestor)
+    {
+        DetailLog("{0},BSLinksetCompound.InternalScheduleRebuild,,rebuilding={1},hasChildren={2}",
+                            requestor.LocalID, Rebuilding, HasAnyChildren);
+        RebuildScheduled = true;
+        m_physicsScene.PostTaintObject("BSLinksetCompound.ScheduleRebuild", LinksetRoot.LocalID, delegate()
+        {
+            if (HasAnyChildren)
+            {
+                if (this.AllPartsComplete)
+                {
+                    RecomputeLinksetCompound();
+                }
+                else
+                {
+                    DetailLog("{0},BSLinksetCompound.InternalScheduleRebuild,,rescheduling because not all children complete",
+                                                    requestor.LocalID);
+                    InternalScheduleRebuild(requestor);
+                }
+            }
+            RebuildScheduled = false;
+        });
+    }
+
     // The object is going dynamic (physical). Do any setup necessary for a dynamic linkset.
     // Only the state of the passed object can be modified. The rest of the linkset
     //     has not yet been fully constructed.
@@ -178,7 +201,10 @@ public sealed class BSLinksetCompound : BSLinkset
             if ((whichUpdated & ~(UpdatedProperties.Position | UpdatedProperties.Orientation)) == 0)
             {
                 // Find the physical instance of the child
-                if (LinksetRoot.PhysShape.HasPhysicalShape && m_physicsScene.PE.IsCompound(LinksetRoot.PhysShape.physShapeInfo))
+                if (!RebuildScheduled   // if rebuilding, let the rebuild do it
+                        && !LinksetRoot.IsIncomplete    // if waiting for assets or whatever, don't change
+                        && LinksetRoot.PhysShape.HasPhysicalShape   // there must be a physical shape assigned
+                        && m_physicsScene.PE.IsCompound(LinksetRoot.PhysShape.physShapeInfo))
                 {
                     // It is possible that the linkset is still under construction and the child is not yet
                     //    inserted into the compound shape. A rebuild of the linkset in a pre-step action will
@@ -369,23 +395,47 @@ public sealed class BSLinksetCompound : BSLinkset
                 // Get a reference to the shape of the child for adding of that shape to the linkset compound shape
                 BSShape childShape = cPrim.PhysShape.GetReference(m_physicsScene, cPrim);
 
-                // Offset the child shape from the center-of-mass and rotate it to vehicle relative.
+                // Offset the child shape from the center-of-mass and rotate it to root relative.
                 OMV.Vector3 offsetPos = (cPrim.RawPosition - origRootPosition) * invRootOrientation - centerDisplacementV;
                 OMV.Quaternion offsetRot = OMV.Quaternion.Normalize(cPrim.RawOrientation) * invRootOrientation;
 
                 // Add the child shape to the compound shape being built
-                m_physicsScene.PE.AddChildShapeToCompoundShape(linksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
-                DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1},cShape={2},offPos={3},offRot={4}",
-                                    LinksetRoot.LocalID, cPrim.LinksetChildIndex, childShape, offsetPos, offsetRot);
+                if (childShape.physShapeInfo.HasPhysicalShape)
+                {
+                    m_physicsScene.PE.AddChildShapeToCompoundShape(linksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
+                    DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1},cShape={2},offPos={3},offRot={4}",
+                                LinksetRoot.LocalID, cPrim.LinksetChildIndex, childShape, offsetPos, offsetRot);
 
-                // Since we are borrowing the shape of the child, disable the origional child body
-                if (!IsRoot(cPrim))
+                    // Since we are borrowing the shape of the child, disable the origional child body
+                    if (!IsRoot(cPrim))
+                    {
+                        m_physicsScene.PE.AddToCollisionFlags(cPrim.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+                        m_physicsScene.PE.ForceActivationState(cPrim.PhysBody, ActivationState.DISABLE_SIMULATION);
+                        // We don't want collisions from the old linkset children.
+                        m_physicsScene.PE.RemoveFromCollisionFlags(cPrim.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+                        cPrim.PhysBody.collisionType = CollisionType.LinksetChild;
+                    }
+                }
+                else
                 {
-                    m_physicsScene.PE.AddToCollisionFlags(cPrim.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
-                    m_physicsScene.PE.ForceActivationState(cPrim.PhysBody, ActivationState.DISABLE_SIMULATION);
-                    // We don't want collisions from the old linkset children.
-                    m_physicsScene.PE.RemoveFromCollisionFlags(cPrim.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
-                    cPrim.PhysBody.collisionType = CollisionType.LinksetChild;
+                    // The linkset must be in an intermediate state where all the children have not yet
+                    //    been constructed. This sometimes happens on startup when everything is getting
+                    //    built and some shapes have to wait for assets to be read in.
+                    // Just skip this linkset for the moment and cause the shape to be rebuilt next tick.
+                    // One problem might be that the shape is broken somehow and it never becomes completely
+                    //    available. This might cause the rebuild to happen over and over.
+                    InternalScheduleRebuild(LinksetRoot);
+                    DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChildWithNoShape,indx={1},cShape={2},offPos={3},offRot={4}",
+                                    LinksetRoot.LocalID, cPrim.LinksetChildIndex, childShape, offsetPos, offsetRot);
+                    // Output an annoying warning. It should only happen once but if it keeps coming out,
+                    //    the user knows there is something wrong and will report it.
+                    m_physicsScene.Logger.WarnFormat("{0} Linkset rebuild warning. If this happens more than one or two times, please report in Mantis 7191", LogHeader);
+                    m_physicsScene.Logger.WarnFormat("{0} pName={1}, childIdx={2}, shape={3}",
+                                    LogHeader, LinksetRoot.Name, cPrim.LinksetChildIndex, childShape);
+
+                    // This causes the loop to bail on building the rest of this linkset.
+                    // The rebuild operation will fix it up next tick or declare the object unbuildable.
+                    return true;
                 }
 
                 return false;   // 'false' says to move onto the next child in the list
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index aaf92c8..4384cdc 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -78,7 +78,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         public override void ResetLink()
         {
             // constraintType = ConstraintType.D6_CONSTRAINT_TYPE;
-            constraintType = ConstraintType.FIXED_CONSTRAINT_TYPE;
+            constraintType = ConstraintType.BS_FIXED_CONSTRAINT_TYPE;
             linearLimitLow = OMV.Vector3.Zero;
             linearLimitHigh = OMV.Vector3.Zero;
             angularLimitLow = OMV.Vector3.Zero;
@@ -115,7 +115,7 @@ public sealed class BSLinksetConstraints : BSLinkset
             member.PhysScene.DetailLog("{0},BSLinkInfoConstraint.SetLinkParameters,type={1}", member.LocalID, constraintType);
             switch (constraintType)
             {
-                case ConstraintType.FIXED_CONSTRAINT_TYPE:
+                case ConstraintType.BS_FIXED_CONSTRAINT_TYPE:
                 case ConstraintType.D6_CONSTRAINT_TYPE:
                     BSConstraint6Dof constrain6dof = constrain as BSConstraint6Dof;
                     if (constrain6dof != null)
@@ -179,7 +179,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         public override bool ShouldUpdateChildProperties()
         {
             bool ret = true;
-            if (constraintType == ConstraintType.FIXED_CONSTRAINT_TYPE)
+            if (constraintType == ConstraintType.BS_FIXED_CONSTRAINT_TYPE)
                 ret = false;
 
             return ret;
@@ -212,20 +212,28 @@ public sealed class BSLinksetConstraints : BSLinkset
         // When rebuilding, it is possible to set properties that would normally require a rebuild.
         //    If already rebuilding, don't request another rebuild.
         //    If a linkset with just a root prim (simple non-linked prim) don't bother rebuilding.
-        if (!Rebuilding && HasAnyChildren)
+        lock (this)
         {
-            // Queue to happen after all the other taint processing
-            m_physicsScene.PostTaintObject("BSLinksetContraints.Refresh", requestor.LocalID, delegate()
+            if (!RebuildScheduled)
             {
-                if (HasAnyChildren)
+                if (!Rebuilding && HasAnyChildren)
                 {
-                    // Constraints that have not been changed are not rebuild but make sure
-                    //     the constraint of the requestor is rebuilt.
-                    PhysicallyUnlinkAChildFromRoot(LinksetRoot, requestor);
-                    // Rebuild the linkset and all its constraints.
-                    RecomputeLinksetConstraints();
+                    RebuildScheduled = true;
+                    // Queue to happen after all the other taint processing
+                    m_physicsScene.PostTaintObject("BSLinksetContraints.Refresh", requestor.LocalID, delegate()
+                    {
+                        if (HasAnyChildren)
+                        {
+                            // Constraints that have not been changed are not rebuild but make sure
+                            //     the constraint of the requestor is rebuilt.
+                            PhysicallyUnlinkAChildFromRoot(LinksetRoot, requestor);
+                            // Rebuild the linkset and all its constraints.
+                            RecomputeLinksetConstraints();
+                        }
+                        RebuildScheduled = false;
+                    });
                 }
-            });
+            }
         }
     }
 
@@ -363,7 +371,7 @@ public sealed class BSLinksetConstraints : BSLinkset
 
         switch (linkInfo.constraintType)
         {
-            case ConstraintType.FIXED_CONSTRAINT_TYPE:
+            case ConstraintType.BS_FIXED_CONSTRAINT_TYPE:
             case ConstraintType.D6_CONSTRAINT_TYPE:
                 // Relative position normalized to the root prim
                 // Essentually a vector pointing from center of rootPrim to center of li.member
@@ -536,7 +544,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                 {
                     int requestedType = (int)pParams[2];
                     DetailLog("{0},BSLinksetConstraint.ChangeLinkType,requestedType={1}", LinksetRoot.LocalID, requestedType);
-                    if (requestedType == (int)ConstraintType.FIXED_CONSTRAINT_TYPE
+                    if (requestedType == (int)ConstraintType.BS_FIXED_CONSTRAINT_TYPE
                         || requestedType == (int)ConstraintType.D6_CONSTRAINT_TYPE
                         || requestedType == (int)ConstraintType.D6_SPRING_CONSTRAINT_TYPE
                         || requestedType == (int)ConstraintType.HINGE_CONSTRAINT_TYPE
@@ -646,7 +654,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                                         case ExtendedPhysics.PHYS_PARAM_LINK_TYPE:
                                             valueInt = (int)pParams[opIndex + 1];
                                             ConstraintType valueType = (ConstraintType)valueInt;
-                                            if (valueType == ConstraintType.FIXED_CONSTRAINT_TYPE
+                                            if (valueType == ConstraintType.BS_FIXED_CONSTRAINT_TYPE
                                                 || valueType == ConstraintType.D6_CONSTRAINT_TYPE
                                                 || valueType == ConstraintType.D6_SPRING_CONSTRAINT_TYPE
                                                 || valueType == ConstraintType.HINGE_CONSTRAINT_TYPE
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 834228e..6d46fe6 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -54,6 +54,14 @@ public static class BSParam
     // ===================
     // From:
 
+    /// <summary>
+    /// Set whether physics is active or not.
+    /// </summary>
+    /// <remarks>
+    /// Can be enabled and disabled to start and stop physics.
+    /// </remarks>
+    public static bool Active { get; private set; }
+
     public static bool UseSeparatePhysicsThread { get; private set; }
     public static float PhysicsTimeStep { get; private set; }
 
@@ -97,6 +105,7 @@ public static class BSParam
 
     public static float TerrainImplementation { get; set; }
     public static int TerrainMeshMagnification { get; private set; }
+    public static float TerrainGroundPlane { get; private set; }
     public static float TerrainFriction { get; private set; }
     public static float TerrainHitFraction { get; private set; }
     public static float TerrainRestitution { get; private set; }
@@ -123,22 +132,29 @@ public static class BSParam
     public static float PhysicsUnmanLoggingFrames { get; private set; }
 
     // Avatar parameters
+    public static bool AvatarToAvatarCollisionsByDefault { get; private set; }
     public static float AvatarFriction { get; private set; }
     public static float AvatarStandingFriction { get; private set; }
     public static float AvatarAlwaysRunFactor { get; private set; }
     public static float AvatarDensity { get; private set; }
     public static float AvatarRestitution { get; private set; }
+    public static int AvatarShape { get; private set; }
     public static float AvatarCapsuleWidth { get; private set; }
     public static float AvatarCapsuleDepth { get; private set; }
     public static float AvatarCapsuleHeight { get; private set; }
     public static float AvatarHeightLowFudge { get; private set; }
     public static float AvatarHeightMidFudge { get; private set; }
     public static float AvatarHeightHighFudge { get; private set; }
+    public static float AvatarFlyingGroundMargin { get; private set; }
+    public static float AvatarFlyingGroundUpForce { get; private set; }
+    public static float AvatarTerminalVelocity { get; private set; }
         public static float AvatarContactProcessingThreshold { get; private set; }
     public static float AvatarStopZeroThreshold { get; private set; }
         public static int AvatarJumpFrames { get; private set; }
         public static float AvatarBelowGroundUpCorrectionMeters { get; private set; }
         public static float AvatarStepHeight { get; private set; }
+        public static float AvatarStepAngle { get; private set; }
+        public static float AvatarStepGroundFudge { get; private set; }
         public static float AvatarStepApproachFactor { get; private set; }
         public static float AvatarStepForceFactor { get; private set; }
         public static float AvatarStepUpCorrectionFactor { get; private set; }
@@ -147,6 +163,8 @@ public static class BSParam
     // Vehicle parameters
     public static float VehicleMaxLinearVelocity { get; private set; }
     public static float VehicleMaxLinearVelocitySquared { get; private set; }
+    public static float VehicleMinLinearVelocity { get; private set; }
+    public static float VehicleMinLinearVelocitySquared { get; private set; }
     public static float VehicleMaxAngularVelocity { get; private set; }
     public static float VehicleMaxAngularVelocitySq { get; private set; }
     public static float VehicleAngularDamping { get; private set; }
@@ -165,6 +183,7 @@ public static class BSParam
     public static bool VehicleEnableAngularBanking { get; private set; }
 
     // Convex Hulls
+    // Parameters for convex hull routine that ships with Bullet
     public static int CSHullMaxDepthSplit { get; private set; }
     public static int CSHullMaxDepthSplitForSimpleShapes { get; private set; }
     public static float CSHullConcavityThresholdPercent { get; private set; }
@@ -180,6 +199,22 @@ public static class BSParam
         public static bool BHullAddNeighboursDistPoints { get; private set; }   // false
         public static bool BHullAddFacesPoints { get; private set; }                    // false
         public static bool BHullShouldAdjustCollisionMargin { get; private set; }       // false
+        public static float WhichHACD { get; private set; }                                 // zero if Bullet HACD, non-zero says VHACD
+    // Parameters for VHACD 2.0: http://code.google.com/p/v-hacd
+    // To enable, set both ShouldUseBulletHACD=true and WhichHACD=1
+        // http://kmamou.blogspot.ca/2014/12/v-hacd-20-parameters-description.html
+        public static float VHACDresolution { get; private set; }                       // 100,000 max number of voxels generated during voxelization stage
+        public static float VHACDdepth { get; private set; }                            // 20 max number of clipping stages
+        public static float VHACDconcavity { get; private set; }                        // 0.0025 maximum concavity
+        public static float VHACDplaneDownsampling { get; private set; }        // 4 granularity of search for best clipping plane
+        public static float VHACDconvexHullDownsampling { get; private set; }   // 4 precision of hull gen process
+        public static float VHACDalpha { get; private set; }                            // 0.05 bias toward clipping along symmetry planes
+        public static float VHACDbeta { get; private set; }                                 // 0.05 bias toward clipping along revolution axis
+        public static float VHACDgamma { get; private set; }                            // 0.00125 max concavity when merging
+        public static float VHACDpca { get; private set; }                                      // 0 on/off normalizing mesh before decomp
+        public static float VHACDmode { get; private set; }                                 // 0 0:voxel based, 1: tetrahedron based
+        public static float VHACDmaxNumVerticesPerCH { get; private set; }      // 64 max triangles per convex hull
+        public static float VHACDminVolumePerCH { get; private set; }           // 0.0001 sampling of generated convex hulls
 
     // Linkset implementation parameters
     public static float LinksetImplementation { get; private set; }
@@ -366,6 +401,8 @@ public static class BSParam
     //    v = value (appropriate type)
     private static ParameterDefnBase[] ParameterDefinitions =
     {
+        new ParameterDefn<bool>("Active", "If 'true', false then physics is not active",
+            false ),
         new ParameterDefn<bool>("UseSeparatePhysicsThread", "If 'true', the physics engine runs independent from the simulator heartbeat",
             false ),
         new ParameterDefn<float>("PhysicsTimeStep", "If separate thread, seconds to simulate each interval",
@@ -538,9 +575,11 @@ public static class BSParam
             (s,o) => { s.PE.SetContactProcessingThreshold(o.PhysBody, ContactProcessingThreshold); } ),
 
             new ParameterDefn<float>("TerrainImplementation", "Type of shape to use for terrain (0=heightmap, 1=mesh)",
-            (float)BSTerrainPhys.TerrainImplementation.Mesh ),
+            (float)BSTerrainPhys.TerrainImplementation.Heightmap ),
         new ParameterDefn<int>("TerrainMeshMagnification", "Number of times the 256x256 heightmap is multiplied to create the terrain mesh" ,
             2 ),
+        new ParameterDefn<float>("TerrainGroundPlane", "Altitude of ground plane used to keep things from falling to infinity" ,
+            -500.0f ),
         new ParameterDefn<float>("TerrainFriction", "Factor to reduce movement against terrain surface" ,
             0.3f ),
         new ParameterDefn<float>("TerrainHitFraction", "Distance to measure hit collisions" ,
@@ -550,8 +589,10 @@ public static class BSParam
         new ParameterDefn<float>("TerrainContactProcessingThreshold", "Distance from terrain to stop processing collisions" ,
             0.0f ),
         new ParameterDefn<float>("TerrainCollisionMargin", "Margin where collision checking starts" ,
-            0.08f ),
+            0.04f ),
 
+        new ParameterDefn<bool>("AvatarToAvatarCollisionsByDefault", "Should avatars collide with other avatars by default?",
+            true),
         new ParameterDefn<float>("AvatarFriction", "Factor to reduce movement against an avatar. Changed on avatar recreation.",
             0.2f ),
         new ParameterDefn<float>("AvatarStandingFriction", "Avatar friction when standing. Changed on avatar recreation.",
@@ -563,6 +604,8 @@ public static class BSParam
             3500f) ,    // 3.5 * 100
         new ParameterDefn<float>("AvatarRestitution", "Bouncyness. Changed on avatar recreation.",
             0f ),
+        new ParameterDefn<int>("AvatarShape", "Code for avatar physical shape: 0:capsule, 1:cube, 2:ovoid, 2:mesh",
+            BSShapeCollection.AvatarShapeCube ) ,
         new ParameterDefn<float>("AvatarCapsuleWidth", "The distance between the sides of the avatar capsule",
             0.6f ) ,
         new ParameterDefn<float>("AvatarCapsuleDepth", "The distance between the front and back of the avatar capsule",
@@ -570,11 +613,17 @@ public static class BSParam
         new ParameterDefn<float>("AvatarCapsuleHeight", "Default height of space around avatar",
             1.5f ),
         new ParameterDefn<float>("AvatarHeightLowFudge", "A fudge factor to make small avatars stand on the ground",
-            -0.2f ),
+            0f ),
         new ParameterDefn<float>("AvatarHeightMidFudge", "A fudge distance to adjust average sized avatars to be standing on ground",
-            0.1f ),
+            0f ),
         new ParameterDefn<float>("AvatarHeightHighFudge", "A fudge factor to make tall avatars stand on the ground",
-            0.1f ),
+            0f ),
+        new ParameterDefn<float>("AvatarFlyingGroundMargin", "Meters avatar is kept above the ground when flying",
+            5f ),
+        new ParameterDefn<float>("AvatarFlyingGroundUpForce", "Upward force applied to the avatar to keep it at flying ground margin",
+            2.0f ),
+        new ParameterDefn<float>("AvatarTerminalVelocity", "Terminal Velocity of falling avatar",
+            -54.0f ),
             new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions",
             0.1f ),
             new ParameterDefn<float>("AvatarStopZeroThreshold", "Movement velocity below which avatar is assumed to be stopped",
@@ -584,20 +633,28 @@ public static class BSParam
             new ParameterDefn<int>("AvatarJumpFrames", "Number of frames to allow jump forces. Changes jump height.",
             4 ),
             new ParameterDefn<float>("AvatarStepHeight", "Height of a step obstacle to consider step correction",
-            0.6f ) ,
+            0.999f ) ,
+            new ParameterDefn<float>("AvatarStepAngle", "The angle (in radians) for a vertical surface to be considered a step",
+            0.3f ) ,
+            new ParameterDefn<float>("AvatarStepGroundFudge", "Fudge factor subtracted from avatar base when comparing collision height",
+            0.1f ) ,
             new ParameterDefn<float>("AvatarStepApproachFactor", "Factor to control angle of approach to step (0=straight on)",
-            0.6f ),
+            2f ),
             new ParameterDefn<float>("AvatarStepForceFactor", "Controls the amount of force up applied to step up onto a step",
-            1.0f ),
+            0f ),
             new ParameterDefn<float>("AvatarStepUpCorrectionFactor", "Multiplied by height of step collision to create up movement at step",
-            1.0f ),
+            0.8f ),
             new ParameterDefn<int>("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs",
-            2 ),
+            1 ),
 
         new ParameterDefn<float>("VehicleMaxLinearVelocity", "Maximum velocity magnitude that can be assigned to a vehicle",
             1000.0f,
             (s) => { return (float)VehicleMaxLinearVelocity; },
             (s,v) => { VehicleMaxLinearVelocity = v; VehicleMaxLinearVelocitySquared = v * v; } ),
+        new ParameterDefn<float>("VehicleMinLinearVelocity", "Maximum velocity magnitude that can be assigned to a vehicle",
+            0.001f,
+            (s) => { return (float)VehicleMinLinearVelocity; },
+            (s,v) => { VehicleMinLinearVelocity = v; VehicleMinLinearVelocitySquared = v * v; } ),
         new ParameterDefn<float>("VehicleMaxAngularVelocity", "Maximum rotational velocity magnitude that can be assigned to a vehicle",
             12.0f,
             (s) => { return (float)VehicleMaxAngularVelocity; },
@@ -709,6 +766,33 @@ public static class BSParam
             new ParameterDefn<bool>("BHullShouldAdjustCollisionMargin", "Bullet impl: whether to shrink resulting hulls to account for collision margin",
             false ),
 
+            new ParameterDefn<float>("WhichHACD", "zero if Bullet HACD, non-zero says VHACD",
+            0f ),
+            new ParameterDefn<float>("VHACDresolution", "max number of voxels generated during voxelization stage",
+            100000f ),
+            new ParameterDefn<float>("VHACDdepth", "max number of clipping stages",
+            20f ),
+            new ParameterDefn<float>("VHACDconcavity", "maximum concavity",
+            0.0025f ),
+            new ParameterDefn<float>("VHACDplaneDownsampling", "granularity of search for best clipping plane",
+            4f ),
+            new ParameterDefn<float>("VHACDconvexHullDownsampling", "precision of hull gen process",
+            4f ),
+            new ParameterDefn<float>("VHACDalpha", "bias toward clipping along symmetry planes",
+            0.05f ),
+            new ParameterDefn<float>("VHACDbeta", "bias toward clipping along revolution axis",
+            0.05f ),
+            new ParameterDefn<float>("VHACDgamma", "max concavity when merging",
+            0.00125f ),
+            new ParameterDefn<float>("VHACDpca", "on/off normalizing mesh before decomp",
+            0f ),
+            new ParameterDefn<float>("VHACDmode", "0:voxel based, 1: tetrahedron based",
+            0f ),
+            new ParameterDefn<float>("VHACDmaxNumVerticesPerCH", "max triangles per convex hull",
+            64f ),
+            new ParameterDefn<float>("VHACDminVolumePerCH",     "sampling of generated convex hulls",
+            0.0001f ),
+
             new ParameterDefn<float>("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)",
             (float)BSLinkset.LinksetImplementation.Compound ),
             new ParameterDefn<bool>("LinksetOffsetCenterOfMass", "If 'true', compute linkset center-of-mass and offset linkset position to account for same",
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index f89b376..90da7a6 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -80,28 +80,27 @@ public abstract class BSPhysObject : PhysicsActor
         Name = name;    // PhysicsActor also has the name of the object. Someday consolidate.
         TypeName = typeName;
 
-        // The collection of things that push me around
-        PhysicalActors = new BSActorCollection(PhysScene);
+        // Oddity if object is destroyed and recreated very quickly it could still have the old body.
+        if (!PhysBody.HasPhysicalBody)
+            PhysBody = new BulletBody(localID);
 
-        // Initialize variables kept in base.
-        GravModifier = 1.0f;
-        Gravity = new OMV.Vector3(0f, 0f, BSParam.Gravity);
-        HoverActive = false;
-
-        // We don't have any physical representation yet.
-        PhysBody = new BulletBody(localID);
-        PhysShape = new BSShapeNull();
+        // Clean out anything that might be in the physical actor list.
+        // Again, a workaround for destroying and recreating an object very quickly.
+        PhysicalActors.Dispose();
 
         UserSetCenterOfMassDisplacement = null;
 
         PrimAssetState = PrimAssetCondition.Unknown;
 
+        // Initialize variables kept in base.
+        // Beware that these cause taints to be queued whch can cause race conditions on startup.
+        GravModifier = 1.0f;
+        Gravity = new OMV.Vector3(0f, 0f, BSParam.Gravity);
+        HoverActive = false;
+
         // Default material type. Also sets Friction, Restitution and Density.
         SetMaterial((int)MaterialAttributes.Material.Wood);
 
-        CollisionCollection = new CollisionEventUpdate();
-        CollisionsLastReported = CollisionCollection;
-        CollisionsLastTick = new CollisionEventUpdate();
         CollisionsLastTickStep = -1;
 
         SubscribedEventsMs = 0;
@@ -136,6 +135,15 @@ public abstract class BSPhysObject : PhysicsActor
     // This mostly prevents property updates and collisions until the object is completely here.
     public bool IsInitialized { get; protected set; }
 
+    // Set to 'true' if an object (mesh/linkset/sculpty) is not completely constructed.
+    // This test is used to prevent some updates to the object when it only partially exists.
+    // There are several reasons and object might be incomplete:
+    //     Its underlying mesh/sculpty is an asset which must be fetched from the asset store
+    //     It is a linkset who is being added to or removed from
+    //     It is changing state (static to physical, for instance) which requires rebuilding
+    // This is a computed value based on the underlying physical object construction
+    abstract public bool IsIncomplete { get; }
+
     // Return the object mass without calculating it or having side effects
     public abstract float RawMass { get; }
     // Set the raw mass but also update physical mass properties (inertia, ...)
@@ -148,9 +156,9 @@ public abstract class BSPhysObject : PhysicsActor
     public OMV.Vector3 Inertia { get; set; }
 
     // Reference to the physical body (btCollisionObject) of this object
-    public BulletBody PhysBody;
+    public BulletBody PhysBody = new BulletBody(0);
     // Reference to the physical shape (btCollisionShape) of this object
-    public BSShape PhysShape;
+    public BSShape PhysShape = new BSShapeNull();
 
     // The physical representation of the prim might require an asset fetch.
     // The asset state is first 'Unknown' then 'Waiting' then either 'Failed' or 'Fetched'.
@@ -159,6 +167,11 @@ public abstract class BSPhysObject : PhysicsActor
         Unknown, Waiting, FailedAssetFetch, FailedMeshing, Fetched
     }
     public PrimAssetCondition PrimAssetState { get; set; }
+    public virtual bool AssetFailed()
+    {
+        return ( (this.PrimAssetState == PrimAssetCondition.FailedAssetFetch)
+              || (this.PrimAssetState == PrimAssetCondition.FailedMeshing) );
+    }
 
     // The objects base shape information. Null if not a prim type shape.
     public PrimitiveBaseShape BaseShape { get; protected set; }
@@ -223,7 +236,7 @@ public abstract class BSPhysObject : PhysicsActor
     public virtual OMV.Quaternion RawOrientation { get; set; }
     public abstract OMV.Quaternion ForceOrientation { get; set; }
 
-    public OMV.Vector3 RawVelocity { get; set; }
+    public virtual OMV.Vector3 RawVelocity { get; set; }
     public abstract OMV.Vector3 ForceVelocity { get; set; }
 
     public OMV.Vector3 RawForce { get; set; }
@@ -241,7 +254,12 @@ public abstract class BSPhysObject : PhysicsActor
 
     public virtual bool ForceBodyShapeRebuild(bool inTaintTime) { return false; }
 
-    public override bool PIDActive { set { MoveToTargetActive = value; } }
+    public override bool PIDActive 
+    {
+        get { return MoveToTargetActive; }
+        set { MoveToTargetActive = value; } 
+    }
+
     public override OMV.Vector3 PIDTarget { set { MoveToTargetTarget = value; } }
     public override float PIDTau { set { MoveToTargetTau = value; } }
 
@@ -290,11 +308,20 @@ public abstract class BSPhysObject : PhysicsActor
     // Note this is a displacement from the root's coordinates. Zero means use the root prim as center-of-mass.
     public OMV.Vector3? UserSetCenterOfMassDisplacement { get; set; }
 
-    public OMV.Vector3 LockedLinearAxis { get; set; } // zero means locked. one means free.
-    public OMV.Vector3 LockedAngularAxis { get; set; } // zero means locked. one means free.
+    public OMV.Vector3 LockedLinearAxis;   // zero means locked. one means free.
+    public OMV.Vector3 LockedAngularAxis;  // zero means locked. one means free.
     public const float FreeAxis = 1f;
+    public const float LockedAxis = 0f;
     public readonly OMV.Vector3 LockedAxisFree = new OMV.Vector3(FreeAxis, FreeAxis, FreeAxis);  // All axis are free
 
+    // If an axis is locked (flagged above) then the limits of that axis are specified here.
+    // Linear axis limits are relative to the object's starting coordinates.
+    // Angular limits are limited to -PI to +PI
+    public OMV.Vector3 LockedLinearAxisLow;
+    public OMV.Vector3 LockedLinearAxisHigh;
+    public OMV.Vector3 LockedAngularAxisLow;
+    public OMV.Vector3 LockedAngularAxisHigh;
+
     // Enable physical actions. Bullet will keep sleeping non-moving physical objects so
     //     they need waking up when parameters are changed.
     // Called in taint-time!!
@@ -416,12 +443,12 @@ public abstract class BSPhysObject : PhysicsActor
     }
 
     // The collisions that have been collected for the next collision reporting (throttled by subscription)
-    protected CollisionEventUpdate CollisionCollection;
+    protected CollisionEventUpdate CollisionCollection = new CollisionEventUpdate();
     // This is the collision collection last reported to the Simulator.
-    public CollisionEventUpdate CollisionsLastReported;
+    public CollisionEventUpdate CollisionsLastReported = new CollisionEventUpdate();
     // Remember the collisions recorded in the last tick for fancy collision checking
     //     (like a BSCharacter walking up stairs).
-    public CollisionEventUpdate CollisionsLastTick;
+    public CollisionEventUpdate CollisionsLastTick = new CollisionEventUpdate();
     private long CollisionsLastTickStep = -1;
 
     // The simulation step is telling this object about a collision.
@@ -462,8 +489,11 @@ public abstract class BSPhysObject : PhysicsActor
 
         // If someone has subscribed for collision events log the collision so it will be reported up
         if (SubscribedEvents()) {
-            CollisionCollection.AddCollider(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth));
-            DetailLog("{0},{1}.Collison.AddCollider,call,with={2},point={3},normal={4},depth={5},colliderMoving={6}",
+            lock (PhysScene.CollisionLock)
+            {
+                CollisionCollection.AddCollider(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth));
+            }
+            DetailLog("{0},{1}.Collision.AddCollider,call,with={2},point={3},normal={4},depth={5},colliderMoving={6}",
                             LocalID, TypeName, collidingWith, contactPoint, contactNormal, pentrationDepth, ColliderIsMoving);
 
             ret = true;
@@ -474,12 +504,14 @@ public abstract class BSPhysObject : PhysicsActor
     // Send the collected collisions into the simulator.
     // Called at taint time from within the Step() function thus no locking problems
     //      with CollisionCollection and ObjectsWithNoMoreCollisions.
+    // Called with BSScene.CollisionLock locked to protect the collision lists.
     // Return 'true' if there were some actual collisions passed up
     public virtual bool SendCollisions()
     {
         bool ret = true;
 
-        // If the 'no collision' call, force it to happen right now so quick collision_end
+        // If no collisions this call but there were collisions last call, force the collision
+        //     event to be happen right now so quick collision_end.
         bool force = (CollisionCollection.Count == 0 && CollisionsLastReported.Count != 0);
 
         // throttle the collisions to the number of milliseconds specified in the subscription
@@ -562,7 +594,7 @@ public abstract class BSPhysObject : PhysicsActor
 
     #region Per Simulation Step actions
 
-    public BSActorCollection PhysicalActors;
+    public BSActorCollection PhysicalActors = new BSActorCollection();
 
     // When an update to the physical properties happens, this event is fired to let
     //    different actors to modify the update before it is passed around
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 15b7090..a00991f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -34,6 +34,7 @@ using OMV = OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
 using OpenSim.Region.Physics.ConvexDecompositionDotNet;
+using OpenSim.Region.OptionalModules.Scripting; // for ExtendedPhysics
 
 namespace OpenSim.Region.Physics.BulletSPlugin
 {
@@ -95,11 +96,9 @@ public class BSPrim : BSPhysObject
         _isPhysical = pisPhysical;
         _isVolumeDetect = false;
 
-        // Add a dynamic vehicle to our set of actors that can move this prim.
-        // PhysicalActors.Add(VehicleActorName, new BSDynamics(PhysScene, this, VehicleActorName));
-
         _mass = CalculateMass();
 
+        DetailLog("{0},BSPrim.constructor,pbs={1}", LocalID, BSScene.PrimitiveBaseShapeToString(pbs));
         // DetailLog("{0},BSPrim.constructor,call", LocalID);
         // do the actual object creation at taint time
         PhysScene.TaintedObject(LocalID, "BSPrim.create", delegate()
@@ -141,6 +140,18 @@ public class BSPrim : BSPhysObject
     public override bool Stopped {
         get { return false; }
     }
+
+    public override bool IsIncomplete {
+        get {
+            return ShapeRebuildScheduled;
+        }
+    }
+
+    // 'true' if this object's shape is in need of a rebuild and a rebuild has been queued.
+    // The prim is still available but its underlying shape will change soon.
+    // This is protected by a 'lock(this)'.
+    public bool ShapeRebuildScheduled { get; protected set; }
+
     public override OMV.Vector3 Size {
         get { return _size; }
         set {
@@ -155,17 +166,42 @@ public class BSPrim : BSPhysObject
     public override PrimitiveBaseShape Shape {
         set {
             BaseShape = value;
+            DetailLog("{0},BSPrim.changeShape,pbs={1}", LocalID, BSScene.PrimitiveBaseShapeToString(BaseShape));
             PrimAssetState = PrimAssetCondition.Unknown;
             ForceBodyShapeRebuild(false);
         }
     }
+    // Cause the body and shape of the prim to be rebuilt if necessary.
+    // If there are no changes required, this is quick and does not make changes to the prim.
+    // If rebuilding is necessary (like changing from static to physical), that will happen.
+    // The 'ShapeRebuildScheduled' tells any checker that the body/shape may change shortly.
+    // The return parameter is not used by anyone.
     public override bool ForceBodyShapeRebuild(bool inTaintTime)
     {
-        PhysScene.TaintedObject(inTaintTime, LocalID, "BSPrim.ForceBodyShapeRebuild", delegate()
+        if (inTaintTime)
         {
+            // If called in taint time, do the operation immediately
             _mass = CalculateMass();   // changing the shape changes the mass
             CreateGeomAndObject(true);
-        });
+        }
+        else
+        {
+            lock (this)
+            {
+                // If a rebuild is not already in the queue
+                if (!ShapeRebuildScheduled)
+                {
+                    // Remember that a rebuild is queued -- this is used to flag an incomplete object
+                    ShapeRebuildScheduled = true;
+                    PhysScene.TaintedObject(LocalID, "BSPrim.ForceBodyShapeRebuild", delegate()
+                    {
+                        _mass = CalculateMass();   // changing the shape changes the mass
+                        CreateGeomAndObject(true);
+                        ShapeRebuildScheduled = false;
+                    });
+                }
+            }
+        }
         return true;
     }
     public override bool Grabbed {
@@ -249,23 +285,21 @@ public class BSPrim : BSPhysObject
     {
         DetailLog("{0},BSPrim.LockAngularMotion,call,axis={1}", LocalID, axis);
 
-        // "1" means free, "0" means locked
-        OMV.Vector3 locking = LockedAxisFree;
-        if (axis.X != 1) locking.X = 0f;
-        if (axis.Y != 1) locking.Y = 0f;
-        if (axis.Z != 1) locking.Z = 0f;
-        LockedAngularAxis = locking;
-
-        EnableActor(LockedAngularAxis != LockedAxisFree, LockedAxisActorName, delegate()
+        ApplyAxisLimits(ExtendedPhysics.PHYS_AXIS_UNLOCK_ANGULAR, 0f, 0f);
+        if (axis.X != 1)
         {
-            return new BSActorLockAxis(PhysScene, this, LockedAxisActorName);
-        });
-
-        // Update parameters so the new actor's Refresh() action is called at the right time.
-        PhysScene.TaintedObject(LocalID, "BSPrim.LockAngularMotion", delegate()
+            ApplyAxisLimits(ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_X, 0f, 0f);
+        }
+        if (axis.Y != 1)
         {
-            UpdatePhysicalParameters();
-        });
+            ApplyAxisLimits(ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_Y, 0f, 0f);
+        }
+        if (axis.Z != 1)
+        {
+            ApplyAxisLimits(ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_Z, 0f, 0f);
+        }
+
+        InitializeAxisActor();
 
         return;
     }
@@ -376,18 +410,19 @@ public class BSPrim : BSPhysObject
     {
         bool ret = false;
 
-        uint wayOutThere = Constants.RegionSize * Constants.RegionSize;
+        int wayOverThere = -1000;
+        int wayOutThere = 10000;
         // There have been instances of objects getting thrown way out of bounds and crashing
         //    the border crossing code.
-        if (   RawPosition.X < -Constants.RegionSize || RawPosition.X > wayOutThere
-            || RawPosition.Y < -Constants.RegionSize || RawPosition.Y > wayOutThere
-            || RawPosition.Z < -Constants.RegionSize || RawPosition.Z > wayOutThere)
+        if (   RawPosition.X < wayOverThere || RawPosition.X > wayOutThere
+            || RawPosition.Y < wayOverThere || RawPosition.X > wayOutThere
+            || RawPosition.Z < wayOverThere || RawPosition.X > wayOutThere)
         {
             RawPosition = new OMV.Vector3(10, 10, 50);
             ZeroMotion(inTaintTime);
             ret = true;
         }
-        if (RawVelocity.LengthSquared() > BSParam.MaxLinearVelocity)
+        if (RawVelocity.LengthSquared() > BSParam.MaxLinearVelocitySquared)
         {
             RawVelocity = Util.ClampV(RawVelocity, BSParam.MaxLinearVelocity);
             ret = true;
@@ -496,6 +531,12 @@ public class BSPrim : BSPhysObject
             {
                 return new BSActorSetForce(PhysScene, this, SetForceActorName);
             });
+
+            // Call update so actor Refresh() is called to start things off
+            PhysScene.TaintedObject(LocalID, "BSPrim.setForce", delegate()
+            {
+                UpdatePhysicalParameters();
+            });
         }
     }
 
@@ -729,6 +770,12 @@ public class BSPrim : BSPhysObject
                 return new BSActorSetTorque(PhysScene, this, SetTorqueActorName);
             });
             DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, RawTorque);
+
+            // Call update so actor Refresh() is called to start things off
+            PhysScene.TaintedObject(LocalID, "BSPrim.setTorque", delegate()
+            {
+                UpdatePhysicalParameters();
+            });
         }
     }
     public override OMV.Vector3 Acceleration {
@@ -1086,13 +1133,27 @@ public class BSPrim : BSPhysObject
         }
     }
 
-    public override bool PIDActive {
-        set {
-            base.MoveToTargetActive = value;
+    public override bool PIDActive 
+    {
+        get
+        {
+            return MoveToTargetActive;
+        }
+
+        set 
+        {
+            MoveToTargetActive = value;
+
             EnableActor(MoveToTargetActive, MoveToTargetActorName, delegate()
             {
                 return new BSActorMoveToTarget(PhysScene, this, MoveToTargetActorName);
             });
+
+            // Call update so actor Refresh() is called to start things off
+            PhysScene.TaintedObject(LocalID, "BSPrim.PIDActive", delegate()
+            {
+                UpdatePhysicalParameters();
+            });
         }
     }
 
@@ -1119,6 +1180,12 @@ public class BSPrim : BSPhysObject
             {
                 return new BSActorHover(PhysScene, this, HoverActorName);
             });
+
+            // Call update so actor Refresh() is called to start things off
+            PhysScene.TaintedObject(LocalID, "BSPrim.PIDHoverActive", delegate()
+            {
+                UpdatePhysicalParameters();
+            });
         }
     }
 
@@ -1556,12 +1623,232 @@ public class BSPrim : BSPhysObject
         object ret = null;
         switch (pFunct)
         {
+            case ExtendedPhysics.PhysFunctAxisLockLimits:
+                ret = SetAxisLockLimitsExtension(pParams);
+                break;
             default:
                 ret = base.Extension(pFunct, pParams);
                 break;
         }
         return ret;
     }
+
+    private void InitializeAxisActor()
+    {
+        EnableActor(LockedAngularAxis != LockedAxisFree || LockedLinearAxis != LockedAxisFree,
+                                    LockedAxisActorName, delegate()
+        {
+            return new BSActorLockAxis(PhysScene, this, LockedAxisActorName);
+        });
+
+        // Update parameters so the new actor's Refresh() action is called at the right time.
+        PhysScene.TaintedObject(LocalID, "BSPrim.LockAxis", delegate()
+        {
+            UpdatePhysicalParameters();
+        });
+    }
+
+    // Passed an array of an array of parameters, set the axis locking.
+    // This expects an int (PHYS_AXIS_*) followed by none or two limit floats
+    //    followed by another int and floats, etc.
+    private object SetAxisLockLimitsExtension(object[] pParams)
+    {
+        DetailLog("{0} SetAxisLockLimitsExtension. parmlen={1}", LocalID, pParams.GetLength(0));
+        object ret = null;
+        try
+        {
+            if (pParams.GetLength(0) > 1)
+            {
+                int index = 2;
+                while (index < pParams.GetLength(0))
+                {
+                    var funct = pParams[index];
+                    DetailLog("{0} SetAxisLockLimitsExtension. op={1}, index={2}", LocalID, funct, index);
+                    if (funct is Int32 || funct is Int64)
+                    {
+                        switch ((int)funct)
+                        {
+                            // Those that take no parameters
+                            case ExtendedPhysics.PHYS_AXIS_LOCK_LINEAR:
+                            case ExtendedPhysics.PHYS_AXIS_LOCK_LINEAR_X:
+                            case ExtendedPhysics.PHYS_AXIS_LOCK_LINEAR_Y:
+                            case ExtendedPhysics.PHYS_AXIS_LOCK_LINEAR_Z:
+                            case ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR:
+                            case ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_X:
+                            case ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_Y:
+                            case ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_Z:
+                            case ExtendedPhysics.PHYS_AXIS_UNLOCK_LINEAR:
+                            case ExtendedPhysics.PHYS_AXIS_UNLOCK_LINEAR_X:
+                            case ExtendedPhysics.PHYS_AXIS_UNLOCK_LINEAR_Y:
+                            case ExtendedPhysics.PHYS_AXIS_UNLOCK_LINEAR_Z:
+                            case ExtendedPhysics.PHYS_AXIS_UNLOCK_ANGULAR:
+                            case ExtendedPhysics.PHYS_AXIS_UNLOCK_ANGULAR_X:
+                            case ExtendedPhysics.PHYS_AXIS_UNLOCK_ANGULAR_Y:
+                            case ExtendedPhysics.PHYS_AXIS_UNLOCK_ANGULAR_Z:
+                            case ExtendedPhysics.PHYS_AXIS_UNLOCK:
+                                ApplyAxisLimits((int)funct, 0f, 0f);
+                                index += 1;
+                                break;
+                            // Those that take two parameters (the limits)
+                            case ExtendedPhysics.PHYS_AXIS_LIMIT_LINEAR_X:
+                            case ExtendedPhysics.PHYS_AXIS_LIMIT_LINEAR_Y:
+                            case ExtendedPhysics.PHYS_AXIS_LIMIT_LINEAR_Z:
+                            case ExtendedPhysics.PHYS_AXIS_LIMIT_ANGULAR_X:
+                            case ExtendedPhysics.PHYS_AXIS_LIMIT_ANGULAR_Y:
+                            case ExtendedPhysics.PHYS_AXIS_LIMIT_ANGULAR_Z:
+                                ApplyAxisLimits((int)funct, (float)pParams[index + 1], (float)pParams[index + 2]);
+                                index += 3;
+                                break;
+                            default:
+                                m_log.WarnFormat("{0} SetSxisLockLimitsExtension. Unknown op={1}", LogHeader, funct);
+                                index += 1;
+                                break;
+                        }
+                    }
+                }
+                InitializeAxisActor();
+                ret = (object)index;
+            }
+        }
+        catch (Exception e)
+        {
+            m_log.WarnFormat("{0} SetSxisLockLimitsExtension exception in object {1}: {2}", LogHeader, this.Name, e);
+            ret = null;
+        }
+        return ret;    // not implemented yet
+    }
+
+        // Set the locking parameters.
+        // If an axis is locked, the limits for the axis are set to zero,
+        // If the axis is being constrained, the high and low value are passed and set.
+        // When done here, LockedXXXAxis flags are set and LockedXXXAxixLow/High are set to the range.
+    protected void ApplyAxisLimits(int funct, float low, float high)
+    {
+        DetailLog("{0} ApplyAxisLimits. op={1}, low={2}, high={3}", LocalID, funct, low, high);
+        float linearMax = 23000f;
+        float angularMax = (float)Math.PI;
+
+        switch (funct)
+        {
+            case ExtendedPhysics.PHYS_AXIS_LOCK_LINEAR:
+                this.LockedLinearAxis = new OMV.Vector3(LockedAxis, LockedAxis, LockedAxis);
+                this.LockedLinearAxisLow = OMV.Vector3.Zero;
+                this.LockedLinearAxisHigh = OMV.Vector3.Zero;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LOCK_LINEAR_X:
+                this.LockedLinearAxis.X = LockedAxis;
+                this.LockedLinearAxisLow.X = 0f;
+                this.LockedLinearAxisHigh.X = 0f;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LIMIT_LINEAR_X:
+                this.LockedLinearAxis.X = LockedAxis;
+                this.LockedLinearAxisLow.X = Util.Clip(low, -linearMax, linearMax);
+                this.LockedLinearAxisHigh.X = Util.Clip(high, -linearMax, linearMax);
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LOCK_LINEAR_Y:
+                this.LockedLinearAxis.Y = LockedAxis;
+                this.LockedLinearAxisLow.Y = 0f;
+                this.LockedLinearAxisHigh.Y = 0f;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LIMIT_LINEAR_Y:
+                this.LockedLinearAxis.Y = LockedAxis;
+                this.LockedLinearAxisLow.Y = Util.Clip(low, -linearMax, linearMax);
+                this.LockedLinearAxisHigh.Y = Util.Clip(high, -linearMax, linearMax);
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LOCK_LINEAR_Z:
+                this.LockedLinearAxis.Z = LockedAxis;
+                this.LockedLinearAxisLow.Z = 0f;
+                this.LockedLinearAxisHigh.Z = 0f;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LIMIT_LINEAR_Z:
+                this.LockedLinearAxis.Z = LockedAxis;
+                this.LockedLinearAxisLow.Z = Util.Clip(low, -linearMax, linearMax);
+                this.LockedLinearAxisHigh.Z = Util.Clip(high, -linearMax, linearMax);
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR:
+                this.LockedAngularAxis = new OMV.Vector3(LockedAxis, LockedAxis, LockedAxis);
+                this.LockedAngularAxisLow = OMV.Vector3.Zero;
+                this.LockedAngularAxisHigh = OMV.Vector3.Zero;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_X:
+                this.LockedAngularAxis.X = LockedAxis;
+                this.LockedAngularAxisLow.X = 0;
+                this.LockedAngularAxisHigh.X = 0;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LIMIT_ANGULAR_X:
+                this.LockedAngularAxis.X = LockedAxis;
+                this.LockedAngularAxisLow.X = Util.Clip(low, -angularMax, angularMax);
+                this.LockedAngularAxisHigh.X = Util.Clip(high, -angularMax, angularMax);
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_Y:
+                this.LockedAngularAxis.Y = LockedAxis;
+                this.LockedAngularAxisLow.Y = 0;
+                this.LockedAngularAxisHigh.Y = 0;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LIMIT_ANGULAR_Y:
+                this.LockedAngularAxis.Y = LockedAxis;
+                this.LockedAngularAxisLow.Y = Util.Clip(low, -angularMax, angularMax);
+                this.LockedAngularAxisHigh.Y = Util.Clip(high, -angularMax, angularMax);
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_Z:
+                this.LockedAngularAxis.Z = LockedAxis;
+                this.LockedAngularAxisLow.Z = 0;
+                this.LockedAngularAxisHigh.Z = 0;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_LIMIT_ANGULAR_Z:
+                this.LockedAngularAxis.Z = LockedAxis;
+                this.LockedAngularAxisLow.Z = Util.Clip(low, -angularMax, angularMax);
+                this.LockedAngularAxisHigh.Z = Util.Clip(high, -angularMax, angularMax);
+                break;
+            case ExtendedPhysics.PHYS_AXIS_UNLOCK_LINEAR:
+                this.LockedLinearAxis = LockedAxisFree;
+                this.LockedLinearAxisLow = new OMV.Vector3(-linearMax, -linearMax, -linearMax);
+                this.LockedLinearAxisHigh = new OMV.Vector3(linearMax, linearMax, linearMax);
+                break;
+            case ExtendedPhysics.PHYS_AXIS_UNLOCK_LINEAR_X:
+                this.LockedLinearAxis.X = FreeAxis;
+                this.LockedLinearAxisLow.X = -linearMax;
+                this.LockedLinearAxisHigh.X = linearMax;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_UNLOCK_LINEAR_Y:
+                this.LockedLinearAxis.Y = FreeAxis;
+                this.LockedLinearAxisLow.Y = -linearMax;
+                this.LockedLinearAxisHigh.Y = linearMax;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_UNLOCK_LINEAR_Z:
+                this.LockedLinearAxis.Z = FreeAxis;
+                this.LockedLinearAxisLow.Z = -linearMax;
+                this.LockedLinearAxisHigh.Z = linearMax;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_UNLOCK_ANGULAR:
+                this.LockedAngularAxis = LockedAxisFree;
+                this.LockedAngularAxisLow = new OMV.Vector3(-angularMax, -angularMax, -angularMax);
+                this.LockedAngularAxisHigh = new OMV.Vector3(angularMax, angularMax, angularMax);
+                break;
+            case ExtendedPhysics.PHYS_AXIS_UNLOCK_ANGULAR_X:
+                this.LockedAngularAxis.X = FreeAxis;
+                this.LockedAngularAxisLow.X = -angularMax;
+                this.LockedAngularAxisHigh.X = angularMax;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_UNLOCK_ANGULAR_Y:
+                this.LockedAngularAxis.Y = FreeAxis;
+                this.LockedAngularAxisLow.Y = -angularMax;
+                this.LockedAngularAxisHigh.Y = angularMax;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_UNLOCK_ANGULAR_Z:
+                this.LockedAngularAxis.Z = FreeAxis;
+                this.LockedAngularAxisLow.Z = -angularMax;
+                this.LockedAngularAxisHigh.Z = angularMax;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_UNLOCK:
+                ApplyAxisLimits(ExtendedPhysics.PHYS_AXIS_UNLOCK_LINEAR, 0f, 0f);
+                ApplyAxisLimits(ExtendedPhysics.PHYS_AXIS_UNLOCK_ANGULAR, 0f, 0f);
+                break;
+            default:
+                break;
+        }
+        return;
+    }
     #endregion  // Extension
 
     // The physics engine says that properties have updated. Update same and inform
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 126b146..430d645 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -42,7 +42,9 @@ public class BSPrimLinkable : BSPrimDisplaced
     //    operations necessary for keeping the linkset created and, additionally, this
     //    calls the linkset implementation for its creation and management.
 
+#pragma warning disable 414
     private static readonly string LogHeader = "[BULLETS PRIMLINKABLE]";
+#pragma warning restore 414
 
     // This adds the overrides for link() and delink() so the prim is linkable.
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index b3dfa41..8a19944 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -32,6 +32,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework;
 using OpenSim.Region.CoreModules;
 using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging;
@@ -75,7 +76,8 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
     // Keep track of all the avatars so we can send them a collision event
     //    every tick so OpenSim will update its animation.
-    private HashSet<BSPhysObject> m_avatars = new HashSet<BSPhysObject>();
+    private HashSet<BSPhysObject> AvatarsInScene = new HashSet<BSPhysObject>();
+    private Object AvatarsInSceneLock = new Object();
 
     // let my minuions use my logger
     public ILog Logger { get { return m_log; } }
@@ -88,7 +90,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     public BSConstraintCollection Constraints { get; private set; }
 
     // Simulation parameters
-    internal float m_physicsStepTime;   // if running independently, the interval simulated by default
+    //internal float m_physicsStepTime;   // if running independently, the interval simulated by default
 
     internal int m_maxSubSteps;
     internal float m_fixedTimeStep;
@@ -129,6 +131,11 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     internal int m_maxUpdatesPerFrame;
     internal EntityProperties[] m_updateArray;
 
+    /// <summary>
+    /// Used to control physics simulation timing if Bullet is running on its own thread.
+    /// </summary>
+    private ManualResetEvent m_updateWaitEvent;
+
     public const uint TERRAIN_ID = 0;       // OpenSim senses terrain with a localID of zero
     public const uint GROUNDPLANE_ID = 1;
     public const uint CHILDTERRAIN_ID = 2;  // Terrain allocated based on our mega-prim childre start here
@@ -208,8 +215,17 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         Name = EngineType + "/" + RegionName;
     }
 
+    // Old version of initialization that assumes legacy sized regions (256x256)
     public override void Initialise(IMesher meshmerizer, IConfigSource config)
     {
+        m_log.ErrorFormat("{0} WARNING WARNING WARNING! BulletSim initialized without region extent specification. Terrain will be messed up.");
+        Vector3 regionExtent = new Vector3( Constants.RegionSize, Constants.RegionSize, Constants.RegionSize);
+        Initialise(meshmerizer, config, regionExtent);
+        
+    }
+
+    public override void Initialise(IMesher meshmerizer, IConfigSource config, Vector3 regionExtent)
+    {
         mesher = meshmerizer;
         _taintOperations = new List<TaintCallbackEntry>();
         _postTaintOperations = new Dictionary<string, TaintCallbackEntry>();
@@ -226,6 +242,14 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         // Set default values for physics parameters plus any overrides from the ini file
         GetInitialParameterValues(config);
 
+        // Force some parameters to values depending on other configurations
+        // Only use heightmap terrain implementation if terrain larger than legacy size
+        if ((uint)regionExtent.X > Constants.RegionSize || (uint)regionExtent.Y > Constants.RegionSize)
+        {
+            m_log.WarnFormat("{0} Forcing terrain implementation to heightmap for large region", LogHeader);
+            BSParam.TerrainImplementation = (float)BSTerrainPhys.TerrainImplementation.Heightmap;
+        }
+
         // Get the connection to the physics engine (could be native or one of many DLLs)
         PE = SelectUnderlyingBulletEngine(BulletEngineName);
 
@@ -250,13 +274,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         //    a child in a mega-region.
         // Bullet actually doesn't care about the extents of the simulated
         //    area. It tracks active objects no matter where they are.
-        Vector3 worldExtent = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight);
+        Vector3 worldExtent = regionExtent;
 
         World = PE.Initialize(worldExtent, Params, m_maxCollisionsPerFrame, ref m_collisionArray, m_maxUpdatesPerFrame, ref m_updateArray);
 
         Constraints = new BSConstraintCollection(World);
 
-        TerrainManager = new BSTerrainManager(this);
+        TerrainManager = new BSTerrainManager(this, worldExtent);
         TerrainManager.CreateInitialGroundPlaneAndTerrain();
 
         // Put some informational messages into the log file.
@@ -269,9 +293,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         if (BSParam.UseSeparatePhysicsThread)
         {
             // The physics simulation should happen independently of the heartbeat loop
-            m_physicsThread = new Thread(BulletSPluginPhysicsThread);
-            m_physicsThread.Name = BulletEngineName;
-            m_physicsThread.Start();
+            m_physicsThread 
+                = WorkManager.StartThread(
+                    BulletSPluginPhysicsThread, 
+                    string.Format("{0} ({1})", BulletEngineName, RegionName), 
+                    ThreadPriority.Normal, 
+                    true, 
+                    true);
         }
     }
 
@@ -381,7 +409,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
         if (ret == null)
         {
-            m_log.ErrorFormat("{0) COULD NOT SELECT BULLET ENGINE: '[BulletSim]PhysicsEngine' must be either 'BulletUnmanaged-*' or 'BulletXNA-*'", LogHeader);
+            m_log.ErrorFormat("{0} COULD NOT SELECT BULLET ENGINE: '[BulletSim]PhysicsEngine' must be either 'BulletUnmanaged-*' or 'BulletXNA-*'", LogHeader);
         }
         else
         {
@@ -398,11 +426,14 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         // make sure no stepping happens while we're deleting stuff
         m_initialized = false;
 
-        foreach (KeyValuePair<uint, BSPhysObject> kvp in PhysObjects)
+        lock (PhysObjects)
         {
-            kvp.Value.Destroy();
+            foreach (KeyValuePair<uint, BSPhysObject> kvp in PhysObjects)
+            {
+                kvp.Value.Destroy();
+            }
+            PhysObjects.Clear();
         }
-        PhysObjects.Clear();
 
         // Now that the prims are all cleaned up, there should be no constraints left
         if (Constraints != null)
@@ -434,27 +465,27 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
     #region Prim and Avatar addition and removal
 
-    public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
+    public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
     {
         m_log.ErrorFormat("{0}: CALL TO AddAvatar in BSScene. NOT IMPLEMENTED", LogHeader);
         return null;
     }
 
-    public override PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, bool isFlying)
+    public override PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
     {
         // m_log.DebugFormat("{0}: AddAvatar: {1}", LogHeader, avName);
 
         if (!m_initialized) return null;
 
-        BSCharacter actor = new BSCharacter(localID, avName, this, position, size, isFlying);
+        BSCharacter actor = new BSCharacter(localID, avName, this, position, velocity, size, isFlying);
         lock (PhysObjects)
             PhysObjects.Add(localID, actor);
 
         // TODO: Remove kludge someday.
         // We must generate a collision for avatars whether they collide or not.
         // This is required by OpenSim to update avatar animations, etc.
-        lock (m_avatars)
-            m_avatars.Add(actor);
+        lock (AvatarsInSceneLock)
+            AvatarsInScene.Add(actor);
 
         return actor;
     }
@@ -473,8 +504,8 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                 lock (PhysObjects)
                     PhysObjects.Remove(bsactor.LocalID);
                 // Remove kludge someday
-                lock (m_avatars)
-                    m_avatars.Remove(bsactor);
+                lock (AvatarsInSceneLock)
+                    AvatarsInScene.Remove(bsactor);
             }
             catch (Exception e)
             {
@@ -622,15 +653,18 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         {
             if (collidersCount > 0)
             {
-                for (int ii = 0; ii < collidersCount; ii++)
+                lock (PhysObjects)
                 {
-                    uint cA = m_collisionArray[ii].aID;
-                    uint cB = m_collisionArray[ii].bID;
-                    Vector3 point = m_collisionArray[ii].point;
-                    Vector3 normal = m_collisionArray[ii].normal;
-                    float penetration = m_collisionArray[ii].penetration;
-                    SendCollision(cA, cB, point, normal, penetration);
-                    SendCollision(cB, cA, point, -normal, penetration);
+                    for (int ii = 0; ii < collidersCount; ii++)
+                    {
+                        uint cA = m_collisionArray[ii].aID;
+                        uint cB = m_collisionArray[ii].bID;
+                        Vector3 point = m_collisionArray[ii].point;
+                        Vector3 normal = m_collisionArray[ii].normal;
+                        float penetration = m_collisionArray[ii].penetration;
+                        SendCollision(cA, cB, point, normal, penetration);
+                        SendCollision(cB, cA, point, -normal, penetration);
+                    }
                 }
             }
         }
@@ -641,14 +675,17 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         {
             if (updatedEntityCount > 0)
             {
-                for (int ii = 0; ii < updatedEntityCount; ii++)
+                lock (PhysObjects)
                 {
-                    EntityProperties entprop = m_updateArray[ii];
-                    BSPhysObject pobj;
-                    if (PhysObjects.TryGetValue(entprop.ID, out pobj))
+                    for (int ii = 0; ii < updatedEntityCount; ii++)
                     {
-                        if (pobj.IsInitialized)
-                            pobj.UpdateProperties(entprop);
+                        EntityProperties entprop = m_updateArray[ii];
+                        BSPhysObject pobj;
+                        if (PhysObjects.TryGetValue(entprop.ID, out pobj))
+                        {
+                            if (pobj.IsInitialized)
+                                pobj.UpdateProperties(entprop);
+                        }
                     }
                 }
             }
@@ -682,7 +719,10 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     //    this is is under UpdateLock.
     public void PostUpdate(BSPhysObject updatee)
     {
-        ObjectsWithUpdates.Add(updatee);
+        lock (UpdateLock)
+        {
+            ObjectsWithUpdates.Add(updatee);
+        }
     }
 
     // The simulator thinks it is physics time so return all the collisions and position
@@ -710,9 +750,18 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
             // The simulator expects collisions for avatars even if there are have been no collisions.
             //    The event updates avatar animations and stuff.
             // If you fix avatar animation updates, remove this overhead and let normal collision processing happen.
-            foreach (BSPhysObject bsp in m_avatars)
-                if (!ObjectsWithCollisions.Contains(bsp))   // don't call avatars twice
-                    bsp.SendCollisions();
+            // Note that we get a copy of the list to search because SendCollision() can take a while.
+            HashSet<BSPhysObject> tempAvatarsInScene;
+            lock (AvatarsInSceneLock)
+            {
+                tempAvatarsInScene = new HashSet<BSPhysObject>(AvatarsInScene);
+            }
+            foreach (BSPhysObject actor in tempAvatarsInScene)
+            {
+                if (!ObjectsWithCollisions.Contains(actor))   // don't call avatars twice
+                    actor.SendCollisions();
+            }
+            tempAvatarsInScene = null;
 
             // Objects that are done colliding are removed from the ObjectsWithCollisions list.
             // Not done above because it is inside an iteration of ObjectWithCollisions.
@@ -762,6 +811,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         }
 
         BSPhysObject collider;
+        // NOTE that PhysObjects was locked before the call to SendCollision().
         if (!PhysObjects.TryGetValue(localID, out collider))
         {
             // If the object that is colliding cannot be found, just ignore the collision.
@@ -780,7 +830,10 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
             if (collider.Collide(collidingWith, collidee, collidePoint, collideNormal, penetration))
             {
                 // If a collision was 'good', remember to send it to the simulator
-                ObjectsWithCollisions.Add(collider);
+                lock (CollisionLock)
+                {
+                    ObjectsWithCollisions.Add(collider);
+                }
             }
         }
 
@@ -789,18 +842,25 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
     public void BulletSPluginPhysicsThread()
     {
+        Thread.CurrentThread.Priority = ThreadPriority.Highest;
+        m_updateWaitEvent = new ManualResetEvent(false);
+
         while (m_initialized)
         {
             int beginSimulationRealtimeMS = Util.EnvironmentTickCount();
-            DoPhysicsStep(BSParam.PhysicsTimeStep);
+
+            if (BSParam.Active)
+                DoPhysicsStep(BSParam.PhysicsTimeStep);
+
             int simulationRealtimeMS = Util.EnvironmentTickCountSubtract(beginSimulationRealtimeMS);
             int simulationTimeVsRealtimeDifferenceMS = ((int)(BSParam.PhysicsTimeStep*1000f)) - simulationRealtimeMS;
 
             if (simulationTimeVsRealtimeDifferenceMS > 0)
             {
                 // The simulation of the time interval took less than realtime.
-                // Do a sleep for the rest of realtime.
-                Thread.Sleep(simulationTimeVsRealtimeDifferenceMS);
+                // Do a wait for the rest of realtime.
+                 m_updateWaitEvent.WaitOne(simulationTimeVsRealtimeDifferenceMS);
+                //Thread.Sleep(simulationTimeVsRealtimeDifferenceMS);
             }
             else
             {
@@ -809,7 +869,11 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                 // TODO.
                 DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS);
             }
+
+            Watchdog.UpdateThread();
         }
+
+        Watchdog.RemoveThread();
     }
 
     #endregion // Simulation
@@ -882,6 +946,75 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     }
     #endregion // Extensions
 
+    public static string PrimitiveBaseShapeToString(PrimitiveBaseShape pbs)
+    {
+        float pathShearX = pbs.PathShearX < 128 ? (float)pbs.PathShearX * 0.01f : (float)(pbs.PathShearX - 256) * 0.01f;
+        float pathShearY = pbs.PathShearY < 128 ? (float)pbs.PathShearY * 0.01f : (float)(pbs.PathShearY - 256) * 0.01f;
+        float pathBegin = (float)pbs.PathBegin * 2.0e-5f;
+        float pathEnd = 1.0f - (float)pbs.PathEnd * 2.0e-5f;
+        float pathScaleX = (float)(200 - pbs.PathScaleX) * 0.01f;
+        float pathScaleY = (float)(200 - pbs.PathScaleY) * 0.01f;
+        float pathTaperX = pbs.PathTaperX * 0.01f;
+        float pathTaperY = pbs.PathTaperY * 0.01f;
+
+        float profileBegin = (float)pbs.ProfileBegin * 2.0e-5f;
+        float profileEnd = 1.0f - (float)pbs.ProfileEnd * 2.0e-5f;
+        float profileHollow = (float)pbs.ProfileHollow * 2.0e-5f;
+        if (profileHollow > 0.95f)
+            profileHollow = 0.95f;
+
+        StringBuilder buff = new StringBuilder();
+        buff.Append("shape=");
+        buff.Append(((ProfileShape)pbs.ProfileShape).ToString());
+        buff.Append(",");
+        buff.Append("hollow=");
+        buff.Append(((HollowShape)pbs.HollowShape).ToString());
+        buff.Append(",");
+        buff.Append("pathCurve=");
+        buff.Append(((Extrusion)pbs.PathCurve).ToString());
+        buff.Append(",");
+        buff.Append("profCurve=");
+        buff.Append(((Extrusion)pbs.ProfileCurve).ToString());
+        buff.Append(",");
+        buff.Append("profHollow=");
+        buff.Append(profileHollow.ToString());
+        buff.Append(",");
+        buff.Append("pathBegEnd=");
+        buff.Append(pathBegin.ToString());
+        buff.Append("/");
+        buff.Append(pathEnd.ToString());
+        buff.Append(",");
+        buff.Append("profileBegEnd=");
+        buff.Append(profileBegin.ToString());
+        buff.Append("/");
+        buff.Append(profileEnd.ToString());
+        buff.Append(",");
+        buff.Append("scaleXY=");
+        buff.Append(pathScaleX.ToString());
+        buff.Append("/");
+        buff.Append(pathScaleY.ToString());
+        buff.Append(",");
+        buff.Append("shearXY=");
+        buff.Append(pathShearX.ToString());
+        buff.Append("/");
+        buff.Append(pathShearY.ToString());
+        buff.Append(",");
+        buff.Append("taperXY=");
+        buff.Append(pbs.PathTaperX.ToString());
+        buff.Append("/");
+        buff.Append(pbs.PathTaperY.ToString());
+        buff.Append(",");
+        buff.Append("skew=");
+        buff.Append(pbs.PathSkew.ToString());
+        buff.Append(",");
+        buff.Append("twist/Beg=");
+        buff.Append(pbs.PathTwist.ToString());
+        buff.Append("/");
+        buff.Append(pbs.PathTwistBegin.ToString());
+
+        return buff.ToString();
+    }
+
     #region Taints
     // The simulation execution order is:
     // Simulate()
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 32bbc8f..d1de844 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -36,7 +36,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 {
 public sealed class BSShapeCollection : IDisposable
 {
+#pragma warning disable 414
     private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]";
+#pragma warning restore 414
 
     private BSScene m_physicsScene { get; set; }
 
@@ -124,6 +126,10 @@ public sealed class BSShapeCollection : IDisposable
     // Info in prim.BSShape is updated to the new shape.
     // Returns 'true' if the geometry was rebuilt.
     // Called at taint-time!
+    public const int AvatarShapeCapsule = 0;
+    public const int AvatarShapeCube = 1;
+    public const int AvatarShapeOvoid = 2;
+    public const int AvatarShapeMesh = 3;
     private bool CreateGeom(bool forceRebuild, BSPhysObject prim, PhysicalDestructionCallback shapeCallback)
     {
         bool ret = false;
@@ -137,10 +143,32 @@ public sealed class BSShapeCollection : IDisposable
         if (theChar != null)
         {
             DereferenceExistingShape(prim, shapeCallback);
-            prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
+            switch (BSParam.AvatarShape)
+            {
+                case AvatarShapeCapsule:
+                    prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
                                             BSPhysicsShapeType.SHAPE_CAPSULE, FixedShapeKey.KEY_CAPSULE);
-            ret = true;
-            haveShape = true;
+                    ret = true;
+                    haveShape = true;
+                    break;
+                case AvatarShapeCube:
+                    prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
+                                            BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_CAPSULE);
+                    ret = true;
+                    haveShape = true;
+                    break;
+                case AvatarShapeOvoid:
+                    // Saddly, Bullet doesn't scale spheres so this doesn't work as an avatar shape
+                    prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
+                                            BSPhysicsShapeType.SHAPE_SPHERE, FixedShapeKey.KEY_CAPSULE);
+                    ret = true;
+                    haveShape = true;
+                    break;
+                case AvatarShapeMesh:
+                    break;
+                default:
+                    break;
+            }
         }
 
         // If the prim attributes are simple, this could be a simple Bullet native shape
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index fe5ff6c..03a9ddc 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -38,6 +38,76 @@ using OMV = OpenMetaverse;
 
 namespace OpenSim.Region.Physics.BulletSPlugin
 {
+// Information class that holds stats for the shape. Which values mean
+//     something depends on the type of shape.
+// This information is used for debugging and stats and is not used
+//     for operational things.
+public class ShapeInfoInfo
+{
+    public int Vertices { get; set; }
+    private int m_hullCount;
+    private int[] m_verticesPerHull;
+    public ShapeInfoInfo()
+    {
+        Vertices = 0;
+        m_hullCount = 0;
+        m_verticesPerHull = null;
+    }
+    public int HullCount
+    {
+        set
+        {
+            m_hullCount = value;
+            m_verticesPerHull = new int[m_hullCount];
+            Array.Clear(m_verticesPerHull, 0, m_hullCount);
+        }
+        get { return m_hullCount; }
+    }
+    public void SetVerticesPerHull(int hullNum, int vertices)
+    {
+        if (m_verticesPerHull != null && hullNum < m_verticesPerHull.Length)
+        {
+            m_verticesPerHull[hullNum] = vertices;
+        }
+    }
+    public int GetVerticesPerHull(int hullNum)
+    {
+        if (m_verticesPerHull != null && hullNum < m_verticesPerHull.Length)
+        {
+            return m_verticesPerHull[hullNum];
+        }
+        return 0;
+    }
+    public override string ToString()
+    {
+        StringBuilder buff = new StringBuilder();
+        // buff.Append("ShapeInfo=<");
+        buff.Append("<");
+        if (Vertices > 0)
+        {
+            buff.Append("verts=");
+            buff.Append(Vertices.ToString());
+        }
+
+        if (Vertices > 0 && HullCount > 0) buff.Append(",");
+
+        if (HullCount > 0)
+        {
+            buff.Append("nHulls=");
+            buff.Append(HullCount.ToString());
+            buff.Append(",");
+            buff.Append("hullVerts=");
+            for (int ii = 0; ii < HullCount; ii++)
+            {
+                if (ii != 0) buff.Append(",");
+                buff.Append(GetVerticesPerHull(ii).ToString());
+            }
+        }
+        buff.Append(">");
+        return buff.ToString();
+    }
+}
+
 public abstract class BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE]";
@@ -45,18 +115,21 @@ public abstract class BSShape
     public int referenceCount { get; set; }
     public DateTime lastReferenced { get; set; }
     public BulletShape physShapeInfo { get; set; }
+    public ShapeInfoInfo shapeInfo { get; private set; }
 
     public BSShape()
     {
         referenceCount = 1;
         lastReferenced = DateTime.Now;
         physShapeInfo = new BulletShape();
+        shapeInfo = new ShapeInfoInfo();
     }
     public BSShape(BulletShape pShape)
     {
         referenceCount = 1;
         lastReferenced = DateTime.Now;
         physShapeInfo = pShape;
+        shapeInfo = new ShapeInfoInfo();
     }
 
     // Get another reference to this shape.
@@ -177,8 +250,7 @@ public abstract class BSShape
         {
             // If this mesh has an underlying asset and we have not failed getting it before, fetch the asset
             if (prim.BaseShape.SculptEntry
-                && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.FailedAssetFetch
-                && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.FailedMeshing
+                && !prim.AssetFailed()
                 && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Waiting
                 && prim.BaseShape.SculptTexture != OMV.UUID.Zero
                 )
@@ -189,50 +261,46 @@ public abstract class BSShape
                 prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Waiting;
 
                 BSPhysObject xprim = prim;
-                Util.FireAndForget(delegate
+                RequestAssetDelegate assetProvider = physicsScene.RequestAssetMethod;
+                if (assetProvider != null)
+                {
+                    BSPhysObject yprim = xprim; // probably not necessary, but, just in case.
+                    assetProvider(yprim.BaseShape.SculptTexture, delegate(AssetBase asset)
                     {
-                        // physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,inFireAndForget", xprim.LocalID);
-                        RequestAssetDelegate assetProvider = physicsScene.RequestAssetMethod;
-                        if (assetProvider != null)
+                        // physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,assetProviderCallback", xprim.LocalID);
+                        bool assetFound = false;
+                        string mismatchIDs = String.Empty;  // DEBUG DEBUG
+                        if (asset != null && yprim.BaseShape.SculptEntry)
                         {
-                            BSPhysObject yprim = xprim; // probably not necessary, but, just in case.
-                            assetProvider(yprim.BaseShape.SculptTexture, delegate(AssetBase asset)
+                            if (yprim.BaseShape.SculptTexture.ToString() == asset.ID)
                             {
-                                // physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,assetProviderCallback", xprim.LocalID);
-                                bool assetFound = false;
-                                string mismatchIDs = String.Empty;  // DEBUG DEBUG
-                                if (asset != null && yprim.BaseShape.SculptEntry)
-                                {
-                                    if (yprim.BaseShape.SculptTexture.ToString() == asset.ID)
-                                    {
-                                        yprim.BaseShape.SculptData = asset.Data;
-                                        // This will cause the prim to see that the filler shape is not the right
-                                        //    one and try again to build the object.
-                                        // No race condition with the normal shape setting since the rebuild is at taint time.
-                                        yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
-                                        yprim.ForceBodyShapeRebuild(false /* inTaintTime */);
-                                        assetFound = true;
-                                    }
-                                    else
-                                    {
-                                        mismatchIDs = yprim.BaseShape.SculptTexture.ToString() + "/" + asset.ID;
-                                    }
-                                }
-                                if (!assetFound)
-                                {
-                                    yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedAssetFetch;
-                                }
-                                physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
-                                            yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
-                            });
+                                yprim.BaseShape.SculptData = asset.Data;
+                                // This will cause the prim to see that the filler shape is not the right
+                                //    one and try again to build the object.
+                                // No race condition with the normal shape setting since the rebuild is at taint time.
+                                yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
+                                yprim.ForceBodyShapeRebuild(false /* inTaintTime */);
+                                assetFound = true;
+                            }
+                            else
+                            {
+                                mismatchIDs = yprim.BaseShape.SculptTexture.ToString() + "/" + asset.ID;
+                            }
                         }
-                        else
+                        if (!assetFound)
                         {
-                            xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedAssetFetch;
-                            physicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
-                                                        LogHeader, physicsScene.Name);
+                            yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedAssetFetch;
                         }
+                        physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
+                                    yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
                     });
+                }
+                else
+                {
+                    xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedAssetFetch;
+                    physicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
+                                                LogHeader, physicsScene.Name);
+                }
             }
             else
             {
@@ -288,6 +356,9 @@ public class BSShapeNull : BSShape
 }
 
 // ============================================================================================================
+// BSShapeNative is a wrapper for a Bullet 'native' shape -- cube and sphere.
+// They are odd in that they don't allocate meshes but are computated/procedural.
+// This means allocation and freeing is different than meshes.
 public class BSShapeNative : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE NATIVE]";
@@ -366,6 +437,7 @@ public class BSShapeNative : BSShape
 }
 
 // ============================================================================================================
+// BSShapeMesh is a simple mesh.
 public class BSShapeMesh : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE MESH]";
@@ -395,9 +467,7 @@ public class BSShapeMesh : BSShape
 
                 // Check to see if mesh was created (might require an asset).
                 newShape = VerifyMeshCreated(physicsScene, newShape, prim);
-                if (!newShape.isNativeShape
-                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedMeshing
-                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedAssetFetch)
+                if (!newShape.isNativeShape || prim.AssetFailed() )
                 {
                     // If a mesh was what was created, remember the built shape for later sharing.
                     // Also note that if meshing failed we put it in the mesh list as there is nothing else to do about the mesh.
@@ -464,7 +534,11 @@ public class BSShapeMesh : BSShape
                                             PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
     {
         return BSShapeMesh.CreatePhysicalMeshShape(physicsScene, prim, newMeshKey, pbs, size, lod,
-                            (w, iC, i, vC, v) => physicsScene.PE.CreateMeshShape(w, iC, i, vC, v) );
+                            (w, iC, i, vC, v) =>
+                            {
+                                shapeInfo.Vertices = vC;
+                                return physicsScene.PE.CreateMeshShape(w, iC, i, vC, v);
+                            });
     }
 
     // Code that uses the mesher to create the index/vertices info for a trimesh shape.
@@ -554,11 +628,18 @@ public class BSShapeMesh : BSShape
 }
 
 // ============================================================================================================
+// BSShapeHull is a physical shape representation htat is made up of many convex hulls.
+// The convex hulls are either supplied with the asset or are approximated by one of the
+//     convex hull creation routines (in OpenSim or in Bullet).
 public class BSShapeHull : BSShape
 {
+#pragma warning disable 414
     private static string LogHeader = "[BULLETSIM SHAPE HULL]";
+#pragma warning restore 414
+
     public static Dictionary<System.UInt64, BSShapeHull> Hulls = new Dictionary<System.UInt64, BSShapeHull>();
 
+
     public BSShapeHull(BulletShape pShape) : base(pShape)
     {
     }
@@ -583,9 +664,7 @@ public class BSShapeHull : BSShape
 
                 // Check to see if hull was created (might require an asset).
                 newShape = VerifyMeshCreated(physicsScene, newShape, prim);
-                if (!newShape.isNativeShape
-                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedMeshing
-                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedAssetFetch)
+                if (!newShape.isNativeShape || prim.AssetFailed())
                 {
                     // If a mesh was what was created, remember the built shape for later sharing.
                     Hulls.Add(newHullKey, retHull);
@@ -623,6 +702,7 @@ public class BSShapeHull : BSShape
             // TODO: schedule aging and destruction of unused meshes.
         }
     }
+
     List<ConvexResult> m_hulls;
     private BulletShape CreatePhysicalHull(BSScene physicsScene, BSPhysObject prim, System.UInt64 newHullKey,
                                             PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
@@ -655,6 +735,7 @@ public class BSShapeHull : BSShape
         if (allHulls != null && BSParam.ShouldUseAssetHulls)
         {
             int hullCount = allHulls.Count;
+            shapeInfo.HullCount = hullCount;
             int totalVertices = 1;      // include one for the count of the hulls
             // Using the structure described for HACD hulls, create the memory sturcture
             //     to pass the hull data to the creater.
@@ -667,6 +748,7 @@ public class BSShapeHull : BSShape
 
             convHulls[0] = (float)hullCount;
             int jj = 1;
+            int hullIndex = 0;
             foreach (List<OMV.Vector3> hullVerts in allHulls)
             {
                 convHulls[jj + 0] = hullVerts.Count;
@@ -681,6 +763,8 @@ public class BSShapeHull : BSShape
                     convHulls[jj + 2] = oneVert.Z;
                     jj += 3;
                 }
+                shapeInfo.SetVerticesPerHull(hullIndex, hullVerts.Count);
+                hullIndex++;
             }
 
             // create the hull data structure in Bullet
@@ -700,7 +784,7 @@ public class BSShapeHull : BSShape
 
             if (meshShape.physShapeInfo.HasPhysicalShape)
             {
-                HACDParams parms;
+                HACDParams parms = new HACDParams();
                 parms.maxVerticesPerHull = BSParam.BHullMaxVerticesPerHull;
                 parms.minClusters = BSParam.BHullMinClusters;
                 parms.compacityWeight = BSParam.BHullCompacityWeight;
@@ -710,12 +794,17 @@ public class BSShapeHull : BSShape
                 parms.addNeighboursDistPoints = BSParam.NumericBool(BSParam.BHullAddNeighboursDistPoints);
                 parms.addFacesPoints = BSParam.NumericBool(BSParam.BHullAddFacesPoints);
                 parms.shouldAdjustCollisionMargin = BSParam.NumericBool(BSParam.BHullShouldAdjustCollisionMargin);
+                parms.whichHACD = 0;    // Use the HACD routine that comes with Bullet
 
                 physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
                 newShape = physicsScene.PE.BuildHullShapeFromMesh(physicsScene.World, meshShape.physShapeInfo, parms);
                 physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,hullFromMesh,shape={1}", prim.LocalID, newShape);
 
                 // Now done with the mesh shape.
+                shapeInfo.HullCount = 1;
+                BSShapeMesh maybeMesh = meshShape as BSShapeMesh;
+                if (maybeMesh != null)
+                    shapeInfo.SetVerticesPerHull(0, maybeMesh.shapeInfo.Vertices);
                 meshShape.Dereference(physicsScene);
             }
             physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,bulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
@@ -865,6 +954,8 @@ public class BSShapeHull : BSShape
 }
 
 // ============================================================================================================
+// BSShapeCompound is a wrapper for the Bullet compound shape which is built from multiple, separate
+//    meshes. Used by BulletSim for complex shapes like linksets.
 public class BSShapeCompound : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE COMPOUND]";
@@ -993,6 +1084,11 @@ public class BSShapeCompound : BSShape
                                 BSShapeNative nativeShape = new BSShapeNative(pShape);
                                 nativeShape.Dereference(physicsScene);
                             }
+                            else
+                            {
+                                physicsScene.Logger.WarnFormat("{0} DereferenceAnonCollisionShape. Did not find shape. {1}",
+                                    LogHeader, pShape);
+                            }
                         }
                     }
                 }
@@ -1002,9 +1098,15 @@ public class BSShapeCompound : BSShape
 }
 
 // ============================================================================================================
+// BSShapeConvexHull is a wrapper for a Bullet single convex hull. A BSShapeHull contains multiple convex
+//     hull shapes. This is used for simple prims that are convex and thus can be made into a simple
+//     collision shape (a single hull). More complex physical shapes will be BSShapeHull's.
 public class BSShapeConvexHull : BSShape
 {
+#pragma warning disable 414
     private static string LogHeader = "[BULLETSIM SHAPE CONVEX HULL]";
+#pragma warning restore 414
+
     public static Dictionary<System.UInt64, BSShapeConvexHull> ConvexHulls = new Dictionary<System.UInt64, BSShapeConvexHull>();
 
     public BSShapeConvexHull(BulletShape pShape) : base(pShape)
@@ -1098,9 +1200,15 @@ public class BSShapeConvexHull : BSShape
     }
 }
 // ============================================================================================================
+// BSShapeGImpact is a wrapper for the Bullet GImpact shape which is a collision mesh shape that
+//     can handle concave as well as convex shapes. Much slower computationally but creates smoother
+//     shapes than multiple convex hull approximations.
 public class BSShapeGImpact : BSShape
 {
+#pragma warning disable 414
     private static string LogHeader = "[BULLETSIM SHAPE GIMPACT]";
+#pragma warning restore 414
+
     public static Dictionary<System.UInt64, BSShapeGImpact> GImpacts = new Dictionary<System.UInt64, BSShapeGImpact>();
 
     public BSShapeGImpact(BulletShape pShape) : base(pShape)
@@ -1130,9 +1238,7 @@ public class BSShapeGImpact : BSShape
                 // Check to see if mesh was created (might require an asset).
                 newShape = VerifyMeshCreated(physicsScene, newShape, prim);
                 newShape.shapeKey = newMeshKey;
-                if (!newShape.isNativeShape 
-                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedMeshing
-                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedAssetFetch)
+                if (!newShape.isNativeShape || prim.AssetFailed())
                 {
                     // If a mesh was what was created, remember the built shape for later sharing.
                     // Also note that if meshing failed we put it in the mesh list as there is nothing
@@ -1150,7 +1256,11 @@ public class BSShapeGImpact : BSShape
                                             PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
     {
         return BSShapeMesh.CreatePhysicalMeshShape(physicsScene, prim, newMeshKey, pbs, size, lod,
-                            (w, iC, i, vC, v) => physicsScene.PE.CreateGImpactShape(w, iC, i, vC, v) );
+                            (w, iC, i, vC, v) =>
+                            {
+                                shapeInfo.Vertices = vC;
+                                return physicsScene.PE.CreateGImpactShape(w, iC, i, vC, v);
+                            });
     }
 
     public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
@@ -1205,10 +1315,15 @@ public class BSShapeGImpact : BSShape
 }
 
 // ============================================================================================================
+// BSShapeAvatar is a specialized mesh shape for avatars.
 public class BSShapeAvatar : BSShape
 {
+#pragma warning disable 414
     private static string LogHeader = "[BULLETSIM SHAPE AVATAR]";
-    public BSShapeAvatar() : base()
+#pragma warning restore 414
+
+    public BSShapeAvatar()
+        : base()
     {
     }
     public static BSShape GetReference(BSPhysObject prim)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
index 8888d6d..d70b2fb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
@@ -58,7 +58,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
         {
             initialMap[ii] = BSTerrainManager.HEIGHT_INITIALIZATION;
         }
-        m_mapInfo = new BulletHMapInfo(id, initialMap);
+        m_mapInfo = new BulletHMapInfo(id, initialMap, regionSize.X, regionSize.Y);
         m_mapInfo.minCoords = minTerrainCoords;
         m_mapInfo.maxCoords = maxTerrainCoords;
         m_mapInfo.terrainRegionBase = TerrainBase;
@@ -72,7 +72,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
                                                     Vector3 minCoords, Vector3 maxCoords)
         : base(physicsScene, regionBase, id)
     {
-        m_mapInfo = new BulletHMapInfo(id, initialMap);
+        m_mapInfo = new BulletHMapInfo(id, initialMap, maxCoords.X - minCoords.X, maxCoords.Y - minCoords.Y);
         m_mapInfo.minCoords = minCoords;
         m_mapInfo.maxCoords = maxCoords;
         m_mapInfo.minZ = minCoords.Z;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index 441d2d3..50f917a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -111,9 +111,11 @@ public sealed class BSTerrainManager : IDisposable
     private Vector3 m_worldMax;
     private PhysicsScene MegaRegionParentPhysicsScene { get; set; }
 
-    public BSTerrainManager(BSScene physicsScene)
+    public BSTerrainManager(BSScene physicsScene, Vector3 regionSize)
     {
         m_physicsScene = physicsScene;
+        DefaultRegionSize = regionSize;
+
         m_terrains = new Dictionary<Vector3,BSTerrainPhys>();
 
         // Assume one region of default size
@@ -135,8 +137,9 @@ public sealed class BSTerrainManager : IDisposable
         DetailLog("{0},BSTerrainManager.CreateInitialGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, m_physicsScene.RegionName);
         // The ground plane is here to catch things that are trying to drop to negative infinity
         BulletShape groundPlaneShape = m_physicsScene.PE.CreateGroundPlaneShape(BSScene.GROUNDPLANE_ID, 1f, BSParam.TerrainCollisionMargin);
+        Vector3 groundPlaneAltitude = new Vector3(0f, 0f, BSParam.TerrainGroundPlane);
         m_groundPlane = m_physicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape,
-                                        BSScene.GROUNDPLANE_ID, Vector3.Zero, Quaternion.Identity);
+                                        BSScene.GROUNDPLANE_ID, groundPlaneAltitude, Quaternion.Identity);
 
         // Everything collides with the ground plane.
         m_groundPlane.collisionType = CollisionType.Groundplane;
@@ -237,9 +240,6 @@ public sealed class BSTerrainManager : IDisposable
     // Called during taint-time.
     private void UpdateTerrain(uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords)
     {
-        DetailLog("{0},BSTerrainManager.UpdateTerrain,call,id={1},minC={2},maxC={3}",
-                            BSScene.DetailLogZero, id, minCoords, maxCoords);
-
         // Find high and low points of passed heightmap.
         // The min and max passed in is usually the area objects can be in (maximum
         //     object height, for instance). The terrain wants the bounding box for the
@@ -259,6 +259,9 @@ public sealed class BSTerrainManager : IDisposable
         minCoords.Z = minZ;
         maxCoords.Z = maxZ;
 
+        DetailLog("{0},BSTerrainManager.UpdateTerrain,call,id={1},minC={2},maxC={3}",
+                            BSScene.DetailLogZero, id, minCoords, maxCoords);
+
         Vector3 terrainRegionBase = new Vector3(minCoords.X, minCoords.Y, 0f);
 
         lock (m_terrains)
@@ -267,8 +270,8 @@ public sealed class BSTerrainManager : IDisposable
             if (m_terrains.TryGetValue(terrainRegionBase, out terrainPhys))
             {
                 // There is already a terrain in this spot. Free the old and build the new.
-                DetailLog("{0},BSTErrainManager.UpdateTerrain:UpdateExisting,call,id={1},base={2},minC={3},maxC={4}",
-                                BSScene.DetailLogZero, id, terrainRegionBase, minCoords, minCoords);
+                DetailLog("{0},BSTerrainManager.UpdateTerrain:UpdateExisting,call,id={1},base={2},minC={3},maxC={4}",
+                                BSScene.DetailLogZero, id, terrainRegionBase, minCoords, maxCoords);
 
                 // Remove old terrain from the collection
                 m_terrains.Remove(terrainRegionBase);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
index 971ff9f..5932461 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -165,14 +165,15 @@ public class BulletConstraint
 //      than making copies.
 public class BulletHMapInfo
 {
-    public BulletHMapInfo(uint id, float[] hm) {
+    public BulletHMapInfo(uint id, float[] hm, float pSizeX, float pSizeY) {
         ID = id;
         heightMap = hm;
         terrainRegionBase = OMV.Vector3.Zero;
         minCoords = new OMV.Vector3(100f, 100f, 25f);
         maxCoords = new OMV.Vector3(101f, 101f, 26f);
         minZ = maxZ = 0f;
-        sizeX = sizeY = 256f;
+        sizeX = pSizeX;
+        sizeY = pSizeY;
     }
     public uint ID;
     public float[] heightMap;
@@ -189,6 +190,7 @@ public class BulletHMapInfo
 public enum CollisionType
 {
     Avatar,
+    PhantomToOthersAvatar, // An avatar that it phantom to other avatars but not to anything else
     Groundplane,
     Terrain,
     Static,
@@ -230,7 +232,12 @@ public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeM
     { CollisionType.Avatar,
                 new CollisionTypeFilterGroup(CollisionType.Avatar,
                                 (uint)CollisionFilterGroups.BCharacterGroup,
-                                (uint)CollisionFilterGroups.BAllGroup)
+                                (uint)(CollisionFilterGroups.BAllGroup))
+    },
+    { CollisionType.PhantomToOthersAvatar,
+        new CollisionTypeFilterGroup(CollisionType.PhantomToOthersAvatar,
+                                     (uint)CollisionFilterGroups.BCharacterGroup,
+                                     (uint)(CollisionFilterGroups.BAllGroup & ~CollisionFilterGroups.BCharacterGroup))
     },
     { CollisionType.Groundplane,
                 new CollisionTypeFilterGroup(CollisionType.Groundplane,
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs
index d069178..4f90eee 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs
index 28207a4..775bca2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs
@@ -28,15 +28,16 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 using Nini.Config;
 
 using OpenSim.Framework;
-using OpenSim.Region.Physics.BulletSPlugin;
+using OpenSim.Region.Physics.Manager;
 using OpenSim.Region.Physics.Meshing;
 
+using OpenMetaverse;
+
 namespace OpenSim.Region.Physics.BulletSPlugin.Tests
 {
 // Utility functions for building up and tearing down the sample physics environments
@@ -77,17 +78,21 @@ public static class BulletSimTestsUtil
             bulletSimConfig.Set("VehicleLoggingEnabled","True");
         }
 
-        BSPlugin bsPlugin = new BSPlugin();
+        PhysicsPluginManager physicsPluginManager;
+        physicsPluginManager = new PhysicsPluginManager();
+        physicsPluginManager.LoadPluginsFromAssemblies("Physics");
+
+        Vector3 regionExtent = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight);
+       
+        PhysicsScene pScene = physicsPluginManager.GetPhysicsScene(
+                        "BulletSim", "Meshmerizer", openSimINI, "BSTestRegion", regionExtent);
 
-        BSScene bsScene = (BSScene)bsPlugin.GetScene("BSTestRegion");
+        BSScene bsScene = pScene as BSScene;
 
         // Since the asset requestor is not initialized, any mesh or sculptie will be a cube.
         // In the future, add a fake asset fetcher to get meshes and sculpts.
         // bsScene.RequestAssetMethod = ???;
 
-        Meshing.Meshmerizer mesher = new Meshmerizer(openSimINI);
-        bsScene.Initialise(mesher, openSimINI);
-
         return bsScene;
     }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs
new file mode 100644
index 0000000..5a5de11
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs
@@ -0,0 +1,205 @@
+/*
+ * 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.Linq;
+using System.Text;
+
+using NUnit.Framework;
+using log4net;
+
+using OpenSim.Framework;
+using OpenSim.Region.Physics.BulletSPlugin;
+using OpenSim.Region.Physics.Manager;
+using OpenSim.Tests.Common;
+
+using OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin.Tests
+{
+[TestFixture]
+public class HullCreation : OpenSimTestCase
+{
+    // Documentation on attributes: http://www.nunit.org/index.php?p=attributes&r=2.6.1
+    // Documentation on assertions: http://www.nunit.org/index.php?p=assertions&r=2.6.1
+
+    BSScene PhysicsScene { get; set; }
+    Vector3 ObjectInitPosition;
+
+    [TestFixtureSetUp]
+    public void Init()
+    {
+
+    }
+
+    [TestFixtureTearDown]
+    public void TearDown()
+    {
+        if (PhysicsScene != null)
+        {
+            // The Dispose() will also free any physical objects in the scene
+            PhysicsScene.Dispose();
+            PhysicsScene = null;
+        }
+    }
+
+    [TestCase(7, 2, 5f, 5f, 32, 0f)]    /* default hull parameters */
+    public void GeomHullConvexDecomp( int maxDepthSplit,
+                                        int maxDepthSplitForSimpleShapes,
+                                        float concavityThresholdPercent,
+                                        float volumeConservationThresholdPercent,
+                                        int maxVertices,
+                                        float maxSkinWidth)
+    {
+        // Setup the physics engine to use the C# version of convex decomp
+        Dictionary<string, string> engineParams = new Dictionary<string, string>();
+        engineParams.Add("MeshSculptedPrim", "true"); // ShouldMeshSculptedPrim
+        engineParams.Add("ForceSimplePrimMeshing", "false"); // ShouldForceSimplePrimMeshing
+        engineParams.Add("UseHullsForPhysicalObjects", "true"); // ShouldUseHullsForPhysicalObjects
+        engineParams.Add("ShouldRemoveZeroWidthTriangles", "true");
+        engineParams.Add("ShouldUseBulletHACD", "false");
+        engineParams.Add("ShouldUseSingleConvexHullForPrims", "true");
+        engineParams.Add("ShouldUseGImpactShapeForPrims", "false");
+        engineParams.Add("ShouldUseAssetHulls", "true");
+
+        engineParams.Add("CSHullMaxDepthSplit", maxDepthSplit.ToString());
+        engineParams.Add("CSHullMaxDepthSplitForSimpleShapes", maxDepthSplitForSimpleShapes.ToString());
+        engineParams.Add("CSHullConcavityThresholdPercent", concavityThresholdPercent.ToString());
+        engineParams.Add("CSHullVolumeConservationThresholdPercent", volumeConservationThresholdPercent.ToString());
+        engineParams.Add("CSHullMaxVertices", maxVertices.ToString());
+        engineParams.Add("CSHullMaxSkinWidth", maxSkinWidth.ToString());
+
+        PhysicsScene = BulletSimTestsUtil.CreateBasicPhysicsEngine(engineParams);
+
+        PrimitiveBaseShape pbs;
+        Vector3 pos;
+        Vector3 size;
+        Quaternion rot;
+        bool isPhys;
+
+        // Cylinder
+        pbs = PrimitiveBaseShape.CreateCylinder();
+        pos = new Vector3(100.0f, 100.0f, 0f);
+        pos.Z = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos) + 10f;
+        ObjectInitPosition = pos;
+        size = new Vector3(2f, 2f, 2f);
+        pbs.Scale = size;
+        rot = Quaternion.Identity;
+        isPhys = true;
+        uint cylinderLocalID = 123;
+        PhysicsScene.AddPrimShape("testCylinder", pbs, pos, size, rot, isPhys, cylinderLocalID);
+        BSPrim primTypeCylinder = (BSPrim)PhysicsScene.PhysObjects[cylinderLocalID];
+
+        // Hollow Cylinder
+        pbs = PrimitiveBaseShape.CreateCylinder();
+        pbs.ProfileHollow = (ushort)(0.70f * 50000);
+        pos = new Vector3(110.0f, 110.0f, 0f);
+        pos.Z = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos) + 10f;
+        ObjectInitPosition = pos;
+        size = new Vector3(2f, 2f, 2f);
+        pbs.Scale = size;
+        rot = Quaternion.Identity;
+        isPhys = true;
+        uint hollowCylinderLocalID = 124;
+        PhysicsScene.AddPrimShape("testHollowCylinder", pbs, pos, size, rot, isPhys, hollowCylinderLocalID);
+        BSPrim primTypeHollowCylinder = (BSPrim)PhysicsScene.PhysObjects[hollowCylinderLocalID];
+
+        // Torus
+        // ProfileCurve = Circle, PathCurve = Curve1
+        pbs = PrimitiveBaseShape.CreateSphere();
+        pbs.ProfileShape = (byte)ProfileShape.Circle;
+        pbs.PathCurve = (byte)Extrusion.Curve1;
+        pbs.PathScaleX = 100;   // default hollow info as set in the viewer
+        pbs.PathScaleY = (int)(.25f / 0.01f) + 200;
+        pos = new Vector3(120.0f, 120.0f, 0f);
+        pos.Z = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos) + 10f;
+        ObjectInitPosition = pos;
+        size = new Vector3(2f, 4f, 4f);
+        pbs.Scale = size;
+        rot = Quaternion.Identity;
+        isPhys = true;
+        uint torusLocalID = 125;
+        PhysicsScene.AddPrimShape("testTorus", pbs, pos, size, rot, isPhys, torusLocalID);
+        BSPrim primTypeTorus = (BSPrim)PhysicsScene.PhysObjects[torusLocalID];
+        
+        // The actual prim shape creation happens at taint time
+        PhysicsScene.ProcessTaints();
+
+        // Check out the created hull shapes and report their characteristics
+        ReportShapeGeom(primTypeCylinder);
+        ReportShapeGeom(primTypeHollowCylinder);
+        ReportShapeGeom(primTypeTorus);
+    }
+
+    [TestCase]
+    public void GeomHullBulletHACD()
+    {
+        // Cylinder
+        // Hollow Cylinder
+        // Torus
+    }
+
+    private void ReportShapeGeom(BSPrim prim)
+    {
+        if (prim != null)
+        {
+            if (prim.PhysShape.HasPhysicalShape)
+            {
+                BSShape physShape = prim.PhysShape;
+                string shapeType = physShape.GetType().ToString();
+                switch (shapeType)
+                {
+                    case "OpenSim.Region.Physics.BulletSPlugin.BSShapeNative":
+                        BSShapeNative nShape = physShape as BSShapeNative;
+                        prim.PhysScene.DetailLog("{0}, type={1}", prim.Name, shapeType);
+                        break;
+                    case "OpenSim.Region.Physics.BulletSPlugin.BSShapeMesh":
+                        BSShapeMesh mShape = physShape as BSShapeMesh;
+                        prim.PhysScene.DetailLog("{0}, mesh, shapeInfo={1}", prim.Name, mShape.shapeInfo);
+                        break;
+                    case "OpenSim.Region.Physics.BulletSPlugin.BSShapeHull":
+                        // BSShapeHull hShape = physShape as BSShapeHull;
+                        // prim.PhysScene.DetailLog("{0}, hull, shapeInfo={1}", prim.Name, hShape.shapeInfo);
+                        break;
+                    case "OpenSim.Region.Physics.BulletSPlugin.BSShapeConvexHull":
+                        BSShapeConvexHull chShape = physShape as BSShapeConvexHull;
+                        prim.PhysScene.DetailLog("{0}, convexHull, shapeInfo={1}", prim.Name, chShape.shapeInfo);
+                        break;
+                    case "OpenSim.Region.Physics.BulletSPlugin.BSShapeCompound":
+                        BSShapeCompound cShape = physShape as BSShapeCompound;
+                        prim.PhysScene.DetailLog("{0}, type={1}", prim.Name, shapeType);
+                        break;
+                    default:
+                        prim.PhysScene.DetailLog("{0}, type={1}", prim.Name, shapeType);
+                        break;
+                }
+            }
+        }
+    }
+}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
index b8cf624..c5867b2 100644
--- a/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
index 10e850e..33f60e4 100644
--- a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.8.0.*")]
+[assembly : AssemblyVersion("0.8.2.*")]
diff --git a/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs b/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs
index 1ccf46d..b52f1f6 100644
--- a/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs
@@ -45,7 +45,8 @@ namespace OpenSim.Region.Physics.Manager
             // Does nothing right now
         }
 
-        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
+        public override PhysicsActor AddAvatar(
+            string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
         {
             m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position);
             return PhysicsActor.Null;
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 44bfd42..60f6480 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -386,7 +386,7 @@ namespace OpenSim.Region.Physics.Manager
 
         // Used for MoveTo
         public abstract Vector3 PIDTarget { set; }
-        public abstract bool  PIDActive { set;}
+        public abstract bool PIDActive { get; set; }
         public abstract float PIDTau { set; }
 
         // Used for llSetHoverHeight and maybe vehicle height
@@ -611,7 +611,13 @@ namespace OpenSim.Region.Physics.Manager
         }
 
         public override Vector3 PIDTarget { set { return; } }
-        public override bool PIDActive { set { return; } }
+
+        public override bool PIDActive 
+        {
+            get { return false; }
+            set { return; } 
+        }
+
         public override float PIDTau { set { return; } }
 
         public override float PIDHoverHeight { set { return; } }
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index d14edfd..ddbe80b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -180,7 +180,7 @@ namespace OpenSim.Region.Physics.Manager
                         {
                             if (!pluginType.IsAbstract)
                             {
-                                Type physTypeInterface = pluginType.GetInterface("IPhysicsPlugin", true);
+                                Type physTypeInterface = pluginType.GetInterface("IPhysicsPlugin");
 
                                 if (physTypeInterface != null)
                                 {
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Physics.Manager
                                     }
                                 }
 
-                                Type meshTypeInterface = pluginType.GetInterface("IMeshingPlugin", true);
+                                Type meshTypeInterface = pluginType.GetInterface("IMeshingPlugin");
 
                                 if (meshTypeInterface != null)
                                 {
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 4f4ff07..96ef0a6 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -148,26 +148,38 @@ namespace OpenSim.Region.Physics.Manager
         /// </summary>
         /// <param name="avName"></param>
         /// <param name="position"></param>
+        /// <param name="velocity"></param>
         /// <param name="size"></param>
         /// <param name="isFlying"></param>
         /// <returns></returns>
+<<<<<<< HEAD
+        public abstract PhysicsActor AddAvatar(
+            string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying);
+
+=======
         public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
         {
             return null;
         }
+>>>>>>> avn/ubitvar
         /// <summary>
         /// Add an avatar
         /// </summary>
         /// <param name="localID"></param>
         /// <param name="avName"></param>
         /// <param name="position"></param>
+        /// <param name="velocity"></param>
         /// <param name="size"></param>
         /// <param name="isFlying"></param>
         /// <returns></returns>
-        public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, bool isFlying)
+        public virtual PhysicsActor AddAvatar(
+            uint localID, string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
         {
-            PhysicsActor ret = AddAvatar(avName, position, size, isFlying);
-            if (ret != null) ret.LocalID = localID;
+            PhysicsActor ret = AddAvatar(avName, position, velocity, size, isFlying);
+
+            if (ret != null) 
+                ret.LocalID = localID;
+
             return ret;
         }
 
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index d67d4d2..ef6482a 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -84,7 +84,8 @@ namespace OpenSim.Region.Physics.Meshing
         private List<List<Vector3>> mConvexHulls = null;
         private List<Vector3> mBoundingHull = null;
 
-        private Dictionary<ulong, Mesh> m_uniqueMeshes = new Dictionary<ulong, Mesh>();
+        // Mesh cache. Static so it can be shared across instances of this class
+        private static Dictionary<ulong, Mesh> m_uniqueMeshes = new Dictionary<ulong, Mesh>();
 
         public Meshmerizer(IConfigSource config)
         {
@@ -937,8 +938,11 @@ namespace OpenSim.Region.Physics.Meshing
             if (shouldCache)
             {
                 key = primShape.GetMeshKey(size, lod);
-                if (m_uniqueMeshes.TryGetValue(key, out mesh))
-                    return mesh;
+                lock (m_uniqueMeshes)
+                {
+                    if (m_uniqueMeshes.TryGetValue(key, out mesh))
+                        return mesh;
+                }
             }
 
             if (size.X < 0.01f) size.X = 0.01f;
@@ -964,7 +968,10 @@ namespace OpenSim.Region.Physics.Meshing
 
                 if (shouldCache)
                 {
-                    m_uniqueMeshes.Add(key, mesh);
+                    lock (m_uniqueMeshes)
+                    {
+                        m_uniqueMeshes.Add(key, mesh);
+                    }
                 }
             }
 
diff --git a/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs
index 8542753..ec968c0 100644
--- a/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 43bef3c..9203169 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1251,8 +1251,12 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override Vector3 PIDTarget { set { return; } }
         public override bool PIDActive 
         { 
+<<<<<<< HEAD
+            get { return false; }
+=======
             // os version
             // get { return false; }
+>>>>>>> avn/ubitvar
             set { return; } 
         }
         public override float PIDTau { set { return; } }
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 218ccda..6363422 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -114,7 +114,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         private float m_PIDTau;
         private float PID_D = 35f;
         private float PID_G = 25f;
-        private bool m_usePID;
 
         // KF: These next 7 params apply to llSetHoverHeight(float height, integer water, float tau),
         // and are for non-VEHICLES only.
@@ -1731,7 +1730,7 @@ Console.WriteLine(" JointCreateFixed");
                     // gravityz multiplier = 1 - m_buoyancy
                     fz = _parent_scene.gravityz * (1.0f - m_buoyancy) * m_mass;
 
-                    if (m_usePID)
+                    if (PIDActive)
                     {
 //Console.WriteLine("PID " +  Name);
                         // KF - this is for object move? eg. llSetPos() ?
@@ -1803,7 +1802,7 @@ Console.WriteLine(" JointCreateFixed");
                     }        // end if (PIDActive)
 
                     // Hover PID Controller needs to be mutually exlusive to MoveTo PID controller
-                    if (m_useHoverPID && !m_usePID)
+                    if (m_useHoverPID && !PIDActive)
                     {
 //Console.WriteLine("Hover " +  Name);
                     
@@ -2875,7 +2874,7 @@ Console.WriteLine(" JointCreateFixed");
                         // it does make sense to do this for tiny little instabilities with physical prim, however 0.5m/frame is fairly large. 
                         // reducing this to 0.02m/frame seems to help the angular rubberbanding quite a bit, however, to make sure it doesn't affect elevators and vehicles
                         // adding these logical exclusion situations to maintain this where I think it was intended to be.
-                        if (m_throttleUpdates || m_usePID || (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE) || (Amotor != IntPtr.Zero)) 
+                        if (m_throttleUpdates || PIDActive || (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE) || (Amotor != IntPtr.Zero)) 
                         {
                             m_minvelocity = 0.5f;
                         }
@@ -2956,10 +2955,14 @@ Console.WriteLine(" JointCreateFixed");
                     m_log.WarnFormat("[PHYSICS]: Got NaN PIDTarget from Scene on Object {0}", Name);
             } 
         }
+<<<<<<< HEAD
+        public override bool PIDActive { get; set; }
+=======
         // os version
         //public override bool PIDActive {get { return m_usePID; } set { m_usePID = value; } }
         public override bool PIDActive { set { m_usePID = value; } }
 
+>>>>>>> avn/ubitvar
         public override float PIDTau { set { m_PIDTau = value; } }
 
         public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
@@ -3356,10 +3359,14 @@ Console.WriteLine(" JointCreateFixed");
                         RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod;
                         if (assetProvider != null)
                             assetProvider(_pbs.SculptTexture, MeshAssetReceived);
+<<<<<<< HEAD
+                    }, null, "ODEPrim.CheckMeshAsset");
+=======
                     // os version
                     //}, null, "ODEPrim.CheckMeshAsset");
                     // avn
                     });
+>>>>>>> avn/ubitvar
             }
         }
 
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 820e649..7f4a809 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -2020,6 +2020,13 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         #region Add/Remove Entities
 
+<<<<<<< HEAD
+        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
+        {                       
+            OdeCharacter newAv
+                = new OdeCharacter(
+                    avName, this, position, velocity, size, avPIDD, avPIDP,
+=======
 /*  core version
         public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
         {                       
@@ -2041,6 +2048,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             OdeCharacter newAv
                 = new OdeCharacter(
                     avName, this, position, Vector3.Zero, size, avPIDD, avPIDP,
+>>>>>>> avn/ubitvar
                     avCapRadius, avStandupTensor, avDensity,
                     avMovementDivisorWalk, avMovementDivisorRun);
 
diff --git a/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs
index 83be103..fc1ffba 100644
--- a/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.8.0.*")]
+[assembly : AssemblyVersion("0.8.2.*")]
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
index ae534ea..40ab984 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
@@ -273,9 +273,10 @@ namespace OpenSim.Region.Physics.POSPlugin
             set { return; }
         }
 
-        public override bool PIDActive
-        {
-            set { return; }
+        public override bool PIDActive 
+        { 
+            get { return false; }
+            set { return; } 
         }
 
         public override float PIDTau
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
index 2ea8bfc..782ba82 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
@@ -270,6 +270,7 @@ namespace OpenSim.Region.Physics.POSPlugin
 
         public override bool PIDActive
         {
+            get { return false; }
             set { return; }
         }
 
diff --git a/OpenSim/Region/Physics/POSPlugin/POSScene.cs b/OpenSim/Region/Physics/POSPlugin/POSScene.cs
index d30d482..080c6ab 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSScene.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSScene.cs
@@ -58,7 +58,8 @@ namespace OpenSim.Region.Physics.POSPlugin
         {
         }
 
-        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
+        public override PhysicsActor AddAvatar(
+            string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
         {
             POSCharacter act = new POSCharacter();
             act.Position = position;
diff --git a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
index c341dfd..11b89d2 100644
--- a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Mono.Addins;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -29,5 +30,7 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
+[assembly: Addin("OpenSim.RegionModules.RegionCombinerModule", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 341c8f8..0fe3ab0 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -41,9 +41,11 @@ using Mono.Addins;
 
 namespace OpenSim.Region.RegionCombinerModule
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionCombinerModule")]
     public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static string LogHeader = "[REGION COMBINER MODULE]";
 
         public string Name
         {
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
index 40ed3fd..ddfe3e0 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
@@ -34,7 +34,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.RegionCombinerModule
 {
- public class RegionCombinerPermissionModule
+    public class RegionCombinerPermissionModule
     {
         private Scene m_rootScene;
 
diff --git a/OpenSim/Region/RegionCombinerModule/RegionData.cs b/OpenSim/Region/RegionCombinerModule/RegionData.cs
index bd0e398..42fca9f 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionData.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionData.cs
@@ -34,6 +34,7 @@ namespace OpenSim.Region.RegionCombinerModule
     {
         public UUID RegionId;
         public Scene RegionScene;
+        // Offset of this region from the base of the root region.
         public Vector3 Offset;
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
deleted file mode 100644
index 13cb8b6..0000000
--- a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Addin id="OpenSim.RegionModules.RegionCombinerModule" version="0.3">
-    <Runtime>
-        <Import assembly="OpenSim.Region.RegionCombinerModule.dll"/>
-    </Runtime>
-
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-
-    <Extension path = "/OpenSim/RegionModules">
-        <RegionModule id="RegionCombinerModule" type="OpenSim.Region.RegionCombinerModule.RegionCombinerModule" />
-    </Extension>
-
-</Addin>
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
index e4ca635..a7fa502 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
@@ -34,7 +34,36 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
 {
     public interface ICompiler
     {
-        void PerformScriptCompile(string source, string asset, UUID ownerID, out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap);
+        /// <summary>
+        /// Performs the script compile.
+        /// </summary>
+        /// <param name="Script"></param>
+        /// <param name="asset"></param>
+        /// <param name="ownerUUID"></param>
+        /// <param name="alwaysRecompile">
+        /// If set to true then always recompile the script, even if we have a DLL already cached.
+        /// </param>
+        /// <param name="assembly"></param>
+        /// <param name="linemap"></param>
+        void PerformScriptCompile(
+            string source, string asset, UUID ownerID, 
+            out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap);
+
+        /// <summary>
+        /// Performs the script compile.
+        /// </summary>
+        /// <param name="Script"></param>
+        /// <param name="asset"></param>
+        /// <param name="ownerUUID"></param>
+        /// <param name="alwaysRecompile">
+        /// If set to true then always recompile the script, even if we have a DLL already cached.
+        /// </param>
+        /// <param name="assembly"></param>
+        /// <param name="linemap"></param>
+        void PerformScriptCompile(
+            string source, string asset, UUID ownerID, bool alwaysRecompile,
+            out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap);
+
         string[] GetWarnings();
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
index 30e99b0..b9970bf 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
@@ -46,6 +46,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// <param name='item'>/param>
         /// <param name='coopSleepHandle'>/param>
         void Initialize(
-            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle);
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item);
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
index b8fdd01..6355669 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
@@ -110,5 +110,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         ParameterInfo[] ScriptBaseClassParameters { get; }
 
         IScriptApi GetApi(UUID itemID, string name);
+
+        void SleepScript(UUID itemID, int delay);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index b9a217b..e4297c4 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
+using System.Diagnostics;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
@@ -93,24 +94,30 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         bool ShuttingDown { get; set; }
 
         /// <summary>
+        /// When stopping the script: should it remain stopped permanently (i.e., save !Running in its state)?
+        /// </summary>
+        bool StayStopped { get; set; }
+
+        /// <summary>
         /// Script state
         /// </summary>
         string State { get; set; }
 
         /// <summary>
-        /// Time the script was last started
+        /// If true then the engine is responsible for persisted state.  If false then some other component may 
+        /// persist state (e.g. attachments persisting in assets).
         /// </summary>
-        DateTime TimeStarted { get; }
+        bool StatePersistedHere { get; }
 
         /// <summary>
-        /// Tick the last measurement period was started.
+        /// Time the script was last started
         /// </summary>
-        long MeasurementPeriodTickStart { get; }
+        DateTime TimeStarted { get; }
 
         /// <summary>
-        /// Ticks spent executing in the last measurement period.
+        /// Collects information about how long the script was executed.
         /// </summary>
-        long MeasurementPeriodExecutionTime { get; }
+        MetricsCollectorTime ExecutionTime { get; }
 
         /// <summary>
         /// Scene part in which this script instance is contained.
@@ -157,6 +164,9 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         void ClearQueue();
         int StartParam { get; set; }
 
+        WaitHandle CoopWaitHandle { get; }
+        Stopwatch ExecutionTimer { get; }
+
         void RemoveState();
 
         void Init();
@@ -172,8 +182,9 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// <param name="timeout"></param>
         /// How many milliseconds we will wait for an existing script event to finish before
         /// forcibly aborting that event.
+        /// <param name="clearEventQueue">If true then the event queue is also cleared</param>
         /// <returns>true if the script was successfully stopped, false otherwise</returns>
-        bool Stop(int timeout);
+        bool Stop(int timeout, bool clearEventQueue = false);
 
         void SetState(string state);
 
@@ -222,7 +233,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         void SetVars(Dictionary<string, object> vars);
         DetectParams GetDetectParams(int idx);
         UUID GetDetectID(int idx);
-        void SaveState(string assembly);
+        void SaveState();
         void DestroyScriptInstance();
 
         IScriptApi GetApi(string name);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 1e19032..df1bd8b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -182,7 +182,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 // Start the thread that will be doing the work
                 cmdHandlerThread
-                    = Watchdog.StartThread(
+                    = WorkManager.StartThread(
                         CmdHandlerThreadLoop, "AsyncLSLCmdHandlerThread", ThreadPriority.Normal, true, true);
             }
         }
@@ -301,6 +301,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
+        public static void StateChange(IScriptEngine engine, uint localID, UUID itemID)
+        {
+            // Remove a specific script
+
+            // Remove dataserver events
+            m_Dataserver[engine].RemoveEvents(localID, itemID);
+
+            IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
+            if (comms != null)
+                comms.DeleteListener(itemID);
+
+            IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>();
+            if (xmlrpc != null)
+            {
+                xmlrpc.DeleteChannels(itemID);
+                xmlrpc.CancelSRDRequests(itemID);
+            }
+            // Remove Sensors
+            m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID);
+
+        }
+
         /// <summary>
         /// Get the sensor repeat plugin for this script engine.
         /// </summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b5ba4a0..f637a1d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -28,7 +28,13 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+<<<<<<< HEAD
+using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Imaging;
+=======
 using System.Diagnostics; //for [DebuggerNonUserCode]
+>>>>>>> avn/ubitvar
 using System.Runtime.Remoting.Lifetime;
 using System.Text;
 using System.Threading;
@@ -37,8 +43,13 @@ using System.Timers;
 using Nini.Config;
 using log4net;
 using OpenMetaverse;
+<<<<<<< HEAD
+using OpenMetaverse.Assets;
+=======
 using OpenMetaverse.StructuredData;
+>>>>>>> avn/ubitvar
 using OpenMetaverse.Packets;
+using OpenMetaverse.Rendering;
 using OpenSim;
 using OpenSim.Framework;
 
@@ -92,6 +103,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        public int LlRequestAgentDataCacheTimeoutMs { get; set; }
+
         protected IScriptEngine m_ScriptEngine;
         protected SceneObjectPart m_host;
 
@@ -99,14 +112,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// Used for script sleeps when we are using co-operative script termination.
         /// </summary>
         /// <remarks>null if co-operative script termination is not active</remarks>
-        WaitHandle m_coopSleepHandle;
-
         /// <summary>
         /// The item that hosts this script
         /// </summary>
         protected TaskInventoryItem m_item;
 
-        protected bool throwErrorOnNotImplemented = true;
+        protected bool throwErrorOnNotImplemented = false;
         protected AsyncCommandManager AsyncCommands = null;
         protected float m_ScriptDelayFactor = 1.0f;
         protected float m_ScriptDistanceFactor = 1.0f;
@@ -122,6 +133,128 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected bool m_scriptConsoleChannelEnabled = false;
         protected bool m_debuggerSafe = false;
         protected IUrlModule m_UrlModule = null;
+<<<<<<< HEAD
+        protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>();
+        protected int EMAIL_PAUSE_TIME = 20;  // documented delay value for smtp.
+        protected int m_sleepMsOnSetTexture = 200;
+        protected int m_sleepMsOnSetLinkTexture = 200;
+        protected int m_sleepMsOnScaleTexture = 200;
+        protected int m_sleepMsOnOffsetTexture = 200;
+        protected int m_sleepMsOnRotateTexture = 200;
+        protected int m_sleepMsOnSetPos = 200;
+        protected int m_sleepMsOnSetRot = 200;
+        protected int m_sleepMsOnSetLocalRot = 200;
+        protected int m_sleepMsOnPreloadSound = 1000;
+        protected int m_sleepMsOnMakeExplosion = 100;
+        protected int m_sleepMsOnMakeFountain = 100;
+        protected int m_sleepMsOnMakeSmoke = 100;
+        protected int m_sleepMsOnMakeFire = 100;
+        protected int m_sleepMsOnRezAtRoot = 100;
+        protected int m_sleepMsOnInstantMessage = 2000;
+        protected int m_sleepMsOnEmail = 20000;
+        protected int m_sleepMsOnCreateLink = 1000;
+        protected int m_sleepMsOnGiveInventory = 3000;
+        protected int m_sleepMsOnRequestAgentData = 100;
+        protected int m_sleepMsOnRequestInventoryData = 1000;
+        protected int m_sleepMsOnSetDamage = 5000;
+        protected int m_sleepMsOnTextBox = 1000;
+        protected int m_sleepMsOnAdjustSoundVolume = 100;
+        protected int m_sleepMsOnEjectFromLand = 5000;
+        protected int m_sleepMsOnAddToLandPassList = 100;
+        protected int m_sleepMsOnDialog = 1000;
+        protected int m_sleepMsOnRemoteLoadScript = 3000;
+        protected int m_sleepMsOnRemoteLoadScriptPin = 3000;
+        protected int m_sleepMsOnOpenRemoteDataChannel = 1000;
+        protected int m_sleepMsOnSendRemoteData = 3000;
+        protected int m_sleepMsOnRemoteDataReply = 3000;
+        protected int m_sleepMsOnCloseRemoteDataChannel = 1000;
+        protected int m_sleepMsOnSetPrimitiveParams = 200;
+        protected int m_sleepMsOnSetLinkPrimitiveParams = 200;
+        protected int m_sleepMsOnXorBase64Strings = 300;
+        protected int m_sleepMsOnSetParcelMusicURL = 2000;
+        protected int m_sleepMsOnGetPrimMediaParams = 1000;
+        protected int m_sleepMsOnGetLinkMedia = 1000;
+        protected int m_sleepMsOnSetPrimMediaParams = 1000;
+        protected int m_sleepMsOnSetLinkMedia = 1000;
+        protected int m_sleepMsOnClearPrimMedia = 1000;
+        protected int m_sleepMsOnClearLinkMedia = 1000;
+        protected int m_sleepMsOnRequestSimulatorData = 1000;
+        protected int m_sleepMsOnLoadURL = 10000;
+        protected int m_sleepMsOnParcelMediaCommandList = 2000;
+        protected int m_sleepMsOnParcelMediaQuery = 2000;
+        protected int m_sleepMsOnModPow = 1000;
+        protected int m_sleepMsOnSetPrimURL = 2000;
+        protected int m_sleepMsOnRefreshPrimURL = 20000;
+        protected int m_sleepMsOnMapDestination = 1000;
+        protected int m_sleepMsOnAddToLandBanList = 100;
+        protected int m_sleepMsOnRemoveFromLandPassList = 100;
+        protected int m_sleepMsOnRemoveFromLandBanList = 100;
+        protected int m_sleepMsOnResetLandBanList = 100;
+        protected int m_sleepMsOnResetLandPassList = 100;
+        protected int m_sleepMsOnGetParcelPrimOwners = 2000;
+        protected int m_sleepMsOnGetNumberOfNotecardLines = 100;
+        protected int m_sleepMsOnGetNotecardLine = 100;
+        protected string m_internalObjectHost = "lsl.opensim.local";
+        protected bool m_restrictEmail = false;
+        protected ISoundModule m_SoundModule = null;
+
+        protected float m_avatarHeightCorrection = 0.2f;
+        protected bool m_useSimpleBoxesInGetBoundingBox = false;
+        protected bool m_addStatsInGetBoundingBox = false;
+
+        //LSL Avatar Bounding Box (lABB), lower (1) and upper (2),
+        //standing (Std), Groundsitting (Grs), Sitting (Sit),
+        //along X, Y and Z axes, constants (0) and coefficients (1)
+        protected float m_lABB1StdX0 = -0.275f;
+        protected float m_lABB2StdX0 = 0.275f;
+        protected float m_lABB1StdY0 = -0.35f;
+        protected float m_lABB2StdY0 = 0.35f;
+        protected float m_lABB1StdZ0 = -0.1f;
+        protected float m_lABB1StdZ1 = -0.5f;
+        protected float m_lABB2StdZ0 = 0.1f;
+        protected float m_lABB2StdZ1 = 0.5f;
+        protected float m_lABB1GrsX0 = -0.3875f;
+        protected float m_lABB2GrsX0 = 0.3875f;
+        protected float m_lABB1GrsY0 = -0.5f;
+        protected float m_lABB2GrsY0 = 0.5f;
+        protected float m_lABB1GrsZ0 = -0.05f;
+        protected float m_lABB1GrsZ1 = -0.375f;
+        protected float m_lABB2GrsZ0 = 0.5f;
+        protected float m_lABB2GrsZ1 = 0.0f;
+        protected float m_lABB1SitX0 = -0.5875f;
+        protected float m_lABB2SitX0 = 0.1875f;
+        protected float m_lABB1SitY0 = -0.35f;
+        protected float m_lABB2SitY0 = 0.35f;
+        protected float m_lABB1SitZ0 = -0.35f;
+        protected float m_lABB1SitZ1 = -0.375f;
+        protected float m_lABB2SitZ0 = -0.25f;
+        protected float m_lABB2SitZ1 = 0.25f;
+
+        protected float m_primSafetyCoeffX = 2.414214f;
+        protected float m_primSafetyCoeffY = 2.414214f;
+        protected float m_primSafetyCoeffZ = 1.618034f;
+        protected bool m_useCastRayV3 = false;
+        protected float m_floatToleranceInCastRay = 0.00001f;
+        protected float m_floatTolerance2InCastRay = 0.001f;
+        protected DetailLevel m_primLodInCastRay = DetailLevel.Medium;
+        protected DetailLevel m_sculptLodInCastRay = DetailLevel.Medium;
+        protected DetailLevel m_meshLodInCastRay = DetailLevel.Highest;
+        protected DetailLevel m_avatarLodInCastRay = DetailLevel.Medium;
+        protected int m_maxHitsInCastRay = 16;
+        protected int m_maxHitsPerPrimInCastRay = 16;
+        protected int m_maxHitsPerObjectInCastRay = 16;
+        protected bool m_detectExitsInCastRay = false;
+        protected bool m_filterPartsInCastRay = false;
+        protected bool m_doAttachmentsInCastRay = false;
+        protected int m_msThrottleInCastRay = 200;
+        protected int m_msPerRegionInCastRay = 40;
+        protected int m_msPerAvatarInCastRay = 10;
+        protected int m_msMinInCastRay = 2;
+        protected int m_msMaxInCastRay = 40;
+        protected static List<CastRayCall> m_castRayCalls = new List<CastRayCall>();
+        protected bool m_useMeshCacheInCastRay = true;
+        protected static Dictionary<ulong, FacetedMesh> m_cachedMeshes = new Dictionary<ulong, FacetedMesh>();
+=======
         protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache =
                 new Dictionary<UUID, UserInfoCacheEntry>();
             protected int EMAIL_PAUSE_TIME = 20;  // documented delay value for smtp.
@@ -155,6 +288,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         {"TURNRIGHT", "Turning Right"},
                         {"WALK", "Walking"}
                 };
+>>>>>>> avn/ubitvar
 
         //An array of HTTP/1.1 headers that are not allowed to be used
         //as custom headers by llHTTPRequest.
@@ -174,15 +308,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         };
 
         public void Initialize(
-            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item)
         {
             m_lastSayShoutCheck = DateTime.UtcNow;
 
             m_ScriptEngine = scriptEngine;
             m_host = host;
             m_item = item;
+<<<<<<< HEAD
+=======
             m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
             m_coopSleepHandle = coopSleepHandle;
+>>>>>>> avn/ubitvar
 
             LoadConfig();
 
@@ -199,30 +336,102 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </summary>
         private void LoadConfig()
         {
-            m_ScriptDelayFactor =
-                m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
-            m_ScriptDistanceFactor =
-                m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f);
-            m_MinTimerInterval =
-                m_ScriptEngine.Config.GetFloat("MinTimerInterval", 0.5f);
-            m_automaticLinkPermission =
-                m_ScriptEngine.Config.GetBoolean("AutomaticLinkPermission", false);
-            m_notecardLineReadCharsMax =
-                m_ScriptEngine.Config.GetInt("NotecardLineReadCharsMax", 255);
+            LlRequestAgentDataCacheTimeoutMs = 20000;
+
+            IConfig seConfig = m_ScriptEngine.Config;
+
+            if (seConfig != null)
+            {
+                m_ScriptDelayFactor =
+                    seConfig.GetFloat("ScriptDelayFactor", m_ScriptDelayFactor);
+                m_ScriptDistanceFactor =
+                    seConfig.GetFloat("ScriptDistanceLimitFactor", m_ScriptDistanceFactor);
+                m_MinTimerInterval =
+                    seConfig.GetFloat("MinTimerInterval", m_MinTimerInterval);
+                m_automaticLinkPermission =
+                    seConfig.GetBoolean("AutomaticLinkPermission", m_automaticLinkPermission);
+                m_notecardLineReadCharsMax =
+                    seConfig.GetInt("NotecardLineReadCharsMax", m_notecardLineReadCharsMax);
+
+                // Rezzing an object with a velocity can create recoil. This feature seems to have been
+                //    removed from recent versions of SL. The code computes recoil (vel*mass) and scales
+                //    it by this factor. May be zero to turn off recoil all together.
+                m_recoilScaleFactor = m_ScriptEngine.Config.GetFloat("RecoilScaleFactor", m_recoilScaleFactor);
+            }
+
             if (m_notecardLineReadCharsMax > 65535)
                 m_notecardLineReadCharsMax = 65535;
 
             // load limits for particular subsystems.
-            IConfig SMTPConfig;
-            if ((SMTPConfig = m_ScriptEngine.ConfigSource.Configs["SMTP"]) != null) {
-                // there's an smtp config, so load in the snooze time.
-                EMAIL_PAUSE_TIME = SMTPConfig.GetInt("email_pause_time", EMAIL_PAUSE_TIME);
-            }
+            IConfigSource seConfigSource = m_ScriptEngine.ConfigSource;
 
-            // Rezzing an object with a velocity can create recoil. This feature seems to have been
-            //    removed from recent versions of SL. The code computes recoil (vel*mass) and scales
-            //    it by this factor. May be zero to turn off recoil all together.
-            m_recoilScaleFactor = m_ScriptEngine.Config.GetFloat("RecoilScaleFactor", m_recoilScaleFactor);
+            if (seConfigSource != null)
+            {
+                IConfig lslConfig = seConfigSource.Configs["LL-Functions"];
+                if (lslConfig != null)
+                {
+                    m_restrictEmail = lslConfig.GetBoolean("RestrictEmail", m_restrictEmail);
+                    m_avatarHeightCorrection = lslConfig.GetFloat("AvatarHeightCorrection", m_avatarHeightCorrection);
+                    m_useSimpleBoxesInGetBoundingBox = lslConfig.GetBoolean("UseSimpleBoxesInGetBoundingBox", m_useSimpleBoxesInGetBoundingBox);
+                    m_addStatsInGetBoundingBox = lslConfig.GetBoolean("AddStatsInGetBoundingBox", m_addStatsInGetBoundingBox);
+                    m_lABB1StdX0 = lslConfig.GetFloat("LowerAvatarBoundingBoxStandingXconst", m_lABB1StdX0);
+                    m_lABB2StdX0 = lslConfig.GetFloat("UpperAvatarBoundingBoxStandingXconst", m_lABB2StdX0);
+                    m_lABB1StdY0 = lslConfig.GetFloat("LowerAvatarBoundingBoxStandingYconst", m_lABB1StdY0);
+                    m_lABB2StdY0 = lslConfig.GetFloat("UpperAvatarBoundingBoxStandingYconst", m_lABB2StdY0);
+                    m_lABB1StdZ0 = lslConfig.GetFloat("LowerAvatarBoundingBoxStandingZconst", m_lABB1StdZ0);
+                    m_lABB1StdZ1 = lslConfig.GetFloat("LowerAvatarBoundingBoxStandingZcoeff", m_lABB1StdZ1);
+                    m_lABB2StdZ0 = lslConfig.GetFloat("UpperAvatarBoundingBoxStandingZconst", m_lABB2StdZ0);
+                    m_lABB2StdZ1 = lslConfig.GetFloat("UpperAvatarBoundingBoxStandingZcoeff", m_lABB2StdZ1);
+                    m_lABB1GrsX0 = lslConfig.GetFloat("LowerAvatarBoundingBoxGroundsittingXconst", m_lABB1GrsX0);
+                    m_lABB2GrsX0 = lslConfig.GetFloat("UpperAvatarBoundingBoxGroundsittingXconst", m_lABB2GrsX0);
+                    m_lABB1GrsY0 = lslConfig.GetFloat("LowerAvatarBoundingBoxGroundsittingYconst", m_lABB1GrsY0);
+                    m_lABB2GrsY0 = lslConfig.GetFloat("UpperAvatarBoundingBoxGroundsittingYconst", m_lABB2GrsY0);
+                    m_lABB1GrsZ0 = lslConfig.GetFloat("LowerAvatarBoundingBoxGroundsittingZconst", m_lABB1GrsZ0);
+                    m_lABB1GrsZ1 = lslConfig.GetFloat("LowerAvatarBoundingBoxGroundsittingZcoeff", m_lABB1GrsZ1);
+                    m_lABB2GrsZ0 = lslConfig.GetFloat("UpperAvatarBoundingBoxGroundsittingZconst", m_lABB2GrsZ0);
+                    m_lABB2GrsZ1 = lslConfig.GetFloat("UpperAvatarBoundingBoxGroundsittingZcoeff", m_lABB2GrsZ1);
+                    m_lABB1SitX0 = lslConfig.GetFloat("LowerAvatarBoundingBoxSittingXconst", m_lABB1SitX0);
+                    m_lABB2SitX0 = lslConfig.GetFloat("UpperAvatarBoundingBoxSittingXconst", m_lABB2SitX0);
+                    m_lABB1SitY0 = lslConfig.GetFloat("LowerAvatarBoundingBoxSittingYconst", m_lABB1SitY0);
+                    m_lABB2SitY0 = lslConfig.GetFloat("UpperAvatarBoundingBoxSittingYconst", m_lABB2SitY0);
+                    m_lABB1SitZ0 = lslConfig.GetFloat("LowerAvatarBoundingBoxSittingZconst", m_lABB1SitZ0);
+                    m_lABB1SitZ1 = lslConfig.GetFloat("LowerAvatarBoundingBoxSittingZcoeff", m_lABB1SitZ1);
+                    m_lABB2SitZ0 = lslConfig.GetFloat("UpperAvatarBoundingBoxSittingZconst", m_lABB2SitZ0);
+                    m_lABB2SitZ1 = lslConfig.GetFloat("UpperAvatarBoundingBoxSittingZcoeff", m_lABB2SitZ1);
+                    m_primSafetyCoeffX = lslConfig.GetFloat("PrimBoundingBoxSafetyCoefficientX", m_primSafetyCoeffX);
+                    m_primSafetyCoeffY = lslConfig.GetFloat("PrimBoundingBoxSafetyCoefficientY", m_primSafetyCoeffY);
+                    m_primSafetyCoeffZ = lslConfig.GetFloat("PrimBoundingBoxSafetyCoefficientZ", m_primSafetyCoeffZ);
+                    m_useCastRayV3 = lslConfig.GetBoolean("UseLlCastRayV3", m_useCastRayV3);
+                    m_floatToleranceInCastRay = lslConfig.GetFloat("FloatToleranceInLlCastRay", m_floatToleranceInCastRay);
+                    m_floatTolerance2InCastRay = lslConfig.GetFloat("FloatTolerance2InLlCastRay", m_floatTolerance2InCastRay);
+                    m_primLodInCastRay = (DetailLevel)lslConfig.GetInt("PrimDetailLevelInLlCastRay", (int)m_primLodInCastRay);
+                    m_sculptLodInCastRay = (DetailLevel)lslConfig.GetInt("SculptDetailLevelInLlCastRay", (int)m_sculptLodInCastRay);
+                    m_meshLodInCastRay = (DetailLevel)lslConfig.GetInt("MeshDetailLevelInLlCastRay", (int)m_meshLodInCastRay);
+                    m_avatarLodInCastRay = (DetailLevel)lslConfig.GetInt("AvatarDetailLevelInLlCastRay", (int)m_avatarLodInCastRay);
+                    m_maxHitsInCastRay = lslConfig.GetInt("MaxHitsInLlCastRay", m_maxHitsInCastRay);
+                    m_maxHitsPerPrimInCastRay = lslConfig.GetInt("MaxHitsPerPrimInLlCastRay", m_maxHitsPerPrimInCastRay);
+                    m_maxHitsPerObjectInCastRay = lslConfig.GetInt("MaxHitsPerObjectInLlCastRay", m_maxHitsPerObjectInCastRay);
+                    m_detectExitsInCastRay = lslConfig.GetBoolean("DetectExitHitsInLlCastRay", m_detectExitsInCastRay);
+                    m_filterPartsInCastRay = lslConfig.GetBoolean("FilterPartsInLlCastRay", m_filterPartsInCastRay);
+                    m_doAttachmentsInCastRay = lslConfig.GetBoolean("DoAttachmentsInLlCastRay", m_doAttachmentsInCastRay);
+                    m_msThrottleInCastRay = lslConfig.GetInt("ThrottleTimeInMsInLlCastRay", m_msThrottleInCastRay);
+                    m_msPerRegionInCastRay = lslConfig.GetInt("AvailableTimeInMsPerRegionInLlCastRay", m_msPerRegionInCastRay);
+                    m_msPerAvatarInCastRay = lslConfig.GetInt("AvailableTimeInMsPerAvatarInLlCastRay", m_msPerAvatarInCastRay);
+                    m_msMinInCastRay = lslConfig.GetInt("RequiredAvailableTimeInMsInLlCastRay", m_msMinInCastRay);
+                    m_msMaxInCastRay = lslConfig.GetInt("MaximumAvailableTimeInMsInLlCastRay", m_msMaxInCastRay);
+                    m_useMeshCacheInCastRay = lslConfig.GetBoolean("UseMeshCacheInLlCastRay", m_useMeshCacheInCastRay);
+                }
+
+                IConfig smtpConfig = seConfigSource.Configs["SMTP"];
+                if (smtpConfig != null) 
+                {
+                    // there's an smtp config, so load in the snooze time.
+                    EMAIL_PAUSE_TIME = smtpConfig.GetInt("email_pause_time", EMAIL_PAUSE_TIME);
+
+                    m_internalObjectHost = smtpConfig.GetString("internal_object_host", m_internalObjectHost);
+                }
+            }
+            m_sleepMsOnEmail = EMAIL_PAUSE_TIME * 1000;
         }
 
         public override Object InitializeLifetimeService()
@@ -249,21 +458,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         protected virtual void Sleep(int delay)
         {
-            if (m_coopSleepHandle == null)
-                System.Threading.Thread.Sleep(delay);
-            else
-                CheckForCoopTermination(delay);
+            if (m_item == null) // Some unit tests don't set this
+            {
+                Thread.Sleep(delay);
+                return;
+            }
+
+            m_ScriptEngine.SleepScript(m_item.ItemID, delay);
         }
 
         /// <summary>
         /// Check for co-operative termination.
         /// </summary>
         /// <param name='delay'>If called with 0, then just the check is performed with no wait.</param>
-        protected virtual void CheckForCoopTermination(int delay)
-        {
-            if (m_coopSleepHandle.WaitOne(delay))
-                throw new ScriptCoopStopException();
-        }
 
         public Scene World
         {
@@ -302,7 +509,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if ((item = GetScriptByName(name)) != UUID.Zero)
                 m_ScriptEngine.ResetScript(item);
             else
-                ShoutError("llResetOtherScript: script "+name+" not found");
+                Error("llResetOtherScript", "Can't find script '" + name + "'");
         }
 
         public LSL_Integer llGetScriptState(string name)
@@ -316,7 +523,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return m_ScriptEngine.GetScriptState(item) ?1:0;
             }
 
-            ShoutError("llGetScriptState: script "+name+" not found");
+            Error("llGetScriptState", "Can't find script '" + name + "'");
 
             // If we didn't find it, then it's safe to
             // assume it is not running.
@@ -339,7 +546,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                ShoutError("llSetScriptState: script "+name+" not found");
+                Error("llSetScriptState", "Can't find script '" + name + "'");
             }
         }
 
@@ -405,6 +612,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// <returns>
         /// The link entity.  null if not found.
         /// </returns>
+        /// <param name='part'></param>
         /// <param name='linknum'>
         /// Can be either a non-negative integer or ScriptBaseClass.LINK_THIS (-4).
         /// If ScriptBaseClass.LINK_THIS then the entity containing the script is returned.
@@ -415,26 +623,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// Otherwise, if a positive linknum is given which is greater than the number of entities in the linkset, then
         /// null is returned.
         /// </param>
-        public ISceneEntity GetLinkEntity(int linknum)
+        public ISceneEntity GetLinkEntity(SceneObjectPart part, int linknum)
         {
             if (linknum < 0)
             {
                 if (linknum == ScriptBaseClass.LINK_THIS)
-                    return m_host;
+                    return part;
                 else
                     return null;
             }
 
-            int actualPrimCount = m_host.ParentGroup.PrimCount;
-            List<UUID> sittingAvatarIds = m_host.ParentGroup.GetSittingAvatars();
-            int adjustedPrimCount = actualPrimCount + sittingAvatarIds.Count;
+            int actualPrimCount = part.ParentGroup.PrimCount;
+            List<ScenePresence> sittingAvatars = part.ParentGroup.GetSittingAvatars();
+            int adjustedPrimCount = actualPrimCount + sittingAvatars.Count;
 
             // Special case for a single prim.  In this case the linknum is zero.  However, this will not match a single
             // prim that has any avatars sat upon it (in which case the root prim is link 1).
             if (linknum == 0)
             {
-                if (actualPrimCount == 1 && sittingAvatarIds.Count == 0)
-                    return m_host;
+                if (actualPrimCount == 1 && sittingAvatars.Count == 0)
+                    return part;
 
                 return null;
             }
@@ -442,8 +650,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // here we must match 1 (ScriptBaseClass.LINK_ROOT).
             else if (linknum == ScriptBaseClass.LINK_ROOT && actualPrimCount == 1)
             {
-                if (sittingAvatarIds.Count > 0)
-                    return m_host.ParentGroup.RootPart;
+                if (sittingAvatars.Count > 0)
+                    return part.ParentGroup.RootPart;
                 else
                     return null;
             }
@@ -451,15 +659,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 if (linknum <= actualPrimCount)
                 {
-                    return m_host.ParentGroup.GetLinkNumPart(linknum);
+                    return part.ParentGroup.GetLinkNumPart(linknum);
                 }
                 else
                 {
-                    ScenePresence sp = World.GetScenePresence(sittingAvatarIds[linknum - actualPrimCount - 1]);
-                    if (sp != null)
-                        return sp;
-                    else
-                        return null;
+                    return sittingAvatars[linknum - actualPrimCount - 1];
                 }
             }
             else
@@ -521,6 +725,54 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
+        public List<ISceneEntity> GetLinkEntities(int linkType)
+        {
+            return GetLinkEntities(m_host, linkType);
+        }
+
+        public List<ISceneEntity> GetLinkEntities(SceneObjectPart part, int linkType)
+        {
+            List<ISceneEntity> ret;
+
+            switch (linkType)
+            {
+                case ScriptBaseClass.LINK_SET:
+                    return new List<ISceneEntity>(part.ParentGroup.Parts);
+
+                case ScriptBaseClass.LINK_ROOT:
+                    return new List<ISceneEntity>() { part.ParentGroup.RootPart };
+
+                case ScriptBaseClass.LINK_ALL_OTHERS:
+                    ret = new List<ISceneEntity>(part.ParentGroup.Parts);
+
+                    if (ret.Contains(part))
+                        ret.Remove(part);
+
+                    return ret;
+
+                case ScriptBaseClass.LINK_ALL_CHILDREN:
+                    ret = new List<ISceneEntity>(part.ParentGroup.Parts);
+
+                    if (ret.Contains(part.ParentGroup.RootPart))
+                        ret.Remove(part.ParentGroup.RootPart);
+
+                    return ret;
+
+                case ScriptBaseClass.LINK_THIS:
+                    return new List<ISceneEntity>() { part };
+
+                default:
+                    if (linkType < 0)
+                        return new List<ISceneEntity>();
+
+                    ISceneEntity target = GetLinkEntity(part, linkType);
+                    if (target == null)
+                        return new List<ISceneEntity>();
+
+                    return new List<ISceneEntity>() { target };
+            }
+        }
+
         //These are the implementations of the various ll-functions used by the LSL scripts.
         public LSL_Float llSin(double f)
         {
@@ -577,10 +829,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Float llFrand(double mag)
         {
             m_host.AddScriptLPS(1);
-            lock (Util.RandomClass)
-            {
-                return Util.RandomClass.NextDouble() * mag;
-            }
+
+            return Util.RandomClass.NextDouble() * mag;
         }
 
         public LSL_Integer llFloor(double f)
@@ -1032,7 +1282,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             if (channelID == 0)
             {
-                LSLError("Cannot use llRegionSay() on channel 0");
+                Error("llRegionSay", "Cannot use on channel 0");
                 return;
             }
 
@@ -1041,6 +1291,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             m_host.AddScriptLPS(1);
 
+            World.SimChat(Utils.StringToBytes(text),
+                          ChatTypeEnum.Region, channelID, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, false);
+
             IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
             if (wComm != null)
                 wComm.DeliverMessage(ChatTypeEnum.Region, channelID, m_host.Name, m_host.UUID, text);
@@ -1058,6 +1311,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID TargetID;
             UUID.TryParse(target, out TargetID);
 
+            World.SimChatToAgent(TargetID, Utils.StringToBytes(msg),
+                          channel, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true);
+
             IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
             if (wComm != null)
                 if (!wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error))
@@ -1466,12 +1722,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             if ((status & ScriptBaseClass.STATUS_BLOCK_GRAB) == ScriptBaseClass.STATUS_BLOCK_GRAB)
-            {
-                if (value != 0)
-                    m_host.SetBlockGrab(true);
-                else
-                    m_host.SetBlockGrab(false);
-            }
+                m_host.BlockGrab = value != 0;
+
+            if ((status & ScriptBaseClass.STATUS_BLOCK_GRAB_OBJECT) == ScriptBaseClass.STATUS_BLOCK_GRAB_OBJECT)
+                m_host.ParentGroup.BlockGrabOverride = value != 0;
 
             if ((status & ScriptBaseClass.STATUS_DIE_AT_EDGE) == ScriptBaseClass.STATUS_DIE_AT_EDGE)
             {
@@ -1532,10 +1786,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     return 0;
 
                 case ScriptBaseClass.STATUS_BLOCK_GRAB:
-                    if (m_host.GetBlockGrab())
-                        return 1;
-                    else
-                        return 0;
+                    return m_host.BlockGrab ? 1 : 0;
+
+                case ScriptBaseClass.STATUS_BLOCK_GRAB_OBJECT:
+                    return m_host.ParentGroup.BlockGrabOverride ? 1 : 0;
 
                 case ScriptBaseClass.STATUS_DIE_AT_EDGE:
                     if (m_host.GetDieAtEdge())
@@ -2047,9 +2301,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 part.Shape.LightColorR = Util.Clip((float)color.x, 0.0f, 1.0f);
                 part.Shape.LightColorG = Util.Clip((float)color.y, 0.0f, 1.0f);
                 part.Shape.LightColorB = Util.Clip((float)color.z, 0.0f, 1.0f);
-                part.Shape.LightIntensity = intensity;
-                part.Shape.LightRadius = radius;
-                part.Shape.LightFalloff = falloff;
+                part.Shape.LightIntensity = Util.Clip((float)intensity, 0.0f, 1.0f);
+                part.Shape.LightRadius = Util.Clip((float)radius, 0.1f, 20.0f);
+                part.Shape.LightFalloff = Util.Clip((float)falloff, 0.01f, 2.0f);
             }
             else
             {
@@ -2111,7 +2365,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             SetTexture(m_host, texture, face);
-            ScriptSleep(200);
+            ScriptSleep(m_sleepMsOnSetTexture);
         }
 
         public void llSetLinkTexture(int linknumber, string texture, int face)
@@ -2119,6 +2373,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             List<SceneObjectPart> parts = GetLinkParts(linknumber);
+<<<<<<< HEAD
+
+            foreach (SceneObjectPart part in parts)
+              SetTexture(part, texture, face);
+
+            ScriptSleep(m_sleepMsOnSetLinkTexture);
+=======
             if (parts.Count > 0)
             {
                 try
@@ -2131,6 +2392,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
             ScriptSleep(200);
+>>>>>>> avn/ubitvar
         }
 
         protected void SetTexture(SceneObjectPart part, string texture, int face)
@@ -2177,7 +2439,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             ScaleTexture(m_host, u, v, face);
-            ScriptSleep(200);
+            ScriptSleep(m_sleepMsOnScaleTexture);
         }
 
         protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
@@ -2216,7 +2478,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             OffsetTexture(m_host, u, v, face);
-            ScriptSleep(200);
+            ScriptSleep(m_sleepMsOnOffsetTexture);
         }
 
         protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
@@ -2255,7 +2517,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             RotateTexture(m_host, rotation, face);
-            ScriptSleep(200);
+            ScriptSleep(m_sleepMsOnRotateTexture);
         }
 
         protected void RotateTexture(SceneObjectPart part, double rotation, int face)
@@ -2333,7 +2595,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             SetPos(m_host, pos, true);
 
-            ScriptSleep(200);
+            ScriptSleep(m_sleepMsOnSetPos);
         }
 
         /// <summary>
@@ -2521,14 +2783,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
 
-            ScriptSleep(200);
+            ScriptSleep(m_sleepMsOnSetRot);
         }
 
         public void llSetLocalRot(LSL_Rotation rot)
         {
             m_host.AddScriptLPS(1);
             SetRot(m_host, rot);
-            ScriptSleep(200);
+            ScriptSleep(m_sleepMsOnSetLocalRot);
         }
 
         protected void SetRot(SceneObjectPart part, Quaternion rot)
@@ -2776,8 +3038,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (m_host.ParentGroup.IsAttachment)
             {
                 ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
+<<<<<<< HEAD
+                vel = avatar.GetWorldVelocity();
+=======
                 if (avatar != null)
                     vel = avatar.Velocity;
+>>>>>>> avn/ubitvar
             }
             else
             {
@@ -2843,9 +3109,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSound(string sound, double volume, int queue, int loop)
         {
             m_host.AddScriptLPS(1);
-            // This function has been deprecated
-            // see http://www.lslwiki.net/lslwiki/wakka.php?wakka=llSound
-            Deprecated("llSound");
+            Deprecated("llSound", "Use llPlaySound instead");
         }
 
         // Xantor 20080528 PlaySound updated so it accepts an objectinventory name -or- a key to a sound
@@ -2933,7 +3197,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             if (m_SoundModule != null)
                 m_SoundModule.PreloadSound(m_host.UUID, ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound), 0);
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnPreloadSound);
         }
 
         /// <summary>
@@ -3177,7 +3441,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0)
                 {
-                    LSLError("No permissions to give money");
+                    Error("llGiveMoney", "No permissions to give money");
                     return;
                 }
 
@@ -3185,7 +3449,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if (!UUID.TryParse(destination, out toID))
                 {
-                    LSLError("Bad key in llGiveMoney");
+                    Error("llGiveMoney", "Bad key in llGiveMoney");
                     return;
                 }
 
@@ -3199,38 +3463,43 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 string reason;
                 money.ObjectGiveMoney(
+<<<<<<< HEAD
+                    m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount);
+            }, null, "LSL_Api.llGiveMoney");
+=======
                     m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount,UUID.Zero, out reason);
             });
 
             return 0;
+>>>>>>> avn/ubitvar
         }
 
         public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
             m_host.AddScriptLPS(1);
-            Deprecated("llMakeExplosion");
-            ScriptSleep(100);
+            Deprecated("llMakeExplosion", "Use llParticleSystem instead");
+            ScriptSleep(m_sleepMsOnMakeExplosion);
         }
 
         public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset)
         {
             m_host.AddScriptLPS(1);
-            Deprecated("llMakeFountain");
-            ScriptSleep(100);
+            Deprecated("llMakeFountain", "Use llParticleSystem instead");
+            ScriptSleep(m_sleepMsOnMakeFountain);
         }
 
         public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
             m_host.AddScriptLPS(1);
-            Deprecated("llMakeSmoke");
-            ScriptSleep(100);
+            Deprecated("llMakeSmoke", "Use llParticleSystem instead");
+            ScriptSleep(m_sleepMsOnMakeSmoke);
         }
 
         public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
             m_host.AddScriptLPS(1);
-            Deprecated("llMakeFire");
-            ScriptSleep(100);
+            Deprecated("llMakeFire", "Use llParticleSystem instead");
+            ScriptSleep(m_sleepMsOnMakeFire);
         }
 
         public void llRezAtRoot(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param)
@@ -3256,13 +3525,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if (item == null)
                 {
-                    llSay(0, "Could not find object " + inventory);
+                    Error("llRezAtRoot", "Can't find object '" + inventory + "'");
                     return;
                 }
 
                 if (item.InvType != (int)InventoryType.Object)
                 {
-                    llSay(0, "Unable to create requested object. Object is missing from database.");
+                    Error("llRezAtRoot", "Can't create requested object; object is missing from database");
                     return;
                 }
 
@@ -3305,11 +3574,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                     // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
                 }
+<<<<<<< HEAD
+            }, null, "LSL_Api.llRezAtRoot");
+=======
                 return;
             });
+>>>>>>> avn/ubitvar
 
             //ScriptSleep((int)((groupmass * velmag) / 10));
-            ScriptSleep(100);
+            ScriptSleep(m_sleepMsOnRezAtRoot);
         }
 
         public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param)
@@ -3321,6 +3594,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
+<<<<<<< HEAD
+            // normalized direction to target
+            LSL_Vector dir = llVecNorm(target - from);
+            // use vertical to help compute left axis
+            LSL_Vector up = new LSL_Vector(0.0, 0.0, 1.0);
+            // find normalized left axis parallel to horizon
+            LSL_Vector left = llVecNorm(LSL_Vector.Cross(up, dir));
+            // make up orthogonal to left and dir
+            up = LSL_Vector.Cross(dir, left);
+
+            // compute rotation based on orthogonal axes
+            LSL_Rotation rot = new LSL_Rotation(0.0, 0.707107, 0.0, 0.707107) * llAxes2Rot(dir, left, up);
+
+            // Per discussion with Melanie, for non-physical objects llLookAt appears to simply
+            // set the rotation of the object, copy that behavior
+            PhysicsActor pa = m_host.PhysActor;
+
+            if (m_host.ParentGroup.IsAttachment || strength == 0 || pa == null || !pa.IsPhysical)
+=======
             // Get the normalized vector to the target
             LSL_Vector d1 = llVecNorm(target - llGetPos());
 
@@ -3337,6 +3629,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             LSL_Rotation r3 = new LSL_Rotation(0.000000, 0.707107, 0.000000, 0.707107);
 
             if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
+>>>>>>> avn/ubitvar
             {
                 // Do nothing if either value is 0 (this has been checked in SL)
                 if (strength <= 0.0 || damping <= 0.0)
@@ -3359,7 +3652,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llStopLookAt()
         {
             m_host.AddScriptLPS(1);
-//            NotImplemented("llStopLookAt");
             m_host.StopLookAt();
         }
 
@@ -3411,10 +3703,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
+<<<<<<< HEAD
+        public LSL_Float llGetMassMKS()
+        {
+            // this is what the wiki says it does!
+            // http://wiki.secondlife.com/wiki/LlGetMassMKS
+            return llGetMass() * 100.0;
+=======
  
         public LSL_Float llGetMassMKS()
         {
             return 100f * llGetMass();
+>>>>>>> avn/ubitvar
         }
 
         public void llCollisionFilter(string name, string id, int accept)
@@ -3504,7 +3804,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </remarks>
         public void DetachFromAvatar()
         {
-            Util.FireAndForget(DetachWrapper, m_host);
+            Util.FireAndForget(DetachWrapper, m_host, "LSL_Api.DetachFromAvatar");
         }
 
         private void DetachWrapper(object o)
@@ -3545,13 +3845,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llTakeCamera(string avatar)
         {
             m_host.AddScriptLPS(1);
-            Deprecated("llTakeCamera");
+            Deprecated("llTakeCamera", "Use llSetCameraParams instead");
         }
 
         public void llReleaseCamera(string avatar)
         {
             m_host.AddScriptLPS(1);
-            Deprecated("llReleaseCamera");
+            Deprecated("llReleaseCamera", "Use llClearCameraParams instead");
         }
 
         public LSL_String llGetOwner()
@@ -3583,14 +3883,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             // TODO: figure out values for client, fromSession, and imSessionID
             // client.SendInstantMessage(m_host.UUID, fromSession, message, user, imSessionID, m_host.Name, AgentManager.InstantMessageDialog.MessageFromAgent, (uint)Util.UnixTimeSinceEpoch());
+<<<<<<< HEAD
+
+=======
             UUID friendTransactionID = UUID.Random();
 
             //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
             
+>>>>>>> avn/ubitvar
             GridInstantMessage msg = new GridInstantMessage();
-            msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
+            msg.fromAgentID = new Guid(m_host.OwnerID.ToString()); // fromAgentID.Guid;
             msg.toAgentID = new Guid(user); // toAgentID.Guid;
-            msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
+            msg.imSessionID = new Guid(m_host.UUID.ToString()); // This is the item we're mucking with here
 //            m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
 //            m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
 //            DateTime dt = DateTime.UtcNow;
@@ -3648,7 +3952,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
             }
 
-            ScriptSleep(2000);
+            ScriptSleep(m_sleepMsOnInstantMessage);
       }
 
         public void llEmail(string address, string subject, string message)
@@ -3657,12 +3961,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>();
             if (emailModule == null)
             {
-                ShoutError("llEmail: email module not configured");
+                Error("llEmail", "Email module not configured");
                 return;
             }
 
+            //Restrict email destination to the avatars registered email address?
+            //The restriction only applies if the destination address is not local.
+            if (m_restrictEmail == true && address.Contains(m_internalObjectHost) == false)
+            {
+                UserAccount account =
+                        World.UserAccountService.GetUserAccount(
+                            World.RegionInfo.ScopeID,
+                            m_host.OwnerID);
+
+                if (account == null)
+                {
+                    Error("llEmail", "Can't find user account for '" + m_host.OwnerID.ToString() + "'");
+                    return;
+                }
+
+                if (String.IsNullOrEmpty(account.Email))
+                {
+                    Error("llEmail", "User account has not registered an email address.");
+                    return;
+                }
+
+                address = account.Email;
+            }
+
             emailModule.SendEmail(m_host.UUID, address, subject, message);
-            ScriptSleep(EMAIL_PAUSE_TIME * 1000);
+            ScriptSleep(m_sleepMsOnEmail);
         }
 
         public void llGetNextEmail(string address, string subject)
@@ -3671,7 +3999,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>();
             if (emailModule == null)
             {
-                ShoutError("llGetNextEmail: email module not configured");
+                Error("llGetNextEmail", "Email module not configured");
                 return;
             }
             Email email;
@@ -3756,17 +4084,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             catch (NotImplementedException)
             {
                 // Currently not implemented in DotNetEngine only XEngine
-                NotImplemented("llMinEventDelay in DotNetEngine");
+                NotImplemented("llMinEventDelay", "In DotNetEngine");
             }
         }
 
-        /// <summary>
-        /// llSoundPreload is deprecated. In SL this appears to do absolutely nothing
-        /// and is documented to have no delay.
-        /// </summary>
         public void llSoundPreload(string sound)
         {
             m_host.AddScriptLPS(1);
+            Deprecated("llSoundPreload", "Use llPreloadSound instead");
         }
 
         public void llRotLookAt(LSL_Rotation target, double strength, double damping)
@@ -3864,6 +4189,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         protected void TargetOmega(SceneObjectPart part, LSL_Vector axis, double spinrate, double gain)
         {
+            PhysicsActor pa = part.PhysActor;
+            if ( ( pa == null || !pa.IsPhysical ) && gain == 0.0d )
+                spinrate = 0.0d;
             part.UpdateAngularVelocity(axis * spinrate);
          }
 
@@ -3909,13 +4237,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
                         ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
                         ScriptBaseClass.PERMISSION_TRACK_CAMERA |
+<<<<<<< HEAD
+                        ScriptBaseClass.PERMISSION_ATTACH;
+=======
                         ScriptBaseClass.PERMISSION_ATTACH |
                         ScriptBaseClass.PERMISSION_OVERRIDE_ANIMATIONS;
 
+>>>>>>> avn/ubitvar
             }
             else
             {
-                if (m_host.ParentGroup.GetSittingAvatars().Contains(agentID))
+                if (m_host.ParentGroup.GetSittingAvatars().SingleOrDefault(sp => sp.UUID == agentID) != null)
                 {
                     // When agent is sitting, certain permissions are implicit if requested from sitting agent
                     implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
@@ -3950,10 +4282,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             ScenePresence presence = World.GetScenePresence(agentID);
+            
             if (presence != null)
             {
                 // If permissions are being requested from an NPC and were not implicitly granted above then
-                // auto grant all reuqested permissions if the script is owned by the NPC or the NPCs owner
+                // auto grant all requested permissions if the script is owned by the NPC or the NPCs owner
                 INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
                 if (npcModule != null && npcModule.IsNPC(agentID, World))
                 {
@@ -4076,23 +4409,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llCreateLink(string target, int parent)
         {
             m_host.AddScriptLPS(1);
+<<<<<<< HEAD
+=======
 
             UUID targetID;
 
             if (!UUID.TryParse(target, out targetID))
                 return;
+>>>>>>> avn/ubitvar
 
             if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
                 && !m_automaticLinkPermission)
             {
-                ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
+                Error("llCreateLink", "PERMISSION_CHANGE_LINKS permission not set");
                 return;
             }
 
-            IClientAPI client = null;
-            ScenePresence sp = World.GetScenePresence(m_item.PermsGranter);
-            if (sp != null)
-                client = sp.ControllingClient;
+            CreateLink(target, parent);
+        }
+
+        public void CreateLink(string target, int parent)
+        {
+            UUID targetID;
+
+            if (!UUID.TryParse(target, out targetID))
+                return;           
 
             SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)targetID);
 
@@ -4127,10 +4468,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             parentPrim.HasGroupChanged = true;
             parentPrim.ScheduleGroupForFullUpdate();
 
+            IClientAPI client = null;
+            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
+            if (sp != null)
+                client = sp.ControllingClient;
+
             if (client != null)
                 parentPrim.SendPropertiesToClient(client);
 
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnCreateLink);
         }
 
         public void llBreakLink(int linknum)
@@ -4140,10 +4486,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
                 && !m_automaticLinkPermission)
             {
-                ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
+                Error("llBreakLink", "PERMISSION_CHANGE_LINKS permission not set");
                 return;
             }
 
+            BreakLink(linknum);
+        }
+
+        public void BreakLink(int linknum)
+        {
             if (linknum < ScriptBaseClass.LINK_THIS)
                 return;
 
@@ -4238,6 +4589,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
+<<<<<<< HEAD
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
+                && !m_automaticLinkPermission)
+            {
+                Error("llBreakAllLinks", "PERMISSION_CHANGE_LINKS permission not set");
+                return;
+            }
+
+            BreakAllLinks();
+        }
+
+        public void BreakAllLinks()
+        {
+=======
             TaskInventoryItem item = m_item;
              
             if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
@@ -4247,6 +4612,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
             }
 
+>>>>>>> avn/ubitvar
             SceneObjectGroup parentPrim = m_host.ParentGroup;
             if (parentPrim.AttachmentPoint != 0)
                 return; // Fail silently if attached
@@ -4277,8 +4643,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     linknum -= (m_host.ParentGroup.PrimCount) + 1;
 
+<<<<<<< HEAD
+            ISceneEntity entity = GetLinkEntity(m_host, linknum);
+=======
                     if (linknum < 0)
                         return UUID.Zero.ToString();
+>>>>>>> avn/ubitvar
 
                     List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET);
                     if (avatars.Count > linknum)
@@ -4333,7 +4703,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            ISceneEntity entity = GetLinkEntity(linknum);
+            ISceneEntity entity = GetLinkEntity(m_host, linknum);
 
             if (entity != null)
                 return entity.Name;
@@ -4401,7 +4771,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (!UUID.TryParse(destination, out destId))
             {
-                llSay(0, "Could not parse key " + destination);
+                Error("llGiveInventory", "Can't parse destination key '" + destination + "'");
                 return;
             }
 
@@ -4409,9 +4779,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (item == null)
             {
+<<<<<<< HEAD
+                Error("llGiveInventory", "Can't find inventory object '" + inventory + "'");
+                return;
+=======
                 llSay(0, String.Format("Could not find object '{0}'", inventory));
                 return;
 //                throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
+>>>>>>> avn/ubitvar
             }
 
             UUID objId = item.ItemID;
@@ -4435,16 +4810,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     if (account == null)
                     {
-                        llSay(0, "Can't find destination "+destId.ToString());
-                        return;
+                        GridUserInfo info = World.GridUserService.GetGridUserInfo(destId.ToString());
+                        if(info == null || info.Online == false)
+                        {
+                            Error("llGiveInventory", "Can't find destination '" + destId.ToString() + "'");
+                            return;
+                        }
                     }
                 }
 
                 // destination is an avatar
-                InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
+                string message;
+                InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId, out message);
 
                 if (agentItem == null)
+                {
+                    llSay(0, message); 
                     return;
+                }
 
                 byte[] bucket = new byte[1];
                 bucket[0] = (byte)item.Type;
@@ -4462,6 +4845,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 ScenePresence sp;
 
+<<<<<<< HEAD
+                ScriptSleep(m_sleepMsOnGiveInventory);
+=======
                 if (World.TryGetScenePresence(destId, out sp))
                 {
                     sp.ControllingClient.SendInstantMessage(msg);
@@ -4474,6 +4860,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 
                 //This delay should only occur when giving inventory to avatars.
                 ScriptSleep(3000);
+>>>>>>> avn/ubitvar
             }
         }
 
@@ -4532,6 +4919,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
+<<<<<<< HEAD
+            UUID uuid = (UUID)id;
+            PresenceInfo pinfo = null;
+            UserAccount account;
+
+            UserInfoCacheEntry ce;
+
+            lock (m_userInfoCache)
+            {
+=======
             UUID uuid;
             if (UUID.TryParse(id, out uuid))
             {
@@ -4539,6 +4936,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 UserAccount account;
 
                 UserInfoCacheEntry ce;
+>>>>>>> avn/ubitvar
                 if (!m_userInfoCache.TryGetValue(uuid, out ce))
                 {
                     account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
@@ -4547,7 +4945,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         m_userInfoCache[uuid] = null; // Cache negative
                         return UUID.Zero.ToString();
                     }
+<<<<<<< HEAD
+=======
 
+>>>>>>> avn/ubitvar
 
                     PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
                     if (pinfos != null && pinfos.Length > 0)
@@ -4560,6 +4961,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             }
                         }
                     }
+<<<<<<< HEAD
+
+                    ce = new UserInfoCacheEntry();
+                    ce.time = Util.EnvironmentTickCount();
+                    ce.account = account;
+                    ce.pinfo = pinfo;
+
+                    m_userInfoCache[uuid] = ce;
+                }
+                else
+                {
+                    if (ce == null)
+                        return UUID.Zero.ToString();
+
+                    account = ce.account;
+
+                    if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) 
+                        >= LlRequestAgentDataCacheTimeoutMs)
+                    {
+                        PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
+                        if (pinfos != null && pinfos.Length > 0)
+                        {
+                            foreach (PresenceInfo p in pinfos)
+                            {
+                                if (p.RegionID != UUID.Zero)
+                                {
+                                    pinfo = p;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            pinfo = null;
+=======
 
                     ce = new UserInfoCacheEntry();
                     ce.time = Util.EnvironmentTickCount();
@@ -4587,17 +5022,60 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             {
                                 pinfo = p;
                             }
+>>>>>>> avn/ubitvar
                         }
+
+                        ce.time = Util.EnvironmentTickCount();
+                        ce.pinfo = pinfo;
                     }
                     else
+                    {
+                        pinfo = ce.pinfo;
+                    }
+<<<<<<< HEAD
+                }
+            }
+=======
+                    else
                         pinfo = null;
 
                     ce.time = Util.EnvironmentTickCount();
                     ce.pinfo = pinfo;
                 }
+>>>>>>> avn/ubitvar
 
                 string reply = String.Empty;
 
+<<<<<<< HEAD
+            switch (data)
+            {
+            case ScriptBaseClass.DATA_ONLINE:
+                if (pinfo != null && pinfo.RegionID != UUID.Zero)
+                    reply = "1";
+                else
+                    reply = "0";
+                break;
+            case ScriptBaseClass.DATA_NAME: // (First Last)
+                reply = account.FirstName + " " + account.LastName;
+                break;
+            case ScriptBaseClass.DATA_BORN: // (YYYY-MM-DD)
+                DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
+                born = born.AddSeconds(account.Created);
+                reply = born.ToString("yyyy-MM-dd");
+                break;
+            case ScriptBaseClass.DATA_RATING: // (0,0,0,0,0,0)
+                reply = "0,0,0,0,0,0";
+                break;
+            case 7: // DATA_USERLEVEL (integer).  This is not available in LL and so has no constant.
+                reply = account.UserLevel.ToString();
+                break;
+            case ScriptBaseClass.DATA_PAYINFO: // (0|1|2|3)
+                reply = "0";
+                break;
+            default:
+                return UUID.Zero.ToString(); // Raise no event
+            }
+=======
                 switch (data)
                 {
                     case 1: // DATA_ONLINE (0|1)
@@ -4623,6 +5101,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     default:
                         return UUID.Zero.ToString(); // Raise no event
                 }
+>>>>>>> avn/ubitvar
 
                 UUID rq = UUID.Random();
 
@@ -4633,6 +5112,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 AsyncCommands.
                 DataserverPlugin.DataserverReply(rq.ToString(), reply);
 
+<<<<<<< HEAD
+            ScriptSleep(m_sleepMsOnRequestAgentData);
+            return tid.ToString();
+=======
                 ScriptSleep(100);
                 return tid.ToString();
             }
@@ -4641,6 +5124,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 ShoutError("Invalid UUID passed to llRequestAgentData.");
             }
             return "";
+>>>>>>> avn/ubitvar
         }
 
         public LSL_String llRequestInventoryData(string name)
@@ -4672,12 +5156,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                                              reply);
                         });
 
-                    ScriptSleep(1000);
+                    ScriptSleep(m_sleepMsOnRequestInventoryData);
                     return tid.ToString();
                 }
             }
 
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnRequestInventoryData);
             return String.Empty;
         }
 
@@ -4717,7 +5201,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
 
-            ScriptSleep(5000);
+            ScriptSleep(m_sleepMsOnSetDamage);
         }
 
         public void llTeleportAgent(string agent, string destination, LSL_Vector targetPos, LSL_Vector targetLookAt)
@@ -4768,7 +5252,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             UUID agentId = new UUID();
 
+<<<<<<< HEAD
+            ulong regionHandle = Util.RegionWorldLocToHandle((uint)global_coords.x, (uint)global_coords.y);
+=======
             ulong regionHandle = Utils.UIntsToLong((uint)(global_coords.x / 256) * 256, (uint)(global_coords.y / 256) * 256);
+>>>>>>> avn/ubitvar
 
             if (UUID.TryParse(agent, out agentId))
             {
@@ -4834,22 +5322,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID av = new UUID();
             if (!UUID.TryParse(agent,out av))
             {
-                LSLError("First parameter to llTextBox needs to be a key");
+                Error("llTextBox", "First parameter must be a key");
                 return;
             }
 
             if (message == string.Empty)
             {
-                ShoutError("Trying to use llTextBox with empty message.");
+                Error("llTextBox", "Empty message");
             }
             else if (message.Length > 512)
             {
-                ShoutError("Trying to use llTextBox with message over 512 characters.");
+                Error("llTextBox", "Message more than 512 characters");
             }
             else
             {
                 dm.SendTextBoxToUser(av, message, chatChannel, m_host.Name, m_host.UUID, m_host.OwnerID);
-                ScriptSleep(1000);
+                ScriptSleep(m_sleepMsOnTextBox);
             }
         }
 
@@ -5566,9 +6054,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // so the OR check may be a little redundant, but it's being done
             // for completion and should LSL_Key ever be implemented
             // as it's own struct
+            // NOTE: 3rd case is needed because a NULL_KEY comes through as
+            // type 'obj' and wrongly returns ""
             else if (!(src.Data[index] is LSL_String ||
+<<<<<<< HEAD
+                       src.Data[index] is LSL_Key ||
+                       src.Data[index].ToString() == "00000000-0000-0000-0000-000000000000"))
+=======
                     src.Data[index] is LSL_Key ||
                     src.Data[index] is String))
+>>>>>>> avn/ubitvar
             {
                 return "";
             }
@@ -5776,7 +6271,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_List llListRandomize(LSL_List src, int stride)
         {
             LSL_List result;
-            Random rand           = new Random();
+            BetterRandom rand = new BetterRandom();
 
             int   chunkk;
             int[] chunks;
@@ -5792,24 +6287,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // If not, then return the src list. This also
             // traps those cases where stride > length.
 
-            if (src.Length != stride && src.Length%stride == 0)
+            if (src.Length != stride && src.Length % stride == 0)
             {
                 chunkk = src.Length/stride;
 
                 chunks = new int[chunkk];
 
                 for (int i = 0; i < chunkk; i++)
+                {
                     chunks[i] = i;
+                }
 
                 // Knuth shuffle the chunkk index
-                for (int i = chunkk - 1; i >= 1; i--)
+                for (int i = chunkk - 1; i > 0; i--)
                 {
                     // Elect an unrandomized chunk to swap
                     int index = rand.Next(i + 1);
-                    int tmp;
 
                     // and swap position with first unrandomized chunk
-                    tmp = chunks[i];
+                    int tmp = chunks[i];
                     chunks[i] = chunks[index];
                     chunks[index] = tmp;
                 }
@@ -5822,7 +6318,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     for (int j = 0; j < stride; j++)
                     {
-                        result.Add(src.Data[chunks[i]*stride+j]);
+                        result.Add(src.Data[chunks[i] * stride + j]);
                     }
                 }
             }
@@ -5947,6 +6443,74 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             return new LSL_Vector(World.RegionInfo.WorldLocX, World.RegionInfo.WorldLocY, 0);
+<<<<<<< HEAD
+        }
+
+        public LSL_String llGetEnv(LSL_String name)
+        {
+            m_host.AddScriptLPS(1);
+            if (name == "agent_limit")
+            {
+                return World.RegionInfo.RegionSettings.AgentLimit.ToString();
+            }
+            else if (name == "dynamic_pathfinding")
+            {
+                return "0";
+            }
+            else if (name == "estate_id")
+            {
+                return World.RegionInfo.EstateSettings.EstateID.ToString();
+            }
+            else if (name == "estate_name")
+            {
+                return World.RegionInfo.EstateSettings.EstateName;
+            }
+            else if (name == "frame_number")
+            {
+                return World.Frame.ToString();
+            }
+            else if (name == "region_cpu_ratio")
+            {
+                return "1";
+            }
+            else if (name == "region_idle")
+            {
+                return "0";
+            }
+            else if (name == "region_product_name")
+            {
+                if (World.RegionInfo.RegionType != String.Empty)
+                    return World.RegionInfo.RegionType;
+                else
+                    return "";
+            }
+            else if (name == "region_product_sku")
+            {
+                return "OpenSim";
+            }
+            else if (name == "region_start_time")
+            {
+                return World.UnixStartTime.ToString();
+            }
+            else if (name == "sim_channel")
+            {
+                return "OpenSim";
+            }
+            else if (name == "sim_version")
+            {
+                return World.GetSimulatorVersion();
+            }
+            else if (name == "simulator_hostname")
+            {
+                IUrlModule UrlModule = World.RequestModuleInterface<IUrlModule>();
+                return UrlModule.ExternalHostNameForLSL;
+            }
+            else
+            {
+                return "";
+            }
+=======
+>>>>>>> avn/ubitvar
         }
 
         /// <summary>
@@ -5958,8 +6522,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_List llListInsertList(LSL_List dest, LSL_List src, int index)
         {
 
-            LSL_List pref = null;
-            LSL_List suff = null;
+            LSL_List pref;
+            LSL_List suff;
 
             m_host.AddScriptLPS(1);
 
@@ -6253,12 +6817,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_String llGetAgentLanguage(string id)
         {
-            // This should only return a value if the avatar is in the same region
-            //ckrinke 1-30-09 : This needs to parse the XMLRPC language field supplied
-            //by the client at login. Currently returning only en-us until our I18N
-            //effort gains momentum
+            // This should only return a value if the avatar is in the same region, but eh. idc.
             m_host.AddScriptLPS(1);
-            return "en-us";
+            if (World.AgentPreferencesService == null)
+            {
+                Error("llGetAgentLanguage", "No AgentPreferencesService present");
+            }
+            else
+            {
+                UUID key = new UUID();
+                if (UUID.TryParse(id, out key))
+                {
+                    return new LSL_String(World.AgentPreferencesService.GetLang(key));
+                }
+            }
+            return new LSL_String("en-us");
         }
         /// <summary>
         /// http://wiki.secondlife.com/wiki/LlGetAgentList
@@ -6347,7 +6920,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             m_host.AdjustSoundGain(volume);
-            ScriptSleep(100);
+            ScriptSleep(m_sleepMsOnAdjustSoundVolume);
         }
 
         public void llSetSoundRadius(double radius)
@@ -6461,7 +7034,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            ScriptSleep(5000);
+            ScriptSleep(m_sleepMsOnEjectFromLand);
         }
 
         public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
@@ -6580,10 +7153,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (UUID.TryParse(id, out key))
             {
                 ScenePresence av = World.GetScenePresence(key);
+                List<ScenePresence> sittingAvatars = m_host.ParentGroup.GetSittingAvatars();
 
                 if (av != null)
                 {
-                    if (llAvatarOnSitTarget() == id)
+                    if (sittingAvatars.Contains(av))
                     {
                         // if the avatar is sitting on this object, then
                         // we can unsit them.  We don't want random scripts unsitting random people
@@ -6699,8 +7273,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public virtual LSL_Integer llGetFreeMemory()
         {
             m_host.AddScriptLPS(1);
-            // Make scripts designed for LSO happy
-            return 16384;
+            // Make scripts designed for Mono happy
+            return 65536;
         }
 
         public LSL_Integer llGetFreeURLs()
@@ -6813,17 +7387,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             foreach (SceneObjectPart part in parts)
             {
-                SetParticleSystem(part, rules);
+                SetParticleSystem(part, rules, "llLinkParticleSystem");
             }
         }
 
         public void llParticleSystem(LSL_List rules)
         {
             m_host.AddScriptLPS(1);
-            SetParticleSystem(m_host, rules);
+            SetParticleSystem(m_host, rules, "llParticleSystem");
         }
 
-        private void SetParticleSystem(SceneObjectPart part, LSL_List rules)
+        private void SetParticleSystem(SceneObjectPart part, LSL_List rules, string originFunc)
         {
             if (rules.Length == 0)
             {
@@ -6840,62 +7414,152 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 for (int i = 0; i < rules.Length; i += 2)
                 {
-                    switch (rules.GetLSLIntegerItem(i))
+                    int psystype;
+                    try
+                    {
+                        psystype = rules.GetLSLIntegerItem(i);
+                    }
+                    catch (InvalidCastException)
+                    {
+                        Error(originFunc, string.Format("Error running particle system params index #{0}: particle system parameter type must be integer", i));
+                        return;
+                    }
+                    switch (psystype)
                     {
                         case (int)ScriptBaseClass.PSYS_PART_FLAGS:
-                            prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)(uint)rules.GetLSLIntegerItem(i + 1);
+                            try
+                            {
+                                prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)(uint)rules.GetLSLIntegerItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_FLAGS: arg #{0} - parameter 1 must be integer", i + 1));
+                                return;
+                            }
                             break;
 
                         case (int)ScriptBaseClass.PSYS_PART_START_COLOR:
-                            tempv = rules.GetVector3Item(i + 1);
+                            try
+                            {
+                                tempv = rules.GetVector3Item(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_START_COLOR: arg #{0} - parameter 1 must be vector", i + 1));
+                                return;
+                            }
                             prules.PartStartColor.R = (float)tempv.x;
                             prules.PartStartColor.G = (float)tempv.y;
                             prules.PartStartColor.B = (float)tempv.z;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_PART_START_ALPHA:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_START_ALPHA: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.PartStartColor.A = tempf;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_PART_END_COLOR:
-                            tempv = rules.GetVector3Item(i + 1);
+                            try
+                            {
+                                tempv = rules.GetVector3Item(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_END_COLOR: arg #{0} - parameter 1 must be vector", i + 1));
+                                return;
+                            }
                             prules.PartEndColor.R = (float)tempv.x;
                             prules.PartEndColor.G = (float)tempv.y;
                             prules.PartEndColor.B = (float)tempv.z;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_PART_END_ALPHA:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_END_ALPHA: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.PartEndColor.A = tempf;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_PART_START_SCALE:
-                            tempv = rules.GetVector3Item(i + 1);
-                            prules.PartStartScaleX = (float)tempv.x;
-                            prules.PartStartScaleY = (float)tempv.y;
+                            try
+                            {
+                                tempv = rules.GetVector3Item(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_START_SCALE: arg #{0} - parameter 1 must be vector", i + 1));
+                                return;
+                            }
+                            prules.PartStartScaleX = validParticleScale((float)tempv.x);
+                            prules.PartStartScaleY = validParticleScale((float)tempv.y);
                             break;
 
                         case (int)ScriptBaseClass.PSYS_PART_END_SCALE:
-                            tempv = rules.GetVector3Item(i + 1);
-                            prules.PartEndScaleX = (float)tempv.x;
-                            prules.PartEndScaleY = (float)tempv.y;
+                            try
+                            {
+                                tempv = rules.GetVector3Item(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_END_SCALE: arg #{0} - parameter 1 must be vector", i + 1));
+                                return;
+                            }
+                            prules.PartEndScaleX = validParticleScale((float)tempv.x);
+                            prules.PartEndScaleY = validParticleScale((float)tempv.y);
                             break;
 
                         case (int)ScriptBaseClass.PSYS_PART_MAX_AGE:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_MAX_AGE: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.PartMaxAge = tempf;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_ACCEL:
-                            tempv = rules.GetVector3Item(i + 1);
+                            try
+                            {
+                                tempv = rules.GetVector3Item(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_ACCEL: arg #{0} - parameter 1 must be vector", i + 1));
+                                return;
+                            }
                             prules.PartAcceleration.X = (float)tempv.x;
                             prules.PartAcceleration.Y = (float)tempv.y;
                             prules.PartAcceleration.Z = (float)tempv.z;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_PATTERN:
-                            tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            try
+                            {
+                                tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_PATTERN: arg #{0} - parameter 1 must be integer", i + 1));
+                                return;
+                            }
                             prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi;
                             break;
 
@@ -6904,67 +7568,171 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         // client tells the difference between the two by looking at the 0x02 bit in
                         // the PartFlags variable.
                         case (int)ScriptBaseClass.PSYS_SRC_INNERANGLE:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_INNERANGLE: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.InnerAngle = (float)tempf;
                             prules.PartFlags &= 0xFFFFFFFD; // Make sure new angle format is off.
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_OUTERANGLE:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_OUTERANGLE: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.OuterAngle = (float)tempf;
                             prules.PartFlags &= 0xFFFFFFFD; // Make sure new angle format is off.
                             break;
 
                         case (int)ScriptBaseClass.PSYS_PART_BLEND_FUNC_SOURCE:
-                            tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            try
+                            {
+                                tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_BLEND_FUNC_SOURCE: arg #{0} - parameter 1 must be integer", i + 1));
+                                return;
+                            }
                             prules.BlendFuncSource = (byte)tmpi;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_PART_BLEND_FUNC_DEST:
-                            tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            try
+                            {
+                                tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_BLEND_FUNC_DEST: arg #{0} - parameter 1 must be integer", i + 1));
+                                return;
+                            }
                             prules.BlendFuncDest = (byte)tmpi;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_PART_START_GLOW:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_START_GLOW: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.PartStartGlow = (float)tempf;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_PART_END_GLOW:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_PART_END_GLOW: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.PartEndGlow = (float)tempf;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_TEXTURE:
-                            prules.Texture = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, rules.GetLSLStringItem(i + 1));
+                            try
+                            {
+                                prules.Texture = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, rules.GetLSLStringItem(i + 1));
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_TEXTURE: arg #{0} - parameter 1 must be string or key", i + 1));
+                                return;
+                            }
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_BURST_RATE:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_BURST_RATE: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.BurstRate = (float)tempf;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_BURST_PART_COUNT:
-                            prules.BurstPartCount = (byte)(int)rules.GetLSLIntegerItem(i + 1);
+                            try
+                            {
+                                prules.BurstPartCount = (byte)(int)rules.GetLSLIntegerItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_BURST_PART_COUNT: arg #{0} - parameter 1 must be integer", i + 1));
+                                return;
+                            }
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_BURST_RADIUS:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_BURST_RADIUS: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.BurstRadius = (float)tempf;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_BURST_SPEED_MIN:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_BURST_SPEED_MIN: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.BurstSpeedMin = (float)tempf;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_BURST_SPEED_MAX:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_BURST_SPEED_MAX: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.BurstSpeedMax = (float)tempf;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_MAX_AGE:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_MAX_AGE: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.MaxAge = (float)tempf;
                             break;
 
@@ -6982,20 +7750,44 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PSYS_SRC_OMEGA:
                             // AL: This is an assumption, since it is the only thing that would match.
-                            tempv = rules.GetVector3Item(i + 1);
+                            try
+                            {
+                                tempv = rules.GetVector3Item(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_OMEGA: arg #{0} - parameter 1 must be vector", i + 1));
+                                return;
+                            }
                             prules.AngularVelocity.X = (float)tempv.x;
                             prules.AngularVelocity.Y = (float)tempv.y;
                             prules.AngularVelocity.Z = (float)tempv.z;
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_ANGLE_BEGIN:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_ANGLE_BEGIN: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.InnerAngle = (float)tempf;
                             prules.PartFlags |= 0x02; // Set new angle format.
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_ANGLE_END:
-                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            try
+                            {
+                                tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            }
+                            catch (InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule PSYS_SRC_ANGLE_END: arg #{0} - parameter 1 must be float", i + 1));
+                                return;
+                            }
                             prules.OuterAngle = (float)tempf;
                             prules.PartFlags |= 0x02; // Set new angle format.
                             break;
@@ -7010,6 +7802,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             part.SendFullUpdateToAllClients();
         }
 
+        private float validParticleScale(float value)
+        {
+            if (value > 4.0f) return 4.0f;
+            return value;
+        }
+
         public void llGroundRepel(double height, int water, double tau)
         {
             m_host.AddScriptLPS(1);
@@ -7249,7 +8047,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land);
                 }
             }
-            ScriptSleep(100);
+            ScriptSleep(m_sleepMsOnAddToLandPassList);
         }
 
         public void llSetTouchText(string text)
@@ -7268,12 +8066,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             m_host.SetCameraEyeOffset(offset);
+
+            if (m_host.ParentGroup.RootPart.GetCameraEyeOffset() == Vector3.Zero)
+                m_host.ParentGroup.RootPart.SetCameraEyeOffset(offset);
         }
 
         public void llSetCameraAtOffset(LSL_Vector offset)
         {
             m_host.AddScriptLPS(1);
             m_host.SetCameraAtOffset(offset);
+
+            if (m_host.ParentGroup.RootPart.GetCameraAtOffset() == Vector3.Zero)
+                m_host.ParentGroup.RootPart.SetCameraAtOffset(offset);
         }
 
         public void llSetLinkCamera(LSL_Integer link, LSL_Vector eye, LSL_Vector at)
@@ -7348,16 +8152,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID av = new UUID();
             if (!UUID.TryParse(avatar,out av))
             {
+<<<<<<< HEAD
+                Error("llDialog", "First parameter must be a key");
+=======
                 //LSLError("First parameter to llDialog needs to be a key");
+>>>>>>> avn/ubitvar
                 return;
             }
             if (buttons.Length < 1)
             {
+<<<<<<< HEAD
+                Error("llDialog", "At least 1 button must be shown");
+                return;
+            }
+            if (buttons.Length > 12)
+            {
+                Error("llDialog", "No more than 12 buttons can be shown");
+                return;
+=======
                 buttons.Add("OK");
             }
             if (buttons.Length > 12)
             {
                 ShoutError("button list too long, must be 12 or fewer entries");
+>>>>>>> avn/ubitvar
             }
             int length = buttons.Length;
             if (length > 12)
@@ -7368,12 +8186,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 if (buttons.Data[i].ToString() == String.Empty)
                 {
+<<<<<<< HEAD
+                    Error("llDialog", "Button label cannot be blank");
+=======
                     ShoutError("button label cannot be blank");
+>>>>>>> avn/ubitvar
                     return;
                 }
                 if (buttons.Data[i].ToString().Length > 24)
                 {
+<<<<<<< HEAD
+                    Error("llDialog", "Button label cannot be longer than 24 characters");
+=======
                     ShoutError("button label cannot be longer than 24 characters");
+>>>>>>> avn/ubitvar
                     return;
                 }
                 buts[i] = buttons.Data[i].ToString();
@@ -7383,7 +8209,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 av, m_host.Name, m_host.UUID, m_host.OwnerID,
                 message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts);
 
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnDialog);
         }
 
         public void llVolumeDetect(int detect)
@@ -7394,16 +8220,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 m_host.ParentGroup.ScriptSetVolumeDetect(detect != 0);
         }
 
-        /// <summary>
-        /// This is a depecated function so this just replicates the result of
-        /// invoking it in SL
-        /// </summary>
         public void llRemoteLoadScript(string target, string name, int running, int start_param)
         {
             m_host.AddScriptLPS(1);
-            // Report an error as it does in SL
-            ShoutError("Deprecated. Please use llRemoteLoadScriptPin instead.");
-            ScriptSleep(3000);
+            Deprecated("llRemoteLoadScript", "Use llRemoteLoadScriptPin instead");
+            ScriptSleep(m_sleepMsOnRemoteLoadScript);
         }
 
         public void llSetRemoteScriptAccessPin(int pin)
@@ -7420,7 +8241,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (!UUID.TryParse(target, out destId))
             {
-                llSay(0, "Could not parse key " + target);
+                Error("llRemoteLoadScriptPin", "Can't parse key '" + target + "'");
                 return;
             }
 
@@ -7436,7 +8257,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // make sure the object is a script
             if (item == null || item.Type != 10)
             {
-                llSay(0, "Could not find script " + name);
+                Error("llRemoteLoadScriptPin", "Can't find script '" + name + "'");
                 return;
             }
 
@@ -7453,7 +8274,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
             // this will cause the delay even if the script pin or permissions were wrong - seems ok
-            ScriptSleep(3000);
+            ScriptSleep(m_sleepMsOnRemoteLoadScriptPin);
         }
 
         public void llOpenRemoteDataChannel()
@@ -7484,14 +8305,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams("remote_data", resobj,
                                                                          new DetectParams[0]));
             }
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnOpenRemoteDataChannel);
         }
 
         public LSL_String llSendRemoteData(string channel, string dest, int idata, string sdata)
         {
             m_host.AddScriptLPS(1);
             IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
-            ScriptSleep(3000);
+            ScriptSleep(m_sleepMsOnSendRemoteData);
             if (xmlrpcMod == null)
                 return "";
             return (xmlrpcMod.SendRemoteData(m_host.LocalId, m_item.ItemID, channel, dest, idata, sdata)).ToString();
@@ -7503,7 +8324,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
             if (xmlrpcMod != null)
                 xmlrpcMod.RemoteDataReply(channel, message_id, sdata, idata);
-            ScriptSleep(3000);
+            ScriptSleep(m_sleepMsOnRemoteDataReply);
         }
 
         public void llCloseRemoteDataChannel(string channel)
@@ -7519,7 +8340,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
             if (xmlrpcMod != null)
                 xmlrpcMod.CloseXMLRPCChannel((UUID)channel);
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnCloseRemoteDataChannel);
         }
 
         public LSL_String llMD5String(string src, int nonce)
@@ -7567,13 +8388,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 cut.y = 1f;
             }
-            if (cut.y - cut.x < 0.05f)
+            if (cut.y - cut.x < 0.02f)
             {
-                cut.x = cut.y - 0.05f;
+                cut.x = cut.y - 0.02f;
                 if (cut.x < 0.0f)
                 {
                     cut.x = 0.0f;
-                    cut.y = 0.05f;
+                    cut.y = 0.02f;
                 }
             }
             shapeBlock.ProfileBegin = (ushort)(50000 * cut.x);
@@ -7595,12 +8416,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     hollow = 0.70f;
                 }
             }
-            // Otherwise, hollow is limited to 95%.
+            // Otherwise, hollow is limited to 99%.
             else
             {
-                if (hollow > 0.95f)
+                if (hollow > 0.99f)
                 {
-                    hollow = 0.95f;
+                    hollow = 0.99f;
                 }
             }
             shapeBlock.ProfileHollow = (ushort)(50000 * hollow);
@@ -7730,9 +8551,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 dimple.y = 1f;
             }
-            if (dimple.y - cut.x < 0.05f)
+            if (dimple.y - dimple.x < 0.02f)
             {
-                dimple.x = cut.y - 0.05f;
+                dimple.x = dimple.y - 0.02f;
+                if (dimple.x < 0.0f)
+                {
+                    dimple.x = 0.0f;
+                    dimple.y = 0.02f;
+                }
             }
             shapeBlock.ProfileBegin = (ushort)(50000 * dimple.x);
             shapeBlock.ProfileEnd   = (ushort)(50000 * (1 - dimple.y));
@@ -7756,17 +8582,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             shapeBlock.PathBegin = shapeBlock.ProfileBegin;
             shapeBlock.PathEnd = shapeBlock.ProfileEnd;
 
-            if (holesize.x < 0.05f)
+            if (holesize.x < 0.01f)
             {
-                holesize.x = 0.05f;
+                holesize.x = 0.01f;
             }
             if (holesize.x > 1f)
             {
                 holesize.x = 1f;
             }
-            if (holesize.y < 0.05f)
+            if (holesize.y < 0.01f)
             {
-                holesize.y = 0.05f;
+                holesize.y = 0.01f;
             }
             if (holesize.y > 0.5f)
             {
@@ -7812,13 +8638,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 profilecut.y = 1f;
             }
-            if (profilecut.y - profilecut.x < 0.05f)
+            if (profilecut.y - profilecut.x < 0.02f)
             {
-                profilecut.x = profilecut.y - 0.05f;
+                profilecut.x = profilecut.y - 0.02f;
                 if (profilecut.x < 0.0f)
                 {
                     profilecut.x = 0.0f;
-                    profilecut.y = 0.05f;
+                    profilecut.y = 0.02f;
                 }
             }
             shapeBlock.ProfileBegin = (ushort)(50000 * profilecut.x);
@@ -7919,18 +8745,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            setLinkPrimParams(ScriptBaseClass.LINK_THIS, rules, "llSetPrimitiveParams");
+            SetLinkPrimParams(ScriptBaseClass.LINK_THIS, rules, "llSetPrimitiveParams");
 
-            ScriptSleep(200);
+            ScriptSleep(m_sleepMsOnSetPrimitiveParams);
         }
 
+<<<<<<< HEAD
+        public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
+        {
+            m_host.AddScriptLPS(1);
+
+            SetLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
+
+            ScriptSleep(m_sleepMsOnSetLinkPrimitiveParams);
+        }
+
+=======
+>>>>>>> avn/ubitvar
         public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
         {
             m_host.AddScriptLPS(1);
 
-            setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast");
+            SetLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast");
         }
 
+<<<<<<< HEAD
+        protected void SetLinkPrimParams(int linknumber, LSL_List rules, string originFunc)
+        {
+            SetEntityParams(GetLinkEntities(linknumber), rules, originFunc);
+        }
+=======
         private void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc)
         {
             List<object> parts = new List<object>();
@@ -7940,11 +8784,61 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 parts.Add(p);
             foreach (ScenePresence p in avatars)
                 parts.Add(p);
+>>>>>>> avn/ubitvar
 
-            LSL_List remaining = null;
+        protected void SetEntityParams(List<ISceneEntity> entities, LSL_List rules, string originFunc)
+        {
+            LSL_List remaining = new LSL_List();
             uint rulesParsed = 0;
 
+<<<<<<< HEAD
+            foreach (ISceneEntity entity in entities)
+            {
+                if (entity is SceneObjectPart)
+                    remaining = SetPrimParams((SceneObjectPart)entity, rules, originFunc, ref rulesParsed);
+                else
+                    remaining = SetAgentParams((ScenePresence)entity, rules, originFunc, ref rulesParsed);
+            }
+
+            while (remaining.Length > 2)
+            {
+                int linknumber;
+                try
+                {
+                    linknumber = remaining.GetLSLIntegerItem(0);
+                }
+                catch(InvalidCastException)
+                {
+                    Error(originFunc, string.Format("Error running rule #{0} -> PRIM_LINK_TARGET: parameter 2 must be integer", rulesParsed));
+                    return;
+                }
+
+                rules = remaining.GetSublist(1, -1);
+                entities = GetLinkEntities(linknumber);
+
+                foreach (ISceneEntity entity in entities)
+                {
+                    if (entity is SceneObjectPart)
+                        remaining = SetPrimParams((SceneObjectPart)entity, rules, originFunc, ref rulesParsed);
+                    else
+                        remaining = SetAgentParams((ScenePresence)entity, rules, originFunc, ref rulesParsed);
+                }
+            }
+        }
+
+        public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
+        {
+            SceneObjectGroup group = m_host.ParentGroup;
+
+            if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical)
+                return;
+            if (group.IsAttachment)
+                return;
+
+            if (frames.Data.Length > 0) // We are getting a new motion
+=======
             if (parts.Count > 0)
+>>>>>>> avn/ubitvar
             {
                 foreach (object part in parts)
                 {
@@ -8078,32 +8972,55 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     switch (code)
                     {
-                        case (int)ScriptBaseClass.PRIM_POSITION:
-                        case (int)ScriptBaseClass.PRIM_POS_LOCAL:
+                        case ScriptBaseClass.PRIM_POSITION:
+                        case ScriptBaseClass.PRIM_POS_LOCAL:
                             if (remain < 1)
-                                return null;
+                                return new LSL_List();
 
+<<<<<<< HEAD
+                            try
+                            {
+                                v = rules.GetVector3Item(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                if(code == ScriptBaseClass.PRIM_POSITION)
+                                    Error(originFunc, string.Format("Error running rule #{0} -> PRIM_POSITION: arg #{1} - parameter 1 must be vector", rulesParsed, idx - idxStart - 1));
+                                else
+                                    Error(originFunc, string.Format("Error running rule #{0} -> PRIM_POS_LOCAL: arg #{1} - parameter 1 must be vector", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+=======
                             v=rules.GetVector3Item(idx++);
                             if (part.IsRoot && !part.ParentGroup.IsAttachment)
                                 currentPosition = GetSetPosTarget(part, v, currentPosition, true);
                             else
                                 currentPosition = GetSetPosTarget(part, v, currentPosition, false);
+>>>>>>> avn/ubitvar
                             positionChanged = true;
 
                             break;
-                        case (int)ScriptBaseClass.PRIM_SIZE:
+                        case ScriptBaseClass.PRIM_SIZE:
                             if (remain < 1)
-                                return null;
+                                return new LSL_List();
 
                             v=rules.GetVector3Item(idx++);
                             SetScale(part, v);
 
                             break;
-                        case (int)ScriptBaseClass.PRIM_ROTATION:
+                        case ScriptBaseClass.PRIM_ROTATION:
                             if (remain < 1)
-                                return null;
-
-                            LSL_Rotation q = rules.GetQuaternionItem(idx++);
+                                return new LSL_List();
+                            LSL_Rotation q;
+                            try
+                            {
+                                q = rules.GetQuaternionItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_ROTATION: arg #{1} - parameter 1 must be rotation", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
                             // try to let this work as in SL...
                             if (part.ParentID == 0 || (part.ParentGroup != null && part == part.ParentGroup.RootPart))
                             {
@@ -8119,11 +9036,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                             break;
 
-                        case (int)ScriptBaseClass.PRIM_TYPE:
+                        case ScriptBaseClass.PRIM_TYPE:
                             if (remain < 3)
-                                return null;
+                                return new LSL_List();
 
-                            code = (int)rules.GetLSLIntegerItem(idx++);
+                            try
+                            {
+                                code = (int)rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE: arg #{1} - parameter 1 must be integer", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
 
                             remain = rules.Length - idx;
                             float hollow;
@@ -8138,140 +9063,625 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                             switch (code)
                             {
-                                case (int)ScriptBaseClass.PRIM_TYPE_BOX:
+                                case ScriptBaseClass.PRIM_TYPE_BOX:
                                     if (remain < 6)
-                                        return null;
-
-                                    face = (int)rules.GetLSLIntegerItem(idx++);
-                                    v = rules.GetVector3Item(idx++); // cut
-                                    hollow = (float)rules.GetLSLFloatItem(idx++);
-                                    twist = rules.GetVector3Item(idx++);
-                                    taper_b = rules.GetVector3Item(idx++);
-                                    topshear = rules.GetVector3Item(idx++);
+                                        return new LSL_List();
+
+                                    try
+                                    {
+                                        face = (int)rules.GetLSLIntegerItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_BOX: arg #{1} - parameter 2 must be integer", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        v = rules.GetVector3Item(idx++); // cut
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_BOX: arg #{1} - parameter 3 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        hollow = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_BOX: arg #{1} - parameter 4 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        twist = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_BOX: arg #{1} - parameter 5 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        taper_b = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_BOX: arg #{1} - parameter 6 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        topshear = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_BOX: arg #{1} - parameter 7 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
 
                                     SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear,
                                         (byte)ProfileShape.Square, (byte)Extrusion.Straight);
                                     break;
 
-                                case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER:
+                                case ScriptBaseClass.PRIM_TYPE_CYLINDER:
                                     if (remain < 6)
-                                        return null;
-
-                                    face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
-                                    v = rules.GetVector3Item(idx++); // cut
-                                    hollow = (float)rules.GetLSLFloatItem(idx++);
-                                    twist = rules.GetVector3Item(idx++);
-                                    taper_b = rules.GetVector3Item(idx++);
-                                    topshear = rules.GetVector3Item(idx++);
+                                        return new LSL_List();
+
+                                    try
+                                    {
+                                        face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_CYLINDER: arg #{1} - parameter 3 must be integer", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        v = rules.GetVector3Item(idx++); // cut
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_CYLINDER: arg #{1} - parameter 4 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        hollow = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_CYLINDER: arg #{1} - parameter 5 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        twist = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_CYLINDER: arg #{1} - parameter 6 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        taper_b = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_CYLINDER: arg #{1} - parameter 7 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        topshear = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_CYLINDER: arg #{1} - parameter 8 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
                                     SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear,
                                         (byte)ProfileShape.Circle, (byte)Extrusion.Straight);
                                     break;
 
-                                case (int)ScriptBaseClass.PRIM_TYPE_PRISM:
+                                case ScriptBaseClass.PRIM_TYPE_PRISM:
                                     if (remain < 6)
-                                        return null;
-
-                                    face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
-                                    v = rules.GetVector3Item(idx++); //cut
-                                    hollow = (float)rules.GetLSLFloatItem(idx++);
-                                    twist = rules.GetVector3Item(idx++);
-                                    taper_b = rules.GetVector3Item(idx++);
-                                    topshear = rules.GetVector3Item(idx++);
+                                        return new LSL_List();
+
+                                    try
+                                    {
+                                        face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_PRISM: arg #{1} - parameter 3 must be integer", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        v = rules.GetVector3Item(idx++); //cut
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_PRISM: arg #{1} - parameter 4 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        hollow = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_PRISM: arg #{1} - parameter 5 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        twist = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_PRISM: arg #{1} - parameter 6 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        taper_b = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_PRISM: arg #{1} - parameter 7 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        topshear = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_PRISM: arg #{1} - parameter 8 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
                                     SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear,
                                         (byte)ProfileShape.EquilateralTriangle, (byte)Extrusion.Straight);
                                     break;
 
-                                case (int)ScriptBaseClass.PRIM_TYPE_SPHERE:
+                                case ScriptBaseClass.PRIM_TYPE_SPHERE:
                                     if (remain < 5)
-                                        return null;
-
-                                    face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
-                                    v = rules.GetVector3Item(idx++); // cut
-                                    hollow = (float)rules.GetLSLFloatItem(idx++);
-                                    twist = rules.GetVector3Item(idx++);
-                                    taper_b = rules.GetVector3Item(idx++); // dimple
+                                        return new LSL_List();
+
+                                    try
+                                    {
+                                        face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_SPHERE: arg #{1} - parameter 3 must be integer", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        v = rules.GetVector3Item(idx++); // cut
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_SPHERE: arg #{1} - parameter 4 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        hollow = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_SPHERE: arg #{1} - parameter 5 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        twist = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_SPHERE: arg #{1} - parameter 6 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        taper_b = rules.GetVector3Item(idx++); // dimple
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_SPHERE: arg #{1} - parameter 7 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
                                     SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b,
                                         (byte)ProfileShape.HalfCircle, (byte)Extrusion.Curve1);
                                     break;
 
-                                case (int)ScriptBaseClass.PRIM_TYPE_TORUS:
+                                case ScriptBaseClass.PRIM_TYPE_TORUS:
                                     if (remain < 11)
-                                        return null;
-
-                                    face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
-                                    v = rules.GetVector3Item(idx++); //cut
-                                    hollow = (float)rules.GetLSLFloatItem(idx++);
-                                    twist = rules.GetVector3Item(idx++);
-                                    holesize = rules.GetVector3Item(idx++);
-                                    topshear = rules.GetVector3Item(idx++);
-                                    profilecut = rules.GetVector3Item(idx++);
-                                    taper_b = rules.GetVector3Item(idx++); // taper_a
-                                    revolutions = (float)rules.GetLSLFloatItem(idx++);
-                                    radiusoffset = (float)rules.GetLSLFloatItem(idx++);
-                                    skew = (float)rules.GetLSLFloatItem(idx++);
+                                        return new LSL_List();
+
+                                    try
+                                    {
+                                        face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TORUS: arg #{1} - parameter 3 must be integer", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        v = rules.GetVector3Item(idx++); //cut
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TORUS: arg #{1} - parameter 4 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        hollow = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TORUS: arg #{1} - parameter 5 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        twist = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TORUS: arg #{1} - parameter 6 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        holesize = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TORUS: arg #{1} - parameter 7 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        topshear = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TORUS: arg #{1} - parameter 8 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        profilecut = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TORUS: arg #{1} - parameter 9 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        taper_b = rules.GetVector3Item(idx++); // taper_a
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TORUS: arg #{1} - parameter 10 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        revolutions = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TORUS: arg #{1} - parameter 11 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        radiusoffset = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TORUS: arg #{1} - parameter 12 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        skew = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TORUS: arg #{1} - parameter 13 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
                                     SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b,
                                         revolutions, radiusoffset, skew, (byte)ProfileShape.Circle, (byte)Extrusion.Curve1);
                                     break;
 
-                                case (int)ScriptBaseClass.PRIM_TYPE_TUBE:
+                                case ScriptBaseClass.PRIM_TYPE_TUBE:
                                     if (remain < 11)
-                                        return null;
-
-                                    face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
-                                    v = rules.GetVector3Item(idx++); //cut
-                                    hollow = (float)rules.GetLSLFloatItem(idx++);
-                                    twist = rules.GetVector3Item(idx++);
-                                    holesize = rules.GetVector3Item(idx++);
-                                    topshear = rules.GetVector3Item(idx++);
-                                    profilecut = rules.GetVector3Item(idx++);
-                                    taper_b = rules.GetVector3Item(idx++); // taper_a
-                                    revolutions = (float)rules.GetLSLFloatItem(idx++);
-                                    radiusoffset = (float)rules.GetLSLFloatItem(idx++);
-                                    skew = (float)rules.GetLSLFloatItem(idx++);
+                                        return new LSL_List();
+
+                                    try
+                                    {
+                                        face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TUBE: arg #{1} - parameter 3 must be integer", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        v = rules.GetVector3Item(idx++); //cut
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TUBE: arg #{1} - parameter 4 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        hollow = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TUBE: arg #{1} - parameter 5 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        twist = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TUBE: arg #{1} - parameter 6 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        holesize = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TUBE: arg #{1} - parameter 7 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        topshear = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TUBE: arg #{1} - parameter 8 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        profilecut = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TUBE: arg #{1} - parameter 9 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        taper_b = rules.GetVector3Item(idx++); // taper_a
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TUBE: arg #{1} - parameter 10 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        revolutions = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TUBE: arg #{1} - parameter 11 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        radiusoffset = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TUBE: arg #{1} - parameter 12 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        skew = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_TUBE: arg #{1} - parameter 13 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
                                     SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b,
                                         revolutions, radiusoffset, skew, (byte)ProfileShape.Square, (byte)Extrusion.Curve1);
                                     break;
 
-                                case (int)ScriptBaseClass.PRIM_TYPE_RING:
+                                case ScriptBaseClass.PRIM_TYPE_RING:
                                     if (remain < 11)
-                                        return null;
-
-                                    face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
-                                    v = rules.GetVector3Item(idx++); //cut
-                                    hollow = (float)rules.GetLSLFloatItem(idx++);
-                                    twist = rules.GetVector3Item(idx++);
-                                    holesize = rules.GetVector3Item(idx++);
-                                    topshear = rules.GetVector3Item(idx++);
-                                    profilecut = rules.GetVector3Item(idx++);
-                                    taper_b = rules.GetVector3Item(idx++); // taper_a
-                                    revolutions = (float)rules.GetLSLFloatItem(idx++);
-                                    radiusoffset = (float)rules.GetLSLFloatItem(idx++);
-                                    skew = (float)rules.GetLSLFloatItem(idx++);
+                                        return new LSL_List();
+
+                                    try
+                                    {
+                                        face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_RING: arg #{1} - parameter 3 must be integer", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        v = rules.GetVector3Item(idx++); //cut
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_RING: arg #{1} - parameter 4 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        hollow = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_RING: arg #{1} - parameter 5 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        twist = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_RING: arg #{1} - parameter 6 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        holesize = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_RING: arg #{1} - parameter 7 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        topshear = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_RING: arg #{1} - parameter 8 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        profilecut = rules.GetVector3Item(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_RING: arg #{1} - parameter 9 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        taper_b = rules.GetVector3Item(idx++); // taper_a
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_RING: arg #{1} - parameter 10 must be vector", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        revolutions = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_RING: arg #{1} - parameter 11 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        radiusoffset = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_RING: arg #{1} - parameter 12 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
+                                    try
+                                    {
+                                        skew = (float)rules.GetLSLFloatItem(idx++);
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_RING: arg #{1} - parameter 13 must be float", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
                                     SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b,
                                         revolutions, radiusoffset, skew, (byte)ProfileShape.EquilateralTriangle, (byte)Extrusion.Curve1);
                                     break;
 
-                                case (int)ScriptBaseClass.PRIM_TYPE_SCULPT:
+                                case ScriptBaseClass.PRIM_TYPE_SCULPT:
                                     if (remain < 2)
-                                        return null;
+                                        return new LSL_List();
 
                                     string map = rules.Data[idx++].ToString();
-                                    face = (int)rules.GetLSLIntegerItem(idx++); // type
+                                    try
+                                    {
+                                        face = (int)rules.GetLSLIntegerItem(idx++); // type
+                                    }
+                                    catch(InvalidCastException)
+                                    {
+                                        Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TYPE, PRIM_TYPE_SCULPT: arg #{1} - parameter 4 must be integer", rulesParsed, idx - idxStart - 1));
+                                        return new LSL_List();
+                                    }
                                     SetPrimitiveShapeParams(part, map, face, (byte)Extrusion.Curve1);
                                     break;
                             }
 
                             break;
 
-                        case (int)ScriptBaseClass.PRIM_TEXTURE:
+                        case ScriptBaseClass.PRIM_TEXTURE:
                             if (remain < 5)
-                                return null;
+                                return new LSL_List();
 
                             face=(int)rules.GetLSLIntegerItem(idx++);
-                            string tex=rules.Data[idx++].ToString();
-                            LSL_Vector repeats=rules.GetVector3Item(idx++);
-                            LSL_Vector offsets=rules.GetVector3Item(idx++);
-                            double rotation=(double)rules.GetLSLFloatItem(idx++);
+                            string tex;
+                            LSL_Vector repeats;
+                            LSL_Vector offsets;
+                            double rotation;
+
+                            tex = rules.Data[idx++].ToString();
+                            try
+                            {
+                                repeats = rules.GetVector3Item(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TEXTURE: arg #{1} - parameter 3 must be vector", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                offsets = rules.GetVector3Item(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TEXTURE: arg #{1} - parameter 4 must be vector", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                rotation = (double)rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TEXTURE: arg #{1} - parameter 5 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
 
                             SetTexture(part, tex, face);
                             ScaleTexture(part, repeats.x, repeats.y, face);
@@ -8280,114 +9690,328 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                             break;
 
-                        case (int)ScriptBaseClass.PRIM_COLOR:
+                        case ScriptBaseClass.PRIM_COLOR:
                             if (remain < 3)
-                                return null;
+                                return new LSL_List();
 
-                            face=(int)rules.GetLSLIntegerItem(idx++);
-                            LSL_Vector color=rules.GetVector3Item(idx++);
-                            double alpha=(double)rules.GetLSLFloatItem(idx++);
+                            LSL_Vector color;
+                            double alpha;
+
+                            try
+                            {
+                                face = (int)rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_COLOR: arg #{1} - parameter 2 must be integer", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                color = rules.GetVector3Item(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_COLOR: arg #{1} - parameter 3 must be vector", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                alpha = (double)rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_COLOR: arg #{1} - parameter 4 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
 
                             part.SetFaceColorAlpha(face, color, alpha);
 
                             break;
 
-                        case (int)ScriptBaseClass.PRIM_FLEXIBLE:
+                        case ScriptBaseClass.PRIM_FLEXIBLE:
                             if (remain < 7)
-                                return null;
-
-                            bool flexi = rules.GetLSLIntegerItem(idx++);
-                            int softness = rules.GetLSLIntegerItem(idx++);
-                            float gravity = (float)rules.GetLSLFloatItem(idx++);
-                            float friction = (float)rules.GetLSLFloatItem(idx++);
-                            float wind = (float)rules.GetLSLFloatItem(idx++);
-                            float tension = (float)rules.GetLSLFloatItem(idx++);
-                            LSL_Vector force = rules.GetVector3Item(idx++);
+                                return new LSL_List();
+                            bool flexi;
+                            int softness;
+                            float gravity;
+                            float friction;
+                            float wind;
+                            float tension;
+                            LSL_Vector force;
+
+                            try
+                            {
+                                flexi = rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_FLEXIBLE: arg #{1} - parameter 2 must be integer", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                softness = rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_FLEXIBLE: arg #{1} - parameter 3 must be integer", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                gravity = (float)rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_FLEXIBLE: arg #{1} - parameter 4 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                friction = (float)rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_FLEXIBLE: arg #{1} - parameter 5 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                wind = (float)rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_FLEXIBLE: arg #{1} - parameter 6 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                tension = (float)rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_FLEXIBLE: arg #{1} - parameter 7 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                force = rules.GetVector3Item(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_FLEXIBLE: arg #{1} - parameter 8 must be vector", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
 
                             SetFlexi(part, flexi, softness, gravity, friction, wind, tension, force);
 
                             break;
 
-                        case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
+                        case ScriptBaseClass.PRIM_POINT_LIGHT:
                             if (remain < 5)
-                                return null;
-                            bool light = rules.GetLSLIntegerItem(idx++);
-                            LSL_Vector lightcolor = rules.GetVector3Item(idx++);
-                            float intensity = (float)rules.GetLSLFloatItem(idx++);
-                            float radius = (float)rules.GetLSLFloatItem(idx++);
-                            float falloff = (float)rules.GetLSLFloatItem(idx++);
+                                return new LSL_List();
+                            bool light;
+                            LSL_Vector lightcolor;
+                            float intensity;
+                            float radius;
+                            float falloff;
+
+                            try
+                            {
+                                light = rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_POINT_LIGHT: arg #{1} - parameter 2 must be integer", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                lightcolor = rules.GetVector3Item(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_POINT_LIGHT: arg #{1} - parameter 3 must be vector", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                intensity = (float)rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_POINT_LIGHT: arg #{1} - parameter 4 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                radius = (float)rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_POINT_LIGHT: arg #{1} - parameter 5 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                falloff = (float)rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_POINT_LIGHT: arg #{1} - parameter 6 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
 
                             SetPointLight(part, light, lightcolor, intensity, radius, falloff);
 
                             break;
 
-                        case (int)ScriptBaseClass.PRIM_GLOW:
+                        case ScriptBaseClass.PRIM_GLOW:
                             if (remain < 2)
-                                return null;
-                            face = rules.GetLSLIntegerItem(idx++);
-                            float glow = (float)rules.GetLSLFloatItem(idx++);
+                                return new LSL_List();
+
+                            float glow;
+
+                            try
+                            {
+                                face = rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_GLOW: arg #{1} - parameter 2 must be integer", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                glow = (float)rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_GLOW: arg #{1} - parameter 3 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
 
                             SetGlow(part, face, glow);
 
                             break;
 
-                        case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
+                        case ScriptBaseClass.PRIM_BUMP_SHINY:
                             if (remain < 3)
-                                return null;
-                            face = (int)rules.GetLSLIntegerItem(idx++);
-                            int shiny = (int)rules.GetLSLIntegerItem(idx++);
-                            Bumpiness bump = (Bumpiness)(int)rules.GetLSLIntegerItem(idx++);
+                                return new LSL_List();
+
+                            int shiny;
+                            Bumpiness bump;
+
+                            try
+                            {
+                                face = (int)rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_BUMP_SHINY: arg #{1} - parameter 2 must be integer", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                shiny = (int)rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_BUMP_SHINY: arg #{1} - parameter 3 must be integer", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                bump = (Bumpiness)(int)rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_BUMP_SHINY: arg #{1} - parameter 4 must be integer", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
 
                             SetShiny(part, face, shiny, bump);
 
                             break;
 
-                         case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
-                             if (remain < 2)
-                                 return null;
-                             face = rules.GetLSLIntegerItem(idx++);
-                             bool st = rules.GetLSLIntegerItem(idx++);
-                             SetFullBright(part, face , st);
-                             break;
-
-                         case (int)ScriptBaseClass.PRIM_MATERIAL:
-                             if (remain < 1)
-                                 return null;
-                             int mat = rules.GetLSLIntegerItem(idx++);
-                             if (mat < 0 || mat > 7)
-                                 return null;
+                        case ScriptBaseClass.PRIM_FULLBRIGHT:
+                            if (remain < 2)
+                                return new LSL_List();
+                            bool st;
 
-                             part.Material = Convert.ToByte(mat);
-                             break;
+                            try
+                            {
+                                face = rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                               Error(originFunc, string.Format("Error running rule #{0} -> PRIM_FULLBRIGHT: arg #{1} - parameter 2 must be integer", rulesParsed, idx - idxStart - 1));
+                               return new LSL_List();
+                            }
+                            try
+                            {
+                                st = rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_FULLBRIGHT: arg #{1} - parameter 4 must be integer", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            SetFullBright(part, face , st);
+                            break;
 
-                         case (int)ScriptBaseClass.PRIM_PHANTOM:
-                             if (remain < 1)
-                                 return null;
+                        case ScriptBaseClass.PRIM_MATERIAL:
+                            if (remain < 1)
+                                return new LSL_List();
+                            int mat;
 
-                             string ph = rules.Data[idx++].ToString();
-                             part.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1"));
+                            try
+                            {
+                                mat = rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                               Error(originFunc, string.Format("Error running rule #{0} -> PRIM_MATERIAL: arg #{1} - parameter 2 must be integer", rulesParsed, idx - idxStart - 1));
+                               return new LSL_List();
+                            }
+                            if (mat < 0 || mat > 7)
+                                return new LSL_List();
 
-                             break;
+                            part.Material = Convert.ToByte(mat);
+                            break;
 
-                         case (int)ScriptBaseClass.PRIM_PHYSICS:
+                        case ScriptBaseClass.PRIM_PHANTOM:
                             if (remain < 1)
-                                 return null;
-                             string phy = rules.Data[idx++].ToString();
-                             bool physics;
+                                return new LSL_List();
+
+                            string ph = rules.Data[idx++].ToString();
+                            part.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1"));
 
-                             if (phy.Equals("1"))
-                                 physics = true;
-                             else
-                                 physics = false;
+                            break;
 
-                             part.ScriptSetPhysicsStatus(physics);
-                             break;
+                        case ScriptBaseClass.PRIM_PHYSICS:
+                           if (remain < 1)
+                                return new LSL_List();
+                            string phy = rules.Data[idx++].ToString();
+                            part.ScriptSetPhysicsStatus(phy.Equals("1"));
+                            break;
 
-                        case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE:
+                        case ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE:
                             if (remain < 1)
-                                return null;
+                                return new LSL_List();
 
-                            int shape_type = rules.GetLSLIntegerItem(idx++);
+                            int shape_type;
+
+                            try
+                            {
+                                shape_type = rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_PHYSICS_SHAPE_TYPE: arg #{1} - parameter 2 must be integer", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
 
                             ExtraPhysicsData physdata = new ExtraPhysicsData();
                             physdata.Density = part.Density;
@@ -8399,6 +10023,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                             break;
 
+<<<<<<< HEAD
+                        case ScriptBaseClass.PRIM_TEMP_ON_REZ:
+=======
                         case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
                             if (remain < 5)
                                 return null;
@@ -8414,76 +10041,192 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             break;
 
                         case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
+>>>>>>> avn/ubitvar
                             if (remain < 1)
-                                return null;
+                                return new LSL_List();
                             string temp = rules.Data[idx++].ToString();
 
                             part.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1"));
 
                             break;
 
-                        case (int)ScriptBaseClass.PRIM_TEXGEN:
+                        case ScriptBaseClass.PRIM_TEXGEN:
                             if (remain < 2)
-                                return null;
+                                return new LSL_List();
                                 //face,type
-                            face = rules.GetLSLIntegerItem(idx++);
-                            int style = rules.GetLSLIntegerItem(idx++);
+                            int style;
+
+                            try
+                            {
+                                face = rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                               Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TEXGEN: arg #{1} - parameter 2 must be integer", rulesParsed, idx - idxStart - 1));
+                               return new LSL_List();
+                            }
+                            try
+                            {
+                                style = rules.GetLSLIntegerItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                               Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TEXGEN: arg #{1} - parameter 3 must be integer", rulesParsed, idx - idxStart - 1));
+                               return new LSL_List();
+                            }
                             SetTexGen(part, face, style);
                             break;
-                        case (int)ScriptBaseClass.PRIM_TEXT:
+                        case ScriptBaseClass.PRIM_TEXT:
                             if (remain < 3)
-                                return null;
-                            string primText = rules.GetLSLStringItem(idx++);
-                            LSL_Vector primTextColor = rules.GetVector3Item(idx++);
-                            LSL_Float primTextAlpha = rules.GetLSLFloatItem(idx++);
+                                return new LSL_List();
+                            string primText;
+                            LSL_Vector primTextColor;
+                            LSL_Float primTextAlpha;
+
+                            try
+                            {
+                                primText = rules.GetLSLStringItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                               Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TEXT: arg #{1} - parameter 2 must be string", rulesParsed, idx - idxStart - 1));
+                               return new LSL_List();
+                            }
+                            try
+                            {
+                                primTextColor = rules.GetVector3Item(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                               Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TEXT: arg #{1} - parameter 3 must be vector", rulesParsed, idx - idxStart - 1));
+                               return new LSL_List();
+                            }
+                            try
+                            {
+                                primTextAlpha = rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                               Error(originFunc, string.Format("Error running rule #{0} -> PRIM_TEXT: arg #{1} - parameter 4 must be float", rulesParsed, idx - idxStart - 1));
+                               return new LSL_List();
+                            }
                             Vector3 av3 = Util.Clip(primTextColor, 0.0f, 1.0f);
                             part.SetText(primText, av3, Util.Clip((float)primTextAlpha, 0.0f, 1.0f));
 
                             break;
-                        case (int)ScriptBaseClass.PRIM_NAME:
+
+                        case ScriptBaseClass.PRIM_NAME:
                             if (remain < 1)
-                                return null;
-                            string primName = rules.GetLSLStringItem(idx++);
-                            part.Name = primName;
+                                return new LSL_List();
+                            try
+                            {
+                                string primName = rules.GetLSLStringItem(idx++);
+                                part.Name = primName;
+                            }
+                            catch(InvalidCastException)
+                            {
+                               Error(originFunc, string.Format("Error running rule #{0} -> PRIM_NAME: arg #{1} - parameter 2 must be string", rulesParsed, idx - idxStart - 1));
+                               return new LSL_List();
+                            }
                             break;
-                        case (int)ScriptBaseClass.PRIM_DESC:
+                        case ScriptBaseClass.PRIM_DESC:
                             if (remain < 1)
-                                return null;
-                            string primDesc = rules.GetLSLStringItem(idx++);
-                            part.Description = primDesc;
+                                return new LSL_List();
+                            try
+                            {
+                                string primDesc = rules.GetLSLStringItem(idx++);
+                                part.Description = primDesc;
+                            }
+                            catch(InvalidCastException)
+                            {
+                               Error(originFunc, string.Format("Error running rule #{0} -> PRIM_DESC: arg #{1} - parameter 2 must be string", rulesParsed, idx - idxStart - 1));
+                               return new LSL_List();
+                            }
                             break;
-                        case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
+                        case ScriptBaseClass.PRIM_ROT_LOCAL:
                             if (remain < 1)
-                                return null;
-                            SetRot(part, rules.GetQuaternionItem(idx++));
+                                return new LSL_List();
+                            LSL_Rotation rot;
+                            try
+                            {
+                                rot = rules.GetQuaternionItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                               Error(originFunc, string.Format("Error running rule #{0} -> PRIM_ROT_LOCAL: arg #{1} - parameter 2 must be rotation", rulesParsed, idx - idxStart - 1));
+                               return new LSL_List();
+                            }
+                            SetRot(part, rot);
                             break;
-                        case (int)ScriptBaseClass.PRIM_OMEGA:
+
+                        case ScriptBaseClass.PRIM_OMEGA:
                             if (remain < 3)
-                                return null;
-                            LSL_Vector axis = rules.GetVector3Item(idx++);
-                            LSL_Float spinrate = rules.GetLSLFloatItem(idx++);
-                            LSL_Float gain = rules.GetLSLFloatItem(idx++);
+                                return new LSL_List();
+                            LSL_Vector axis;
+                            LSL_Float spinrate;
+                            LSL_Float gain;
+
+                            try
+                            {
+                                axis = rules.GetVector3Item(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_OMEGA: arg #{1} - parameter 2 must be vector", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                spinrate = rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_OMEGA: arg #{1} - parameter 3 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+                            try
+                            {
+                                gain = rules.GetLSLFloatItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_OMEGA: arg #{1} - parameter 4 must be float", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
                             TargetOmega(part, axis, (double)spinrate, (double)gain);
                             break;
-                        case (int)ScriptBaseClass.PRIM_SLICE:
+
+                        case ScriptBaseClass.PRIM_SLICE:
                             if (remain < 1)
-                                return null;
-                            LSL_Vector slice = rules.GetVector3Item(idx++);
+                                return new LSL_List();
+                            LSL_Vector slice;
+                            try
+                            {
+                                slice = rules.GetVector3Item(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_SLICE: arg #{1} - parameter 2 must be vector", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
                             part.UpdateSlice((float)slice.x, (float)slice.y);
                             break;
-                        case (int)ScriptBaseClass.PRIM_LINK_TARGET:
+
+                        case ScriptBaseClass.PRIM_LINK_TARGET:
                             if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
-                                return null;
+                                return new LSL_List();
 
                             return rules.GetSublist(idx, -1);
+
+                        default:
+                            Error(originFunc, string.Format("Error running rule #{0}: arg #{1} - unsupported parameter", rulesParsed, idx - idxStart));
+                            return new LSL_List();
                     }
                 }
             }
             catch (InvalidCastException e)
             {
-                ShoutError(string.Format(
-                        "{0} error running rule #{1}: arg #{2} ",
-                        originFunc, rulesParsed, idx - idxStart) + e.Message);
+                Error(originFunc, string.Format("Error running rule #{0}: arg #{1} - ", rulesParsed, idx - idxStart) + e.Message);
             }
             finally
             {
@@ -8506,7 +10249,118 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            return null;
+
+            return new LSL_List();
+        }
+
+        protected LSL_List SetAgentParams(ScenePresence sp, LSL_List rules, string originFunc, ref uint rulesParsed)
+        {
+            int idx = 0;
+            int idxStart = 0;
+
+            try
+            {
+                while (idx < rules.Length)
+                {
+                    ++rulesParsed;
+                    int code = rules.GetLSLIntegerItem(idx++);
+
+                    int remain = rules.Length - idx;
+                    idxStart = idx;
+
+                    switch (code)
+                    {
+                        case ScriptBaseClass.PRIM_POSITION:
+                        case ScriptBaseClass.PRIM_POS_LOCAL:
+                            if (remain < 1)
+                                return new LSL_List();
+
+                            try
+                            {
+                                sp.OffsetPosition = rules.GetVector3Item(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                if (code == ScriptBaseClass.PRIM_POSITION)
+                                {
+                                    Error(originFunc, string.Format("Error running rule #{0} -> PRIM_POSITION: arg #{1} - parameter 2 must be vector", rulesParsed, idx - idxStart - 1));
+                                }
+                                else
+                                {
+                                    Error(originFunc, string.Format("Error running rule #{0} -> PRIM_POS_LOCAL: arg #{1} - parameter 2 must be vector", rulesParsed, idx - idxStart - 1));
+                                }
+                                return new LSL_List();
+                            }
+                            break;
+
+                        case ScriptBaseClass.PRIM_ROTATION:                       
+                            if (remain < 1)
+                                return new LSL_List();
+
+                            Quaternion inRot;
+
+                            try
+                            {
+                                inRot = rules.GetQuaternionItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_ROTATION: arg #{1} - parameter 2 must be rotation", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+
+                            SceneObjectPart parentPart = sp.ParentPart;
+
+                            if (parentPart != null)
+                                sp.Rotation = m_host.GetWorldRotation() * inRot;
+
+                            break;
+
+                        case ScriptBaseClass.PRIM_ROT_LOCAL:
+                            if (remain < 1)
+                                return new LSL_List();
+
+                            try
+                            {
+                                sp.Rotation = rules.GetQuaternionItem(idx++);
+                            }
+                            catch(InvalidCastException)
+                            {
+                                Error(originFunc, string.Format("Error running rule #{0} -> PRIM_ROT_LOCAL: arg #{1} - parameter 2 must be rotation", rulesParsed, idx - idxStart - 1));
+                                return new LSL_List();
+                            }
+
+                            break;
+
+                        case ScriptBaseClass.PRIM_TYPE:
+                            Error(originFunc, "PRIM_TYPE disallowed on agent");
+                            return new LSL_List();
+
+                        case ScriptBaseClass.PRIM_OMEGA:
+                            Error(originFunc, "PRIM_OMEGA disallowed on agent");
+                            return new LSL_List();
+
+                        case ScriptBaseClass.PRIM_LINK_TARGET:
+                            if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
+                                return new LSL_List();
+
+                            return rules.GetSublist(idx, -1);
+
+                        default:
+                            Error(originFunc,
+                                string.Format("Error running rule #{0} on agent: arg #{1} - disallowed on agent", rulesParsed, idx - idxStart));
+                            return new LSL_List();
+                    }
+                }
+            }
+            catch (InvalidCastException e)
+            {
+                Error(
+                    originFunc, 
+                    string.Format("Error running rule #{0}: arg #{1} - ", rulesParsed, idx - idxStart) + e.Message);
+            }
+
+            return new LSL_List();
         }
 
         public LSL_String llStringToBase64(string str)
@@ -8514,14 +10368,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             try
             {
-                byte[] encData_byte = new byte[str.Length];
+                byte[] encData_byte;
                 encData_byte = Util.UTF8.GetBytes(str);
                 string encodedData = Convert.ToBase64String(encData_byte);
                 return encodedData;
             }
-            catch (Exception e)
+            catch
             {
-                throw new Exception("Error in base64Encode" + e.Message);
+                Error("llBase64ToString", "Error encoding string");
+                return String.Empty;
             }
         }
 
@@ -8530,16 +10385,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             try
             {
-                return Util.Base64ToString(str);
+                byte[] b = Convert.FromBase64String(str);
+                return Encoding.UTF8.GetString(b);
             }
-            catch (Exception e)
+            catch
             {
-                throw new Exception("Error in base64Decode" + e.Message);
+                Error("llBase64ToString", "Error decoding string");
+                return String.Empty;
             }
         }
 
         public LSL_String llXorBase64Strings(string str1, string str2)
         {
+<<<<<<< HEAD
+            m_host.AddScriptLPS(1);
+            Deprecated("llXorBase64Strings", "Use llXorBase64 instead");
+            ScriptSleep(m_sleepMsOnXorBase64Strings);
+            return String.Empty;
+=======
             int padding = 0;
 
             string b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -8638,12 +10501,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 output += "=";
 
             return output;
+>>>>>>> avn/ubitvar
         }
 
         public void llRemoteDataSetRegion()
         {
             m_host.AddScriptLPS(1);
-            Deprecated("llRemoteDataSetRegion");
+            Deprecated("llRemoteDataSetRegion", "Use llOpenRemoteDataChannel instead");
         }
 
         public LSL_Float llLog10(double val)
@@ -8684,7 +10548,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             land.SetMusicUrl(url);
 
-            ScriptSleep(2000);
+            ScriptSleep(m_sleepMsOnSetParcelMusicURL);
         }
 
         public LSL_String llGetParcelMusicURL()
@@ -8768,25 +10632,186 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         }
 
         /// <summary>
-        /// A partial implementation.
+        /// Full implementation of llGetBoundingBox according to SL 2015-04-15.
+        /// http://wiki.secondlife.com/wiki/LlGetBoundingBox
         /// http://lslwiki.net/lslwiki/wakka.php?wakka=llGetBoundingBox
-        /// So far only valid for standing/flying/ground sitting avatars and single prim objects.
-        /// If the object has multiple prims and/or a sitting avatar then the bounding
-        /// box is for the root prim only.
+        /// Returns local bounding box of avatar without attachments
+        /// if target is non-seated avatar or prim/mesh in avatar attachment.
+        /// Returns local bounding box of object including seated avatars
+        /// if target is seated avatar or prim/mesh in object.
+        /// Uses meshing of prims for high accuracy
+        /// or less accurate box models for speed.
         /// </summary>
         public LSL_List llGetBoundingBox(string obj)
         {
             m_host.AddScriptLPS(1);
+
+            // Get target avatar if non-seated avatar or attachment, or prim and object
             UUID objID = UUID.Zero;
+            UUID.TryParse(obj, out objID);
+            ScenePresence agent = World.GetScenePresence(objID);
+            if (agent != null)
+            {
+                if (agent.ParentPart != null)
+                {
+                    objID = agent.ParentPart.UUID;
+                    agent = null;
+                }
+            }
+            SceneObjectGroup group = null;
+            SceneObjectPart target = World.GetSceneObjectPart(objID);
+            if (target != null)
+            {
+                group = target.ParentGroup;
+                if (group.IsAttachment) {
+                    objID = group.AttachedAvatar;
+                    agent = World.GetScenePresence(objID);
+                    group = null;
+                    target = null;
+                }
+            }
+
+            // Initialize but break if no target
             LSL_List result = new LSL_List();
+<<<<<<< HEAD
+            int groupCount = 0;
+            int partCount = 0;
+            int vertexCount = 0;
+            if (target == null && agent == null)
+=======
 
             // If the ID is not valid, return null result
             if (!UUID.TryParse(obj, out objID))
+>>>>>>> avn/ubitvar
             {
                 result.Add(new LSL_Vector());
                 result.Add(new LSL_Vector());
+                if (m_addStatsInGetBoundingBox)
+                    result.Add(new LSL_Vector((float)groupCount, (float)partCount, (float)vertexCount));
+                return result;
+            }
+<<<<<<< HEAD
+            Vector3 minPosition = new Vector3(float.MaxValue, float.MaxValue, float.MaxValue);
+            Vector3 maxPosition = new Vector3(float.MinValue, float.MinValue, float.MinValue);
+
+            // Try to get a mesher
+            IRendering primMesher = null;
+            List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
+            if (renderers.Count > 0)
+                primMesher = RenderingLoader.LoadRenderer(renderers[0]);
+
+            // Get bounding box of just avatar, seated or not
+            if (agent != null)
+            {
+                bool hasParent = false;
+                Vector3 lower;
+                Vector3 upper;
+                BoundingBoxOfScenePresence(agent, out lower, out upper);
+                Vector3 offset = Vector3.Zero;
+
+                // Since local bounding box unrotated and untilted, keep it simple
+                AddBoundingBoxOfSimpleBox(lower, upper, offset, agent.Rotation, hasParent, ref minPosition, ref maxPosition, ref vertexCount);
+                partCount++;
+                groupCount++;
+
+                // Return lower and upper bounding box corners
+                result.Add(new LSL_Vector(minPosition));
+                result.Add(new LSL_Vector(maxPosition));
+                if (m_addStatsInGetBoundingBox)
+                    result.Add(new LSL_Vector((float)groupCount, (float)partCount, (float)vertexCount));
                 return result;
             }
+            // Get bounding box of object including seated avatars
+            else if (group != null)
+            {
+                // Merge bounding boxes of all parts (prims and mesh)
+                foreach (SceneObjectPart part in group.Parts)
+                {
+                    bool hasParent = (!part.IsRoot);
+                    // When requested or if no mesher, keep it simple
+                    if (m_useSimpleBoxesInGetBoundingBox || primMesher == null)
+                    {
+                        AddBoundingBoxOfSimpleBox(part.Scale * -0.5f, part.Scale * 0.5f, part.OffsetPosition, part.RotationOffset, hasParent, ref minPosition, ref maxPosition, ref vertexCount);
+                    }
+                    // Do the full mounty
+                    else
+                    {
+                        Primitive omvPrim = part.Shape.ToOmvPrimitive(part.OffsetPosition, part.RotationOffset);
+                        byte[] sculptAsset = null;
+                        if (omvPrim.Sculpt != null)
+                            sculptAsset = World.AssetService.GetData(omvPrim.Sculpt.SculptTexture.ToString());
+
+                        // When part is mesh
+                        // Quirk: Only imports as incompletely populated faceted mesh object, so needs an own handler.
+                        if (omvPrim.Sculpt != null && omvPrim.Sculpt.Type == SculptType.Mesh && sculptAsset != null)
+                        {
+                            AssetMesh meshAsset = new AssetMesh(omvPrim.Sculpt.SculptTexture, sculptAsset);
+                            FacetedMesh mesh = null;
+                            FacetedMesh.TryDecodeFromAsset(omvPrim, meshAsset, DetailLevel.Highest, out mesh);
+                            meshAsset = null;
+                            if (mesh != null)
+                            {
+                                AddBoundingBoxOfFacetedMesh(mesh, omvPrim, hasParent, ref minPosition, ref maxPosition, ref vertexCount);
+                                mesh = null;
+                            }
+                        }
+
+                        // When part is sculpt
+                        // Quirk: Generated sculpt mesh is about 2.8% smaller in X and Y than visual sculpt.
+                        else if (omvPrim.Sculpt != null && omvPrim.Sculpt.Type != SculptType.Mesh && sculptAsset != null)
+                        {
+                            IJ2KDecoder imgDecoder = World.RequestModuleInterface<IJ2KDecoder>();
+                            if (imgDecoder != null)
+                            {
+                                Image sculpt = imgDecoder.DecodeToImage(sculptAsset);
+                                if (sculpt != null)
+                                {
+                                    SimpleMesh mesh = primMesher.GenerateSimpleSculptMesh(omvPrim, (Bitmap)sculpt, DetailLevel.Medium);
+                                    sculpt.Dispose();
+                                    if (mesh != null)
+                                    {
+                                        AddBoundingBoxOfSimpleMesh(mesh, omvPrim, hasParent, ref minPosition, ref maxPosition, ref vertexCount);
+                                        mesh = null;
+                                    }
+                                }
+                            }
+                        }
+
+                        // When part is prim
+                        else if (omvPrim.Sculpt == null)
+                        {
+                            SimpleMesh mesh = primMesher.GenerateSimpleMesh(omvPrim, DetailLevel.Medium);
+                            if (mesh != null)
+                            {
+                                AddBoundingBoxOfSimpleMesh(mesh, omvPrim, hasParent, ref minPosition, ref maxPosition, ref vertexCount);
+                                mesh = null;
+                            }
+                        }
+
+                        // When all else fails, try fallback to simple box
+                        else
+                        {
+                            AddBoundingBoxOfSimpleBox(part.Scale * -0.5f, part.Scale * 0.5f, part.OffsetPosition, part.RotationOffset, hasParent, ref minPosition, ref maxPosition, ref vertexCount);
+                        }
+                    }
+                    partCount++;
+                }
+            }
+
+            // Merge bounding boxes of seated avatars
+            foreach (ScenePresence sp in group.GetSittingAvatars())
+            {
+                Vector3 lower;
+                Vector3 upper;
+                BoundingBoxOfScenePresence(sp, out lower, out upper);
+                Vector3 offset = sp.OffsetPosition;
+
+                bool hasParent = true;
+                // When requested or if no mesher, keep it simple
+                if (m_useSimpleBoxesInGetBoundingBox || primMesher == null)
+                {
+                    AddBoundingBoxOfSimpleBox(lower, upper, offset, sp.Rotation, hasParent, ref minPosition, ref maxPosition, ref vertexCount);
+=======
 
             // Check if this is an attached prim. If so, replace
             // the UUID with the avatar UUID and report it's bounding box
@@ -8830,9 +10855,68 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     // This is for ground sitting avatars TODO!
                     lower = new LSL_Vector(-box.X - 0.1125, -box.Y, box.Z * -1.0f);
                     upper = new LSL_Vector(box.X + 0.1125, box.Y, box.Z * -1.0f);
+>>>>>>> avn/ubitvar
                 }
+                // Do the full mounty
                 else
                 {
+<<<<<<< HEAD
+                    // Prim shapes don't do center offsets, so add it here.
+                    offset = offset + (lower + upper) * 0.5f * sp.Rotation;
+                    Primitive omvPrim = MakeOpenMetaversePrim(upper - lower, offset, sp.Rotation, ScriptBaseClass.PRIM_TYPE_SPHERE);
+                    SimpleMesh mesh = primMesher.GenerateSimpleMesh(omvPrim, DetailLevel.Medium);
+                    AddBoundingBoxOfSimpleMesh(mesh, omvPrim, hasParent, ref minPosition, ref maxPosition, ref vertexCount);
+                    mesh = null;
+                }
+                partCount++;
+            }
+
+            groupCount++;
+
+            // Return lower and upper bounding box corners
+            result.Add(new LSL_Vector(minPosition));
+            result.Add(new LSL_Vector(maxPosition));
+            if (m_addStatsInGetBoundingBox)
+                result.Add(new LSL_Vector((float)groupCount, (float)partCount, (float)vertexCount));
+
+            primMesher = null;
+            return result;
+        }
+
+        /// <summary>
+        /// Helper to calculate bounding box of an avatar.
+        /// </summary>
+        private void BoundingBoxOfScenePresence(ScenePresence sp, out Vector3 lower, out Vector3 upper)
+        {
+            // Adjust from OS model
+            // avatar height = visual height - 0.2, bounding box height = visual height
+            // to SL model
+            // avatar height = visual height, bounding box height = visual height + 0.2
+            float height = sp.Appearance.AvatarHeight + m_avatarHeightCorrection;
+
+            // According to avatar bounding box in SL 2015-04-18:
+            // standing = <-0.275,-0.35,-0.1-0.5*h> : <0.275,0.35,0.1+0.5*h>
+            // groundsitting = <-0.3875,-0.5,-0.05-0.375*h> : <0.3875,0.5,0.5>
+            // sitting = <-0.5875,-0.35,-0.35-0.375*h> : <0.1875,0.35,-0.25+0.25*h>
+
+            // When avatar is sitting
+            if (sp.ParentPart != null)
+            {
+                lower = new Vector3(m_lABB1SitX0, m_lABB1SitY0, m_lABB1SitZ0 + m_lABB1SitZ1 * height);
+                upper = new Vector3(m_lABB2SitX0, m_lABB2SitY0, m_lABB2SitZ0 + m_lABB2SitZ1 * height);
+            }
+            // When avatar is groundsitting
+            else if (sp.Animator.Animations.ImplicitDefaultAnimation.AnimID == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
+            {
+                lower = new Vector3(m_lABB1GrsX0, m_lABB1GrsY0, m_lABB1GrsZ0 + m_lABB1GrsZ1 * height);
+                upper = new Vector3(m_lABB2GrsX0, m_lABB2GrsY0, m_lABB2GrsZ0 + m_lABB2GrsZ1 * height);
+            }
+            // When avatar is standing or flying
+            else
+            {
+                lower = new Vector3(m_lABB1StdX0, m_lABB1StdY0, m_lABB1StdZ0 + m_lABB1StdZ1 * height);
+                upper = new Vector3(m_lABB2StdX0, m_lABB2StdY0, m_lABB2StdZ0 + m_lABB2StdZ1 * height);
+=======
                     // This is for standing/flying avatars
                     lower = new LSL_Vector(-box.X, -box.Y, -box.Z);
                     upper = new LSL_Vector(box.X, box.Y, box.Z);
@@ -8890,22 +10974,230 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 result.Add(lower);
                 result.Add(upper);
                 return result;
+>>>>>>> avn/ubitvar
             }
+        }
 
-            // Not found so return empty values
-            result.Add(new LSL_Vector());
-            result.Add(new LSL_Vector());
-            return result;
+        /// <summary>
+        /// Helper to approximate a part with a simple box.
+        /// </summary>
+        private void AddBoundingBoxOfSimpleBox(Vector3 corner1, Vector3 corner2, Vector3 offset, Quaternion rotation, bool hasParent, ref Vector3 lower, ref Vector3 upper, ref int count)
+        {
+            // Parse the 8 box corners
+            for (int i = 0; i < 8; i++)
+            {
+                // Calculate each box corner
+                Vector3 position = corner1;
+                if ((i & 1) != 0)
+                    position.X = corner2.X;
+                if ((i & 2) != 0)
+                    position.Y = corner2.Y;
+                if ((i & 4) != 0)
+                    position.Z = corner2.Z;
+                // Rotate part unless part is root
+                if (hasParent)
+                    position = position * rotation;
+                position = position + offset;
+                // Adjust lower and upper bounding box corners if needed
+                lower = Vector3.Min(lower, position);
+                upper = Vector3.Max(upper, position);
+                count++;
+            }
+        }
+
+        /// <summary>
+        /// Helper to parse a meshed prim and needed especially
+        /// for accuracy with tortured prims and sculpts.
+        /// </summary>
+        private void AddBoundingBoxOfSimpleMesh(SimpleMesh mesh, Primitive prim, bool hasParent, ref Vector3 lower, ref Vector3 upper, ref int count)
+        {
+            // Quirk: A meshed box contains 10 instead of the 8 necessary vertices.
+            if (mesh != null)
+            {
+                // Parse each vertex in mesh
+                foreach (Vertex vertex in mesh.Vertices)
+                {
+                    Vector3 position = vertex.Position;
+                    position = position * prim.Scale;
+                    // Rotate part unless part is root
+                    if (hasParent)
+                        position = position * prim.Rotation;
+                    position = position + prim.Position;
+                    // Adjust lower and upper bounding box corners if needed
+                    lower = Vector3.Min(lower, position);
+                    upper = Vector3.Max(upper, position);
+                    count++;
+                }
+            }
         }
 
+        /// <summary>
+        /// Helper to parse mesh because no method exists
+        /// to parse mesh assets to SimpleMesh.
+        /// </summary>
+        private void AddBoundingBoxOfFacetedMesh(FacetedMesh mesh, Primitive prim, bool hasParent, ref Vector3 lower, ref Vector3 upper, ref int count)
+        {
+            if (mesh != null)
+            {
+                // Parse each face in mesh
+                // since vertex array isn't populated.
+                // This parses each unique vertex 3-6 times.
+                foreach (Face face in mesh.Faces)
+                {
+                    // Parse each vertex in face
+                    foreach (Vertex vertex in face.Vertices)
+                    {
+                        Vector3 position = vertex.Position;
+                        position = position * prim.Scale;
+                        // Rotate part unless part is root
+                        if (hasParent)
+                            position = position * prim.Rotation;
+                        position = position + prim.Position;
+                        // Adjust lower and upper bounding box corners if needed
+                        lower = Vector3.Min(lower, position);
+                        upper = Vector3.Max(upper, position);
+                        count++;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Helper to make up an OpenMetaverse prim
+        /// needed to create mesh from parts.
+        /// </summary>
+        private Primitive MakeOpenMetaversePrim(Vector3 scale, Vector3 position, Quaternion rotation, int primType)
+        {
+            // Initialize and set common parameters
+            Primitive prim = new OpenMetaverse.Primitive();
+            prim.Scale = scale;
+            prim.Position = position;
+            prim.Rotation = rotation;
+            prim.PrimData.PathShearX = 0.0f;
+            prim.PrimData.PathShearY = 0.0f;
+            prim.PrimData.PathBegin = 0.0f;
+            prim.PrimData.PathEnd = 1.0f;
+            prim.PrimData.PathScaleX = 1.0f;
+            prim.PrimData.PathScaleY = 1.0f;
+            prim.PrimData.PathTaperX = 0.0f;
+            prim.PrimData.PathTaperY = 0.0f;
+            prim.PrimData.PathTwistBegin = 0.0f;
+            prim.PrimData.PathTwist = 0.0f;
+            prim.PrimData.ProfileBegin = 0.0f;
+            prim.PrimData.ProfileEnd = 1.0f;
+            prim.PrimData.ProfileHollow = 0.0f;
+            prim.PrimData.ProfileCurve = (ProfileCurve)1;
+            prim.PrimData.ProfileHole = (HoleType)0;
+            prim.PrimData.PathCurve = (PathCurve)16;
+            prim.PrimData.PathRadiusOffset = 0.0f;
+            prim.PrimData.PathRevolutions = 1.0f;
+            prim.PrimData.PathSkew = 0.0f;
+            prim.PrimData.PCode = OpenMetaverse.PCode.Prim;
+            prim.PrimData.State = (byte)0;
+
+            // Set type specific parameters
+            switch (primType)
+            {
+                // Set specific parameters for box
+                case ScriptBaseClass.PRIM_TYPE_BOX:
+                    prim.PrimData.PathScaleY = 1.0f;
+                    prim.PrimData.ProfileCurve = (ProfileCurve)1;
+                    prim.PrimData.PathCurve = (PathCurve)16;
+                    break;
+                // Set specific parameters for cylinder
+                case ScriptBaseClass.PRIM_TYPE_CYLINDER:
+                    prim.PrimData.PathScaleY = 1.0f;
+                    prim.PrimData.ProfileCurve = (ProfileCurve)0;
+                    prim.PrimData.PathCurve = (PathCurve)16;
+                    break;
+                // Set specific parameters for prism
+                case ScriptBaseClass.PRIM_TYPE_PRISM:
+                    prim.PrimData.PathScaleY = 1.0f;
+                    prim.PrimData.ProfileCurve = (ProfileCurve)3;
+                    prim.PrimData.PathCurve = (PathCurve)16;
+                    break;
+                // Set specific parameters for sphere
+                case ScriptBaseClass.PRIM_TYPE_SPHERE:
+                    prim.PrimData.PathScaleY = 1.0f;
+                    prim.PrimData.ProfileCurve = (ProfileCurve)5;
+                    prim.PrimData.PathCurve = (PathCurve)32;
+                    break;
+                // Set specific parameters for torus
+                case ScriptBaseClass.PRIM_TYPE_TORUS:
+                    prim.PrimData.PathScaleY = 0.5f;
+                    prim.PrimData.ProfileCurve = (ProfileCurve)0;
+                    prim.PrimData.PathCurve = (PathCurve)32;
+                    break;
+                // Set specific parameters for tube
+                case ScriptBaseClass.PRIM_TYPE_TUBE:
+                    prim.PrimData.PathScaleY = 0.5f;
+                    prim.PrimData.ProfileCurve = (ProfileCurve)1;
+                    prim.PrimData.PathCurve = (PathCurve)32;
+                    break;
+                // Set specific parameters for ring
+                case ScriptBaseClass.PRIM_TYPE_RING:
+                    prim.PrimData.PathScaleY = 0.5f;
+                    prim.PrimData.ProfileCurve = (ProfileCurve)3;
+                    prim.PrimData.PathCurve = (PathCurve)32;
+                    break;
+                // Set specific parameters for sculpt
+                case ScriptBaseClass.PRIM_TYPE_SCULPT:
+                    prim.PrimData.PathScaleY = 1.0f;
+                    prim.PrimData.ProfileCurve = (ProfileCurve)5;
+                    prim.PrimData.PathCurve = (PathCurve)32;
+                    break;
+                // Default to specific parameters for box
+                default:
+                    prim.PrimData.PathScaleY = 1.0f;
+                    prim.PrimData.ProfileCurve = (ProfileCurve)1;
+                    prim.PrimData.PathCurve = (PathCurve)16;
+                    break;
+            }
+
+            return prim;
+        }
+
+        /// <summary>
+        /// Implementation of llGetGeometricCenter according to SL 2015-04-30.
+        /// http://wiki.secondlife.com/wiki/LlGetGeometricCenter
+        /// Returns the average position offset of all linked parts,
+        /// including the root prim and seated avatars,
+        /// relative to the root prim in local coordinates.
+        /// </summary>
         public LSL_Vector llGetGeometricCenter()
         {
-            return new LSL_Vector(m_host.GetGeometricCenter());
+            // Subtract whatever position the root prim has to make it zero
+            Vector3 offset = m_host.ParentGroup.RootPart.OffsetPosition * -1.0f;
+
+            // Add all prim/part position offsets
+            foreach (SceneObjectPart part in m_host.ParentGroup.Parts)
+                offset = offset + part.OffsetPosition;
+            // Add all avatar/scene presence position offsets
+            foreach (ScenePresence sp in m_host.ParentGroup.GetSittingAvatars())
+                offset = offset + sp.OffsetPosition;
+
+            // Calculate and return the average offset
+            offset = offset / (float)(m_host.ParentGroup.PrimCount + m_host.ParentGroup.GetSittingAvatarsCount());
+            return new LSL_Vector(offset);
         }
 
         public LSL_List llGetPrimitiveParams(LSL_List rules)
         {
+<<<<<<< HEAD
+            LSL_List result = new LSL_List();
+            LSL_List remaining;
+
+            while (true)
+            {
+//                m_log.DebugFormat(
+//                    "[LSL API]: GetEntityParams has {0} rules with scene entity named {1}", 
+//                    rules.Length, entity != null ? entity.Name : "NULL");
+
+                if (entity == null)
+                    return result;
+=======
             m_host.AddScriptLPS(1);
+>>>>>>> avn/ubitvar
 
             LSL_List result = new LSL_List();
 
@@ -8915,7 +11207,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 int linknumber = remaining.GetLSLIntegerItem(0);
                 rules = remaining.GetSublist(1, -1);
+<<<<<<< HEAD
+                entity = GetLinkEntity(m_host, linknumber);
+            }
+        }
+=======
                 List<SceneObjectPart> parts = GetLinkParts(linknumber);
+>>>>>>> avn/ubitvar
 
                 foreach (SceneObjectPart part in parts)
                     remaining = GetPrimParams(part, rules, ref result);
@@ -8928,8 +11226,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
+<<<<<<< HEAD
+            return GetEntityParams(GetLinkEntity(m_host, linknumber), rules);
+        }
+=======
             // acording to SL wiki this must indicate a single link number or link_root or link_this.
             // keep other options as before
+>>>>>>> avn/ubitvar
 
             List<SceneObjectPart> parts;
             List<ScenePresence> avatars;
@@ -8945,12 +11248,161 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 remaining = null;
                 foreach (SceneObjectPart part in parts)
                 {
+<<<<<<< HEAD
+                    case (int)ScriptBaseClass.PRIM_MATERIAL:
+                        res.Add(new LSL_Integer(ScriptBaseClass.PRIM_MATERIAL_FLESH));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_PHYSICS:
+                        res.Add(ScriptBaseClass.FALSE);
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
+                        res.Add(ScriptBaseClass.FALSE);
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_PHANTOM:
+                        res.Add(ScriptBaseClass.FALSE);
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_POSITION:
+                        res.Add(new LSL_Vector(sp.AbsolutePosition));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_SIZE:
+                        res.Add(GetAgentSize(sp));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_ROTATION:
+                        res.Add(sp.GetWorldRotation());
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_TYPE:
+                        res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TYPE_BOX));
+                        res.Add(new LSL_Integer(ScriptBaseClass.PRIM_HOLE_DEFAULT));
+                        res.Add(new LSL_Vector(0, 1, 0));
+                        res.Add(new LSL_Float(0));
+                        res.Add(new LSL_Vector(0, 0, 0));
+                        res.Add(new LSL_Vector(1, 1, 0));
+                        res.Add(new LSL_Vector(0, 0, 0));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_TEXTURE:
+                        if (remain < 1)
+                            return new LSL_List();
+
+                        int face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face > 21)
+                            break;
+
+                        res.Add(new LSL_String(""));
+                        res.Add(ScriptBaseClass.ZERO_VECTOR);
+                        res.Add(ScriptBaseClass.ZERO_VECTOR);
+                        res.Add(new LSL_Float(0));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_COLOR:
+                        if (remain < 1)
+                            return new LSL_List();
+
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face > 21)
+                            break;
+
+                        res.Add(ScriptBaseClass.ZERO_VECTOR);
+                        res.Add(new LSL_Float(0));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
+                        if (remain < 1)
+                            return new LSL_List();
+
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face > 21)
+                            break;
+
+                        res.Add(ScriptBaseClass.PRIM_SHINY_NONE);
+                        res.Add(ScriptBaseClass.PRIM_BUMP_NONE);
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
+                        if (remain < 1)
+                            return new LSL_List();
+
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face > 21)
+                            break;
+
+                        res.Add(ScriptBaseClass.FALSE);
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_FLEXIBLE:
+                        res.Add(ScriptBaseClass.FALSE);
+                        res.Add(new LSL_Integer(0));
+                        res.Add(new LSL_Float(0));
+                        res.Add(new LSL_Float(0));
+                        res.Add(new LSL_Float(0));
+                        res.Add(new LSL_Float(0));
+                        res.Add(ScriptBaseClass.ZERO_VECTOR);
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_TEXGEN:
+                        if (remain < 1)
+                            return new LSL_List();
+
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face > 21)
+                            break;
+
+                        res.Add(ScriptBaseClass.PRIM_TEXGEN_DEFAULT);
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
+                        res.Add(ScriptBaseClass.FALSE);
+                        res.Add(ScriptBaseClass.ZERO_VECTOR);
+                        res.Add(ScriptBaseClass.ZERO_VECTOR);
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_GLOW:
+                        if (remain < 1)
+                            return new LSL_List();
+
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face > 21)
+                            break;
+
+                        res.Add(new LSL_Float(0));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_TEXT:
+                        res.Add(new LSL_String(""));
+                        res.Add(ScriptBaseClass.ZERO_VECTOR);
+                        res.Add(new LSL_Float(1));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
+                        res.Add(new LSL_Rotation(sp.Rotation));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_POS_LOCAL:
+                        res.Add(new LSL_Vector(sp.OffsetPosition));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_SLICE:
+                        res.Add(new LSL_Vector(0, 1, 0));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_LINK_TARGET:
+                        if(remain < 3)
+                            return new LSL_List();
+=======
                     remaining = GetPrimParams(part, rules, ref res);
                 }
                 foreach (ScenePresence avatar in avatars)
                 {
                     remaining = GetPrimParams(avatar, rules, ref res);
                 }
+>>>>>>> avn/ubitvar
 
                 if ((object)remaining != null && remaining.Length > 0)
                 {
@@ -8961,7 +11413,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     break;
             }
 
+<<<<<<< HEAD
+            return new LSL_List();
+=======
             return res;
+>>>>>>> avn/ubitvar
         }
 
         public LSL_List GetPrimParams(SceneObjectPart part, LSL_List rules, ref LSL_List res)
@@ -9014,6 +11470,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         res.Add(GetPartRot(part));
                         break;
 
+                    case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE:
+                        res.Add(new LSL_Integer((int)part.PhysicsShapeType));
+                        break;
+
                     case (int)ScriptBaseClass.PRIM_TYPE:
                         // implementing box
                         PrimitiveBaseShape Shape = part.Shape;
@@ -9101,7 +11561,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     case (int)ScriptBaseClass.PRIM_TEXTURE:
                         if (remain < 1)
-                            return null;
+                            return new LSL_List();
 
                         int face = (int)rules.GetLSLIntegerItem(idx++);
                         Primitive.TextureEntry tex = part.Shape.Textures;
@@ -9141,7 +11601,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     case (int)ScriptBaseClass.PRIM_COLOR:
                         if (remain < 1)
-                            return null;
+                            return new LSL_List();
 
                         face=(int)rules.GetLSLIntegerItem(idx++);
 
@@ -9170,7 +11630,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
                         if (remain < 1)
-                            return null;
+                            return new LSL_List();
 
                         face = (int)rules.GetLSLIntegerItem(idx++);
 
@@ -9227,7 +11687,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
                         if (remain < 1)
-                            return null;
+                            return new LSL_List();
 
                         face = (int)rules.GetLSLIntegerItem(idx++);
 
@@ -9282,7 +11742,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case (int)ScriptBaseClass.PRIM_TEXGEN:
                         // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
                         if (remain < 1)
-                            return null;
+                            return new LSL_List();
 
                         face = (int)rules.GetLSLIntegerItem(idx++);
 
@@ -9331,7 +11791,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     case (int)ScriptBaseClass.PRIM_GLOW:
                         if (remain < 1)
-                            return null;
+                            return new LSL_List();
 
                         face = (int)rules.GetLSLIntegerItem(idx++);
 
@@ -9358,7 +11818,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         res.Add(new LSL_Vector(textColor.R,
                                                textColor.G,
                                                textColor.B));
-                        res.Add(new LSL_Float(textColor.A));
+                        res.Add(new LSL_Float(1.0 - textColor.A));
                         break;
 
                     case (int)ScriptBaseClass.PRIM_NAME:
@@ -9388,26 +11848,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         // TODO: Should be issuing a runtime script warning in this case.
                         if (remain < 2)
-                            return null;
+                            return new LSL_List();
 
                         return rules.GetSublist(idx, -1);
                 }
             }
 
-            return null;
+            return new LSL_List();
         }
 
         public LSL_List llGetPrimMediaParams(int face, LSL_List rules)
         {
             m_host.AddScriptLPS(1);
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnGetPrimMediaParams);
             return GetPrimMediaParams(m_host, face, rules);
         }
 
         public LSL_List llGetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules)
         {
             m_host.AddScriptLPS(1);
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnGetLinkMedia);
             if (link == ScriptBaseClass.LINK_ROOT)
                 return GetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules);
             else if (link == ScriptBaseClass.LINK_THIS)
@@ -9527,14 +11987,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules)
         {
             m_host.AddScriptLPS(1);
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnSetPrimMediaParams);
             return SetPrimMediaParams(m_host, face, rules);
         }
 
         public LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules)
         {
             m_host.AddScriptLPS(1);
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnSetLinkMedia);
             if (link == ScriptBaseClass.LINK_ROOT)
                 return SetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules);
             else if (link == ScriptBaseClass.LINK_THIS)
@@ -9653,14 +12113,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llClearPrimMedia(LSL_Integer face)
         {
             m_host.AddScriptLPS(1);
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnClearPrimMedia);
             return ClearPrimMedia(m_host, face);
         }
 
         public LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face)
         {
             m_host.AddScriptLPS(1);
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnClearLinkMedia);
             if (link == ScriptBaseClass.LINK_ROOT)
                 return ClearPrimMedia(m_host.ParentGroup.RootPart, face);
             else if (link == ScriptBaseClass.LINK_THIS)
@@ -10268,7 +12728,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (item == null)
             {
-                llSay(0, "No item name '" + item + "'");
+                Error("llGetInventoryCreator", "Can't find item '" + item + "'");
 
                 return String.Empty;
             }
@@ -10316,7 +12776,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case ScriptBaseClass.DATA_SIM_POS:
                         if (info == null)
                         {
-                            ScriptSleep(1000);
+                            ScriptSleep(m_sleepMsOnRequestSimulatorData);
                             return UUID.Zero.ToString();
                         }
 
@@ -10363,7 +12823,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case ScriptBaseClass.DATA_SIM_RATING:
                         if (info == null)
                         {
-                            ScriptSleep(1000);
+                            ScriptSleep(m_sleepMsOnRequestSimulatorData);
                             return UUID.Zero.ToString();
                         }
                         int access = info.Maturity;
@@ -10382,7 +12842,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         reply = "OpenSim";
                         break;
                     default:
-                        ScriptSleep(1000);
+                        ScriptSleep(m_sleepMsOnRequestSimulatorData);
                         return UUID.Zero.ToString(); // Raise no event
                 }
                 UUID rq = UUID.Random();
@@ -10393,7 +12853,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 AsyncCommands.
                     DataserverPlugin.DataserverReply(rq.ToString(), reply);
 
-                ScriptSleep(1000);
+                ScriptSleep(m_sleepMsOnRequestSimulatorData);
                 return tid.ToString();
             }
             catch(Exception)
@@ -10462,7 +12922,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_List llListReplaceList(LSL_List dest, LSL_List src, int start, int end)
         {
-            LSL_List pref = null;
+            LSL_List pref;
 
             m_host.AddScriptLPS(1);
 
@@ -10542,7 +13002,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 dm.SendUrlToUser(
                     new UUID(avatar_id), m_host.Name, m_host.UUID, m_host.OwnerID, false, message, url);
 
-            ScriptSleep(10000);
+            ScriptSleep(m_sleepMsOnLoadURL);
         }
 
         public void llParcelMediaCommandList(LSL_List commandList)
@@ -10591,7 +13051,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                     presence = World.GetScenePresence(agentID);
                                 }
                             }
-                            else ShoutError("The argument of PARCEL_MEDIA_COMMAND_AGENT must be a key");
+                            else Error("llParcelMediaCommandList", "The argument of PARCEL_MEDIA_COMMAND_AGENT must be a key");
                             ++i;
                         }
                         break;
@@ -10622,7 +13082,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 url = (LSL_String)commandList.Data[i + 1];
                                 update = true;
                             }
-                            else ShoutError("The argument of PARCEL_MEDIA_COMMAND_URL must be a string.");
+                            else Error("llParcelMediaCommandList", "The argument of PARCEL_MEDIA_COMMAND_URL must be a string");
                             ++i;
                         }
                         break;
@@ -10635,7 +13095,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 texture = (LSL_String)commandList.Data[i + 1];
                                 update = true;
                             }
-                            else ShoutError("The argument of PARCEL_MEDIA_COMMAND_TEXTURE must be a string or key.");
+                            else Error("llParcelMediaCommandList", "The argument of PARCEL_MEDIA_COMMAND_TEXTURE must be a string or a key");
                             ++i;
                         }
                         break;
@@ -10647,7 +13107,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             {
                                 time = (float)(LSL_Float)commandList.Data[i + 1];
                             }
-                            else ShoutError("The argument of PARCEL_MEDIA_COMMAND_TIME must be a float.");
+                            else Error("llParcelMediaCommandList", "The argument of PARCEL_MEDIA_COMMAND_TIME must be a float");
                             ++i;
                         }
                         break;
@@ -10661,7 +13121,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 update = true;
                             }
 
-                            else ShoutError("The argument of PARCEL_MEDIA_COMMAND_AUTO_ALIGN must be an integer.");
+                            else Error("llParcelMediaCommandList", "The argument of PARCEL_MEDIA_COMMAND_AUTO_ALIGN must be an integer");
                             ++i;
                         }
                         break;
@@ -10674,7 +13134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 mediaType = (LSL_String)commandList.Data[i + 1];
                                 update = true;
                             }
-                            else ShoutError("The argument of PARCEL_MEDIA_COMMAND_TYPE must be a string.");
+                            else Error("llParcelMediaCommandList", "The argument of PARCEL_MEDIA_COMMAND_TYPE must be a string");
                             ++i;
                         }
                         break;
@@ -10687,7 +13147,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 description = (LSL_String)commandList.Data[i + 1];
                                 update = true;
                             }
-                            else ShoutError("The argument of PARCEL_MEDIA_COMMAND_DESC must be a string.");
+                            else Error("llParcelMediaCommandList", "The argument of PARCEL_MEDIA_COMMAND_DESC must be a string");
                             ++i;
                         }
                         break;
@@ -10703,15 +13163,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                     height = (LSL_Integer)commandList.Data[i + 2];
                                     update = true;
                                 }
-                                else ShoutError("The second argument of PARCEL_MEDIA_COMMAND_SIZE must be an integer.");
+                                else Error("llParcelMediaCommandList", "The second argument of PARCEL_MEDIA_COMMAND_SIZE must be an integer");
                             }
-                            else ShoutError("The first argument of PARCEL_MEDIA_COMMAND_SIZE must be an integer.");
+                            else Error("llParcelMediaCommandList", "The first argument of PARCEL_MEDIA_COMMAND_SIZE must be an integer");
                             i += 2;
                         }
                         break;
 
                     default:
-                        NotImplemented("llParcelMediaCommandList parameter not supported yet: " + Enum.Parse(typeof(ParcelMediaCommandEnum), commandList.Data[i].ToString()).ToString());
+                        NotImplemented("llParcelMediaCommandList", "Parameter not supported yet: " + Enum.Parse(typeof(ParcelMediaCommandEnum), commandList.Data[i].ToString()).ToString());
                         break;
                 }//end switch
             }//end for
@@ -10785,7 +13245,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                                                       time);
                 }
             }
-            ScriptSleep(2000);
+            ScriptSleep(m_sleepMsOnParcelMediaCommandList);
         }
 
         public LSL_List llParcelMediaQuery(LSL_List aList)
@@ -10819,13 +13279,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             break;
                         default:
                             ParcelMediaCommandEnum mediaCommandEnum = ParcelMediaCommandEnum.Url;
-                            NotImplemented("llParcelMediaQuery parameter do not supported yet: " + Enum.Parse(mediaCommandEnum.GetType() , aList.Data[i].ToString()).ToString());
+                            NotImplemented("llParcelMediaQuery", "Parameter not supported yet: " + Enum.Parse(mediaCommandEnum.GetType() , aList.Data[i].ToString()).ToString());
                             break;
                     }
 
                 }
             }
-            ScriptSleep(2000);
+            ScriptSleep(m_sleepMsOnParcelMediaQuery);
             return list;
         }
 
@@ -10834,7 +13294,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             Int64 tmp = 0;
             Math.DivRem(Convert.ToInt64(Math.Pow(a, b)), c, out tmp);
-            ScriptSleep(1000);
+            ScriptSleep(m_sleepMsOnModPow);
             return Convert.ToInt32(tmp);
         }
 
@@ -10856,11 +13316,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (quick_pay_buttons.Data.Length < 4)
             {
+<<<<<<< HEAD
+                Error("llSetPayPrice", "List must have at least 4 elements");
+                return;
+=======
                 int x;
                 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
                 {
                     quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
                 }
+>>>>>>> avn/ubitvar
             }
             int[] nPrice = new int[5];
             nPrice[0] = price;
@@ -10881,7 +13346,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
             {
-                ShoutError("No permissions to track the camera");
+                Error("llGetCameraPos", "No permissions to track the camera");
                 return Vector3.Zero;
             }
 
@@ -10905,7 +13370,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
             {
-                ShoutError("No permissions to track the camera");
+                Error("llGetCameraRot", "No permissions to track the camera");
                 return Quaternion.Identity;
             }
 
@@ -10919,25 +13384,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return Quaternion.Identity;
         }
 
-        /// <summary>
-        /// The SL implementation does nothing, it is deprecated
-        /// This duplicates SL
-        /// </summary>
         public void llSetPrimURL(string url)
         {
             m_host.AddScriptLPS(1);
-            ScriptSleep(2000);
+            Deprecated("llSetPrimURL", "Use llSetPrimMediaParams instead");
+            ScriptSleep(m_sleepMsOnSetPrimURL);
         }
 
-        /// <summary>
-        /// The SL implementation shouts an error, it is deprecated
-        /// This duplicates SL
-        /// </summary>
         public void llRefreshPrimURL()
         {
             m_host.AddScriptLPS(1);
-            ShoutError("llRefreshPrimURL - not yet supported");
-            ScriptSleep(20000);
+            Deprecated("llRefreshPrimURL");
+            ScriptSleep(m_sleepMsOnRefreshPrimURL);
         }
 
         public LSL_String llEscapeURL(string url)
@@ -10989,8 +13447,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name,
                     simname, pos, lookAt);
             }
+<<<<<<< HEAD
+            ScriptSleep(m_sleepMsOnMapDestination);
+=======
             
             ScriptSleep(1000);
+>>>>>>> avn/ubitvar
         }
 
         public void llAddToLandBanList(string avatar, double hours)
@@ -11031,7 +13493,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land);
                 }
             }
-            ScriptSleep(100);
+            ScriptSleep(m_sleepMsOnAddToLandBanList);
         }
 
         public void llRemoveFromLandPassList(string avatar)
@@ -11058,7 +13520,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            ScriptSleep(100);
+            ScriptSleep(m_sleepMsOnRemoveFromLandPassList);
         }
 
         public void llRemoveFromLandBanList(string avatar)
@@ -11085,7 +13547,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            ScriptSleep(100);
+            ScriptSleep(m_sleepMsOnRemoveFromLandBanList);
         }
 
         public void llSetCameraParams(LSL_List rules)
@@ -11115,7 +13577,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             object[] data = rules.Data;
             for (int i = 0; i < data.Length; ++i)
             {
+<<<<<<< HEAD
+                int type;
+                try
+                {
+                    type = Convert.ToInt32(data[i++].ToString());
+                }
+                catch
+                {
+                    Error("llSetCameraParams", string.Format("Invalid camera param type {0}", data[i - 1]));
+                    return;
+                }
+=======
                 int type = Convert.ToInt32(data[i++].ToString());
+>>>>>>> avn/ubitvar
                 if (i >= data.Length) break; // odd number of entries => ignore the last
 
                 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
@@ -11125,9 +13600,63 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
                 case ScriptBaseClass.CAMERA_POSITION:
                     LSL_Vector v = (LSL_Vector)data[i];
-                    parameters.Add(type + 1, (float)v.x);
-                    parameters.Add(type + 2, (float)v.y);
-                    parameters.Add(type + 3, (float)v.z);
+                    try
+                    {
+                        parameters.Add(type + 1, (float)v.x);
+                    }
+                    catch
+                    {
+                        switch(type)
+                        {
+                            case ScriptBaseClass.CAMERA_FOCUS:
+                                Error("llSetCameraParams", "CAMERA_FOCUS: Parameter x is invalid");
+                                return;
+                            case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
+                                Error("llSetCameraParams", "CAMERA_FOCUS_OFFSET: Parameter x is invalid");
+                                return;
+                            case ScriptBaseClass.CAMERA_POSITION:
+                                Error("llSetCameraParams", "CAMERA_POSITION: Parameter x is invalid");
+                                return;
+                        }
+                    }
+                    try
+                    {
+                        parameters.Add(type + 2, (float)v.y);
+                    }
+                    catch
+                    {
+                        switch(type)
+                        {
+                            case ScriptBaseClass.CAMERA_FOCUS:
+                                Error("llSetCameraParams", "CAMERA_FOCUS: Parameter y is invalid");
+                                return;
+                            case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
+                                Error("llSetCameraParams", "CAMERA_FOCUS_OFFSET: Parameter y is invalid");
+                                return;
+                            case ScriptBaseClass.CAMERA_POSITION:
+                                Error("llSetCameraParams", "CAMERA_POSITION: Parameter y is invalid");
+                                return;
+                        }
+                    }
+                    try
+                    {
+                        parameters.Add(type + 3, (float)v.z);
+                    }
+                    catch
+                    {
+                        switch(type)
+                        {
+                            case ScriptBaseClass.CAMERA_FOCUS:
+                                Error("llSetCameraParams", "CAMERA_FOCUS: Parameter z is invalid");
+                                return;
+                            case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
+                                Error("llSetCameraParams", "CAMERA_FOCUS_OFFSET: Parameter z is invalid");
+                                return;
+                            case ScriptBaseClass.CAMERA_POSITION:
+                                Error("llSetCameraParams", "CAMERA_POSITION: Parameter z is invalid");
+                                return;
+                        }
+                    }
                     break;
                 default:
                     // TODO: clean that up as soon as the implicit casts are in
@@ -11135,7 +13664,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         parameters.Add(type, (float)((LSL_Float)data[i]).value);
                     else if (data[i] is LSL_Integer)
                         parameters.Add(type, (float)((LSL_Integer)data[i]).value);
-                    else parameters.Add(type, Convert.ToSingle(data[i]));
+                    else
+                    {
+                        try
+                        {
+                            parameters.Add(type, Convert.ToSingle(data[i]));
+                        }
+                        catch
+                        {
+                            Error("llSetCameraParams", string.Format("{0}: Parameter is invalid", type));
+                        }
+                    }
                     break;
                 }
             }
@@ -11306,7 +13845,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (!ok || flag < 0 ||
                     flag > (int)HttpRequestConstants.HTTP_PRAGMA_NO_CACHE)
                 {
-                    throw new ScriptException("Parameter " + i.ToString() + " is an invalid flag");
+                    Error("llHTTPRequest", "Parameter " + i.ToString() + " is an invalid flag");
                 }
 
                 param.Add(parameters.Data[i].ToString());       //Add parameter flag
@@ -11330,12 +13869,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         {
                             //There must be at least one name/value pair for custom header
                             if (count == 1)
-                                throw new ScriptException("Missing name/value for custom header at parameter " + i.ToString());
+                                Error("llHTTPRequest", "Missing name/value for custom header at parameter " + i.ToString());
                             break;
                         }
 
                         if (HttpStandardHeaders.Contains(parameters.Data[i].ToString(), StringComparer.OrdinalIgnoreCase))
-                            throw new ScriptException("Name is invalid as a custom header at parameter " + i.ToString());
+                            Error("llHTTPRequest", "Name is invalid as a custom header at parameter " + i.ToString());
 
                         param.Add(parameters.Data[i].ToString());
                         param.Add(parameters.Data[i+1].ToString());
@@ -11458,8 +13997,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
 
+            HttpInitialRequestStatus status;
             UUID reqID
-                = httpScriptMod.StartHttpRequest(m_host.LocalId, m_item.ItemID, url, param, httpHeaders, body);
+                = httpScriptMod.StartHttpRequest(m_host.LocalId, m_item.ItemID, url, param, httpHeaders, body, out status);
+
+            if (status == HttpInitialRequestStatus.DISALLOWED_BY_FILTER)
+                Error("llHttpRequest", string.Format("Request to {0} disallowed by filter", url));
 
             if (reqID != UUID.Zero)
                 return reqID.ToString();
@@ -11493,7 +14036,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            ScriptSleep(100);
+            ScriptSleep(m_sleepMsOnResetLandBanList);
         }
 
         public void llResetLandPassList()
@@ -11510,7 +14053,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            ScriptSleep(100);
+            ScriptSleep(m_sleepMsOnResetLandPassList);
         }
 
         public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide)
@@ -11568,7 +14111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     ret.Add(new LSL_Integer(detectedParams.Value));
                 }
             }
-            ScriptSleep(2000);
+            ScriptSleep(m_sleepMsOnGetParcelPrimOwners);
             return ret;
         }
 
@@ -11699,8 +14242,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 ret.Add(new LSL_Rotation((double)avrot.X, (double)avrot.Y, (double)avrot.Z, (double)avrot.W));
                                 break;
                             case ScriptBaseClass.OBJECT_VELOCITY:
+<<<<<<< HEAD
+                                ret.Add(new LSL_Vector(av.GetWorldVelocity()));
+=======
                                 Vector3 avvel = av.Velocity;
                                 ret.Add(new LSL_Vector((double)avvel.X, (double)avvel.Y, (double)avvel.Z));
+>>>>>>> avn/ubitvar
                                 break;
                             case ScriptBaseClass.OBJECT_OWNER:
                                 ret.Add(new LSL_String(id));
@@ -11765,6 +14312,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             case ScriptBaseClass.OBJECT_TEMP_ON_REZ:
                                 ret.Add(new LSL_Integer(0));
                                 break;
+                            case ScriptBaseClass.OBJECT_RENDER_WEIGHT:
+                                ret.Add(new LSL_Integer(-1));
+                                break;
+                            case ScriptBaseClass.OBJECT_HOVER_HEIGHT:
+                                ret.Add(new LSL_Float(0));
+                                break;
+                            case ScriptBaseClass.OBJECT_BODY_SHAPE_TYPE:
+                                LSL_Float shapeType;
+                                if (av.Appearance.VisualParams[(int)AvatarAppearance.VPElement.SHAPE_MALE] != 0)
+                                    shapeType = new LSL_Float(1);
+                                else
+                                    shapeType = new LSL_Float(0);
+                                ret.Add(shapeType);
+                                break;
+                            case ScriptBaseClass.OBJECT_LAST_OWNER_ID:
+                                ret.Add(new LSL_Key(ScriptBaseClass.NULL_KEY));
+                                break;
                             default:
                                 // Invalid or unhandled constant.
                                 ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL));
@@ -11793,20 +14357,43 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 ret.Add(new LSL_Vector(opos.X, opos.Y, opos.Z));
                                 break;
                             case ScriptBaseClass.OBJECT_ROT:
+                                Quaternion rot = Quaternion.Identity;
+
+                                if (obj.ParentGroup.IsAttachment)
                                 {
-                                    Quaternion rot = Quaternion.Identity;
+                                    ScenePresence sp = World.GetScenePresence(obj.ParentGroup.AttachedAvatar);
 
+                                    if (sp != null)
+                                        rot = sp.GetWorldRotation();
+                                }
+                                else
+                                {
                                     if (obj.ParentGroup.RootPart == obj)
                                         rot = obj.ParentGroup.GroupRotation;
                                     else
                                         rot = obj.GetWorldRotation();
-
-                                    LSL_Rotation objrot = new LSL_Rotation(rot);
-                                    ret.Add(objrot);
                                 }
+
+                                LSL_Rotation objrot = new LSL_Rotation(rot);
+                                ret.Add(objrot);
+
                                 break;
                             case ScriptBaseClass.OBJECT_VELOCITY:
-                                ret.Add(new LSL_Vector(obj.Velocity));
+                                Vector3 vel = Vector3.Zero;
+
+                                if (obj.ParentGroup.IsAttachment)
+                                {
+                                    ScenePresence sp = World.GetScenePresence(obj.ParentGroup.AttachedAvatar);
+
+                                    if (sp != null)
+                                        vel = sp.GetWorldVelocity();
+                                }
+                                else
+                                {
+                                    vel = obj.Velocity; 
+                                }
+
+                                ret.Add(vel);
                                 break;
                             case ScriptBaseClass.OBJECT_OWNER:
                                 ret.Add(new LSL_String(obj.OwnerID.ToString()));
@@ -11902,6 +14489,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             case ScriptBaseClass.OBJECT_TEMP_ON_REZ:
                                 ret.Add(new LSL_Integer(obj.ParentGroup.IsTemporary ? 1 : 0));
                                 break;
+                            case ScriptBaseClass.OBJECT_RENDER_WEIGHT:
+                                ret.Add(new LSL_Integer(0));
+                                break;
+                            case ScriptBaseClass.OBJECT_HOVER_HEIGHT:
+                                ret.Add(new LSL_Float(0));
+                                break;
+                            case ScriptBaseClass.OBJECT_BODY_SHAPE_TYPE:
+                                ret.Add(new LSL_Float(-1));
+                                break;
+                            case ScriptBaseClass.OBJECT_LAST_OWNER_ID:
+                                ret.Add(new LSL_Key(obj.ParentGroup.LastOwnerID.ToString()));
+                                break;
                             default:
                                 // Invalid or unhandled constant.
                                 ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL));
@@ -11926,25 +14525,71 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return item.ItemID;
         }
 
-        internal void ShoutError(string msg)
+        /// <summary>
+        /// Reports the script error in the viewer's Script Warning/Error dialog and shouts it on the debug channel.
+        /// </summary>
+        /// <param name="command">The name of the command that generated the error.</param>
+        /// <param name="message">The error message to report to the user.</param>
+        internal void Error(string command, string message)
         {
-            llShout(ScriptBaseClass.DEBUG_CHANNEL, msg);
+            string text = command + ": " + message;
+            if (text.Length > 1023)
+            {
+                text = text.Substring(0, 1023);
+            }
+
+            World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.DebugChannel, ScriptBaseClass.DEBUG_CHANNEL,
+                m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, false);
+
+            IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
+            if (wComm != null)
+            {
+                wComm.DeliverMessage(ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.Name, m_host.UUID, text);
+            }
         }
 
-        internal void NotImplemented(string command)
+        /// <summary>
+        /// Reports that the command is not implemented as a script error.
+        /// </summary>
+        /// <param name="command">The name of the command that is not implemented.</param>
+        /// <param name="message">Additional information to report to the user. (Optional)</param>
+        internal void NotImplemented(string command, string message = "")
         {
             if (throwErrorOnNotImplemented)
-                throw new NotImplementedException("Command not implemented: " + command);
-        }
+            {
+                if (message != "")
+                {
+                    message = " - " + message;
+                }
 
-        internal void Deprecated(string command)
-        {
-            throw new ScriptException("Command deprecated: " + command);
+                throw new NotImplementedException("Command not implemented: " + command + message);
+            }
+            else
+            {
+                string text = "Command not implemented";
+                if (message != "")
+                {
+                    text = text + " - " + message;
+                }
+
+                Error(command, text);
+            }
         }
 
-        internal void LSLError(string msg)
+        /// <summary>
+        /// Reports that the command is deprecated as a script error.
+        /// </summary>
+        /// <param name="command">The name of the command that is deprecated.</param>
+        /// <param name="message">Additional information to report to the user. (Optional)</param>
+        internal void Deprecated(string command, string message = "")
         {
-            throw new ScriptException("LSL Runtime Error: " + msg);
+            string text = "Command deprecated";
+            if (message != "")
+            {
+                text = text + " - " + message;
+            }
+
+            Error(command, text);
         }
 
         public delegate void AssetRequestCallback(UUID assetID, AssetBase asset);
@@ -11976,7 +14621,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (assetID == UUID.Zero)
             {
                 // => complain loudly, as specified by the LSL docs
-                ShoutError("Notecard '" + name + "' could not be found.");
+                Error("llGetNumberOfNotecardLines", "Can't find notecard '" + name + "'");
 
                 return UUID.Zero.ToString();
             }
@@ -11990,7 +14635,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(assetID).ToString());
 
-                ScriptSleep(100);
+                ScriptSleep(m_sleepMsOnGetNumberOfNotecardLines);
                 return tid.ToString();
             }
 
@@ -11998,17 +14643,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 if (a == null || a.Type != 7)
                 {
-                    ShoutError("Notecard '" + name + "' could not be found.");
+                    Error("llGetNumberOfNotecardLines", "Can't find notecard '" + name + "'");
                     return;
                 }
 
-                string data = Encoding.UTF8.GetString(a.Data);
-                //m_log.Debug(data);
-                NotecardCache.Cache(id, data);
+                NotecardCache.Cache(id, a.Data);
                 AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(id).ToString());
             });
 
-            ScriptSleep(100);
+            ScriptSleep(m_sleepMsOnGetNumberOfNotecardLines);
             return tid.ToString();
         }
 
@@ -12029,7 +14672,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (assetID == UUID.Zero)
             {
                 // => complain loudly, as specified by the LSL docs
-                ShoutError("Notecard '" + name + "' could not be found.");
+                Error("llGetNotecardLine", "Can't find notecard '" + name + "'");
 
                 return UUID.Zero.ToString();
             }
@@ -12044,7 +14687,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 AsyncCommands.DataserverPlugin.DataserverReply(
                     reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax));
 
-                ScriptSleep(100);
+                ScriptSleep(m_sleepMsOnGetNotecardLine);
                 return tid.ToString();
             }
 
@@ -12052,18 +14695,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                          {
                              if (a == null || a.Type != 7)
                              {
-                                 ShoutError("Notecard '" + name + "' could not be found.");
+                                 Error("llGetNotecardLine", "Can't find notecard '" + name + "'");
                                  return;
                              }
 
                              string data = Encoding.UTF8.GetString(a.Data);
                              //m_log.Debug(data);
-                             NotecardCache.Cache(id, data);
+                             NotecardCache.Cache(id, a.Data);
                              AsyncCommands.DataserverPlugin.DataserverReply(
                                 reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax));
                          });
 
-            ScriptSleep(100);
+            ScriptSleep(m_sleepMsOnGetNotecardLine);
             return tid.ToString();
         }
 
@@ -12076,41 +14719,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (obj.OwnerID != m_host.OwnerID)
                 return;
 
-            uint rulesParsed = 0;
-            LSL_List remaining = SetPrimParams(obj, rules, originFunc, ref rulesParsed);
-
-            while ((object)remaining != null && remaining.Length > 2)
-            {
-                LSL_Integer newLink = remaining.GetLSLIntegerItem(0);
-                LSL_List newrules = remaining.GetSublist(1, -1);
-                foreach(SceneObjectPart part in GetLinkParts(obj, newLink)){
-                    remaining = SetPrimParams(part, newrules, originFunc, ref rulesParsed);
-                }
-            }
+            SetEntityParams(new List<ISceneEntity>() { obj }, rules, originFunc);
         }
 
         public LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules)
         {
             SceneObjectPart obj = World.GetSceneObjectPart(new UUID(prim));
 
-            LSL_List result = new LSL_List();
-
             if (obj != null && obj.OwnerID == m_host.OwnerID)
-            {
-                LSL_List remaining = GetPrimParams(obj, rules, ref result);
-
-                while (remaining != null && remaining.Length > 2)
-                {
-                    int linknumber = remaining.GetLSLIntegerItem(0);
-                    rules = remaining.GetSublist(1, -1);
-                    List<SceneObjectPart> parts = GetLinkParts(linknumber);
-
-                    foreach (SceneObjectPart part in parts)
-                        remaining = GetPrimParams(part, rules, ref result);
-                }
-            }
+                return GetEntityParams(obj, rules);
 
-            return result;
+            return new LSL_List();
         }
 
         public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
@@ -12478,6 +15097,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options)
         {
+            // Use llCastRay V3 if configured
+            if (m_useCastRayV3)
+                return llCastRayV3(start, end, options);
+
             LSL_List list = new LSL_List();
 
             m_host.AddScriptLPS(1);
@@ -12679,6 +15302,872 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return list;
         }
 
+        /// <summary>
+        /// Implementation of llCastRay similar to SL 2015-04-21.
+        /// http://wiki.secondlife.com/wiki/LlCastRay
+        /// Uses pure geometry, bounding shapes, meshing and no physics
+        /// for prims, sculpts, meshes, avatars and terrain.
+        /// Implements all flags, reject types and data flags.
+        /// Can handle both objects/groups and prims/parts, by config.
+        /// May sometimes be inaccurate owing to calculation precision,
+        /// meshing detail level and a bug in libopenmetaverse PrimMesher.
+        /// </summary>
+        public LSL_List llCastRayV3(LSL_Vector start, LSL_Vector end, LSL_List options)
+        {
+            m_host.AddScriptLPS(1);
+            LSL_List result = new LSL_List();
+
+            // Prepare throttle data
+            int calledMs = Environment.TickCount;
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            UUID regionId = World.RegionInfo.RegionID;
+            UUID userId = UUID.Zero;
+            int msAvailable = 0;
+            // Throttle per owner when attachment or "vehicle" (sat upon)
+            if (m_host.ParentGroup.IsAttachment || m_host.ParentGroup.GetSittingAvatars().Count > 0)
+            {
+                userId = m_host.OwnerID;
+                msAvailable = m_msPerAvatarInCastRay;
+            }
+            // Throttle per parcel when not attachment or vehicle
+            else
+            {
+                LandData land = World.GetLandData(m_host.GetWorldPosition());
+                if (land != null)
+                    msAvailable = m_msPerRegionInCastRay * land.Area / 65536;
+            }
+            // Clamp for "oversized" parcels on varregions
+            if (msAvailable > m_msMaxInCastRay)
+                msAvailable = m_msMaxInCastRay;
+
+            // Check throttle data
+            int fromCalledMs = calledMs - m_msThrottleInCastRay;
+            lock (m_castRayCalls)
+            {
+                for (int i = m_castRayCalls.Count - 1; i >= 0; i--)
+                {
+                    // Delete old calls from throttle data
+                    if (m_castRayCalls[i].CalledMs < fromCalledMs)
+                        m_castRayCalls.RemoveAt(i);
+                    // Use current region (in multi-region sims)
+                    else if (m_castRayCalls[i].RegionId == regionId)
+                    {
+                        // Reduce available time with recent calls
+                        if (m_castRayCalls[i].UserId == userId)
+                            msAvailable -= m_castRayCalls[i].UsedMs;
+                    }
+                }
+            }
+
+            // Return failure if not enough available time
+            if (msAvailable < m_msMinInCastRay)
+            {
+                result.Add(new LSL_Integer(ScriptBaseClass.RCERR_CAST_TIME_EXCEEDED));
+                return result;
+            }
+
+            // Initialize
+            List<RayHit> rayHits = new List<RayHit>();
+            float tol = m_floatToleranceInCastRay;
+            Vector3 pos1Ray = start;
+            Vector3 pos2Ray = end;
+
+            // Get input options
+            int rejectTypes = 0;
+            int dataFlags = 0;
+            int maxHits = 1;
+            bool detectPhantom = false;
+            for (int i = 0; i < options.Length; i += 2)
+            {
+                if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_REJECT_TYPES)
+                    rejectTypes = options.GetLSLIntegerItem(i + 1);
+                else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_DATA_FLAGS)
+                    dataFlags = options.GetLSLIntegerItem(i + 1);
+                else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_MAX_HITS)
+                    maxHits = options.GetLSLIntegerItem(i + 1);
+                else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_DETECT_PHANTOM)
+                    detectPhantom = (options.GetLSLIntegerItem(i + 1) != 0);
+            }
+            if (maxHits > m_maxHitsInCastRay)
+                maxHits = m_maxHitsInCastRay;
+            bool rejectAgents = ((rejectTypes & ScriptBaseClass.RC_REJECT_AGENTS) != 0);
+            bool rejectPhysical = ((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) != 0);
+            bool rejectNonphysical = ((rejectTypes & ScriptBaseClass.RC_REJECT_NONPHYSICAL) != 0);
+            bool rejectLand = ((rejectTypes & ScriptBaseClass.RC_REJECT_LAND) != 0);
+            bool getNormal = ((dataFlags & ScriptBaseClass.RC_GET_NORMAL) != 0);
+            bool getRootKey = ((dataFlags & ScriptBaseClass.RC_GET_ROOT_KEY) != 0);
+            bool getLinkNum = ((dataFlags & ScriptBaseClass.RC_GET_LINK_NUM) != 0);
+
+            // Calculate some basic parameters
+            Vector3 vecRay = pos2Ray - pos1Ray;
+            float rayLength = vecRay.Length();
+
+            // Try to get a mesher and return failure if none, degenerate ray, or max 0 hits
+            IRendering primMesher = null;
+            List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
+            if (renderers.Count < 1 || rayLength < tol || m_maxHitsInCastRay < 1)
+            {
+                result.Add(new LSL_Integer(ScriptBaseClass.RCERR_UNKNOWN));
+                return result;
+            }
+            primMesher = RenderingLoader.LoadRenderer(renderers[0]);
+
+            // Iterate over all objects/groups and prims/parts in region
+            World.ForEachSOG(
+                delegate(SceneObjectGroup group)
+                {
+                    // Check group filters unless part filters are configured
+                    bool isPhysical = (group.RootPart != null && group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical);
+                    bool isNonphysical = !isPhysical;
+                    bool isPhantom = group.IsPhantom || group.IsVolumeDetect;
+                    bool isAttachment = group.IsAttachment;
+                    bool doGroup = true;
+                    if (isPhysical && rejectPhysical)
+                        doGroup = false;
+                    if (isNonphysical && rejectNonphysical)
+                        doGroup = false;
+                    if (isPhantom && detectPhantom)
+                        doGroup = true;
+                    if (m_filterPartsInCastRay)
+                        doGroup = true;
+                    if (isAttachment && !m_doAttachmentsInCastRay)
+                        doGroup = false;
+                    // Parse object/group if passed filters
+                    if (doGroup)
+                    {
+                        // Iterate over all prims/parts in object/group
+                        foreach(SceneObjectPart part in group.Parts)
+                        {
+                            // Check part filters if configured
+                            if (m_filterPartsInCastRay)
+                            {
+                                isPhysical = (part.PhysActor != null && part.PhysActor.IsPhysical);
+                                isNonphysical = !isPhysical;
+                                isPhantom = ((part.Flags & PrimFlags.Phantom) != 0) || (part.VolumeDetectActive);
+                                bool doPart = true;
+                                if (isPhysical && rejectPhysical)
+                                    doPart = false;
+                                if (isNonphysical && rejectNonphysical)
+                                    doPart = false;
+                                if (isPhantom && detectPhantom)
+                                    doPart = true;
+                                if (!doPart)
+                                    continue;
+                            }
+
+                            // Parse prim/part and project ray if passed filters
+                            Vector3 scalePart = part.Scale;
+                            Vector3 posPart = part.GetWorldPosition();
+                            Quaternion rotPart = part.GetWorldRotation();
+                            Quaternion rotPartInv = Quaternion.Inverse(rotPart);
+                            Vector3 pos1RayProj = ((pos1Ray - posPart) * rotPartInv) / scalePart;
+                            Vector3 pos2RayProj = ((pos2Ray - posPart) * rotPartInv) / scalePart;
+
+                            // Filter parts by shape bounding boxes
+                            Vector3 shapeBoxMax = new Vector3(0.5f, 0.5f, 0.5f);
+                            if (!part.Shape.SculptEntry)
+                                shapeBoxMax = shapeBoxMax * (new Vector3(m_primSafetyCoeffX, m_primSafetyCoeffY, m_primSafetyCoeffZ));
+                            shapeBoxMax = shapeBoxMax + (new Vector3(tol, tol, tol));
+                            if (RayIntersectsShapeBox(pos1RayProj, pos2RayProj, shapeBoxMax))
+                            {
+                                // Prepare data needed to check for ray hits
+                                RayTrans rayTrans = new RayTrans();
+                                rayTrans.PartId = part.UUID;
+                                rayTrans.GroupId = part.ParentGroup.UUID;
+                                rayTrans.Link = group.PrimCount > 1 ? part.LinkNum : 0;
+                                rayTrans.ScalePart = scalePart;
+                                rayTrans.PositionPart = posPart;
+                                rayTrans.RotationPart = rotPart;
+                                rayTrans.ShapeNeedsEnds = true;
+                                rayTrans.Position1Ray = pos1Ray;
+                                rayTrans.Position1RayProj = pos1RayProj;
+                                rayTrans.VectorRayProj = pos2RayProj - pos1RayProj;
+
+                                // Get detail level depending on type
+                                int lod = 0;
+                                // Mesh detail level
+                                if (part.Shape.SculptEntry && part.Shape.SculptType == (byte)SculptType.Mesh)
+                                    lod = (int)m_meshLodInCastRay;
+                                // Sculpt detail level
+                                else if (part.Shape.SculptEntry && part.Shape.SculptType == (byte)SculptType.Mesh)
+                                    lod = (int)m_sculptLodInCastRay;
+                                // Shape detail level
+                                else if (!part.Shape.SculptEntry)
+                                    lod = (int)m_primLodInCastRay;
+
+                                // Try to get cached mesh if configured
+                                ulong meshKey = 0;
+                                FacetedMesh mesh = null;
+                                if (m_useMeshCacheInCastRay)
+                                {
+                                    meshKey = part.Shape.GetMeshKey(Vector3.One, (float)(4 << lod));
+                                    lock (m_cachedMeshes)
+                                    {
+                                        m_cachedMeshes.TryGetValue(meshKey, out mesh);
+                                    }
+                                }
+
+                                // Create mesh if no cached mesh
+                                if (mesh == null)
+                                {
+                                    // Make an OMV prim to be able to mesh part
+                                    Primitive omvPrim = part.Shape.ToOmvPrimitive(posPart, rotPart);
+                                    byte[] sculptAsset = null;
+                                    if (omvPrim.Sculpt != null)
+                                        sculptAsset = World.AssetService.GetData(omvPrim.Sculpt.SculptTexture.ToString());
+
+                                    // When part is mesh, get mesh
+                                    if (omvPrim.Sculpt != null && omvPrim.Sculpt.Type == SculptType.Mesh && sculptAsset != null)
+                                    {
+                                        AssetMesh meshAsset = new AssetMesh(omvPrim.Sculpt.SculptTexture, sculptAsset);
+                                        FacetedMesh.TryDecodeFromAsset(omvPrim, meshAsset, m_meshLodInCastRay, out mesh);
+                                        meshAsset = null;
+                                    }
+
+                                    // When part is sculpt, create mesh
+                                    // Quirk: Generated sculpt mesh is about 2.8% smaller in X and Y than visual sculpt.
+                                    else if (omvPrim.Sculpt != null && omvPrim.Sculpt.Type != SculptType.Mesh && sculptAsset != null)
+                                    {
+                                        IJ2KDecoder imgDecoder = World.RequestModuleInterface<IJ2KDecoder>();
+                                        if (imgDecoder != null)
+                                        {
+                                            Image sculpt = imgDecoder.DecodeToImage(sculptAsset);
+                                            if (sculpt != null)
+                                            {
+                                                mesh = primMesher.GenerateFacetedSculptMesh(omvPrim, (Bitmap)sculpt, m_sculptLodInCastRay);
+                                                sculpt.Dispose();
+                                            }
+                                        }
+                                   }
+
+                                    // When part is shape, create mesh
+                                    else if (omvPrim.Sculpt == null)
+                                    {
+                                        if (
+                                            omvPrim.PrimData.PathBegin == 0.0 && omvPrim.PrimData.PathEnd == 1.0 &&
+                                            omvPrim.PrimData.PathTaperX == 0.0 && omvPrim.PrimData.PathTaperY == 0.0 &&
+                                            omvPrim.PrimData.PathSkew == 0.0 &&
+                                            omvPrim.PrimData.PathTwist - omvPrim.PrimData.PathTwistBegin == 0.0
+                                        )
+                                            rayTrans.ShapeNeedsEnds = false;
+                                        mesh = primMesher.GenerateFacetedMesh(omvPrim, m_primLodInCastRay);
+                                    }
+
+                                    // Cache mesh if configured
+                                    if (m_useMeshCacheInCastRay && mesh != null)
+                                    {
+                                        lock(m_cachedMeshes)
+                                        {
+                                            if (!m_cachedMeshes.ContainsKey(meshKey))
+                                                m_cachedMeshes.Add(meshKey, mesh);
+                                        }
+                                    }
+                                }
+                                // Check mesh for ray hits
+                                AddRayInFacetedMesh(mesh, rayTrans, ref rayHits);
+                                mesh = null;
+                            }
+                        }
+                    }
+                }
+            );
+
+            // Check avatar filter
+            if (!rejectAgents)
+            {
+                // Iterate over all avatars in region
+                World.ForEachRootScenePresence(
+                    delegate (ScenePresence sp)
+                    {
+                        // Get bounding box
+                        Vector3 lower;
+                        Vector3 upper;
+                        BoundingBoxOfScenePresence(sp, out lower, out upper);
+                        // Parse avatar
+                        Vector3 scalePart = upper - lower;
+                        Vector3 posPart = sp.AbsolutePosition;
+                        Quaternion rotPart = sp.GetWorldRotation();
+                        Quaternion rotPartInv = Quaternion.Inverse(rotPart);
+                        posPart = posPart + (lower + upper) * 0.5f * rotPart;
+                        // Project ray
+                        Vector3 pos1RayProj = ((pos1Ray - posPart) * rotPartInv) / scalePart;
+                        Vector3 pos2RayProj = ((pos2Ray - posPart) * rotPartInv) / scalePart;
+
+                        // Filter avatars by shape bounding boxes
+                        Vector3 shapeBoxMax = new Vector3(0.5f + tol, 0.5f + tol, 0.5f + tol);
+                        if (RayIntersectsShapeBox(pos1RayProj, pos2RayProj, shapeBoxMax))
+                        {
+                            // Prepare data needed to check for ray hits
+                            RayTrans rayTrans = new RayTrans();
+                            rayTrans.PartId = sp.UUID;
+                            rayTrans.GroupId = sp.ParentPart != null ? sp.ParentPart.ParentGroup.UUID : sp.UUID;
+                            rayTrans.Link = sp.ParentPart != null ? UUID2LinkNumber(sp.ParentPart, sp.UUID) : 0;
+                            rayTrans.ScalePart = scalePart;
+                            rayTrans.PositionPart = posPart;
+                            rayTrans.RotationPart = rotPart;
+                            rayTrans.ShapeNeedsEnds = false;
+                            rayTrans.Position1Ray = pos1Ray;
+                            rayTrans.Position1RayProj = pos1RayProj;
+                            rayTrans.VectorRayProj = pos2RayProj - pos1RayProj;
+
+                            // Try to get cached mesh if configured
+                            PrimitiveBaseShape prim = PrimitiveBaseShape.CreateSphere();
+                            int lod = (int)m_avatarLodInCastRay;
+                            ulong meshKey = prim.GetMeshKey(Vector3.One, (float)(4 << lod));
+                            FacetedMesh mesh = null;
+                            if (m_useMeshCacheInCastRay)
+                            {
+                                lock (m_cachedMeshes)
+                                {
+                                    m_cachedMeshes.TryGetValue(meshKey, out mesh);
+                                }
+                            }
+
+                            // Create mesh if no cached mesh
+                            if (mesh == null)
+                            {
+                                // Make OMV prim and create mesh
+                                prim.Scale = scalePart;
+                                Primitive omvPrim = prim.ToOmvPrimitive(posPart, rotPart);
+                                mesh = primMesher.GenerateFacetedMesh(omvPrim, m_avatarLodInCastRay);
+
+                                // Cache mesh if configured
+                                if (m_useMeshCacheInCastRay && mesh != null)
+                                {
+                                    lock(m_cachedMeshes)
+                                    {
+                                        if (!m_cachedMeshes.ContainsKey(meshKey))
+                                            m_cachedMeshes.Add(meshKey, mesh);
+                                    }
+                                }
+                            }
+
+                            // Check mesh for ray hits
+                            AddRayInFacetedMesh(mesh, rayTrans, ref rayHits);
+                            mesh = null;
+                        }
+                    }
+                );
+            }
+
+            // Check terrain filter
+            if (!rejectLand)
+            {
+                // Parse terrain
+
+                // Mesh terrain and check bounding box
+                Vector3 lower;
+                Vector3 upper;
+                List<Tri> triangles = TrisFromHeightmapUnderRay(pos1Ray, pos2Ray, out lower, out upper);
+                lower.Z -= tol;
+                upper.Z += tol;
+                if ((pos1Ray.Z >= lower.Z || pos2Ray.Z >= lower.Z) && (pos1Ray.Z <= upper.Z || pos2Ray.Z <= upper.Z))
+                {
+                    // Prepare data needed to check for ray hits
+                    RayTrans rayTrans = new RayTrans();
+                    rayTrans.PartId = UUID.Zero;
+                    rayTrans.GroupId = UUID.Zero;
+                    rayTrans.Link = 0;
+                    rayTrans.ScalePart = new Vector3 (1.0f, 1.0f, 1.0f);
+                    rayTrans.PositionPart = Vector3.Zero;
+                    rayTrans.RotationPart = Quaternion.Identity;
+                    rayTrans.ShapeNeedsEnds = true;
+                    rayTrans.Position1Ray = pos1Ray;
+                    rayTrans.Position1RayProj = pos1Ray;
+                    rayTrans.VectorRayProj = vecRay;
+
+                    // Check mesh
+                    AddRayInTris(triangles, rayTrans, ref rayHits);
+                    triangles = null;
+                }
+            }
+
+            // Sort hits by ascending distance
+            rayHits.Sort((s1, s2) => s1.Distance.CompareTo(s2.Distance));
+
+            // Check excess hits per part and group
+            for (int t = 0; t < 2; t++)
+            {
+                int maxHitsPerType = 0;
+                UUID id = UUID.Zero;
+                if (t == 0)
+                    maxHitsPerType = m_maxHitsPerPrimInCastRay;
+                else
+                    maxHitsPerType = m_maxHitsPerObjectInCastRay;
+
+                // Handle excess hits only when needed
+                if (maxHitsPerType < m_maxHitsInCastRay)
+                {
+                    // Find excess hits
+                    Hashtable hits = new Hashtable();
+                    for (int i = rayHits.Count - 1; i >= 0; i--)
+                    {
+                        if (t == 0)
+                            id = rayHits[i].PartId;
+                        else
+                            id = rayHits[i].GroupId;
+                        if (hits.ContainsKey(id))
+                            hits[id] = (int)hits[id] + 1;
+                        else
+                            hits[id] = 1;
+                    }
+
+                    // Remove excess hits
+                    for (int i = rayHits.Count - 1; i >= 0; i--)
+                    {
+                        if (t == 0)
+                            id = rayHits[i].PartId;
+                        else
+                            id = rayHits[i].GroupId;
+                        int hit = (int)hits[id];
+                        if (hit > m_maxHitsPerPrimInCastRay)
+                        {
+                            rayHits.RemoveAt(i);
+                            hit--;
+                            hits[id] = hit;
+                        }
+                    }
+                }
+            }
+
+            // Parse hits into result list according to data flags
+            int hitCount = rayHits.Count;
+            if (hitCount > maxHits)
+                hitCount = maxHits;
+            for (int i = 0; i < hitCount; i++)
+            {
+                RayHit rayHit = rayHits[i];
+                if (getRootKey)
+                    result.Add(new LSL_Key(rayHit.GroupId.ToString()));
+                else
+                    result.Add(new LSL_Key(rayHit.PartId.ToString()));
+                result.Add(new LSL_Vector(rayHit.Position));
+                if (getLinkNum)
+                    result.Add(new LSL_Integer(rayHit.Link));
+                if (getNormal)
+                    result.Add(new LSL_Vector(rayHit.Normal));
+            }
+            result.Add(new LSL_Integer(hitCount));
+
+            // Add to throttle data
+            stopWatch.Stop();
+            CastRayCall castRayCall = new CastRayCall();
+            castRayCall.RegionId = regionId;
+            castRayCall.UserId = userId;
+            castRayCall.CalledMs = calledMs;
+            castRayCall.UsedMs = (int)stopWatch.ElapsedMilliseconds;
+            lock (m_castRayCalls)
+            {
+                m_castRayCalls.Add(castRayCall);
+            }
+
+            // Return hits
+            return result;
+        }
+
+        /// <summary>
+        /// Struct for transmitting parameters required for finding llCastRay ray hits.
+        /// </summary>
+        public struct RayTrans
+        {
+            public UUID PartId;
+            public UUID GroupId;
+            public int Link;
+            public Vector3 ScalePart;
+            public Vector3 PositionPart;
+            public Quaternion RotationPart;
+            public bool ShapeNeedsEnds;
+            public Vector3 Position1Ray;
+            public Vector3 Position1RayProj;
+            public Vector3 VectorRayProj;
+        }
+
+        /// <summary>
+        /// Struct for llCastRay ray hits.
+        /// </summary>
+        public struct RayHit
+        {
+            public UUID PartId;
+            public UUID GroupId;
+            public int Link;
+            public Vector3 Position;
+            public Vector3 Normal;
+            public float Distance;
+        }
+
+        /// <summary>
+        /// Struct for llCastRay throttle data.
+        /// </summary>
+        public struct CastRayCall
+        {
+            public UUID RegionId;
+            public UUID UserId;
+            public int CalledMs;
+            public int UsedMs;
+        }
+
+        /// <summary>
+        /// Helper to check if a ray intersects a shape bounding box.
+        /// </summary>
+        private bool RayIntersectsShapeBox(Vector3 pos1RayProj, Vector3 pos2RayProj, Vector3 shapeBoxMax)
+        {
+            // Skip if ray can't intersect bounding box;
+            Vector3 rayBoxProjMin = Vector3.Min(pos1RayProj, pos2RayProj);
+            Vector3 rayBoxProjMax = Vector3.Max(pos1RayProj, pos2RayProj);
+            if (
+                rayBoxProjMin.X > shapeBoxMax.X || rayBoxProjMin.Y > shapeBoxMax.Y || rayBoxProjMin.Z > shapeBoxMax.Z ||
+                rayBoxProjMax.X < -shapeBoxMax.X || rayBoxProjMax.Y < -shapeBoxMax.Y || rayBoxProjMax.Z < -shapeBoxMax.Z
+            )
+                return false;
+
+            // Check if ray intersect any bounding box side
+            int sign = 0;
+            float dist = 0.0f;
+            Vector3 posProj = Vector3.Zero;
+            Vector3 vecRayProj = pos2RayProj - pos1RayProj;
+
+            // Check both X sides unless ray is parallell to them
+            if (Math.Abs(vecRayProj.X) > m_floatToleranceInCastRay)
+            {
+                for (sign = -1; sign <= 1; sign += 2)
+                {
+                    dist = ((float)sign * shapeBoxMax.X - pos1RayProj.X) / vecRayProj.X;
+                    posProj = pos1RayProj + vecRayProj * dist;
+                    if (Math.Abs(posProj.Y) <= shapeBoxMax.Y && Math.Abs(posProj.Z) <= shapeBoxMax.Z)
+                        return true;
+                }
+            }
+
+            // Check both Y sides unless ray is parallell to them
+            if (Math.Abs(vecRayProj.Y) > m_floatToleranceInCastRay)
+            {
+                for (sign = -1; sign <= 1; sign += 2)
+                {
+                    dist = ((float)sign * shapeBoxMax.Y - pos1RayProj.Y) / vecRayProj.Y;
+                    posProj = pos1RayProj + vecRayProj * dist;
+                    if (Math.Abs(posProj.X) <= shapeBoxMax.X && Math.Abs(posProj.Z) <= shapeBoxMax.Z)
+                        return true;
+                }
+            }
+
+            // Check both Z sides unless ray is parallell to them
+            if (Math.Abs(vecRayProj.Z) > m_floatToleranceInCastRay)
+            {
+                for (sign = -1; sign <= 1; sign += 2)
+                {
+                    dist = ((float)sign * shapeBoxMax.Z - pos1RayProj.Z) / vecRayProj.Z;
+                    posProj = pos1RayProj + vecRayProj * dist;
+                    if (Math.Abs(posProj.X) <= shapeBoxMax.X && Math.Abs(posProj.Y) <= shapeBoxMax.Y)
+                        return true;
+                }
+            }
+
+            // No hits on bounding box so return false
+            return false;
+        }
+
+        /// <summary>
+        /// Helper to parse FacetedMesh for ray hits.
+        /// </summary>
+        private void AddRayInFacetedMesh(FacetedMesh mesh, RayTrans rayTrans, ref List<RayHit> rayHits)
+        {
+            if (mesh != null)
+            {
+                foreach (Face face in mesh.Faces)
+                {
+                    for (int i = 0; i < face.Indices.Count; i += 3)
+                    {
+                        Tri triangle = new Tri();
+                        triangle.p1 = face.Vertices[face.Indices[i]].Position;
+                        triangle.p2 = face.Vertices[face.Indices[i + 1]].Position;
+                        triangle.p3 = face.Vertices[face.Indices[i + 2]].Position;
+                        AddRayInTri(triangle, rayTrans, ref rayHits);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Helper to parse Tri (triangle) List for ray hits.
+        /// </summary>
+        private void AddRayInTris(List<Tri> triangles, RayTrans rayTrans, ref List<RayHit> rayHits)
+        {
+            foreach (Tri triangle in triangles)
+            {
+                AddRayInTri(triangle, rayTrans, ref rayHits);
+            }
+        }
+
+        /// <summary>
+        /// Helper to add ray hit in a Tri (triangle).
+        /// </summary>
+        private void AddRayInTri(Tri triProj, RayTrans rayTrans, ref List<RayHit> rayHits)
+        {
+            // Check for hit in triangle
+            Vector3 posHitProj;
+            Vector3 normalProj;
+            if (HitRayInTri(triProj, rayTrans.Position1RayProj, rayTrans.VectorRayProj, out posHitProj, out normalProj))
+            {
+                // Hack to circumvent ghost face bug in PrimMesher by removing hits in (ghost) face plane through shape center
+                if (Math.Abs(Vector3.Dot(posHitProj, normalProj)) < m_floatToleranceInCastRay && !rayTrans.ShapeNeedsEnds)
+                    return;
+
+                // Transform hit and normal to region coordinate system
+                Vector3 posHit = rayTrans.PositionPart + (posHitProj * rayTrans.ScalePart) * rayTrans.RotationPart;
+                Vector3 normal = Vector3.Normalize((normalProj * rayTrans.ScalePart) * rayTrans.RotationPart);
+
+                // Remove duplicate hits at triangle intersections
+                float distance = Vector3.Distance(rayTrans.Position1Ray, posHit);
+                for (int i = rayHits.Count - 1; i >= 0; i--)
+                {
+                    if (rayHits[i].PartId != rayTrans.PartId)
+                        break;
+                    if (Math.Abs(rayHits[i].Distance - distance) < m_floatTolerance2InCastRay)
+                        return;
+                }
+
+                // Build result data set
+                RayHit rayHit = new RayHit();
+                rayHit.PartId = rayTrans.PartId;
+                rayHit.GroupId = rayTrans.GroupId;
+                rayHit.Link = rayTrans.Link;
+                rayHit.Position = posHit;
+                rayHit.Normal = normal;
+                rayHit.Distance = distance;
+                rayHits.Add(rayHit);
+            }
+        }
+
+        /// <summary>
+        /// Helper to find ray hit in triangle
+        /// </summary>
+        bool HitRayInTri(Tri triProj, Vector3 pos1RayProj, Vector3 vecRayProj, out Vector3 posHitProj, out Vector3 normalProj)
+        {
+            float tol = m_floatToleranceInCastRay;
+            posHitProj = Vector3.Zero;
+
+            // Calculate triangle edge vectors
+            Vector3 vec1Proj = triProj.p2 - triProj.p1;
+            Vector3 vec2Proj = triProj.p3 - triProj.p2;
+            Vector3 vec3Proj = triProj.p1 - triProj.p3;
+
+            // Calculate triangle normal
+            normalProj = Vector3.Cross(vec1Proj, vec2Proj);
+
+            // Skip if degenerate triangle or ray parallell with triangle plane
+            float divisor = Vector3.Dot(vecRayProj, normalProj);
+            if (Math.Abs(divisor) < tol)
+                return false;
+
+            // Skip if exit and not configured to detect
+            if (divisor > tol && !m_detectExitsInCastRay)
+                return false;
+
+            // Skip if outside ray ends
+            float distanceProj = Vector3.Dot(triProj.p1 - pos1RayProj, normalProj) / divisor;
+            if (distanceProj < -tol || distanceProj > 1 + tol)
+                return false;
+
+            // Calculate hit position in triangle
+            posHitProj = pos1RayProj + vecRayProj * distanceProj;
+
+            // Skip if outside triangle bounding box
+            Vector3 triProjMin = Vector3.Min(Vector3.Min(triProj.p1, triProj.p2), triProj.p3);
+            Vector3 triProjMax = Vector3.Max(Vector3.Max(triProj.p1, triProj.p2), triProj.p3);
+            if (
+                posHitProj.X < triProjMin.X - tol || posHitProj.Y < triProjMin.Y - tol || posHitProj.Z < triProjMin.Z - tol ||
+                posHitProj.X > triProjMax.X + tol || posHitProj.Y > triProjMax.Y + tol || posHitProj.Z > triProjMax.Z + tol
+            )
+                return false;
+
+            // Skip if outside triangle
+            if (
+                Vector3.Dot(Vector3.Cross(vec1Proj, normalProj), posHitProj - triProj.p1) > tol ||
+                Vector3.Dot(Vector3.Cross(vec2Proj, normalProj), posHitProj - triProj.p2) > tol ||
+                Vector3.Dot(Vector3.Cross(vec3Proj, normalProj), posHitProj - triProj.p3) > tol
+            )
+                 return false;
+
+            // Return hit
+            return true;
+        }
+
+        /// <summary>
+        /// Helper to parse selected parts of HeightMap into a Tri (triangle) List and calculate bounding box.
+        /// </summary>
+        private List<Tri> TrisFromHeightmapUnderRay(Vector3 posStart, Vector3 posEnd, out Vector3 lower, out Vector3 upper)
+        {
+            // Get bounding X-Y rectangle of terrain under ray
+            lower = Vector3.Min(posStart, posEnd);
+            upper = Vector3.Max(posStart, posEnd);
+            lower.X = (float)Math.Floor(lower.X);
+            lower.Y = (float)Math.Floor(lower.Y);
+            float zLower = float.MaxValue;
+            upper.X = (float)Math.Ceiling(upper.X);
+            upper.Y = (float)Math.Ceiling(upper.Y);
+            float zUpper = float.MinValue;
+
+            // Initialize Tri (triangle) List
+            List<Tri> triangles = new List<Tri>();
+
+            // Set parsing lane direction to major ray X-Y axis
+            Vector3 vec = posEnd - posStart;
+            float xAbs = Math.Abs(vec.X);
+            float yAbs = Math.Abs(vec.Y);
+            bool bigX = true;
+            if (yAbs > xAbs)
+            {
+                bigX = false;
+                vec = vec / yAbs;
+            }
+            else if (xAbs > yAbs || xAbs > 0.0f)
+                vec = vec / xAbs;
+            else
+                vec = new Vector3(1.0f, 1.0f, 0.0f);
+
+            // Simplify by start parsing in lower end of lane
+            if ((bigX && vec.X < 0.0f) || (!bigX && vec.Y < 0.0f))
+            {
+                Vector3 posTemp = posStart;
+                posStart = posEnd;
+                posEnd = posTemp;
+                vec = vec * -1.0f;
+            }
+
+            // First 1x1 rectangle under ray
+            float xFloorOld = 0.0f;
+            float yFloorOld = 0.0f;
+            Vector3 pos = posStart;
+            float xFloor = (float)Math.Floor(pos.X);
+            float yFloor = (float)Math.Floor(pos.Y);
+            AddTrisFromHeightmap(xFloor, yFloor, ref triangles, ref zLower, ref zUpper);
+
+            // Parse every remaining 1x1 rectangle under ray
+            while (pos != posEnd)
+            {
+                // Next 1x1 rectangle under ray
+                xFloorOld = xFloor;
+                yFloorOld = yFloor;
+                pos = pos + vec;
+
+                // Clip position to 1x1 rectangle border
+                xFloor = (float)Math.Floor(pos.X);
+                yFloor = (float)Math.Floor(pos.Y);
+                if (bigX && pos.X > xFloor)
+                {
+                    pos.Y -= vec.Y * (pos.X - xFloor);
+                    pos.X = xFloor;
+                }
+                else if (!bigX && pos.Y > yFloor)
+                {
+                    pos.X -= vec.X * (pos.Y - yFloor);
+                    pos.Y = yFloor;
+                }
+
+                // Last 1x1 rectangle under ray
+                if ((bigX && pos.X >= posEnd.X) || (!bigX && pos.Y >= posEnd.Y))
+                {
+                    pos = posEnd;
+                    xFloor = (float)Math.Floor(pos.X);
+                    yFloor = (float)Math.Floor(pos.Y);
+                }
+
+                // Add new 1x1 rectangle in lane
+                if ((bigX && xFloor != xFloorOld) || (!bigX && yFloor != yFloorOld))
+                    AddTrisFromHeightmap(xFloor, yFloor, ref triangles, ref zLower, ref zUpper);
+                // Add last 1x1 rectangle in old lane at lane shift
+                if (bigX && yFloor != yFloorOld)
+                    AddTrisFromHeightmap(xFloor, yFloorOld, ref triangles, ref zLower, ref zUpper);
+                if (!bigX && xFloor != xFloorOld)
+                    AddTrisFromHeightmap(xFloorOld, yFloor, ref triangles, ref zLower, ref zUpper);
+            }
+
+            // Finalize bounding box Z
+            lower.Z = zLower;
+            upper.Z = zUpper;
+
+            // Done and returning Tri (triangle)List
+            return triangles;
+        }
+
+        /// <summary>
+        /// Helper to add HeightMap squares into Tri (triangle) List and adjust bounding box.
+        /// </summary>
+        private void AddTrisFromHeightmap(float xPos, float yPos, ref List<Tri> triangles, ref float zLower, ref float zUpper)
+        {
+            int xInt = (int)xPos;
+            int yInt = (int)yPos;
+
+            // Corner 1 of 1x1 rectangle
+            int x = Util.Clamp<int>(xInt+1, 0, World.Heightmap.Width - 1);
+            int y = Util.Clamp<int>(yInt+1, 0, World.Heightmap.Height - 1);
+            Vector3 pos1 = new Vector3(x, y, (float)World.Heightmap[x, y]);
+            // Adjust bounding box
+            zLower = Math.Min(zLower, pos1.Z);
+            zUpper = Math.Max(zUpper, pos1.Z);
+
+            // Corner 2 of 1x1 rectangle
+            x = Util.Clamp<int>(xInt, 0, World.Heightmap.Width - 1);
+            y = Util.Clamp<int>(yInt+1, 0, World.Heightmap.Height - 1);
+            Vector3 pos2 = new Vector3(x, y, (float)World.Heightmap[x, y]);
+            // Adjust bounding box
+            zLower = Math.Min(zLower, pos2.Z);
+            zUpper = Math.Max(zUpper, pos2.Z);
+
+            // Corner 3 of 1x1 rectangle
+            x = Util.Clamp<int>(xInt, 0, World.Heightmap.Width - 1);
+            y = Util.Clamp<int>(yInt, 0, World.Heightmap.Height - 1);
+            Vector3 pos3 = new Vector3(x, y, (float)World.Heightmap[x, y]);
+            // Adjust bounding box
+            zLower = Math.Min(zLower, pos3.Z);
+            zUpper = Math.Max(zUpper, pos3.Z);
+
+            // Corner 4 of 1x1 rectangle
+            x = Util.Clamp<int>(xInt+1, 0, World.Heightmap.Width - 1);
+            y = Util.Clamp<int>(yInt, 0, World.Heightmap.Height - 1);
+            Vector3 pos4 = new Vector3(x, y, (float)World.Heightmap[x, y]);
+            // Adjust bounding box
+            zLower = Math.Min(zLower, pos4.Z);
+            zUpper = Math.Max(zUpper, pos4.Z);
+
+            // Add triangle 1
+            Tri triangle1 = new Tri();
+            triangle1.p1 = pos1;
+            triangle1.p2 = pos2;
+            triangle1.p3 = pos3;
+            triangles.Add(triangle1);
+
+            // Add triangle 2
+            Tri triangle2 = new Tri();
+            triangle2.p1 = pos3;
+            triangle2.p2 = pos4;
+            triangle2.p3 = pos1;
+            triangles.Add(triangle2);
+        }
+
+        /// <summary>
+        /// Helper to get link number for a UUID.
+        /// </summary>
+        private int UUID2LinkNumber(SceneObjectPart part, UUID id)
+        {
+            SceneObjectGroup group = part.ParentGroup;
+            if (group != null)
+            {
+                // Parse every link for UUID
+                int linkCount = group.PrimCount + group.GetSittingAvatarsCount();
+                for (int link = linkCount; link > 0; link--)
+                {
+                    ISceneEntity entity = GetLinkEntity(part, link);
+                    // Return link number if UUID match
+                    if (entity != null && entity.UUID == id)
+                        return link;
+                }
+            }
+            // Return link number 0 if no links or UUID matches
+            return 0;
+        }
+
         public LSL_Integer llManageEstateAccess(int action, string avatar)
         {
             m_host.AddScriptLPS(1);
@@ -12751,8 +16240,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llGetMemoryLimit()
         {
             m_host.AddScriptLPS(1);
-            // The value returned for LSO scripts in SL
-            return 16384;
+            // The value returned for Mono scripts in SL
+            return 65536;
         }
 
         public LSL_Integer llSetMemoryLimit(LSL_Integer limit)
@@ -12765,15 +16254,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llGetSPMaxMemory()
         {
             m_host.AddScriptLPS(1);
-            // The value returned for LSO scripts in SL
-            return 16384;
+            // The value returned for Mono scripts in SL
+            return 65536;
         }
 
         public virtual LSL_Integer llGetUsedMemory()
         {
             m_host.AddScriptLPS(1);
-            // The value returned for LSO scripts in SL
-            return 16384;
+            // The value returned for Mono scripts in SL
+            return 65536;
         }
 
         public void llScriptProfiler(LSL_Integer flags)
@@ -12788,12 +16277,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         // them from this region as they are completed
         //
 
-        public void llGetEnv(LSL_String name)
-        {
-            m_host.AddScriptLPS(1);
-            NotImplemented("llGetEnv");
-        }
-
         public void llSetSoundQueueing(int queue)
         {
             m_host.AddScriptLPS(1);
@@ -12933,7 +16416,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             new LSL_String(replydata) },
                             new DetectParams[0]));
                 }
-            });
+            }, null, "LSL_Api.llTransferLindenDollars");
 
             return txn.ToString();
         }
@@ -13907,10 +17390,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             public DateTime lastRef;
         }
 
-        protected static Dictionary<UUID, Notecard> m_Notecards =
+        private static Dictionary<UUID, Notecard> m_Notecards =
             new Dictionary<UUID, Notecard>();
 
-        public static void Cache(UUID assetID, string text)
+        public static void Cache(UUID assetID, byte[] text)
         {
             CheckCache();
 
@@ -13921,7 +17404,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 Notecard nc = new Notecard();
                 nc.lastRef = DateTime.Now;
-                nc.text = SLUtil.ParseNotecardToList(text).ToArray();
+                try
+                {
+                    nc.text = SLUtil.ParseNotecardToArray(text);
+                }
+                catch(SLUtil.NotANotecardFormatException)
+                {
+                    nc.text = new string[0];
+                }
                 m_Notecards[assetID] = nc;
             }
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index b13a5ae..e5e43f8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         internal IScriptModuleComms m_comms = null;
 
         public void Initialize(
-            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item)
         {
             m_ScriptEngine = scriptEngine;
             m_host = host;
@@ -265,169 +265,438 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             int idx = 0;
             while (idx < rules.Length)
             {
-                uint rule = (uint)rules.GetLSLIntegerItem(idx);
+                uint rule;
+
+                try
+                {
+                    rule = (uint)rules.GetLSLIntegerItem(idx);
+                }
+                catch (InvalidCastException)
+                {
+                    throw new InvalidCastException(string.Format("Error running rule type: arg #{0} - parameter type must be integer", idx));
+                }
+
                 LSL_Types.Quaternion iQ;
                 LSL_Types.Vector3 iV;
                 switch (rule)
                 {
                     case (int)ScriptBaseClass.WL_SUN_MOON_POSITION:
                         idx++;
-                        wl.sunMoonPosition = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.sunMoonPosition = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_SUN_MOON_POSITION: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_AMBIENT:
                         idx++;
-                        iQ = rules.GetQuaternionItem(idx);
+                        try
+                        {
+                            iQ = rules.GetQuaternionItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_AMBIENT: arg #{0} - parameter 1 must be rotation", idx));
+                        }
                         wl.ambient = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
                         break;
                     case (int)ScriptBaseClass.WL_BIG_WAVE_DIRECTION:
                         idx++;
-                        iV = rules.GetVector3Item(idx);
+                        try
+                        {
+                            iV = rules.GetVector3Item(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_BIG_WAVE_DIRECTION: arg #{0} - parameter 1 must be vector", idx));
+                        }
                         wl.bigWaveDirection = new Vector2((float)iV.x, (float)iV.y);
                         break;
                     case (int)ScriptBaseClass.WL_BLUE_DENSITY:
                         idx++;
-                        iQ = rules.GetQuaternionItem(idx);
+                        try
+                        {
+                            iQ = rules.GetQuaternionItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_BLUE_DENSITY: arg #{0} - parameter 1 must be rotation", idx));
+                        }
                         wl.blueDensity = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
                         break;
                     case (int)ScriptBaseClass.WL_BLUR_MULTIPLIER:
                         idx++;
-                        wl.blurMultiplier = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.blurMultiplier = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_BLUR_MULTIPLIER: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_CLOUD_COLOR:
                         idx++;
-                        iQ = rules.GetQuaternionItem(idx);
+                        try
+                        {
+                            iQ = rules.GetQuaternionItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_CLOUD_COLOR: arg #{0} - parameter 1 must be rotation", idx));
+                        }
                         wl.cloudColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
                         break;
                     case (int)ScriptBaseClass.WL_CLOUD_COVERAGE:
                         idx++;
-                        wl.cloudCoverage = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.cloudCoverage = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_CLOUD_COVERAGE: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_CLOUD_DETAIL_XY_DENSITY:
                         idx++;
-                        iV = rules.GetVector3Item(idx);
+                        try
+                        {
+                            iV = rules.GetVector3Item(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_CLOUD_DETAIL_XY_DENSITY: arg #{0} - parameter 1 must be vector", idx));
+                        }
                         wl.cloudDetailXYDensity = iV;
                         break;
                     case (int)ScriptBaseClass.WL_CLOUD_SCALE:
                         idx++;
-                        wl.cloudScale = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.cloudScale = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_CLOUD_SCALE: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X:
                         idx++;
-                        wl.cloudScrollX = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.cloudScrollX = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_CLOUD_SCROLL_X: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X_LOCK:
                         idx++;
-                        wl.cloudScrollXLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
+                        try
+                        {
+                            wl.cloudScrollXLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_CLOUD_SCROLL_Y_LOCK: arg #{0} - parameter 1 must be integer", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y:
                         idx++;
-                        wl.cloudScrollY = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.cloudScrollY = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_CLOUD_SCROLL_Y: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y_LOCK:
                         idx++;
-                        wl.cloudScrollYLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
+                        try
+                        {
+                            wl.cloudScrollYLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_CLOUD_SCROLL_Y_LOCK: arg #{0} - parameter 1 must be integer", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY:
                         idx++;
-                        iV = rules.GetVector3Item(idx);
+                        try
+                        {
+                            iV = rules.GetVector3Item(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_CLOUD_XY_DENSITY: arg #{0} - parameter 1 must be vector", idx));
+                        }
                         wl.cloudXYDensity = iV;
                         break;
                     case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER:
                         idx++;
-                        wl.densityMultiplier = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.densityMultiplier = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_DENSITY_MULTIPLIER: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_DISTANCE_MULTIPLIER:
                         idx++;
-                        wl.distanceMultiplier = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.distanceMultiplier = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_DISTANCE_MULTIPLIER: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_DRAW_CLASSIC_CLOUDS:
                         idx++;
-                        wl.drawClassicClouds = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
+                        try
+                        {
+                            wl.drawClassicClouds = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_DRAW_CLASSIC_CLOUDS: arg #{0} - parameter 1 must be integer", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_EAST_ANGLE:
                         idx++;
-                        wl.eastAngle = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.eastAngle = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_EAST_ANGLE: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_FRESNEL_OFFSET:
                         idx++;
-                        wl.fresnelOffset = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.fresnelOffset = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_FRESNEL_OFFSET: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_FRESNEL_SCALE:
                         idx++;
-                        wl.fresnelScale = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.fresnelScale = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_FRESNEL_SCALE: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_HAZE_DENSITY:
                         idx++;
-                        wl.hazeDensity = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.hazeDensity = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_HAZE_DENSITY: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_HAZE_HORIZON:
                         idx++;
-                        wl.hazeHorizon = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.hazeHorizon = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_HAZE_HORIZON: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_HORIZON:
                         idx++;
-                        iQ = rules.GetQuaternionItem(idx);
+                        try
+                        {
+                            iQ = rules.GetQuaternionItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_HORIZON: arg #{0} - parameter 1 must be rotation", idx));
+                        }
                         wl.horizon = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
                         break;
                     case (int)ScriptBaseClass.WL_LITTLE_WAVE_DIRECTION:
                         idx++;
-                        iV = rules.GetVector3Item(idx);
+                        try
+                        {
+                            iV = rules.GetVector3Item(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_LITTLE_WAVE_DIRECTION: arg #{0} - parameter 1 must be vector", idx));
+                        }
                         wl.littleWaveDirection = new Vector2((float)iV.x, (float)iV.y);
                         break;
                     case (int)ScriptBaseClass.WL_MAX_ALTITUDE:
                         idx++;
-                        wl.maxAltitude = (ushort)rules.GetLSLIntegerItem(idx).value;
+                        try
+                        {
+                            wl.maxAltitude = (ushort)rules.GetLSLIntegerItem(idx).value;
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_MAX_ALTITUDE: arg #{0} - parameter 1 must be integer", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_NORMAL_MAP_TEXTURE:
                         idx++;
-                        wl.normalMapTexture = new UUID(rules.GetLSLStringItem(idx).m_string);
+                        try
+                        {
+                            wl.normalMapTexture = new UUID(rules.GetLSLStringItem(idx).m_string);
+                        }
+                        catch (ArgumentException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_NORMAL_MAP_TEXTURE: arg #{0} - parameter 1 must be key", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_REFLECTION_WAVELET_SCALE:
                         idx++;
-                        iV = rules.GetVector3Item(idx);
+                        try
+                        {
+                            iV = rules.GetVector3Item(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_REFLECTION_WAVELET_SCALE: arg #{0} - parameter 1 must be vector", idx));
+                        }
                         wl.reflectionWaveletScale = iV;
                         break;
                     case (int)ScriptBaseClass.WL_REFRACT_SCALE_ABOVE:
                         idx++;
-                        wl.refractScaleAbove = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.refractScaleAbove = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_REFRACT_SCALE_ABOVE: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_REFRACT_SCALE_BELOW:
                         idx++;
-                        wl.refractScaleBelow = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.refractScaleBelow = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_REFRACT_SCALE_BELOW: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_SCENE_GAMMA:
                         idx++;
-                        wl.sceneGamma = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.sceneGamma = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_SCENE_GAMMA: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_STAR_BRIGHTNESS:
                         idx++;
-                        wl.starBrightness = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.starBrightness = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_STAR_BRIGHTNESS: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_SUN_GLOW_FOCUS:
                         idx++;
-                        wl.sunGlowFocus = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.sunGlowFocus = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_SUN_GLOW_FOCUS: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_SUN_GLOW_SIZE:
                         idx++;
-                        wl.sunGlowSize = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.sunGlowSize = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_SUN_GLOW_SIZE: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_SUN_MOON_COLOR:
                         idx++;
                         iQ = rules.GetQuaternionItem(idx);
-                        wl.sunMoonColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
+                        try
+                        {
+                            wl.sunMoonColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_SUN_MOON_COLOR: arg #{0} - parameter 1 must be rotation", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_UNDERWATER_FOG_MODIFIER:
                         idx++;
-                        wl.underwaterFogModifier = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.underwaterFogModifier = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_UNDERWATER_FOG_MODIFIER: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                     case (int)ScriptBaseClass.WL_WATER_COLOR:
                         idx++;
-                        iV = rules.GetVector3Item(idx);
+                        try
+                        {
+                            iV = rules.GetVector3Item(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_WATER_COLOR: arg #{0} - parameter 1 must be vector", idx));
+                        }
                         wl.waterColor = iV;
                         break;
                     case (int)ScriptBaseClass.WL_WATER_FOG_DENSITY_EXPONENT:
                         idx++;
-                        wl.waterFogDensityExponent = (float)rules.GetLSLFloatItem(idx);
+                        try
+                        {
+                            wl.waterFogDensityExponent = (float)rules.GetLSLFloatItem(idx);
+                        }
+                        catch (InvalidCastException)
+                        {
+                            throw new InvalidCastException(string.Format("Error running rule WL_WATER_FOG_DENSITY_EXPONENT: arg #{0} - parameter 1 must be float", idx));
+                        }
                         break;
                 }
                 idx++;
@@ -464,7 +733,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (LightShareModule.EnableWindlight)
             {
-                RegionLightShareData wl = getWindlightProfileFromRules(rules);
+                RegionLightShareData wl;
+                try
+                {
+                    wl = getWindlightProfileFromRules(rules);
+                }
+                catch(InvalidCastException e)
+                {
+                    LSShoutError(e.Message);
+                    return 0;
+                }
                 wl.valid = true;
                 m_host.ParentGroup.Scene.StoreWindlightProfile(wl);
                 success = 1;
@@ -532,8 +810,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             if (LightShareModule.EnableWindlight)
-            { 
-                RegionLightShareData wl = getWindlightProfileFromRules(rules);
+            {
+                RegionLightShareData wl;
+                try
+                {
+                    wl = getWindlightProfileFromRules(rules);
+                }
+                catch(InvalidCastException e)
+                {
+                    LSShoutError(e.Message);
+                    return 0;
+                }
                 World.EventManager.TriggerOnSendNewWindlightProfileTargeted(wl, new UUID(target.m_string));
                 success = 1;
             }
@@ -546,4 +833,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return success;
         }        
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index edcdfbc..7bd4fa7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         internal IScriptModuleComms m_comms = null;
 
         public void Initialize(
-            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item)
         {
             m_ScriptEngine = scriptEngine;
             m_host = host;
@@ -420,7 +420,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 if (type == typeof(object[]))
                 {
-                    object[] plist = (lslparm as LSL_List).Data;
+                    object[] plist = ((LSL_List)lslparm).Data;
                     object[] result = new object[plist.Length];
                     for (int i = 0; i < plist.Length; i++)
                     {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 01d90e7..5d8f0f6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -63,6 +63,7 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
 using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
 using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
 using PermissionMask = OpenSim.Framework.PermissionMask;
+using OpenSim.Services.Connectors.Hypergrid;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Api
 {
@@ -145,7 +146,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected IUrlModule m_UrlModule = null;
 
         public void Initialize(
-            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item)
         {
             m_ScriptEngine = scriptEngine;
             m_host = host;
@@ -155,7 +156,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
 
             if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
+            {
                 m_OSFunctionsEnabled = true;
+                // m_log.Warn("[OSSL] OSSL FUNCTIONS ENABLED");
+            }
 
             m_ScriptDelayFactor =
                     m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
@@ -799,9 +803,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         // We will launch the teleport on a new thread so that when the script threads are terminated
                         // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.                        
-                        Util.FireAndForget(o => World.RequestTeleportLocation(
-                            presence.ControllingClient, regionName, position,
-                            lookat, (uint)TPFlags.ViaLocation));
+                        Util.FireAndForget(
+                            o => World.RequestTeleportLocation(
+                                presence.ControllingClient, regionName, position,
+                                lookat, (uint)TPFlags.ViaLocation), 
+                            null, "OSSL_Api.TeleportAgentByRegionCoords");
 
                         ScriptSleep(5000);
 
@@ -823,6 +829,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         private void TeleportAgent(string agent, int regionX, int regionY,
             LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions)
         {
+<<<<<<< HEAD
+            // ulong regionHandle = Util.UIntsToLong(((uint)regionX * (uint)Constants.RegionSize), ((uint)regionY * (uint)Constants.RegionSize));
+=======
+>>>>>>> avn/ubitvar
             ulong regionHandle = Util.RegionLocToHandle((uint)regionX, (uint)regionY);
 
             m_host.AddScriptLPS(1);
@@ -844,9 +854,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         // We will launch the teleport on a new thread so that when the script threads are terminated
                         // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
-                        Util.FireAndForget(o => World.RequestTeleportLocation(
-                            presence.ControllingClient, regionHandle, 
-                            position, lookat, (uint)TPFlags.ViaLocation));
+                        Util.FireAndForget(
+                            o => World.RequestTeleportLocation(
+                                presence.ControllingClient, regionHandle, 
+                                position, lookat, (uint)TPFlags.ViaLocation), 
+                            null, "OSSL_Api.TeleportAgentByRegionName");
 
                         ScriptSleep(5000);
 
@@ -881,6 +893,59 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             TeleportAgent(m_host.OwnerID.ToString(), regionX, regionY, position, lookat, true);
         }
 
+        ///<summary>
+        /// Allows a script IN the target prim to force an avatar to sit on it using normal methods
+        /// as if called by the client.
+        /// Silent fail if agent (or target if overloaded) not found.
+        /// Does work if passed key (or keys if overloaded).
+        /// </summary>
+        /// <param name="avatar"></param>
+        public void osForceOtherSit(string avatar)
+        {
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit");
+
+            m_host.AddScriptLPS(1);
+
+            ForceSit(avatar, m_host.UUID);
+        }
+
+        /// <summary>
+        /// Overload method of osForceOtherSit(string avatar) to allow a script NOT in the target prim to force
+        /// an avatar to sit on the target prim using normal methods as if called by the client.
+        /// </summary>
+        /// <param name="avatar"></param>
+        /// <param name="target"></param>
+        public void osForceOtherSit(string avatar, string target)
+        {
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit");
+
+            m_host.AddScriptLPS(1);
+
+            UUID targetID = new UUID(target);
+            
+            ForceSit(avatar, targetID);             
+        }
+
+        public void ForceSit(string avatar, UUID targetID)
+        {
+            UUID agentID; 
+
+            if (!UUID.TryParse(avatar, out agentID))
+                return;
+
+            ScenePresence presence = World.GetScenePresence(agentID);
+
+            SceneObjectPart part = World.GetSceneObjectPart(targetID);
+
+            if (presence != null &&
+                part != null &&
+                part.SitTargetAvatar == UUID.Zero)
+                presence.HandleAgentRequestSit(presence.ControllingClient,
+                    agentID,
+                    targetID,
+                    part.SitTargetPosition);
+        }
+
         // Functions that get information from the agent itself.
         //
         // osGetAgentIP - this is used to determine the IP address of
@@ -1254,7 +1319,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             World.RegionInfo.EstateSettings.UseGlobalTime = !sunFixed;
             World.RegionInfo.EstateSettings.SunPosition = sunHour;
             World.RegionInfo.EstateSettings.FixedSun = sunFixed;
-            World.RegionInfo.EstateSettings.Save();
+            World.EstateDataService.StoreEstateSettings(World.RegionInfo.EstateSettings);
 
             World.EventManager.TriggerEstateToolsSunUpdate(World.RegionInfo.RegionHandle);
         }
@@ -1578,6 +1643,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
+        public LSL_Integer osCheckODE()
+        {
+            m_host.AddScriptLPS(1);
+            LSL_Integer ret = 0;    // false
+            if (m_ScriptEngine.World.PhysicsScene != null)
+            {
+                string physEngine = m_ScriptEngine.World.PhysicsScene.EngineType;
+                if (physEngine == "OpenDynamicsEngine")
+                {
+                    ret = 1;    // true
+                }
+            }
+            return ret;
+        }
+
         public string osGetPhysicsEngineType()
         {
             // High because it can be used to target attacks to known weaknesses
@@ -1776,13 +1856,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // Create new asset
             AssetBase asset = new AssetBase(UUID.Random(), name, (sbyte)AssetType.Notecard, m_host.OwnerID.ToString());
             asset.Description = description;
+            byte[] a;
+            byte[] b;
+            byte[] c;
+
+            b = Util.UTF8.GetBytes(data);
+
+            a = Util.UTF8.GetBytes(
+                "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length " + b.Length.ToString() + "\n");
 
-            int textLength = data.Length;
-            data
-                = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length "
-                    + textLength.ToString() + "\n" + data + "}\n";
+            c = Util.UTF8.GetBytes("}");
 
-            asset.Data = Util.UTF8.GetBytes(data);
+            byte[] d = new byte[a.Length + b.Length + c.Length];
+            Buffer.BlockCopy(a, 0, d, 0, a.Length);
+            Buffer.BlockCopy(b, 0, d, a.Length, b.Length);
+            Buffer.BlockCopy(c, 0, d, a.Length + b.Length, c.Length);
+
+            asset.Data = d;
             World.AssetService.Store(asset);
 
             // Create Task Entry
@@ -1889,8 +1979,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
 
-                string data = Encoding.UTF8.GetString(a.Data);
-                NotecardCache.Cache(assetID, data);
+                NotecardCache.Cache(assetID, a.Data);
             };
 
             return assetID;
@@ -2002,15 +2091,51 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.Low, "osAvatarName2Key");
             m_host.AddScriptLPS(1);
 
-            UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, firstname, lastname);
-            if (null == account)
+            IUserManagement userManager = World.RequestModuleInterface<IUserManagement>();
+            if (userManager == null)
             {
-                return UUID.Zero.ToString();
+                OSSLShoutError("osAvatarName2Key: UserManagement module not available");
+                return string.Empty;
+            }
+
+            // Check if the user is already cached
+
+            UUID userID = userManager.GetUserIdByName(firstname, lastname);
+            if (userID != UUID.Zero)
+                return userID.ToString();
+
+            // Query for the user
+
+            String realFirstName; String realLastName; String serverURI;
+            if (Util.ParseForeignAvatarName(firstname, lastname, out realFirstName, out realLastName, out serverURI))
+            {
+                try
+                {
+                    UserAgentServiceConnector userConnection = new UserAgentServiceConnector(serverURI, true);
+
+                    if (userConnection != null)
+                    {
+                        userID = userConnection.GetUUID(realFirstName, realLastName);
+                        if (userID != UUID.Zero)
+                        {
+                            userManager.AddUser(userID, realFirstName, realLastName, serverURI);
+                            return userID.ToString();
+                        }
+                    }
+                }
+                catch (Exception /*e*/)
+                {
+                    // m_log.Warn("[osAvatarName2Key] UserAgentServiceConnector - Unable to connect to destination grid ", e);
+                }
             }
             else
             {
-                return account.PrincipalID.ToString();
+                UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, firstname, lastname);
+                if (account != null)
+                    return account.PrincipalID.ToString();
             }
+
+            return UUID.Zero.ToString();
         }
 
         public string osKey2Name(string id)
@@ -2023,19 +2148,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (UUID.TryParse(id, out key))
             {
                 UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, key);
-                if (null == account)
-                {
-                    return "";
-                }
-                else
-                {
+                if (account != null)
                     return account.Name;
+
+                if (m_ScriptEngine.World.GridUserService != null)
+                {
+                    GridUserInfo uInfo = m_ScriptEngine.World.GridUserService.GetGridUserInfo(key.ToString());
+
+                    if (uInfo != null)
+                    {
+                        UUID userUUID; String gridURL; String firstName; String lastName; String tmp;
+
+                        if (Util.ParseUniversalUserIdentifier(uInfo.UserID, out userUUID, out gridURL, out firstName, out lastName, out tmp))
+                        {
+                            string grid = new Uri(gridURL).Authority;
+                            return firstName + "." + lastName + " @" + grid;
+                        }
+                    }
                 }
             }
-            else
-            {
-                return "";
-            }
+            
+            return "";
         }
 
         private enum InfoType
@@ -2224,6 +2357,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return retval;
         }
 
+        public string osGetAvatarHomeURI(string uuid)
+        {
+            CheckThreatLevel(ThreatLevel.Low, "osGetAvatarHomeURI");
+            m_host.AddScriptLPS(1);
+
+            IUserManagement userManager = m_ScriptEngine.World.RequestModuleInterface<IUserManagement>();
+            string returnValue = "";
+
+            if (userManager != null)
+            {
+                returnValue = userManager.GetUserServerURL(new UUID(uuid), "HomeURI");
+            }
+
+            if (returnValue == "")
+            {
+                IConfigSource config = m_ScriptEngine.ConfigSource;
+                returnValue = Util.GetConfigVarFromSections<string>(config, "HomeURI",
+                    new string[] { "Startup", "Hypergrid" }, String.Empty);
+
+                if (!string.IsNullOrEmpty(returnValue))
+                    return returnValue;
+
+                // Legacy. Remove soon!
+                if (config.Configs["LoginService"] != null)
+                    returnValue = config.Configs["LoginService"].GetString("SRV_HomeURI", returnValue);
+
+                if (String.IsNullOrEmpty(returnValue))
+                    returnValue = GridUserInfo(InfoType.Home);
+            }
+
+            return returnValue;
+        }
+
         public LSL_String osFormatString(string str, LSL_List strings)
         {
             CheckThreatLevel(ThreatLevel.VeryLow, "osFormatString");
@@ -2345,14 +2511,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // on the ILSL_Api interface.
             LSL_Api LSL_Api = (LSL_Api)m_LSL_Api;
             LSL_List retVal = new LSL_List();
-            LSL_List remaining = null;
+            LSL_List remaining = new LSL_List();
             List<SceneObjectPart> parts = LSL_Api.GetLinkParts(linknumber);
             foreach (SceneObjectPart part in parts)
             {
                 remaining = LSL_Api.GetPrimParams(part, rules, ref retVal);
             }
 
-            while (remaining != null && remaining.Length > 2)
+            while (remaining.Length > 2)
             {
                 linknumber = remaining.GetLSLIntegerItem(0);
                 rules = remaining.GetSublist(1, -1);
@@ -2364,6 +2530,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return retVal;
         }
 
+        public void osForceCreateLink(string target, int parent)
+        {
+            CheckThreatLevel(ThreatLevel.VeryLow, "osForceCreateLink");
+
+            m_host.AddScriptLPS(1);
+
+            InitLSL();
+            ((LSL_Api)m_LSL_Api).CreateLink(target, parent);
+        }
+
+        public void osForceBreakLink(int linknum)
+        {
+            CheckThreatLevel(ThreatLevel.VeryLow, "osForceBreakLink");
+
+            m_host.AddScriptLPS(1);
+
+            InitLSL();
+            ((LSL_Api)m_LSL_Api).BreakLink(linknum);
+        }
+
+        public void osForceBreakAllLinks()
+        {
+            CheckThreatLevel(ThreatLevel.VeryLow, "osForceBreakAllLinks");
+
+            m_host.AddScriptLPS(1);
+
+            InitLSL();
+            ((LSL_Api)m_LSL_Api).BreakAllLinks();
+        }
+
         public LSL_Integer osIsNpc(LSL_Key npc)
         {
             CheckThreatLevel(ThreatLevel.None, "osIsNpc");
@@ -2942,6 +3138,51 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return SaveAppearanceToNotecard(avatarId, notecard);
         }
+
+        /// <summary>
+        /// Get the gender as specified in avatar appearance for a given avatar key
+        /// </summary>
+        /// <param name="rawAvatarId"></param>
+        /// <returns>"male" or "female" or "unknown"</returns>
+        public LSL_String osGetGender(LSL_Key rawAvatarId)
+        {
+            CheckThreatLevel(ThreatLevel.None, "osGetGender");
+            m_host.AddScriptLPS(1);
+
+            UUID avatarId;
+            if (!UUID.TryParse(rawAvatarId, out avatarId))
+                return new LSL_String("unknown");
+
+            ScenePresence sp = World.GetScenePresence(avatarId);
+
+            if (sp == null || sp.IsChildAgent || sp.Appearance == null || sp.Appearance.VisualParams == null)
+                return new LSL_String("unknown");
+
+            // find the index of "shape" parameter "male"
+            int vpShapeMaleIndex = 0;
+            bool indexFound = false;
+            VisualParam param = new VisualParam();
+            foreach(var vpEntry in VisualParams.Params)
+            {
+                param = vpEntry.Value;
+                if (param.Name == "male" && param.Wearable == "shape")
+                {
+                    indexFound = true;
+                    break;
+                }
+
+                if (param.Group == 0)
+                    vpShapeMaleIndex++;
+            }
+
+            if (!indexFound)
+                return new LSL_String("unknown");
+
+            float vpShapeMale = Utils.ByteToFloat(sp.Appearance.VisualParams[vpShapeMaleIndex], param.MinValue, param.MaxValue);
+
+            bool isMale = vpShapeMale > 0.5f;
+            return new LSL_String(isMale ? "male" : "female");
+        }
         
         /// <summary>
         /// Get current region's map texture UUID
@@ -3024,9 +3265,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
+<<<<<<< HEAD
+                Scene scene = m_ScriptEngine.World;
+                GridRegion region = scene.GridService.GetRegionByUUID(UUID.Zero, World.RegionInfo.RegionID);
+                return new LSL_Vector((float)region.RegionSizeX, (float)region.RegionSizeX, Constants.RegionHeight);
+=======
                 return new LSL_Vector((float)World.RegionInfo.RegionSizeX,
                             (float)World.RegionInfo.RegionSizeY,
                             (float)World.RegionInfo.RegionSizeZ );
+>>>>>>> avn/ubitvar
             }
         }
 
@@ -3401,7 +3648,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void osForceAttachToOtherAvatarFromInventory(string rawAvatarId, string itemName, int attachmentPoint)
         {
-            CheckThreatLevel(ThreatLevel.Severe, "osForceAttachToOtherAvatarFromInventory");
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osForceAttachToOtherAvatarFromInventory");
 
             m_host.AddScriptLPS(1);
 
@@ -3445,14 +3692,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (sp == null)
                 return;
 
-            InventoryItemBase newItem = World.MoveTaskInventoryItem(sp.UUID, UUID.Zero, m_host, item.ItemID);
+            string message;
+            InventoryItemBase newItem = World.MoveTaskInventoryItem(sp.UUID, UUID.Zero, m_host, item.ItemID, out message);
 
             if (newItem == null)
             {
                 m_log.ErrorFormat(
-                    "[OSSL API]: Could not create user inventory item {0} for {1}, attach point {2} in {3}",
-                    itemName, m_host.Name, attachmentPoint, World.Name);
-
+                    "[OSSL API]: Could not create user inventory item {0} for {1}, attach point {2} in {3}: {4}",
+                    itemName, m_host.Name, attachmentPoint, World.Name, message);
+                ((LSL_Api)m_LSL_Api).llSay(0, message);
                 return;
             }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
index 9137c69..4708473 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index b642a9c..a3bb7d6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -124,6 +124,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_String llGetCreator();
         LSL_String llGetDate();
          LSL_Float llGetEnergy();
+        LSL_String llGetEnv(LSL_String name);
         LSL_Vector llGetForce();
        LSL_Integer llGetFreeMemory();
        LSL_Integer llGetUsedMemory();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index d80d389..ddd7630 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -259,6 +259,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 
         string osGetScriptEngineName();
         string osGetSimulatorVersion();
+        LSL_Integer osCheckODE();
         string osGetPhysicsEngineType();
         Hashtable osParseJSON(string JSON);
 
@@ -281,6 +282,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         string osGetGridGatekeeperURI();
         string osGetGridCustom(string key);
 
+        string osGetAvatarHomeURI(string uuid);
+
         LSL_String osFormatString(string str, LSL_List strings);
         LSL_List osMatchString(string src, string pattern, int start);
         LSL_String osReplaceString(string src, string pattern, string replace, int count, int start);
@@ -293,6 +296,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules);
 
         /// <summary>
+        /// Identical to llCreateLink() but does not require permission from the owner.
+        /// </summary>
+        /// <param name='target'></param>
+        /// <param name='parent'></param>
+        void osForceCreateLink(string target, int parent);
+
+        /// <summary>
+        /// Identical to llBreakLink() but does not require permission from the owner.
+        /// </summary>
+        /// <param name='linknum'></param>
+        void osForceBreakLink(int linknum);
+
+        /// <summary>
+        /// Identical to llBreakAllLinks() but does not require permission from the owner.
+        /// </summary>
+        void osForceBreakAllLinks();
+
+        /// <summary>
         /// Check if the given key is an npc
         /// </summary>
         /// <param name="npc"></param>
@@ -333,6 +354,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Key     osOwnerSaveAppearance(string notecard);
         LSL_Key     osAgentSaveAppearance(key agentId, string notecard);
 
+        key osGetGender(LSL_Key rawAvatarId);
         key osGetMapTexture();
         key osGetRegionMapTexture(string regionName);
         LSL_List osGetRegionStats();
@@ -344,6 +366,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Float osGetHealth(string avatar);
         void osCauseHealing(string avatar, double healing);
         void osCauseDamage(string avatar, double damage);
+        void osForceOtherSit(string avatar);
+        void osForceOtherSit(string avatar, string target);
         LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules);
         void osSetPrimitiveParams(LSL_Key prim, LSL_List rules);
         void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index 943d7a2..1cc2cfb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -78,6 +78,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             touch = 8,
             touch_end = 536870912,
             touch_start = 2097152,
+            transaction_result = 33554432,
             object_rez = 4194304
         }
 
@@ -237,6 +238,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_eventFlagsMap.Add("touch", scriptEvents.touch);
             m_eventFlagsMap.Add("touch_end", scriptEvents.touch_end);
             m_eventFlagsMap.Add("touch_start", scriptEvents.touch_start);
+            m_eventFlagsMap.Add("transaction_result", scriptEvents.transaction_result);
             m_eventFlagsMap.Add("object_rez", scriptEvents.object_rez);
         }
     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 0e22ff3..158acc6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -48,6 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int STATUS_DIE_AT_EDGE = 128;
         public const int STATUS_RETURN_AT_EDGE = 256;
         public const int STATUS_CAST_SHADOWS = 512;
+        public const int STATUS_BLOCK_GRAB_OBJECT = 1024;
 
         public const int AGENT = 1;
         public const int AGENT_BY_LEGACY_NAME = 1;
@@ -251,6 +252,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int ATTACH_HUD_BOTTOM_LEFT = 36;
         public const int ATTACH_HUD_BOTTOM = 37;
         public const int ATTACH_HUD_BOTTOM_RIGHT = 38;
+        public const int ATTACH_NECK = 39;
+        public const int ATTACH_AVATAR_CENTER = 40;
 
         #region osMessageAttachments constants
 
@@ -411,6 +414,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int PRIM_POS_LOCAL = 33;
         public const int PRIM_LINK_TARGET = 34;
         public const int PRIM_SLICE = 35;
+        public const int PRIM_SPECULAR = 36;
+        public const int PRIM_NORMAL = 37;
+        public const int PRIM_ALPHA_MODE = 38;
         public const int PRIM_TEXGEN_DEFAULT = 0;
         public const int PRIM_TEXGEN_PLANAR = 1;
 
@@ -593,6 +599,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int OBJECT_PHYSICS = 21;
         public const int OBJECT_PHANTOM = 22;
         public const int OBJECT_TEMP_ON_REZ = 23;
+        public const int OBJECT_RENDER_WEIGHT = 24;
+        public const int OBJECT_HOVER_HEIGHT = 25;
+        public const int OBJECT_BODY_SHAPE_TYPE = 26;
+        public const int OBJECT_LAST_OWNER_ID = 27;
 
         // Pathfinding types
         public const int OPT_OTHER = -1;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 5047162..2745637 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -466,6 +466,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llGetEnergy();
         }
 
+        public LSL_String llGetEnv(LSL_String name)
+        {
+            return m_LSL_Functions.llGetEnv(name);
+        }
+
         public LSL_Vector llGetForce()
         {
             return m_LSL_Functions.llGetForce();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 8666421..5fdbf9d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -420,6 +420,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osGetScriptEngineName();
         }
 
+        public LSL_Integer osCheckODE()
+        {
+            return m_OSSL_Functions.osCheckODE();
+        }
+
         public string osGetPhysicsEngineType()
         {
             return m_OSSL_Functions.osGetPhysicsEngineType();
@@ -500,6 +505,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osGetGridCustom(key);
         }
 
+        public string osGetAvatarHomeURI(string uuid)
+        {
+            return m_OSSL_Functions.osGetAvatarHomeURI(uuid);
+        }
+
         public LSL_String osFormatString(string str, LSL_List strings)
         {
             return m_OSSL_Functions.osFormatString(str, strings);
@@ -537,6 +547,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osGetLinkPrimitiveParams(linknumber, rules);
         }
 
+        public void osForceCreateLink(string target, int parent)
+        {
+            m_OSSL_Functions.osForceCreateLink(target, parent);
+        }
+
+        public void osForceBreakLink(int linknum)
+        {
+            m_OSSL_Functions.osForceBreakLink(linknum);
+        }
+
+        public void osForceBreakAllLinks()
+        {
+            m_OSSL_Functions.osForceBreakAllLinks();
+        }
+
         public LSL_Integer osIsNpc(LSL_Key npc)
         {
             return m_OSSL_Functions.osIsNpc(npc);
@@ -714,6 +739,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
                 if (Position.y > ((int)Constants.RegionSize - 1))
                     Position.y = ((int)Constants.RegionSize - 1);
                  */
+<<<<<<< HEAD
+                if (Position.z > Constants.RegionHeight)
+                    Position.z = Constants.RegionHeight;
+=======
+>>>>>>> avn/ubitvar
                 if (Position.x < 0)
                     Position.x = 0;
                 if (Position.y < 0)
@@ -845,6 +875,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             }
         }
 
+        public string osGetGender(LSL_Key rawAvatarId)
+        {
+            return m_OSSL_Functions.osGetGender(rawAvatarId);
+        }
+
         public key osGetMapTexture()
         {
             return m_OSSL_Functions.osGetMapTexture();
@@ -899,6 +934,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             m_OSSL_Functions.osCauseHealing(avatar, healing);
         }
+
+        public void osForceOtherSit(string avatar)
+        {
+            m_OSSL_Functions.osForceOtherSit(avatar);
+        }
+
+        public void osForceOtherSit(string avatar, string target)
+        {
+            m_OSSL_Functions.osForceOtherSit(avatar, target);
+        }
         
         public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules)
         {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Atom.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Atom.cs
deleted file mode 100644
index 27ab04e..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Atom.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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.Text;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    public class Atom : IUnifiable
-    {
-        private static Dictionary<string, Atom> _atomStore = new Dictionary<string, Atom>();
-        public readonly string _name;
-        public readonly Atom _module;
-
-        /// <summary>
-        /// You should not call this constructor, but use Atom.a instead.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="module"></param>
-        private Atom(string name, Atom module)
-        {
-            _name = name;
-            _module = module;
-        }
-
-        /// <summary>
-        /// Return the unique Atom object for name where module is null. You should use this to create
-        /// an Atom instead of calling the Atom constructor.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public static Atom a(string name)
-        {
-            Atom atom;
-            if (!_atomStore.TryGetValue(name, out atom))
-            {
-                atom = new Atom(name, null);
-                _atomStore[name] = atom;
-            }
-            return atom;
-        }
-
-        /// <summary>
-        /// Return an Atom object with the name and module.  If module is null or Atom.NIL,
-        /// this behaves like Atom.a(name) and returns the unique object where the module is null.
-        /// If module is not null or Atom.NIL, this may or may not be the same object as another Atom
-        /// with the same name and module.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="module"></param>
-        /// <returns></returns>
-        public static Atom a(string name, Atom module)
-        {
-            if (module == null || module == Atom.NIL)
-                return a(name);
-            return new Atom(name, module);
-        }
-
-        /// <summary>
-        /// If Obj is an Atom unify its _module with Module.  If the Atom's _module is null, use Atom.NIL.
-        /// </summary>
-        /// <param name="Atom"></param>
-        /// <param name="Module"></param>
-        /// <returns></returns>
-        public static IEnumerable<bool> module(object Obj, object Module)
-        {
-            Obj = YP.getValue(Obj);
-            if (Obj is Atom)
-            {
-                if (((Atom)Obj)._module == null)
-                    return YP.unify(Module, Atom.NIL);
-                else
-                    return YP.unify(Module, ((Atom)Obj)._module);
-            }
-            return YP.fail();
-        }
-
-        public static readonly Atom NIL = Atom.a("[]");
-        public static readonly Atom DOT = Atom.a(".");
-        public static readonly Atom F = Atom.a("f");
-        public static readonly Atom SLASH = Atom.a("/");
-        public static readonly Atom HAT = Atom.a("^");
-        public static readonly Atom RULE = Atom.a(":-");
-
-        public IEnumerable<bool> unify(object arg)
-        {
-            arg = YP.getValue(arg);
-            if (arg is Atom)
-                return Equals(arg) ? YP.succeed() : YP.fail();
-            else if (arg is Variable)
-                return ((Variable)arg).unify(this);
-            else
-                return YP.fail();
-        }
-
-        public void addUniqueVariables(List<Variable> variableSet)
-        {
-            // Atom does not contain variables.
-        }
-
-        public object makeCopy(Variable.CopyStore copyStore)
-        {
-            // Atom does not contain variables that need to be copied.
-            return this;
-        }
-
-        public bool termEqual(object term)
-        {
-            return Equals(YP.getValue(term));
-        }
-
-        public bool ground()
-        {
-            // Atom is always ground.
-            return true;
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj is Atom)
-            {
-                if (_module == null && ((Atom)obj)._module == null)
-                    // When _declaringClass is null, we always use an identical object from _atomStore.
-                    return this == obj;
-                // Otherwise, ignore _declaringClass and do a normal string compare on the _name.
-                return _name == ((Atom)obj)._name;
-            }
-            return false;
-        }
-
-        public override string ToString()
-        {
-            return _name;
-        }
-
-        public override int GetHashCode()
-        {
-            // Debug: need to check _declaringClass.
-            return _name.GetHashCode();
-        }
-
-        public string toQuotedString()
-        {
-            if (_name.Length == 0)
-                return "''";
-            else if (this == Atom.NIL)
-                return "[]";
-
-            StringBuilder result = new StringBuilder(_name.Length);
-            bool useQuotes = false;
-            foreach (char c in _name)
-            {
-                int cInt = (int)c;
-                if (c == '\'')
-                {
-                    result.Append("''");
-                    useQuotes = true;
-                }
-                else if (c == '_' || cInt >= (int)'a' && cInt <= (int)'z' ||
-                         cInt >= (int)'A' && cInt <= (int)'Z' || cInt >= (int)'0' && cInt <= (int)'9')
-                    result.Append(c);
-                else
-                {
-                    // Debug: Need to handle non-printable chars.
-                    result.Append(c);
-                    useQuotes = true;
-                }
-            }
-
-            if (!useQuotes && (int)_name[0] >= (int)'a' && (int)_name[0] <= (int)'z')
-                return result.ToString();
-            else
-            {
-                // Surround in single quotes.
-                result.Append('\'');
-                return "'" + result;
-            }
-        }
-
-        /// <summary>
-        /// Return true if _name is lexicographically less than atom._name.
-        /// </summary>
-        /// <param name="atom"></param>
-        /// <returns></returns>
-        public bool lessThan(Atom atom)
-        {
-            return _name.CompareTo(atom._name) < 0;
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/BagofAnswers.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/BagofAnswers.cs
deleted file mode 100644
index bbf1a5b..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/BagofAnswers.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-using System.Collections.Generic;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    /// <summary>
-    /// A BagofAnswers holds answers for bagof and setof.
-    /// </summary>
-    public class BagofAnswers
-    {
-        private object _template;
-        private Variable[] _freeVariables;
-        private Dictionary<object[], List<object>> _bagForFreeVariables;
-        private List<object> _findallBagArray;
-        private static TermArrayEqualityComparer _termArrayEqualityComparer =
-            new TermArrayEqualityComparer();
-
-        /// <summary>
-        /// To get the free variables, split off any existential qualifiers from Goal such as the X in
-        /// "X ^ f(Y)", get the set of unbound variables in Goal that are not qualifiers, then remove
-        /// the unbound variables that are qualifiers as well as the unbound variables in Template.
-        /// </summary>
-        /// <param name="Template"></param>
-        /// <param name="Goal"></param>
-        public BagofAnswers(object Template, object Goal)
-        {
-            _template = Template;
-
-            // First get the set of variables that are not free variables.
-            List<Variable> variableSet = new List<Variable>();
-            YP.addUniqueVariables(Template, variableSet);
-            object UnqualifiedGoal = YP.getValue(Goal);
-            while (UnqualifiedGoal is Functor2 && ((Functor2)UnqualifiedGoal)._name == Atom.HAT)
-            {
-                YP.addUniqueVariables(((Functor2)UnqualifiedGoal)._arg1, variableSet);
-                UnqualifiedGoal = YP.getValue(((Functor2)UnqualifiedGoal)._arg2);
-            }
-
-            // Remember how many non-free variables there are so we can find the unique free variables
-            //   that are added.
-            int nNonFreeVariables = variableSet.Count;
-            YP.addUniqueVariables(UnqualifiedGoal, variableSet);
-            int nFreeVariables = variableSet.Count - nNonFreeVariables;
-            if (nFreeVariables == 0)
-            {
-                // There were no free variables added, so we won't waste time with _bagForFreeVariables.
-                _freeVariables = null;
-                _findallBagArray = new List<object>();
-            }
-            else
-            {
-                // Copy the free variables.
-                _freeVariables = new Variable[nFreeVariables];
-                for (int i = 0; i < nFreeVariables; ++i)
-                    _freeVariables[i] = variableSet[i + nNonFreeVariables];
-
-                _bagForFreeVariables = new Dictionary<object[], List<object>>(_termArrayEqualityComparer);
-            }
-        }
-
-        public void add()
-        {
-            if (_freeVariables == null)
-                // The goal has bound the values in _template but we don't bother with _freeVariables.
-                _findallBagArray.Add(YP.makeCopy(_template, new Variable.CopyStore()));
-            else
-            {
-                // The goal has bound the values in _template and _freeVariables.
-                // Find the entry for this set of _freeVariables values.
-                object[] freeVariableValues = new object[_freeVariables.Length];
-                for (int i = 0; i < _freeVariables.Length; ++i)
-                    freeVariableValues[i] = YP.getValue(_freeVariables[i]);
-                List<object> bagArray;
-                if (!_bagForFreeVariables.TryGetValue(freeVariableValues, out bagArray))
-                {
-                    bagArray = new List<object>();
-                    _bagForFreeVariables[freeVariableValues] = bagArray;
-                }
-
-                // Now copy the template and add to the bag for the freeVariables values.
-                bagArray.Add(YP.makeCopy(_template, new Variable.CopyStore()));
-            }
-        }
-
-        // disable warning on l1, don't see how we can
-        // code this differently
-        #pragma warning disable 0168, 0219
-
-        /// <summary>
-        /// For each result, unify the _freeVariables and unify bagArrayVariable with the associated bag.
-        /// </summary>
-        /// <param name="bagArrayVariable">this is unified with the List<object> of matches for template that
-        /// corresponds to the bindings for freeVariables.  Be very careful: this does not unify with a Prolog
-        /// list.</param>
-        /// <returns></returns>
-        public IEnumerable<bool> resultArray(Variable bagArrayVariable)
-        {
-            if (_freeVariables == null)
-            {
-                // No unbound free variables, so we only filled one bag.  If empty, bagof fails.
-                if (_findallBagArray.Count > 0)
-                {
-                    foreach (bool l1 in bagArrayVariable.unify(_findallBagArray))
-                        yield return false;
-                }
-            }
-            else
-            {
-                foreach (KeyValuePair<object[], List<object>> valuesAndBag in _bagForFreeVariables)
-                {
-                    foreach (bool l1 in YP.unifyArrays(_freeVariables, valuesAndBag.Key))
-                    {
-                        foreach (bool l2 in bagArrayVariable.unify(valuesAndBag.Value))
-                            yield return false;
-                    }
-                    // Debug: Should we free memory of the answers already returned?
-                }
-            }
-        }
-
-        /// <summary>
-        /// For each result, unify the _freeVariables and unify Bag with the associated bag.
-        /// </summary>
-        /// <param name="Bag"></param>
-        /// <returns></returns>
-        public IEnumerable<bool> result(object Bag)
-        {
-            Variable bagArrayVariable = new Variable();
-            foreach (bool l1 in resultArray(bagArrayVariable))
-            {
-                foreach (bool l2 in YP.unify(Bag, ListPair.make((List<object>)bagArrayVariable.getValue())))
-                    yield return false;
-            }
-        }
-
-        /// <summary>
-        /// For each result, unify the _freeVariables and unify Bag with the associated bag which is sorted
-        /// with duplicates removed, as in setof.
-        /// </summary>
-        /// <param name="Bag"></param>
-        /// <returns></returns>
-        public IEnumerable<bool> resultSet(object Bag)
-        {
-            Variable bagArrayVariable = new Variable();
-            foreach (bool l1 in resultArray(bagArrayVariable))
-            {
-                List<object> bagArray = (List<object>)bagArrayVariable.getValue();
-                YP.sortArray(bagArray);
-                foreach (bool l2 in YP.unify(Bag, ListPair.makeWithoutRepeatedTerms(bagArray)))
-                    yield return false;
-            }
-        }
-
-        public static IEnumerable<bool> bagofArray
-            (object Template, object Goal, IEnumerable<bool> goalIterator, Variable bagArrayVariable)
-        {
-            BagofAnswers bagOfAnswers = new BagofAnswers(Template, Goal);
-            foreach (bool l1 in goalIterator)
-                bagOfAnswers.add();
-            return bagOfAnswers.resultArray(bagArrayVariable);
-        }
-
-        public static IEnumerable<bool> bagof
-            (object Template, object Goal, IEnumerable<bool> goalIterator, object Bag)
-        {
-            BagofAnswers bagOfAnswers = new BagofAnswers(Template, Goal);
-            foreach (bool l1 in goalIterator)
-                bagOfAnswers.add();
-            return bagOfAnswers.result(Bag);
-        }
-
-        public static IEnumerable<bool> setof
-            (object Template, object Goal, IEnumerable<bool> goalIterator, object Bag)
-        {
-            BagofAnswers bagOfAnswers = new BagofAnswers(Template, Goal);
-            foreach (bool l1 in goalIterator)
-                bagOfAnswers.add();
-            return bagOfAnswers.resultSet(Bag);
-        }
-        #pragma warning restore 0168, 0219
-
-        /// <summary>
-        /// A TermArrayEqualityComparer implements IEqualityComparer to compare two object arrays using YP.termEqual.
-        /// </summary>
-        private class TermArrayEqualityComparer : IEqualityComparer<object[]>
-        {
-            public bool Equals(object[] array1, object[] array2)
-            {
-                if (array1.Length != array2.Length)
-                    return false;
-                for (int i = 0; i < array1.Length; ++i)
-                {
-                    if (!YP.termEqual(array1[i], array2[i]))
-                        return false;
-                }
-                return true;
-            }
-
-            public int GetHashCode(object[] array)
-            {
-                int hashCode = 0;
-                for (int i = 0; i < array.Length; ++i)
-                    hashCode ^= array[i].GetHashCode();
-                return hashCode;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/FindallAnswers.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/FindallAnswers.cs
deleted file mode 100644
index fb9569e..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/FindallAnswers.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-using System.Collections.Generic;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    /// <summary>
-    /// A FindallAnswers holds answers for findall.
-    /// </summary>
-    public class FindallAnswers
-    {
-        private object _template;
-        private List<object> _bagArray;
-
-        public FindallAnswers(object Template)
-        {
-            _template = Template;
-            _bagArray = new List<object>();
-        }
-
-        public void add()
-        {
-            _bagArray.Add(YP.makeCopy(_template, new Variable.CopyStore()));
-        }
-
-        public List<object> resultArray()
-        {
-            return _bagArray;
-        }
-
-        /// <summary>
-        /// Unify Bag with the result. This frees the internal answers, so you can only call this once.
-        /// </summary>
-        /// <param name="Bag"></param>
-        /// <returns></returns>
-        public IEnumerable<bool> result(object Bag)
-        {
-            object result = ListPair.make(_bagArray);
-            // Try to free the memory.
-            _bagArray = null;
-            return YP.unify(Bag, result);
-        }
-
-        // disable warning on l1, don't see how we can
-        // code this differently
-        #pragma warning disable 0168, 0219
-
-        /// <summary>
-        /// This is a simplified findall when the goal is a single call.
-        /// </summary>
-        /// <param name="Template"></param>
-        /// <param name="goal"></param>
-        /// <param name="Bag"></param>
-        /// <returns></returns>
-        public static IEnumerable<bool> findall(object Template, IEnumerable<bool> goal, object Bag)
-        {
-            FindallAnswers findallAnswers = new FindallAnswers(Template);
-            foreach (bool l1 in goal)
-                findallAnswers.add();
-            return findallAnswers.result(Bag);
-        }
-
-        /// <summary>
-        /// Like findall, except return an array of the results.
-        /// </summary>
-        /// <param name="template"></param>
-        /// <param name="goal"></param>
-        /// <returns></returns>
-        public static List<object> findallArray(object Template, IEnumerable<bool> goal)
-        {
-            FindallAnswers findallAnswers = new FindallAnswers(Template);
-            foreach (bool l1 in goal)
-                findallAnswers.add();
-            return findallAnswers.resultArray();
-        }
-        #pragma warning restore 0168, 0219
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor.cs
deleted file mode 100644
index 4d65f5b..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    public class Functor : IUnifiable
-    {
-        public readonly Atom _name;
-        public readonly object[] _args;
-
-        public Functor(Atom name, object[] args)
-        {
-            if (args.Length <= 3)
-            {
-                if (args.Length == 0)
-                    throw new Exception("For arity 0 functor, just use name as an Atom");
-                else if (args.Length == 1)
-                    throw new Exception("For arity 1 functor, use Functor1");
-                else if (args.Length == 2)
-                    throw new Exception("For arity 2 functor, use Functor2");
-                else if (args.Length == 3)
-                    throw new Exception("For arity 3 functor, use Functor3");
-                else
-                    // (This shouldn't happen, but include it for completeness.
-                    throw new Exception("Cannot create a Functor of arity " + args.Length);
-            }
-
-            _name = name;
-            _args = args;
-        }
-
-        public Functor(string name, object[] args)
-            : this(Atom.a(name), args)
-        {
-        }
-
-        /// <summary>
-        /// Return an Atom, Functor1, Functor2, Functor3 or Functor depending on the
-        /// length of args.
-        /// Note that this is different than the Functor constructor which requires
-        /// the length of args to be greater than 3.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="args"></param>
-        /// <returns></returns>
-        public static object make(Atom name, object[] args)
-        {
-            if (args.Length <= 0)
-                return name;
-            else if (args.Length == 1)
-                return new Functor1(name, args[0]);
-            else if (args.Length == 2)
-                return new Functor2(name, args[0], args[1]);
-            else if (args.Length == 3)
-                return new Functor3(name, args[0], args[1], args[2]);
-            else
-                return new Functor(name, args);
-        }
-
-        /// <summary>
-        /// Call the main make, first converting name to an Atom.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="args"></param>
-        /// <returns></returns>
-        public static object make(string name, object[] args)
-        {
-            return make(Atom.a(name), args);
-        }
-
-        /// <summary>
-        /// If arg is another Functor, then succeed (yield once) if this and arg have the
-        /// same name and all functor args unify, otherwise fail (don't yield).
-        /// If arg is a Variable, then call its unify to unify with this.
-        /// Otherwise fail (don't yield).
-        /// </summary>
-        /// <param name="arg"></param>
-        /// <returns></returns>
-        public IEnumerable<bool> unify(object arg)
-        {
-            arg = YP.getValue(arg);
-            if (arg is Functor)
-            {
-                Functor argFunctor = (Functor)arg;
-                if (_name.Equals(argFunctor._name))
-                    return YP.unifyArrays(_args, argFunctor._args);
-                else
-                    return YP.fail();
-            }
-            else if (arg is Variable)
-                return ((Variable)arg).unify(this);
-            else
-                return YP.fail();
-        }
-
-        public override string ToString()
-        {
-            string result = _name + "(" + YP.getValue(_args[0]);
-            for (int i = 1; i < _args.Length; ++i)
-                result += ", " + YP.getValue(_args[i]);
-            result += ")";
-            return result;
-        }
-
-        public bool termEqual(object term)
-        {
-            term = YP.getValue(term);
-            if (term is Functor)
-            {
-                Functor termFunctor = (Functor)term;
-                if (_name.Equals(termFunctor._name) && _args.Length == termFunctor._args.Length)
-                {
-                    for (int i = 0; i < _args.Length; ++i)
-                    {
-                        if (!YP.termEqual(_args[i], termFunctor._args[i]))
-                            return false;
-                    }
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public bool lessThan(Functor functor)
-        {
-            // Do the equal check first since it is faster.
-            if (!_name.Equals(functor._name))
-                return _name.lessThan(functor._name);
-
-            if (_args.Length != functor._args.Length)
-                return _args.Length < functor._args.Length;
-
-            for (int i = 0; i < _args.Length; ++i)
-            {
-                if (!YP.termEqual(_args[i], functor._args[i]))
-                    return YP.termLessThan(_args[i], functor._args[i]);
-            }
-
-            return false;
-        }
-
-        public bool ground()
-        {
-            for (int i = 0; i < _args.Length; ++i)
-            {
-                if (!YP.ground(_args[i]))
-                    return false;
-            }
-            return true;
-        }
-
-        public void addUniqueVariables(List<Variable> variableSet)
-        {
-            for (int i = 0; i < _args.Length; ++i)
-                YP.addUniqueVariables(_args[i], variableSet);
-        }
-
-        public object makeCopy(Variable.CopyStore copyStore)
-        {
-            object[] argsCopy = new object[_args.Length];
-            for (int i = 0; i < _args.Length; ++i)
-                argsCopy[i] = YP.makeCopy(_args[i], copyStore);
-            return new Functor(_name, argsCopy);
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor1.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor1.cs
deleted file mode 100644
index 80d98b1..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor1.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    public class Functor1 : IUnifiable
-    {
-        public readonly Atom _name;
-        public readonly object _arg1;
-
-        public Functor1(Atom name, object arg1)
-        {
-            _name = name;
-            _arg1 = arg1;
-        }
-
-        public Functor1(string name, object arg1)
-            : this(Atom.a(name), arg1)
-        {
-        }
-
-        // disable warning on l1, don't see how we can
-        // code this differently
-        #pragma warning disable 0168, 0219
-        /// <summary>
-        /// If arg is another Functor1, then succeed (yield once) if this and arg have the
-        /// same name and the functor args unify, otherwise fail (don't yield).
-        /// If arg is a Variable, then call its unify to unify with this.
-        /// Otherwise fail (don't yield).
-        /// </summary>
-        /// <param name="arg"></param>
-        /// <returns></returns>
-        public IEnumerable<bool> unify(object arg)
-        {
-            arg = YP.getValue(arg);
-            if (arg is Functor1)
-            {
-                Functor1 argFunctor = (Functor1)arg;
-                if (_name.Equals(argFunctor._name))
-                {
-                    foreach (bool l1 in YP.unify(_arg1, argFunctor._arg1))
-                        yield return false;
-                }
-            }
-            else if (arg is Variable)
-            {
-                foreach (bool l1 in ((Variable)arg).unify(this))
-                    yield return false;
-            }
-        }
-        #pragma warning restore 0168, 0219
-
-
-        public override string ToString()
-        {
-            return _name + "(" + YP.getValue(_arg1) + ")";
-        }
-
-        public bool termEqual(object term)
-        {
-            term = YP.getValue(term);
-            if (term is Functor1)
-            {
-                Functor1 termFunctor = (Functor1)term;
-                return _name.Equals(termFunctor._name) && YP.termEqual(_arg1, termFunctor._arg1);
-            }
-            return false;
-        }
-
-        public bool lessThan(Functor1 functor)
-        {
-            // Do the equal check first since it is faster.
-            if (!_name.Equals(functor._name))
-                return _name.lessThan(functor._name);
-
-            return YP.termLessThan(_arg1, functor._arg1);
-        }
-
-        public bool ground()
-        {
-            return YP.ground(_arg1);
-        }
-
-        public void addUniqueVariables(List<Variable> variableSet)
-        {
-            YP.addUniqueVariables(_arg1, variableSet);
-        }
-
-        public object makeCopy(Variable.CopyStore copyStore)
-        {
-            return new Functor1(_name, YP.makeCopy(_arg1, copyStore));
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor2.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor2.cs
deleted file mode 100644
index 4c501d6..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor2.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    public class Functor2 : IUnifiable
-    {
-        public readonly Atom _name;
-        public readonly object _arg1;
-        public readonly object _arg2;
-
-        public Functor2(Atom name, object arg1, object arg2)
-        {
-            _name = name;
-            _arg1 = arg1;
-            _arg2 = arg2;
-        }
-
-        public Functor2(string name, object arg1, object arg2)
-            : this(Atom.a(name), arg1, arg2)
-        {
-        }
-
-        // disable warning on l1, don't see how we can
-        // code this differently
-        #pragma warning disable 0168, 0219
-        /// If arg is another Functor2, then succeed (yield once) if this and arg have the
-        /// same name and all functor args unify, otherwise fail (don't yield).
-        /// If arg is a Variable, then call its unify to unify with this.
-        /// Otherwise fail (don't yield).
-        public IEnumerable<bool> unify(object arg)
-        {
-            arg = YP.getValue(arg);
-            if (arg is Functor2)
-            {
-                Functor2 argFunctor = (Functor2)arg;
-                if (_name.Equals(argFunctor._name))
-                {
-                    foreach (bool l1 in YP.unify(_arg1, argFunctor._arg1))
-                    {
-                        foreach (bool l2 in YP.unify(_arg2, argFunctor._arg2))
-                            yield return false;
-                    }
-                }
-            }
-            else if (arg is Variable)
-            {
-                foreach (bool l1 in ((Variable)arg).unify(this))
-                    yield return false;
-            }
-        }
-        #pragma warning restore 0168, 0219
-
-
-        public override string ToString()
-        {
-            if (_name == Atom.DOT)
-                return listPairToString(this);
-            else
-                return _name + "(" + YP.getValue(_arg1) + ", " +  YP.getValue(_arg2) + ")";
-        }
-
-        public bool termEqual(object term)
-        {
-            term = YP.getValue(term);
-            if (term is Functor2)
-            {
-                Functor2 termFunctor = (Functor2)term;
-                return _name.Equals(termFunctor._name) && YP.termEqual(_arg1, termFunctor._arg1)
-                     && YP.termEqual(_arg2, termFunctor._arg2);
-            }
-            return false;
-        }
-
-        public bool lessThan(Functor2 functor)
-        {
-            // Do the equal check first since it is faster.
-            if (!_name.Equals(functor._name))
-                return _name.lessThan(functor._name);
-
-            if (!YP.termEqual(_arg1, functor._arg1))
-                return YP.termLessThan(_arg1, functor._arg1);
-
-            return YP.termLessThan(_arg2, functor._arg2);
-        }
-
-        public bool ground()
-        {
-            return YP.ground(_arg1) && YP.ground(_arg2);
-        }
-
-        public void addUniqueVariables(List<Variable> variableSet)
-        {
-            YP.addUniqueVariables(_arg1, variableSet);
-            YP.addUniqueVariables(_arg2, variableSet);
-        }
-
-        public object makeCopy(Variable.CopyStore copyStore)
-        {
-            return new Functor2(_name, YP.makeCopy(_arg1, copyStore),
-                YP.makeCopy(_arg2, copyStore));
-        }
-
-        private static string listPairToString(Functor2 listPair)
-        {
-            string result = "[";
-            while (true)
-            {
-                object head = YP.getValue(listPair._arg1);
-                object tail = YP.getValue(listPair._arg2);
-                if (tail == (object)Atom.NIL)
-                {
-                    result += head;
-                    break;
-                }
-                else if (tail is Functor2 && ((Functor2)tail)._name == Atom.DOT)
-                {
-                    result += head + ", ";
-                    listPair = (Functor2)tail;
-                    // Loop again.
-                }
-                else
-                {
-                    // The list is not terminated with NIL.
-                    result += head + "|" + tail;
-                    break;
-                }
-            }
-            result += "]";
-            return result;
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor3.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor3.cs
deleted file mode 100644
index 94e39c4..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor3.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    public class Functor3 : IUnifiable
-    {
-        public readonly Atom _name;
-        public readonly object _arg1;
-        public readonly object _arg2;
-        public readonly object _arg3;
-
-        public Functor3(Atom name, object arg1, object arg2, object arg3)
-        {
-            _name = name;
-            _arg1 = arg1;
-            _arg2 = arg2;
-            _arg3 = arg3;
-        }
-
-        public Functor3(string name, object arg1, object arg2, object arg3)
-            : this(Atom.a(name), arg1, arg2, arg3)
-        {
-        }
-
-        // disable warning on l1, don't see how we can
-        // code this differently
-        #pragma warning disable 0168, 0219
-        /// If arg is another Functor3, then succeed (yield once) if this and arg have the
-        /// same name and all functor args unify, otherwise fail (don't yield).
-        /// If arg is a Variable, then call its unify to unify with this.
-        /// Otherwise fail (don't yield).
-        public IEnumerable<bool> unify(object arg)
-        {
-            arg = YP.getValue(arg);
-            if (arg is Functor3)
-            {
-                Functor3 argFunctor = (Functor3)arg;
-                if (_name.Equals(argFunctor._name))
-                {
-                    foreach (bool l1 in YP.unify(_arg1, argFunctor._arg1))
-                    {
-                        foreach (bool l2 in YP.unify(_arg2, argFunctor._arg2))
-                        {
-                            foreach (bool l3 in YP.unify(_arg3, argFunctor._arg3))
-                                yield return false;
-                        }
-                    }
-                }
-            }
-            else if (arg is Variable)
-            {
-                foreach (bool l1 in ((Variable)arg).unify(this))
-                    yield return false;
-            }
-        }
-        #pragma warning restore 0168, 0219
-
-        public override string ToString()
-        {
-            return _name + "(" + YP.getValue(_arg1) + ", " + YP.getValue(_arg2) + ", " +
-                YP.getValue(_arg3) + ")";
-        }
-
-        public bool termEqual(object term)
-        {
-            term = YP.getValue(term);
-            if (term is Functor3)
-            {
-                Functor3 termFunctor = (Functor3)term;
-                return _name.Equals(termFunctor._name) && YP.termEqual(_arg1, termFunctor._arg1)
-                     && YP.termEqual(_arg2, termFunctor._arg2)
-                     && YP.termEqual(_arg3, termFunctor._arg3);
-            }
-            return false;
-        }
-
-        public bool lessThan(Functor3 functor)
-        {
-            // Do the equal check first since it is faster.
-            if (!_name.Equals(functor._name))
-                return _name.lessThan(functor._name);
-
-            if (!YP.termEqual(_arg1, functor._arg1))
-                return YP.termLessThan(_arg1, functor._arg1);
-
-            if (!YP.termEqual(_arg2, functor._arg2))
-                return YP.termLessThan(_arg2, functor._arg2);
-
-            return YP.termLessThan(_arg3, functor._arg3);
-        }
-
-        public bool ground()
-        {
-            return YP.ground(_arg1) && YP.ground(_arg2) && YP.ground(_arg3);
-        }
-
-        public void addUniqueVariables(List<Variable> variableSet)
-        {
-            YP.addUniqueVariables(_arg1, variableSet);
-            YP.addUniqueVariables(_arg2, variableSet);
-            YP.addUniqueVariables(_arg3, variableSet);
-        }
-
-        public object makeCopy(Variable.CopyStore copyStore)
-        {
-            return new Functor3(_name, YP.makeCopy(_arg1, copyStore),
-                YP.makeCopy(_arg2, copyStore), YP.makeCopy(_arg3, copyStore));
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs
deleted file mode 100644
index 09a9a08..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-using System.Collections.Generic;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    /// <summary>
-    /// An IndexedAnswers holds answers to a query based on the values of index arguments.
-    /// </summary>
-    public class IndexedAnswers : YP.IClause
-    {
-        private int _arity;
-        // addAnswer adds the answer here and indexes it later.
-        private List<object[]> _allAnswers = new List<object[]>();
-        // The key has the arity of answers with non-null values for each indexed arg.  The value
-        //   is a list of the matching answers.  The signature is implicit in the pattern on non-null index args.
-        private Dictionary<HashedList, List<object[]>> _indexedAnswers =
-            new Dictionary<HashedList, List<object[]>>();
-        // Keeps track of whether we have started adding entries to _indexedAnswers for the signature.
-        private Dictionary<int, object> _gotAnswersForSignature = new Dictionary<int, object>();
-        private const int MAX_INDEX_ARGS = 31;
-
-        public IndexedAnswers(int arity)
-        {
-            _arity = arity;
-        }
-
-        /// <summary>
-        /// Append the answer to the list and update the indexes, if any.
-        /// Elements of answer must be ground, since arguments with unbound variables make this
-        /// into a dynamic rule which we don't index.
-        /// </summary>
-        /// <param name="answer"></param>
-        public void addAnswer(object[] answer)
-        {
-            addOrPrependAnswer(answer, false);
-        }
-
-        /// <summary>
-        /// Prepend the answer to the list and clear the indexes so that they must be re-computed
-        /// on the next call to match.  (Only addAnswer will maintain the indexes while adding answers.)
-        /// Elements of answer must be ground, since arguments with unbound variables make this
-        /// into a dynamic rule which we don't index.
-        /// </summary>
-        /// <param name="answer"></param>
-        public void prependAnswer(object[] answer)
-        {
-            addOrPrependAnswer(answer, true);
-        }
-
-        /// <summary>
-        /// Do the work of addAnswer or prependAnswer.
-        /// </summary>
-        /// <param name="answer"></param>
-        private void addOrPrependAnswer(object[] answer, bool prepend)
-        {
-            if (answer.Length != _arity)
-                return;
-
-            // Store a copy of the answer array.
-            object[] answerCopy = new object[answer.Length];
-            Variable.CopyStore copyStore = new Variable.CopyStore();
-            for (int i = 0; i < answer.Length; ++i)
-                answerCopy[i] = YP.makeCopy(answer[i], copyStore);
-            if (copyStore.getNUniqueVariables() > 0)
-                throw new InvalidOperationException
-                    ("Elements of answer must be ground, but found " + copyStore.getNUniqueVariables() +
-                     " unbound variables");
-
-            if (prepend)
-            {
-                _allAnswers.Insert(0, answerCopy);
-                clearIndexes();
-            }
-            else
-            {
-                _allAnswers.Add(answerCopy);
-                // If match has already indexed answers for a signature, we need to add
-                //   this to the existing indexed answers.
-                foreach (int signature in _gotAnswersForSignature.Keys)
-                    indexAnswerForSignature(answerCopy, signature);
-            }
-        }
-
-        private void indexAnswerForSignature(object[] answer, int signature)
-        {
-            // First find out which of the answer values can be used as an index.
-            object[] indexValues = new object[answer.Length];
-            for (int i = 0; i < answer.Length; ++i)
-            {
-                // We limit the number of indexed args in a 32-bit signature.
-                if (i >= MAX_INDEX_ARGS)
-                    indexValues[i] = null;
-                else
-                    indexValues[i] = getIndexValue(YP.getValue(answer[i]));
-            }
-
-            // We need an entry in indexArgs from indexValues for each 1 bit in signature.
-            HashedList indexArgs = new HashedList(indexValues.Length);
-            for (int i = 0; i < indexValues.Length; ++i)
-            {
-                if ((signature & (1 << i)) == 0)
-                    indexArgs.Add(null);
-                else
-                {
-                    if (indexValues[i] == null)
-                        // The signature wants an index value here, but we don't have one so
-                        //   we can't add it as an answer for this signature.
-                        return;
-                    else
-                        indexArgs.Add(indexValues[i]);
-                }
-            }
-
-            // Add the answer to the answers list for indexArgs, creating the entry if needed.
-            List<object[]> answers;
-            if (!_indexedAnswers.TryGetValue(indexArgs, out answers))
-            {
-                answers = new List<object[]>();
-                _indexedAnswers[indexArgs] = answers;
-            }
-            answers.Add(answer);
-        }
-
-        public IEnumerable<bool> match(object[] arguments)
-        {
-            if (arguments.Length != _arity)
-                yield break;
-
-            // Set up indexArgs, up to arg position MAX_INDEX_ARGS.  The signature has a 1 bit for
-            //   each non-null index arg.
-            HashedList indexArgs = new HashedList(arguments.Length);
-            bool gotAllIndexArgs = true;
-            int signature = 0;
-            for (int i = 0; i < arguments.Length; ++i)
-            {
-                object indexValue = null;
-                if (i < MAX_INDEX_ARGS)
-                {
-                    // We limit the number of args in a 32-bit signature.
-                    indexValue = getIndexValue(YP.getValue(arguments[i]));
-                    if (indexValue != null)
-                        signature += (1 << i);
-                }
-                if (indexValue == null)
-                    gotAllIndexArgs = false;
-                indexArgs.Add(indexValue);
-            }
-
-            List<object[]> answers;
-            if (signature == 0)
-                // No index args, so we have to match from _allAnswers.
-                answers = _allAnswers;
-            else
-            {
-                if (!_gotAnswersForSignature.ContainsKey(signature))
-                {
-                    // We need to create the entry in _indexedAnswers.
-                    foreach (object[] answer in _allAnswers)
-                        indexAnswerForSignature(answer, signature);
-                    // Mark that we did this signature.
-                    _gotAnswersForSignature[signature] = null;
-                }
-                if (!_indexedAnswers.TryGetValue(indexArgs, out answers))
-                    yield break;
-            }
-
-            if (gotAllIndexArgs)
-            {
-                // All the arguments were already bound, so we don't need to do bindings.
-                yield return false;
-                yield break;
-            }
-
-            // Find matches in answers.
-            IEnumerator<bool>[] iterators = new IEnumerator<bool>[arguments.Length];
-            // Debug: If the caller asserts another answer into this same predicate during yield, the iterator
-            //   over clauses will be corrupted.  Should we take the time to copy answers?
-            foreach (object[] answer in answers)
-            {
-                bool gotMatch = true;
-                int nIterators = 0;
-                // Try to bind all the arguments.
-                for (int i = 0; i < arguments.Length; ++i)
-                {
-                    if (indexArgs[i] != null)
-                        // We already matched this argument by looking up _indexedAnswers.
-                        continue;
-
-                    IEnumerator<bool> iterator = YP.unify(arguments[i], answer[i]).GetEnumerator();
-                    iterators[nIterators++] = iterator;
-                    // MoveNext() is true if YP.unify succeeds.
-                    if (!iterator.MoveNext())
-                    {
-                        gotMatch = false;
-                        break;
-                    }
-                }
-                int z = 0;
-                try
-                {
-                    if (gotMatch)
-                        yield return false;
-                }
-                finally
-                {
-                    // Manually finalize all the iterators.
-                    for (z = 0; z < nIterators; ++z)
-                        iterators[z].Dispose();
-                }
-            }
-        }
-
-        public IEnumerable<bool> clause(object Head, object Body)
-        {
-            Head = YP.getValue(Head);
-            if (Head is Variable)
-                throw new PrologException("instantiation_error", "Head is an unbound variable");
-            object[] arguments = YP.getFunctorArgs(Head);
-
-            // We always match Head from _allAnswers, and the Body is Atom.a("true").
-            #pragma warning disable 0168, 0219
-            foreach (bool l1 in YP.unify(Body, Atom.a("true")))
-            {
-                // The caller can assert another answer into this same predicate during yield, so we have to
-                //   make a copy of the answers.
-                foreach (object[] answer in _allAnswers.ToArray())
-                {
-                    foreach (bool l2 in YP.unifyArrays(arguments, answer))
-                        yield return false;
-                }
-            }
-            #pragma warning restore 0168, 0219
-        }
-
-        public IEnumerable<bool> retract(object Head, object Body)
-        {
-            Head = YP.getValue(Head);
-            if (Head is Variable)
-                throw new PrologException("instantiation_error", "Head is an unbound variable");
-            object[] arguments = YP.getFunctorArgs(Head);
-
-            // We always match Head from _allAnswers, and the Body is Atom.a("true").
-            #pragma warning disable 0168, 0219
-            foreach (bool l1 in YP.unify(Body, Atom.a("true")))
-            {
-                // The caller can assert another answer into this same predicate during yield, so we have to
-                //   make a copy of the answers.
-                foreach (object[] answer in _allAnswers.ToArray())
-                {
-                    foreach (bool l2 in YP.unifyArrays(arguments, answer))
-                    {
-                        _allAnswers.Remove(answer);
-                        clearIndexes();
-                        yield return false;
-                    }
-                }
-            }
-            #pragma warning restore 0168, 0219
-        }
-
-        /// <summary>
-        /// After retracting or prepending an answer in _allAnswers, the indexes are invalid, so clear them.
-        /// </summary>
-        private void clearIndexes()
-        {
-            _indexedAnswers.Clear();
-            _gotAnswersForSignature.Clear();
-        }
-
-        /// <summary>
-        /// A HashedList extends an ArrayList with methods to get a hash and to check equality
-        /// based on the elements of the list.
-        /// </summary>
-        public class HashedList : ArrayList
-        {
-            private bool _gotHashCode = false;
-            private int _hashCode;
-
-            public HashedList()
-                : base()
-            {
-            }
-
-            public HashedList(int capacity)
-                : base(capacity)
-            {
-            }
-
-            public HashedList(ICollection c)
-                : base(c)
-            {
-            }
-
-            // Debug: Should override all the other methods that change this.
-            public override int Add(object value)
-            {
-                _gotHashCode = false;
-                return base.Add(value);
-            }
-
-            public override int GetHashCode()
-            {
-                if (!_gotHashCode)
-                {
-                    int hashCode = 1;
-                    foreach (object obj in this)
-                        hashCode = 31 * hashCode + (obj == null ? 0 : obj.GetHashCode());
-                    _hashCode = hashCode;
-                    _gotHashCode = true;
-                }
-                return _hashCode;
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (!(obj is ArrayList))
-                    return false;
-
-                ArrayList objList = (ArrayList)obj;
-                if (objList.Count != Count)
-                    return false;
-
-                for (int i = 0; i < Count; ++i)
-                {
-                    object value = objList[i];
-                    if (value == null)
-                    {
-                        if (this[i] != null)
-                            return false;
-                    }
-                    else
-                    {
-                        if (!value.Equals(this[i]))
-                            return false;
-                    }
-                }
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// If we keep an index on value, return the value, or null if we don't index it.
-        /// </summary>
-        /// <param name="value">the term to examine.  Assume you already called YP.getValue(value)</param>
-        /// <returns></returns>
-        public static object getIndexValue(object value)
-        {
-            if (value is Atom || value is string || value is Int32 || value is DateTime)
-                return value;
-            else
-                return null;
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/ListPair.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/ListPair.cs
deleted file mode 100644
index daac0ba..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/ListPair.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    public class ListPair : Functor2
-    {
-        public ListPair(object head, object tail) : base(Atom.DOT, head, tail)
-        {
-        }
-
-        public static object make(List<object> list)
-        {
-            if (list.Count <= 0)
-                return Atom.NIL;
-
-            object result = Atom.NIL;
-            // Start from the end.
-            for (int i = list.Count - 1; i >= 0; --i)
-                result = new ListPair(list[i], result);
-            return result;
-        }
-
-        public static object make(object[] array)
-        {
-            if (array.Length <= 0)
-                return Atom.NIL;
-
-            object result = Atom.NIL;
-            // Start from the end.
-            for (int i = array.Length - 1; i >= 0; --i)
-                result = new ListPair(array[i], result);
-            return result;
-        }
-
-        /// <summary>
-        /// Return a ListPair version of array, where repeated elements
-        /// (according to YP.termEqual) are removed.
-        /// </summary>
-        /// <param name="array"></param>
-        /// <returns></returns>
-        public static object makeWithoutRepeatedTerms(object[] array)
-        {
-            if (array.Length <= 0)
-                return Atom.NIL;
-
-            // Start from the end.
-            object previousTerm = array[array.Length - 1];
-            object result = new ListPair(previousTerm, Atom.NIL);
-            for (int i = array.Length - 2; i >= 0; --i)
-            {
-                object term = array[i];
-                if (YP.termEqual(term, previousTerm))
-                    continue;
-                result = new ListPair(term, result);
-                previousTerm = term;
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Return a ListPair version of array, where repeated elements
-        /// (according to YP.termEqual) are removed.
-        /// </summary>
-        /// <param name="array"></param>
-        /// <returns></returns>
-        public static object makeWithoutRepeatedTerms(List<object> array)
-        {
-            if (array.Count <= 0)
-                return Atom.NIL;
-
-            // Start from the end.
-            object previousTerm = array[array.Count - 1];
-            object result = new ListPair(previousTerm, Atom.NIL);
-            for (int i = array.Count - 2; i >= 0; --i)
-            {
-                object term = array[i];
-                if (YP.termEqual(term, previousTerm))
-                    continue;
-                result = new ListPair(term, result);
-                previousTerm = term;
-            }
-            return result;
-        }
-
-        public static object make(object element1)
-        {
-            return new ListPair(element1, Atom.NIL);
-        }
-
-        public static object make(object element1, object element2)
-        {
-            return new ListPair(element1, new ListPair(element2, Atom.NIL));
-        }
-
-        public static object make(object element1, object element2, object element3)
-        {
-            return new ListPair(element1,
-                new ListPair(element2, new ListPair(element3, Atom.NIL)));
-        }
-
-        /// <summary>
-        /// Return an array of the elements in list or null if it is not
-        /// a proper list.  If list is Atom.NIL, return an array of zero elements.
-        /// If the list or one of the tails of the list is Variable, raise an instantiation_error.
-        /// This does not call YP.getValue on each element.
-        /// </summary>
-        /// <param name="list"></param>
-        /// <returns></returns>
-        public static object[] toArray(object list)
-        {
-            list = YP.getValue(list);
-            if (list.Equals(Atom.NIL))
-                return new object[0];
-
-            List<object> result = new List<object>();
-            object element = list;
-            while (true) {
-                if (element == Atom.NIL)
-                    break;
-                if (element is Variable)
-                    throw new PrologException(Atom.a("instantiation_error"),
-                        "List tail is an unbound variable");
-                if (!(element is Functor2 && ((Functor2)element)._name == Atom.DOT))
-                    // Not a proper list.
-                    return null;
-                result.Add(((Functor2)element)._arg1);
-                element = YP.getValue(((Functor2)element)._arg2);
-            }
-
-            if (result.Count <= 0)
-                return null;
-            return result.ToArray();
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Parser.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Parser.cs
deleted file mode 100644
index 34010e7..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Parser.cs
+++ /dev/null
@@ -1,4575 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-
-        // disable warning on l1, don't see how we can
-        // code this differently
-        #pragma warning disable 0168, 0219, 0162
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    public class Parser
-    {
-        public static IEnumerable<bool> read_term2(object Term, object Options)
-        {
-            Variable Answer = new Variable();
-            Variable Variables = new Variable();
-            foreach (bool l1 in read_termOptions(Options, Variables))
-            {
-                foreach (bool l2 in portable_read3(Answer, Variables, new Variable()))
-                {
-                    foreach (bool l3 in remove_pos(Answer, Term))
-                        yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_term3(object Input, object Term, object Options)
-        {
-            Variable SaveInput = new Variable();
-            Variable Answer = new Variable();
-            Variable Variables = new Variable();
-            foreach (bool l1 in read_termOptions(Options, Variables))
-            {
-                foreach (bool l2 in YP.current_input(SaveInput))
-                {
-                    try
-                    {
-                        YP.see(Input);
-                        foreach (bool l3 in portable_read3(Answer, Variables, new Variable()))
-                        {
-                            foreach (bool l4 in remove_pos(Answer, Term))
-                                yield return false;
-                        }
-                    }
-                    finally
-                    {
-                        YP.see(SaveInput);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// For read_term, check if Options has variable_names(Variables).
-        /// Otherwise, ignore Options.
-        /// </summary>
-        /// <param name="Options"></param>
-        /// <param name="Variables"></param>
-        /// <returns></returns>
-        private static IEnumerable<bool> read_termOptions(object Options, object Variables)
-        {
-            Options = YP.getValue(Options);
-            if (Options is Variable)
-                throw new PrologException(Atom.a("instantiation_error"), "Options is an unbound variable");
-            // First try to match Options = [variable_names(Variables)]
-            foreach (bool l1 in YP.unify(Options, ListPair.make(new Functor1("variable_names", Variables))))
-            {
-                yield return false;
-                yield break;
-            }
-            // Default: Ignore Options.
-            yield return false;
-        }
-
-        public static IEnumerable<bool> read1(object Term)
-        {
-            return read_term2(Term, Atom.NIL);
-        }
-
-        public static IEnumerable<bool> read2(object Input, object Term)
-        {
-            return read_term3(Input, Term, Atom.NIL);
-        }
-
-        public static IEnumerable<bool> formatError(object Output, object Format, object Arguments)
-        {
-            // Debug: Simple implementation for now.
-            YP.write(Format);
-            YP.write(Arguments);
-            YP.nl();
-            yield return false;
-        }
-
-
-        // Debug: Hand-modify this central predicate to do tail recursion.
-        public static IEnumerable<bool> read_tokens(object arg1, object arg2, object arg3)
-        {
-            bool repeat = true;
-            while (repeat)
-            {
-                repeat = false;
-                {
-                    object C1 = arg1;
-                    object Dict = arg2;
-                    object Tokens = arg3;
-                    Variable C2 = new Variable();
-                    if (YP.lessThanOrEqual(C1, new ListPair(32, Atom.NIL)))
-                    {
-                        if (YP.greaterThanOrEqual(C1, 0))
-                        {
-                            foreach (bool l4 in YP.get_code(C2))
-                            {
-#if false
-                                foreach (bool l5 in read_tokens(C2, Dict, Tokens))
-                                {
-                                    yield return false;
-                                }
-#endif
-                                arg1 = YP.getValue(C2);
-                                arg2 = YP.getValue(Dict);
-                                arg3 = YP.getValue(Tokens);
-                                repeat = true;
-                            }
-                        }
-                        goto cutIf1;
-                    }
-                    if (YP.greaterThanOrEqual(C1, new ListPair(97, Atom.NIL)))
-                    {
-                        if (YP.lessThanOrEqual(C1, new ListPair(122, Atom.NIL)))
-                        {
-                            foreach (bool l4 in read_identifier(C1, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                            goto cutIf2;
-                        }
-                    }
-                    if (YP.greaterThanOrEqual(C1, new ListPair(65, Atom.NIL)))
-                    {
-                        if (YP.lessThanOrEqual(C1, new ListPair(90, Atom.NIL)))
-                        {
-                            foreach (bool l4 in read_variable(C1, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                            goto cutIf3;
-                        }
-                    }
-                    if (YP.greaterThanOrEqual(C1, new ListPair(48, Atom.NIL)))
-                    {
-                        if (YP.lessThanOrEqual(C1, new ListPair(57, Atom.NIL)))
-                        {
-                            foreach (bool l4 in read_number(C1, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                            goto cutIf4;
-                        }
-                    }
-                    if (YP.lessThan(C1, 127))
-                    {
-                        foreach (bool l3 in read_special(C1, Dict, Tokens))
-                        {
-                            yield return false;
-                        }
-                        goto cutIf5;
-                    }
-                    if (YP.lessThanOrEqual(C1, 160))
-                    {
-                        foreach (bool l3 in YP.get_code(C2))
-                        {
-#if false
-                            foreach (bool l4 in read_tokens(C2, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-#endif
-                            arg1 = YP.getValue(C2);
-                            arg2 = YP.getValue(Dict);
-                            arg3 = YP.getValue(Tokens);
-                            repeat = true;
-                        }
-                        goto cutIf6;
-                    }
-                    if (YP.greaterThanOrEqual(C1, 223))
-                    {
-                        if (YP.notEqual(C1, 247))
-                        {
-                            foreach (bool l4 in read_identifier(C1, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                            goto cutIf7;
-                        }
-                    }
-                    if (YP.greaterThanOrEqual(C1, 192))
-                    {
-                        if (YP.notEqual(C1, 215))
-                        {
-                            foreach (bool l4 in read_variable(C1, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                            goto cutIf8;
-                        }
-                    }
-                    if (YP.notEqual(C1, 170))
-                    {
-                        if (YP.notEqual(C1, 186))
-                        {
-                            foreach (bool l4 in read_symbol(C1, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                            goto cutIf9;
-                        }
-                    }
-                    foreach (bool l2 in read_identifier(C1, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                cutIf9:
-                cutIf8:
-                cutIf7:
-                cutIf6:
-                cutIf5:
-                cutIf4:
-                cutIf3:
-                cutIf2:
-                cutIf1:
-                    { }
-                }
-            }
-        }
-
-        // Compiler output follows.
-
-        class YPInnerClass { }
-        // static Type getDeclaringClass() { return typeof(YPInnerClass).DeclaringType; }
-
-        public static IEnumerable<bool> parseInput(object TermList)
-        {
-            {
-                Variable TermAndVariables = new Variable();
-                FindallAnswers findallAnswers1 = new FindallAnswers(TermAndVariables);
-                foreach (bool l2 in parseInputHelper(TermAndVariables))
-                {
-                    findallAnswers1.add();
-                }
-                foreach (bool l2 in findallAnswers1.result(TermList))
-                {
-                    yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> parseInputHelper(object arg1)
-        {
-            {
-                Variable Term = new Variable();
-                Variable Variables = new Variable();
-                Variable Answer = new Variable();
-                Variable x4 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("f", Term, Variables)))
-                {
-                    foreach (bool l3 in YP.repeat())
-                    {
-                        foreach (bool l4 in portable_read3(Answer, Variables, x4))
-                        {
-                            foreach (bool l5 in remove_pos(Answer, Term))
-                            {
-                                if (YP.termEqual(Term, Atom.a("end_of_file")))
-                                {
-                                    yield break;
-                                    goto cutIf1;
-                                }
-                                yield return false;
-                            cutIf1:
-                                { }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> clear_errors()
-        {
-            {
-                yield return false;
-            }
-        }
-
-        public static IEnumerable<bool> remove_pos(object arg1, object arg2)
-        {
-            {
-                Variable X = new Variable();
-                foreach (bool l2 in YP.unify(arg1, X))
-                {
-                    foreach (bool l3 in YP.unify(arg2, X))
-                    {
-                        if (YP.var(X))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object X = arg2;
-                Variable _Pos = new Variable();
-                Variable _Name = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3("$VAR", _Pos, _Name, X)))
-                {
-                    if (YP.var(X))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.NIL))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                Variable H = new Variable();
-                Variable T = new Variable();
-                Variable NH = new Variable();
-                Variable NT = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(H, T)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(NH, NT)))
-                    {
-                        foreach (bool l4 in remove_pos(H, NH))
-                        {
-                            foreach (bool l5 in remove_pos(T, NT))
-                            {
-                                yield return false;
-                            }
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable NA = new Variable();
-                Variable NB = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", A, B)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new Functor2(",", NA, NB)))
-                    {
-                        foreach (bool l4 in remove_pos(A, NA))
-                        {
-                            foreach (bool l5 in remove_pos(B, NB))
-                            {
-                                yield return false;
-                            }
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                Variable Atom_1 = new Variable();
-                Variable _F = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom_1))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom_1))
-                    {
-                        foreach (bool l4 in YP.functor(Atom_1, _F, 0))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-            {
-                object Term = arg1;
-                object NewTerm = arg2;
-                Variable Func = new Variable();
-                Variable _Pos = new Variable();
-                Variable Args = new Variable();
-                Variable NArgs = new Variable();
-                if (YP.nonvar(Term))
-                {
-                    foreach (bool l3 in YP.univ(Term, new ListPair(Func, new ListPair(_Pos, Args))))
-                    {
-                        foreach (bool l4 in remove_pos(Args, NArgs))
-                        {
-                            foreach (bool l5 in YP.univ(NewTerm, new ListPair(Func, NArgs)))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> portable_read_position(object Term, object PosTerm, object Syntax)
-        {
-            {
-                foreach (bool l2 in portable_read(PosTerm, Syntax))
-                {
-                    foreach (bool l3 in remove_pos(PosTerm, Term))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> portable_read(object Answer, object Syntax)
-        {
-            {
-                Variable Tokens = new Variable();
-                Variable ParseTokens = new Variable();
-                foreach (bool l2 in read_tokens1(Tokens))
-                {
-                    foreach (bool l3 in remove_comments(Tokens, ParseTokens, Syntax))
-                    {
-                        foreach (bool l4 in parse2(ParseTokens, Answer))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> portable_read3(object Answer, object Variables, object Syntax)
-        {
-            {
-                Variable Tokens = new Variable();
-                Variable ParseTokens = new Variable();
-                foreach (bool l2 in read_tokens2(Tokens, Variables))
-                {
-                    foreach (bool l3 in remove_comments(Tokens, ParseTokens, Syntax))
-                    {
-                        foreach (bool l4 in parse2(ParseTokens, Answer))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> remove_comments(object arg1, object arg2, object arg3)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.NIL))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.NIL))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-            {
-                object Ys = arg2;
-                Variable S = new Variable();
-                Variable E = new Variable();
-                Variable Xs = new Variable();
-                Variable Zs = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("comment", S, E), Xs)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("comment", S, E), Zs)))
-                    {
-                        foreach (bool l4 in remove_comments(Xs, Ys, Zs))
-                        {
-                            yield return false;
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                Variable Pos = new Variable();
-                Variable Xs = new Variable();
-                Variable Ys = new Variable();
-                Variable Pos2 = new Variable();
-                Variable Zs = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("/", Atom.a("["), Pos), Xs)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(Atom.a("["), Ys)))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, new ListPair(new Functor2("list", Pos, Pos2), Zs)))
-                        {
-                            foreach (bool l5 in YP.unify(Pos2, YP.add(Pos, 1)))
-                            {
-                                foreach (bool l6 in remove_comments(Xs, Ys, Zs))
-                                {
-                                    yield return false;
-                                }
-                            }
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                Variable Pos = new Variable();
-                Variable Xs = new Variable();
-                Variable Ys = new Variable();
-                Variable Pos2 = new Variable();
-                Variable Zs = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("/", Atom.a("]"), Pos), Xs)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(Atom.a("]"), Ys)))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, new ListPair(new Functor2("list", Pos, Pos2), Zs)))
-                        {
-                            foreach (bool l5 in YP.unify(Pos2, YP.add(Pos, 1)))
-                            {
-                                foreach (bool l6 in remove_comments(Xs, Ys, Zs))
-                                {
-                                    yield return false;
-                                }
-                            }
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object Zs = arg3;
-                Variable Token = new Variable();
-                Variable Xs = new Variable();
-                Variable Ys = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Token, Xs)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(Token, Ys)))
-                    {
-                        foreach (bool l4 in remove_comments(Xs, Ys, Zs))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> expect(object Token, object arg2, object arg3)
-        {
-            {
-                object Rest = arg3;
-                foreach (bool l2 in YP.unify(arg2, new ListPair(Token, Rest)))
-                {
-                    yield return true;
-                    yield break;
-                }
-            }
-            {
-                object S0 = arg2;
-                object x3 = arg3;
-                foreach (bool l2 in syntax_error(ListPair.make(new object[] { Token, Atom.a("or"), Atom.a("operator"), Atom.a("expected") }), S0))
-                {
-                    yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> parse2(object Tokens, object Answer)
-        {
-            {
-                Variable Term = new Variable();
-                Variable LeftOver = new Variable();
-                foreach (bool l2 in clear_errors())
-                {
-                    foreach (bool l3 in parse(Tokens, 1200, Term, LeftOver))
-                    {
-                        foreach (bool l4 in all_read(LeftOver))
-                        {
-                            foreach (bool l5 in YP.unify(Answer, Term))
-                            {
-                                yield return false;
-                            }
-                            yield break;
-                        }
-                    }
-                    foreach (bool l3 in syntax_error(Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> all_read(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    yield return false;
-                }
-            }
-            {
-                Variable Token = new Variable();
-                Variable S = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Token, S)))
-                {
-                    foreach (bool l3 in syntax_error(ListPair.make(new object[] { Atom.a("operator"), Atom.a("expected"), Atom.a("after"), Atom.a("expression") }), new ListPair(Token, S)))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> parse(object arg1, object arg2, object arg3, object arg4)
-        {
-            {
-                object x1 = arg2;
-                object x2 = arg3;
-                object x3 = arg4;
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in syntax_error(new ListPair(Atom.a("expression"), new ListPair(Atom.a("expected"), Atom.NIL)), Atom.NIL))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Precedence = arg2;
-                object Term = arg3;
-                object LeftOver = arg4;
-                Variable Token = new Variable();
-                Variable RestTokens = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Token, RestTokens)))
-                {
-                    foreach (bool l3 in parse5(Token, RestTokens, Precedence, Term, LeftOver))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> parse5(object arg1, object arg2, object arg3, object arg4, object arg5)
-        {
-            {
-                object S0 = arg2;
-                object x2 = arg3;
-                object x3 = arg4;
-                object x4 = arg5;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("}")))
-                {
-                    foreach (bool l3 in cannot_start(Atom.a("}"), S0))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object S0 = arg2;
-                object x2 = arg3;
-                object x3 = arg4;
-                object x4 = arg5;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("]")))
-                {
-                    foreach (bool l3 in cannot_start(Atom.a("]"), S0))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object S0 = arg2;
-                object x2 = arg3;
-                object x3 = arg4;
-                object x4 = arg5;
-                foreach (bool l2 in YP.unify(arg1, Atom.a(")")))
-                {
-                    foreach (bool l3 in cannot_start(Atom.a(")"), S0))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object S0 = arg2;
-                object x2 = arg3;
-                object x3 = arg4;
-                object x4 = arg5;
-                foreach (bool l2 in YP.unify(arg1, Atom.a(",")))
-                {
-                    foreach (bool l3 in cannot_start(Atom.a(","), S0))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object S0 = arg2;
-                object x2 = arg3;
-                object x3 = arg4;
-                object x4 = arg5;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("|")))
-                {
-                    foreach (bool l3 in cannot_start(Atom.a("|"), S0))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object S0 = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable Codes = new Variable();
-                Variable Term = new Variable();
-                Variable A = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("string", Codes)))
-                {
-                    foreach (bool l3 in YP.current_prolog_flag(Atom.a("double_quotes"), Atom.a("atom")))
-                    {
-                        foreach (bool l4 in YP.atom_codes(Term, Codes))
-                        {
-                            foreach (bool l5 in exprtl0(S0, Term, Precedence, Answer, S))
-                            {
-                                yield return false;
-                            }
-                        }
-                        goto cutIf1;
-                    }
-                    foreach (bool l3 in YP.current_prolog_flag(Atom.a("double_quotes"), Atom.a("chars")))
-                    {
-                        foreach (bool l4 in YP.atom_codes(A, Codes))
-                        {
-                            foreach (bool l5 in YP.atom_chars(A, Term))
-                {
-                                foreach (bool l6 in exprtl0(S0, Term, Precedence, Answer, S))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-                        goto cutIf2;
-                    }
-                    foreach (bool l3 in YP.unify(Term, Codes))
-                {
-                        foreach (bool l4 in exprtl0(S0, Term, Precedence, Answer, S))
-                    {
-                        yield return false;
-                    }
-                }
-                cutIf2:
-                cutIf1:
-                    { }
-                }
-            }
-            {
-                object S0 = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable Number = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("number", Number)))
-                {
-                    foreach (bool l3 in exprtl0(S0, Number, Precedence, Answer, S))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable S1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("[")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(Atom.a("]"), S1)))
-                    {
-                        foreach (bool l4 in read_atom(new Functor2("/", Atom.NIL, 0), S1, Precedence, Answer, S))
-                        {
-                            yield return false;
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object S1 = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable Arg1 = new Variable();
-                Variable S2 = new Variable();
-                Variable RestArgs = new Variable();
-                Variable S3 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("[")))
-                {
-                    foreach (bool l3 in parse(S1, 999, Arg1, S2))
-                    {
-                        foreach (bool l4 in read_list(S2, RestArgs, S3))
-                        {
-                            foreach (bool l5 in exprtl0(S3, new ListPair(Arg1, RestArgs), Precedence, Answer, S))
-                            {
-                                yield return false;
-                            }
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object S1 = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable Term = new Variable();
-                Variable S2 = new Variable();
-                Variable S3 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("(")))
-                {
-                    foreach (bool l3 in parse(S1, 1200, Term, S2))
-                    {
-                        foreach (bool l4 in expect(Atom.a(")"), S2, S3))
-                        {
-                            foreach (bool l5 in exprtl0(S3, Term, Precedence, Answer, S))
-                            {
-                                yield return false;
-                            }
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object S1 = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable Term = new Variable();
-                Variable S2 = new Variable();
-                Variable S3 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a(" (")))
-                {
-                    foreach (bool l3 in parse(S1, 1200, Term, S2))
-                    {
-                        foreach (bool l4 in expect(Atom.a(")"), S2, S3))
-                        {
-                            foreach (bool l5 in exprtl0(S3, Term, Precedence, Answer, S))
-                            {
-                                yield return false;
-                            }
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable _Pos = new Variable();
-                Variable S1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("/", Atom.a("{"), _Pos)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(Atom.a("}"), S1)))
-                    {
-                        foreach (bool l4 in read_atom(Atom.a("{}"), S1, Precedence, Answer, S))
-                        {
-                            yield return false;
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object S1 = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable Pos = new Variable();
-                Variable Term = new Variable();
-                Variable S2 = new Variable();
-                Variable S3 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("/", Atom.a("{"), Pos)))
-                {
-                    foreach (bool l3 in parse(S1, 1200, Term, S2))
-                    {
-                        foreach (bool l4 in expect(Atom.a("}"), S2, S3))
-                        {
-                            foreach (bool l5 in exprtl0(S3, new Functor2("{}", Pos, Term), Precedence, Answer, S))
-                            {
-                                yield return false;
-                            }
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable Variable_1 = new Variable();
-                Variable Name = new Variable();
-                Variable Pos = new Variable();
-                Variable S1 = new Variable();
-                Variable Arg1 = new Variable();
-                Variable S2 = new Variable();
-                Variable RestArgs = new Variable();
-                Variable S3 = new Variable();
-                Variable Term = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3("var", Variable_1, Name, Pos)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(Atom.a("("), S1)))
-                    {
-                        foreach (bool l4 in parse(S1, 999, Arg1, S2))
-                        {
-                            foreach (bool l5 in read_args(S2, RestArgs, S3))
-                            {
-                                foreach (bool l6 in YP.univ(Term, new ListPair(Atom.a("call"), new ListPair(new Functor3("$VAR", Pos, Name, Variable_1), new ListPair(Arg1, RestArgs)))))
-                                {
-                                    foreach (bool l7 in exprtl0(S3, Term, Precedence, Answer, S))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                                yield break;
-                            }
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object S0 = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable Variable_1 = new Variable();
-                Variable Name = new Variable();
-                Variable Pos = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3("var", Variable_1, Name, Pos)))
-                {
-                    foreach (bool l3 in exprtl0(S0, new Functor3("$VAR", Pos, Name, Variable_1), Precedence, Answer, S))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object S0 = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable Atom_1 = new Variable();
-                Variable P = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("atom", Atom_1, P)))
-                {
-                    foreach (bool l3 in read_atom(new Functor2("/", Atom_1, P), S0, Precedence, Answer, S))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_atom(object arg1, object arg2, object Precedence, object Answer, object S)
-        {
-            {
-                Variable _Pos = new Variable();
-                Variable Number = new Variable();
-                Variable S1 = new Variable();
-                Variable Negative = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("/", Atom.a("-"), _Pos)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(new Functor1("number", Number), S1)))
-                    {
-                        foreach (bool l4 in YP.unify(Negative, YP.negate(Number)))
-                        {
-                            foreach (bool l5 in exprtl0(S1, Negative, Precedence, Answer, S))
-                            {
-                                yield return false;
-                            }
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                Variable Functor_1 = new Variable();
-                Variable Pos = new Variable();
-                Variable S1 = new Variable();
-                Variable Arg1 = new Variable();
-                Variable S2 = new Variable();
-                Variable RestArgs = new Variable();
-                Variable S3 = new Variable();
-                Variable Term = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("/", Functor_1, Pos)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(Atom.a("("), S1)))
-                    {
-                        foreach (bool l4 in parse(S1, 999, Arg1, S2))
-                        {
-                            foreach (bool l5 in read_args(S2, RestArgs, S3))
-                            {
-                                foreach (bool l6 in YP.univ(Term, new ListPair(Functor_1, new ListPair(Pos, new ListPair(Arg1, RestArgs)))))
-                                {
-                                    foreach (bool l7 in exprtl0(S3, Term, Precedence, Answer, S))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                                yield break;
-                            }
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object S0 = arg2;
-                Variable Op = new Variable();
-                Variable Pos = new Variable();
-                Variable Oprec = new Variable();
-                Variable Aprec = new Variable();
-                Variable Flag = new Variable();
-                Variable Term = new Variable();
-                Variable Arg = new Variable();
-                Variable S1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("/", Op, Pos)))
-                {
-                    foreach (bool l3 in prefixop(Op, Oprec, Aprec))
-                    {
-                        foreach (bool l4 in possible_right_operand(S0, Flag))
-                        {
-                            if (YP.lessThan(Flag, 0))
-                            {
-                                foreach (bool l6 in YP.univ(Term, new ListPair(Op, new ListPair(Pos, Atom.NIL))))
-                                {
-                                    foreach (bool l7 in exprtl0(S0, Term, Precedence, Answer, S))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                                goto cutIf1;
-                            }
-                            if (YP.greaterThan(Oprec, Precedence))
-                            {
-                                foreach (bool l6 in syntax_error(ListPair.make(new object[] { Atom.a("prefix"), Atom.a("operator"), Op, Atom.a("in"), Atom.a("context"), Atom.a("with"), Atom.a("precedence"), Precedence }), S0))
-                                {
-                                    yield return false;
-                                }
-                                goto cutIf2;
-                            }
-                            if (YP.greaterThan(Flag, 0))
-                            {
-                                foreach (bool l6 in parse(S0, Aprec, Arg, S1))
-                                {
-                                    foreach (bool l7 in YP.univ(Term, ListPair.make(new object[] { Op, Pos, Arg })))
-                                    {
-                                        foreach (bool l8 in exprtl(S1, Oprec, Term, Precedence, Answer, S))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                    yield break;
-                                }
-                                goto cutIf3;
-                            }
-                            foreach (bool l5 in peepop(S0, S1))
-                            {
-                                foreach (bool l6 in prefix_is_atom(S1, Oprec))
-                                {
-                                    foreach (bool l7 in exprtl(S1, Oprec, new Functor2("/", Op, Pos), Precedence, Answer, S))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                            }
-                            foreach (bool l5 in parse(S0, Aprec, Arg, S1))
-                            {
-                                foreach (bool l6 in YP.univ(Term, ListPair.make(new object[] { Op, Pos, Arg })))
-                                {
-                                    foreach (bool l7 in exprtl(S1, Oprec, Term, Precedence, Answer, S))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                                yield break;
-                            }
-                        cutIf3:
-                        cutIf2:
-                        cutIf1:
-                            { }
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object S0 = arg2;
-                Variable Atom_1 = new Variable();
-                Variable Pos = new Variable();
-                Variable Term = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("/", Atom_1, Pos)))
-                {
-                    foreach (bool l3 in YP.univ(Term, new ListPair(Atom_1, new ListPair(Pos, Atom.NIL))))
-                    {
-                        foreach (bool l4 in exprtl0(S0, Term, Precedence, Answer, S))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> cannot_start(object Token, object S0)
-        {
-            {
-                foreach (bool l2 in syntax_error(ListPair.make(new object[] { Token, Atom.a("cannot"), Atom.a("start"), Atom.a("an"), Atom.a("expression") }), S0))
-                {
-                    yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_args(object arg1, object arg2, object arg3)
-        {
-            {
-                object S = arg3;
-                Variable S1 = new Variable();
-                Variable Term = new Variable();
-                Variable Rest = new Variable();
-                Variable S2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a(","), S1)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(Term, Rest)))
-                    {
-                        foreach (bool l4 in parse(S1, 999, Term, S2))
-                        {
-                            foreach (bool l5 in read_args(S2, Rest, S))
-                            {
-                                yield return false;
-                            }
-                            yield break;
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object S = arg3;
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a(")"), S)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.NIL))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object S = arg1;
-                object x2 = arg2;
-                object x3 = arg3;
-                foreach (bool l2 in syntax_error(ListPair.make(new object[] { Atom.a(", or )"), Atom.a("expected"), Atom.a("in"), Atom.a("arguments") }), S))
-                {
-                    yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_list(object arg1, object arg2, object arg3)
-        {
-            {
-                object x1 = arg2;
-                object x2 = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in syntax_error(ListPair.make(new object[] { Atom.a(", | or ]"), Atom.a("expected"), Atom.a("in"), Atom.a("list") }), Atom.NIL))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Rest = arg2;
-                object S = arg3;
-                Variable Token = new Variable();
-                Variable S1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Token, S1)))
-                {
-                    foreach (bool l3 in read_list4(Token, S1, Rest, S))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_list4(object arg1, object arg2, object arg3, object arg4)
-        {
-            {
-                object S1 = arg2;
-                object S = arg4;
-                Variable Term = new Variable();
-                Variable Rest = new Variable();
-                Variable S2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a(",")))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Term, Rest)))
-                    {
-                        foreach (bool l4 in parse(S1, 999, Term, S2))
-                        {
-                            foreach (bool l5 in read_list(S2, Rest, S))
-                            {
-                                yield return false;
-                            }
-                            yield break;
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object S1 = arg2;
-                object Rest = arg3;
-                object S = arg4;
-                Variable S2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("|")))
-                {
-                    foreach (bool l3 in parse(S1, 999, Rest, S2))
-                    {
-                        foreach (bool l4 in expect(Atom.a("]"), S2, S))
-                        {
-                            yield return false;
-                        }
-                        yield break;
-                    }
-                    yield break;
-                }
-            }
-            {
-                Variable S1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("]")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, S1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.NIL))
-                        {
-                            foreach (bool l5 in YP.unify(arg4, S1))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object Token = arg1;
-                object S1 = arg2;
-                object x3 = arg3;
-                object x4 = arg4;
-                foreach (bool l2 in syntax_error(ListPair.make(new object[] { Atom.a(", | or ]"), Atom.a("expected"), Atom.a("in"), Atom.a("list") }), new ListPair(Token, S1)))
-                {
-                    yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> possible_right_operand(object arg1, object arg2)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg2, -1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Flag = arg2;
-                Variable H = new Variable();
-                Variable T = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(H, T)))
-                {
-                    foreach (bool l3 in possible_right_operand3(H, Flag, T))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> possible_right_operand3(object arg1, object arg2, object arg3)
-        {
-            {
-                object x4 = arg3;
-                Variable x1 = new Variable();
-                Variable x2 = new Variable();
-                Variable x3 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3("var", x1, x2, x3)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x2 = arg3;
-                Variable x1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("number", x1)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x2 = arg3;
-                Variable x1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("string", x1)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x1 = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.a(" (")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x1 = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("(")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 0))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x1 = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.a(")")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, -1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                Variable x1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("[")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 0))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, new ListPair(Atom.a("]"), x1)))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object x1 = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("[")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x1 = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("]")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, -1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                Variable x1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("{")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 0))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, new ListPair(Atom.a("}"), x1)))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object x1 = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("{")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x1 = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("}")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, -1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x1 = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.a(",")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, -1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x1 = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("|")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, -1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x3 = arg3;
-                Variable x1 = new Variable();
-                Variable x2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("atom", x1, x2)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 0))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> peepop(object arg1, object arg2)
-        {
-            {
-                Variable F = new Variable();
-                Variable Pos = new Variable();
-                Variable S1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("atom", F, Pos), new ListPair(Atom.a("("), S1))))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(new Functor2("atom", F, Pos), new ListPair(Atom.a("("), S1))))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                Variable F = new Variable();
-                Variable Pos = new Variable();
-                Variable S1 = new Variable();
-                Variable L = new Variable();
-                Variable P = new Variable();
-                Variable R = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("atom", F, Pos), S1)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(new Functor(Atom.a("infixop", Atom.a("")), new object[] { new Functor2("/", F, Pos), L, P, R }), S1)))
-                    {
-                        foreach (bool l4 in infixop(F, L, P, R))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-            {
-                Variable F = new Variable();
-                Variable Pos = new Variable();
-                Variable S1 = new Variable();
-                Variable L = new Variable();
-                Variable P = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("atom", F, Pos), S1)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(new Functor3(Atom.a("postfixop", Atom.a("")), new Functor2("/", F, Pos), L, P), S1)))
-                    {
-                        foreach (bool l4 in postfixop(F, L, P))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-            {
-                Variable S0 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, S0))
-                {
-                    foreach (bool l3 in YP.unify(arg2, S0))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> prefix_is_atom(object arg1, object arg2)
-        {
-            {
-                object Precedence = arg2;
-                Variable Token = new Variable();
-                Variable x2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Token, x2)))
-                {
-                    foreach (bool l3 in prefix_is_atom(Token, Precedence))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object P = arg2;
-                Variable x1 = new Variable();
-                Variable L = new Variable();
-                Variable x3 = new Variable();
-                Variable x4 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor(Atom.a("infixop", Atom.a("")), new object[] { x1, L, x3, x4 })))
-                {
-                    if (YP.greaterThanOrEqual(L, P))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object P = arg2;
-                Variable x1 = new Variable();
-                Variable L = new Variable();
-                Variable x3 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3(Atom.a("postfixop", Atom.a("")), x1, L, x3)))
-                {
-                    if (YP.greaterThanOrEqual(L, P))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x1 = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.a(")")))
-                {
-                    yield return false;
-                }
-            }
-            {
-                object x1 = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("]")))
-                {
-                    yield return false;
-                }
-            }
-            {
-                object x1 = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("}")))
-                {
-                    yield return false;
-                }
-            }
-            {
-                object P = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("|")))
-                {
-                    if (YP.greaterThanOrEqual(1100, P))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object P = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.a(",")))
-                {
-                    if (YP.greaterThanOrEqual(1000, P))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x1 = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> exprtl0(object arg1, object arg2, object arg3, object arg4, object arg5)
-        {
-            {
-                object x2 = arg3;
-                Variable Term = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Term))
-                    {
-                        foreach (bool l4 in YP.unify(arg4, Term))
-                        {
-                            foreach (bool l5 in YP.unify(arg5, Atom.NIL))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object Term = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable Token = new Variable();
-                Variable S1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Token, S1)))
-                {
-                    foreach (bool l3 in exprtl0_6(Token, Term, Precedence, Answer, S, S1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> exprtl0_6(object arg1, object arg2, object arg3, object arg4, object arg5, object arg6)
-        {
-            {
-                object x2 = arg3;
-                object S1 = arg6;
-                Variable Term = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("}")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Term))
-                    {
-                        foreach (bool l4 in YP.unify(arg4, Term))
-                        {
-                            foreach (bool l5 in YP.unify(arg5, new ListPair(Atom.a("}"), S1)))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object x2 = arg3;
-                object S1 = arg6;
-                Variable Term = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("]")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Term))
-                    {
-                        foreach (bool l4 in YP.unify(arg4, Term))
-                        {
-                            foreach (bool l5 in YP.unify(arg5, new ListPair(Atom.a("]"), S1)))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object x2 = arg3;
-                object S1 = arg6;
-                Variable Term = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a(")")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Term))
-                    {
-                        foreach (bool l4 in YP.unify(arg4, Term))
-                        {
-                            foreach (bool l5 in YP.unify(arg5, new ListPair(Atom.a(")"), S1)))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object Term = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                object S1 = arg6;
-                Variable Next = new Variable();
-                Variable S2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a(",")))
-                {
-                    if (YP.greaterThanOrEqual(Precedence, 1000))
-                    {
-                        foreach (bool l4 in parse(S1, 1000, Next, S2))
-                        {
-                            foreach (bool l5 in exprtl(S2, 1000, new Functor2(",", Term, Next), Precedence, Answer, S))
-                            {
-                                yield return false;
-                            }
-                            yield break;
-                        }
-                        goto cutIf1;
-                    }
-                    foreach (bool l3 in YP.unify(Answer, Term))
-                    {
-                        foreach (bool l4 in YP.unify(S, new ListPair(Atom.a(","), S1)))
-                        {
-                            yield return false;
-                        }
-                    }
-                cutIf1:
-                    { }
-                }
-            }
-            {
-                object Term = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                object S1 = arg6;
-                Variable Next = new Variable();
-                Variable S2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("|")))
-                {
-                    if (YP.greaterThanOrEqual(Precedence, 1100))
-                    {
-                        foreach (bool l4 in parse(S1, 1100, Next, S2))
-                        {
-                            foreach (bool l5 in exprtl(S2, 1100, new Functor2(";", Term, Next), Precedence, Answer, S))
-                            {
-                                yield return false;
-                            }
-                            yield break;
-                        }
-                        goto cutIf2;
-                    }
-                    foreach (bool l3 in YP.unify(Answer, Term))
-                    {
-                        foreach (bool l4 in YP.unify(S, new ListPair(Atom.a("|"), S1)))
-                        {
-                            yield return false;
-                        }
-                    }
-                cutIf2:
-                    { }
-                }
-            }
-            {
-                object x2 = arg2;
-                object x3 = arg3;
-                object x4 = arg4;
-                object x5 = arg5;
-                object S1 = arg6;
-                Variable S = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("string", S)))
-                {
-                    foreach (bool l3 in cannot_follow(Atom.a("chars"), new Functor1("string", S), S1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x2 = arg2;
-                object x3 = arg3;
-                object x4 = arg4;
-                object x5 = arg5;
-                object S1 = arg6;
-                Variable N = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("number", N)))
-                {
-                    foreach (bool l3 in cannot_follow(Atom.a("number"), new Functor1("number", N), S1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Term = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable S1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("{")))
-                {
-                    foreach (bool l3 in YP.unify(arg6, new ListPair(Atom.a("}"), S1)))
-                    {
-                        foreach (bool l4 in exprtl0_atom(Atom.a("{}"), Term, Precedence, Answer, S, S1))
-                        {
-                            yield return false;
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object x1 = arg2;
-                object x2 = arg3;
-                object x3 = arg4;
-                object x4 = arg5;
-                object S1 = arg6;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("{")))
-                {
-                    foreach (bool l3 in cannot_follow(Atom.a("brace"), Atom.a("{"), S1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Term = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable S1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("[")))
-                {
-                    foreach (bool l3 in YP.unify(arg6, new ListPair(Atom.a("]"), S1)))
-                    {
-                        foreach (bool l4 in exprtl0_atom(Atom.NIL, Term, Precedence, Answer, S, S1))
-                        {
-                            yield return false;
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object x1 = arg2;
-                object x2 = arg3;
-                object x3 = arg4;
-                object x4 = arg5;
-                object S1 = arg6;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("[")))
-                {
-                    foreach (bool l3 in cannot_follow(Atom.a("bracket"), Atom.a("["), S1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x1 = arg2;
-                object x2 = arg3;
-                object x3 = arg4;
-                object x4 = arg5;
-                object S1 = arg6;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("(")))
-                {
-                    foreach (bool l3 in cannot_follow(Atom.a("parenthesis"), Atom.a("("), S1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x1 = arg2;
-                object x2 = arg3;
-                object x3 = arg4;
-                object x4 = arg5;
-                object S1 = arg6;
-                foreach (bool l2 in YP.unify(arg1, Atom.a(" (")))
-                {
-                    foreach (bool l3 in cannot_follow(Atom.a("parenthesis"), Atom.a("("), S1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object x4 = arg2;
-                object x5 = arg3;
-                object x6 = arg4;
-                object x7 = arg5;
-                object S1 = arg6;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable P = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3("var", A, B, P)))
-                {
-                    foreach (bool l3 in cannot_follow(Atom.a("variable"), new Functor3("var", A, B, P), S1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Term = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                object S1 = arg6;
-                Variable F = new Variable();
-                Variable P = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("atom", F, P)))
-                {
-                    foreach (bool l3 in exprtl0_atom(new Functor2("/", F, P), Term, Precedence, Answer, S, S1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> exprtl0_atom(object arg1, object arg2, object arg3, object arg4, object arg5, object S1)
-        {
-            {
-                object Term = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable F = new Variable();
-                Variable Pos = new Variable();
-                Variable L1 = new Variable();
-                Variable O1 = new Variable();
-                Variable R1 = new Variable();
-                Variable L2 = new Variable();
-                Variable O2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("/", F, Pos)))
-                {
-                    foreach (bool l3 in ambigop(F, Precedence, L1, O1, R1, L2, O2))
-                    {
-                        foreach (bool l4 in prefix_is_atom(S1, Precedence))
-                        {
-                            foreach (bool l5 in exprtl(new ListPair(new Functor3(Atom.a("postfixop", Atom.a("")), new Functor2("/", F, Pos), L2, O2), S1), 0, Term, Precedence, Answer, S))
-                            {
-                                yield return false;
-                            }
-                            yield break;
-                        }
-                        foreach (bool l4 in exprtl(new ListPair(new Functor(Atom.a("infixop", Atom.a("")), new object[] { new Functor2("/", F, Pos), L1, O1, R1 }), S1), 0, Term, Precedence, Answer, S))
-                        {
-                            yield return false;
-                        }
-                        foreach (bool l4 in exprtl(new ListPair(new Functor3(Atom.a("postfixop", Atom.a("")), new Functor2("/", F, Pos), L2, O2), S1), 0, Term, Precedence, Answer, S))
-                        {
-                            yield return false;
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Term = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable F = new Variable();
-                Variable Pos = new Variable();
-                Variable L1 = new Variable();
-                Variable O1 = new Variable();
-                Variable R1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("/", F, Pos)))
-                {
-                    foreach (bool l3 in infixop(F, L1, O1, R1))
-                    {
-                        foreach (bool l4 in exprtl(new ListPair(new Functor(Atom.a("infixop", Atom.a("")), new object[] { new Functor2("/", F, Pos), L1, O1, R1 }), S1), 0, Term, Precedence, Answer, S))
-                        {
-                            yield return false;
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Term = arg2;
-                object Precedence = arg3;
-                object Answer = arg4;
-                object S = arg5;
-                Variable F = new Variable();
-                Variable Pos = new Variable();
-                Variable L2 = new Variable();
-                Variable O2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("/", F, Pos)))
-                {
-                    foreach (bool l3 in postfixop(F, L2, O2))
-                    {
-                        foreach (bool l4 in exprtl(new ListPair(new Functor3(Atom.a("postfixop", Atom.a("")), new Functor2("/", F, Pos), L2, O2), S1), 0, Term, Precedence, Answer, S))
-                        {
-                            yield return false;
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object X = arg1;
-                object x2 = arg2;
-                object x3 = arg3;
-                object x4 = arg4;
-                object x5 = arg5;
-                Variable x7 = new Variable();
-                foreach (bool l2 in syntax_error(ListPair.make(new object[] { new Functor2("-", Atom.a("non"), Atom.a("operator")), X, Atom.a("follows"), Atom.a("expression") }), new ListPair(new Functor2("atom", X, x7), S1)))
-                {
-                    yield return false;
-                }
-                yield break;
-            }
-        }
-
-        public static IEnumerable<bool> cannot_follow(object Type, object Token, object Tokens)
-        {
-            {
-                foreach (bool l2 in syntax_error(ListPair.make(new object[] { Type, Atom.a("follows"), Atom.a("expression") }), new ListPair(Token, Tokens)))
-                {
-                    yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> exprtl(object arg1, object arg2, object arg3, object arg4, object arg5, object arg6)
-        {
-            {
-                object x1 = arg2;
-                object x3 = arg4;
-                Variable Term = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg3, Term))
-                    {
-                        foreach (bool l4 in YP.unify(arg5, Term))
-                        {
-                            foreach (bool l5 in YP.unify(arg6, Atom.NIL))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object C = arg2;
-                object Term = arg3;
-                object Precedence = arg4;
-                object Answer = arg5;
-                object S = arg6;
-                Variable Token = new Variable();
-                Variable Tokens = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Token, Tokens)))
-                {
-                    foreach (bool l3 in exprtl_7(Token, C, Term, Precedence, Answer, S, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> exprtl_7(object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7)
-        {
-            {
-                object C = arg2;
-                object Term = arg3;
-                object Precedence = arg4;
-                object Answer = arg5;
-                object S = arg6;
-                object S1 = arg7;
-                Variable F = new Variable();
-                Variable Pos = new Variable();
-                Variable L = new Variable();
-                Variable O = new Variable();
-                Variable R = new Variable();
-                Variable Other = new Variable();
-                Variable S2 = new Variable();
-                Variable Expr = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor(Atom.a("infixop", Atom.a("")), new object[] { new Functor2("/", F, Pos), L, O, R })))
-                {
-                    if (YP.greaterThanOrEqual(Precedence, O))
-                    {
-                        if (YP.lessThanOrEqual(C, L))
-                        {
-                            foreach (bool l5 in parse(S1, R, Other, S2))
-                            {
-                                foreach (bool l6 in YP.univ(Expr, ListPair.make(new object[] { F, Pos, Term, Other })))
-                                {
-                                    foreach (bool l7 in exprtl(S2, O, Expr, Precedence, Answer, S))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                            }
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object C = arg2;
-                object Term = arg3;
-                object Precedence = arg4;
-                object Answer = arg5;
-                object S = arg6;
-                object S1 = arg7;
-                Variable F = new Variable();
-                Variable Pos = new Variable();
-                Variable L = new Variable();
-                Variable O = new Variable();
-                Variable Expr = new Variable();
-                Variable S2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3(Atom.a("postfixop", Atom.a("")), new Functor2("/", F, Pos), L, O)))
-                {
-                    if (YP.greaterThanOrEqual(Precedence, O))
-                    {
-                        if (YP.lessThanOrEqual(C, L))
-                        {
-                            foreach (bool l5 in YP.univ(Expr, ListPair.make(new object[] { F, Pos, Term })))
-                            {
-                                foreach (bool l6 in peepop(S1, S2))
-                                {
-                                    foreach (bool l7 in exprtl(S2, O, Expr, Precedence, Answer, S))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                            }
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object C = arg2;
-                object Term = arg3;
-                object Precedence = arg4;
-                object Answer = arg5;
-                object S = arg6;
-                object S1 = arg7;
-                Variable Next = new Variable();
-                Variable S2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a(",")))
-                {
-                    if (YP.greaterThanOrEqual(Precedence, 1000))
-                    {
-                        if (YP.lessThan(C, 1000))
-                        {
-                            foreach (bool l5 in parse(S1, 1000, Next, S2))
-                            {
-                                foreach (bool l6 in exprtl(S2, 1000, new Functor2(",", Term, Next), Precedence, Answer, S))
-                                {
-                                    yield return false;
-                                }
-                            }
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object C = arg2;
-                object Term = arg3;
-                object Precedence = arg4;
-                object Answer = arg5;
-                object S = arg6;
-                object S1 = arg7;
-                Variable Next = new Variable();
-                Variable S2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.a("|")))
-                {
-                    if (YP.greaterThanOrEqual(Precedence, 1100))
-                    {
-                        if (YP.lessThan(C, 1100))
-                        {
-                            foreach (bool l5 in parse(S1, 1100, Next, S2))
-                            {
-                                foreach (bool l6 in exprtl(S2, 1100, new Functor2(";", Term, Next), Precedence, Answer, S))
-                                {
-                                    yield return false;
-                                }
-                            }
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object Token = arg1;
-                object x2 = arg2;
-                object x4 = arg4;
-                object Tokens = arg7;
-                Variable Term = new Variable();
-                foreach (bool l2 in YP.unify(arg3, Term))
-                {
-                    foreach (bool l3 in YP.unify(arg5, Term))
-                    {
-                        foreach (bool l4 in YP.unify(arg6, new ListPair(Token, Tokens)))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> syntax_error(object _Message, object _List)
-        {
-            {
-                yield break;
-            }
-            foreach (bool l1 in YP.fail())
-            {
-                yield return false;
-            }
-        }
-
-        public static IEnumerable<bool> syntax_error(object _List)
-        {
-            {
-                yield break;
-            }
-            foreach (bool l1 in YP.fail())
-            {
-                yield return false;
-            }
-        }
-
-        public static IEnumerable<bool> prefixop(object F, object O, object Q)
-        {
-            {
-                foreach (bool l2 in YP.current_op(O, Atom.a("fx"), F))
-                {
-                    foreach (bool l3 in YP.unify(Q, YP.subtract(O, 1)))
-                    {
-                        yield return false;
-                    }
-                    goto cutIf1;
-                }
-                foreach (bool l2 in YP.current_op(O, Atom.a("fy"), F))
-                {
-                    foreach (bool l3 in YP.unify(Q, O))
-                    {
-                        yield return false;
-                    }
-                    goto cutIf2;
-                }
-            cutIf2:
-            cutIf1:
-                { }
-            }
-        }
-
-        public static IEnumerable<bool> postfixop(object F, object P, object O)
-        {
-            {
-                foreach (bool l2 in YP.current_op(O, Atom.a("xf"), F))
-                {
-                    foreach (bool l3 in YP.unify(P, YP.subtract(O, 1)))
-                    {
-                        yield return false;
-                    }
-                    goto cutIf1;
-                }
-                foreach (bool l2 in YP.current_op(O, Atom.a("yf"), F))
-                {
-                    foreach (bool l3 in YP.unify(P, O))
-                    {
-                        yield return false;
-                    }
-                    goto cutIf2;
-                }
-            cutIf2:
-            cutIf1:
-                { }
-            }
-        }
-
-        public static IEnumerable<bool> infixop(object F, object P, object O, object Q)
-        {
-            {
-                foreach (bool l2 in YP.current_op(O, Atom.a("xfy"), F))
-                {
-                    foreach (bool l3 in YP.unify(P, YP.subtract(O, 1)))
-                    {
-                        foreach (bool l4 in YP.unify(Q, O))
-                        {
-                            yield return false;
-                        }
-                    }
-                    goto cutIf1;
-                }
-                foreach (bool l2 in YP.current_op(O, Atom.a("xfx"), F))
-                {
-                    foreach (bool l3 in YP.unify(P, YP.subtract(O, 1)))
-                    {
-                        foreach (bool l4 in YP.unify(Q, P))
-                        {
-                            yield return false;
-                        }
-                    }
-                    goto cutIf2;
-                }
-                foreach (bool l2 in YP.current_op(O, Atom.a("yfx"), F))
-                {
-                    foreach (bool l3 in YP.unify(Q, YP.subtract(O, 1)))
-                    {
-                        foreach (bool l4 in YP.unify(P, O))
-                        {
-                            yield return false;
-                        }
-                    }
-                    goto cutIf3;
-                }
-            cutIf3:
-            cutIf2:
-            cutIf1:
-                { }
-            }
-        }
-
-        public static IEnumerable<bool> ambigop(object F, object Precedence, object L1, object O1, object R1, object L2, object O2)
-        {
-            {
-                foreach (bool l2 in postfixop(F, L2, O2))
-                {
-                    if (YP.lessThanOrEqual(O2, Precedence))
-                    {
-                        foreach (bool l4 in infixop(F, L1, O1, R1))
-                        {
-                            if (YP.lessThanOrEqual(O1, Precedence))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_tokens1(object arg1)
-        {
-            {
-                object TokenList = arg1;
-                Variable C1 = new Variable();
-                Variable _X = new Variable();
-                Variable ListOfTokens = new Variable();
-                foreach (bool l2 in YP.get_code(C1))
-                {
-                    foreach (bool l3 in read_tokens(C1, _X, ListOfTokens))
-                    {
-                        foreach (bool l4 in YP.unify(TokenList, ListOfTokens))
-                        {
-                            yield return false;
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("atom", Atom.a("end_of_file"), 0), Atom.NIL)))
-                {
-                    yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_tokens2(object arg1, object arg2)
-        {
-            {
-                object TokenList = arg1;
-                object Dictionary = arg2;
-                Variable C1 = new Variable();
-                Variable Dict = new Variable();
-                Variable ListOfTokens = new Variable();
-                foreach (bool l2 in YP.get_code(C1))
-                {
-                    foreach (bool l3 in read_tokens(C1, Dict, ListOfTokens))
-                    {
-                        foreach (bool l4 in terminate_list(Dict))
-                        {
-                            foreach (bool l5 in YP.unify(Dictionary, Dict))
-                            {
-                                foreach (bool l6 in YP.unify(TokenList, ListOfTokens))
-                                {
-                                    yield return false;
-                                }
-                            }
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("atom", Atom.a("end_of_file"), 0), Atom.NIL)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.NIL))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> terminate_list(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    yield return false;
-                }
-            }
-            {
-                Variable x1 = new Variable();
-                Variable Tail = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(x1, Tail)))
-                {
-                    foreach (bool l3 in terminate_list(Tail))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_special(object arg1, object Dict, object arg3)
-        {
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 95))
-                {
-                    foreach (bool l3 in read_variable(95, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 247))
-                {
-                    foreach (bool l3 in read_symbol(247, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 215))
-                {
-                    foreach (bool l3 in read_symbol(215, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                Variable StartPos = new Variable();
-                Variable EndPos = new Variable();
-                Variable Tokens = new Variable();
-                Variable Ch = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 37))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("comment", StartPos, EndPos), Tokens)))
-                    {
-                        foreach (bool l4 in get_current_position(StartPos))
-                        {
-                            foreach (bool l5 in YP.repeat())
-                            {
-                                foreach (bool l6 in YP.get_code(Ch))
-                                {
-                                    if (YP.lessThan(Ch, new ListPair(32, Atom.NIL)))
-                                    {
-                                        if (YP.notEqual(Ch, 9))
-                                        {
-                                            if (YP.termNotEqual(Ch, -1))
-                                            {
-                                                foreach (bool l10 in get_current_position(EndPos))
-                                                {
-                                                    foreach (bool l11 in YP.get_code(NextCh))
-                                                    {
-                                                        foreach (bool l12 in read_tokens(NextCh, Dict, Tokens))
-                                                        {
-                                                            yield return false;
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                            yield break;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object T = arg3;
-                Variable C2 = new Variable();
-                Variable StartPos = new Variable();
-                Variable EndPos = new Variable();
-                Variable Tokens = new Variable();
-                Variable StartPos1 = new Variable();
-                Variable NextCh = new Variable();
-                Variable Chars = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 47))
-                {
-                    foreach (bool l3 in YP.get_code(C2))
-                    {
-                        if (YP.equal(C2, new ListPair(42, Atom.NIL)))
-                        {
-                            foreach (bool l5 in YP.unify(T, new ListPair(new Functor2("comment", StartPos, EndPos), Tokens)))
-                            {
-                                foreach (bool l6 in get_current_position(StartPos1))
-                                {
-                                    foreach (bool l7 in YP.unify(StartPos, YP.subtract(StartPos1, 1)))
-                                    {
-                                        foreach (bool l8 in read_solidus(32, NextCh))
-                                        {
-                                            foreach (bool l9 in get_current_position(EndPos))
-                                            {
-                                                foreach (bool l10 in read_tokens(NextCh, Dict, Tokens))
-                                                {
-                                                    yield return false;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            goto cutIf1;
-                        }
-                        foreach (bool l4 in YP.unify(T, Tokens))
-                        {
-                            foreach (bool l5 in rest_symbol(C2, Chars, NextCh))
-                            {
-                                foreach (bool l6 in read_after_atom4(NextCh, Dict, Tokens, new ListPair(47, Chars)))
-                                {
-                                    yield return false;
-                                }
-                            }
-                        }
-                    cutIf1:
-                        { }
-                    }
-                }
-            }
-            {
-                Variable Pos = new Variable();
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 33))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("atom", Atom.a("!"), Pos), Tokens)))
-                    {
-                        foreach (bool l4 in get_current_position(Pos))
-                        {
-                            foreach (bool l5 in YP.get_code(NextCh))
-                            {
-                                foreach (bool l6 in read_after_atom(NextCh, Dict, Tokens))
-                                {
-                                    yield return false;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 40))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a(" ("), Tokens)))
-                    {
-                        foreach (bool l4 in YP.get_code(NextCh))
-                        {
-                            foreach (bool l5 in read_tokens(NextCh, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 41))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a(")"), Tokens)))
-                    {
-                        foreach (bool l4 in YP.get_code(NextCh))
-                        {
-                            foreach (bool l5 in read_tokens(NextCh, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 44))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a(","), Tokens)))
-                    {
-                        foreach (bool l4 in YP.get_code(NextCh))
-                        {
-                            foreach (bool l5 in read_tokens(NextCh, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                Variable Pos = new Variable();
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 59))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("atom", Atom.a(";"), Pos), Tokens)))
-                    {
-                        foreach (bool l4 in get_current_position(Pos))
-                        {
-                            foreach (bool l5 in YP.get_code(NextCh))
-                            {
-                                foreach (bool l6 in read_after_atom(NextCh, Dict, Tokens))
-                                {
-                                    yield return false;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                Variable Pos = new Variable();
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 91))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("/", Atom.a("["), Pos), Tokens)))
-                    {
-                        foreach (bool l4 in get_current_position(Pos))
-                        {
-                            foreach (bool l5 in YP.get_code(NextCh))
-                            {
-                                foreach (bool l6 in read_tokens(NextCh, Dict, Tokens))
-                                {
-                                    yield return false;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                Variable Pos = new Variable();
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 93))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("/", Atom.a("]"), Pos), Tokens)))
-                    {
-                        foreach (bool l4 in get_current_position(Pos))
-                        {
-                            foreach (bool l5 in YP.get_code(NextCh))
-                            {
-                                foreach (bool l6 in read_after_atom(NextCh, Dict, Tokens))
-                                {
-                                    yield return false;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                Variable Pos = new Variable();
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 123))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("/", Atom.a("{"), Pos), Tokens)))
-                    {
-                        foreach (bool l4 in get_current_position(Pos))
-                        {
-                            foreach (bool l5 in YP.get_code(NextCh))
-                            {
-                                foreach (bool l6 in read_tokens(NextCh, Dict, Tokens))
-                                {
-                                    yield return false;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 124))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a("|"), Tokens)))
-                    {
-                        foreach (bool l4 in YP.get_code(NextCh))
-                        {
-                            foreach (bool l5 in read_tokens(NextCh, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 125))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a("}"), Tokens)))
-                    {
-                        foreach (bool l4 in YP.get_code(NextCh))
-                        {
-                            foreach (bool l5 in read_after_atom(NextCh, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 46))
-                {
-                    foreach (bool l3 in YP.get_code(NextCh))
-                    {
-                        foreach (bool l4 in read_fullstop(NextCh, Dict, Tokens))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-            {
-                Variable Chars = new Variable();
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 34))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor1("string", Chars), Tokens)))
-                    {
-                        foreach (bool l4 in read_string(Chars, 34, NextCh))
-                        {
-                            foreach (bool l5 in read_tokens(NextCh, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                Variable Chars = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 39))
-                {
-                    foreach (bool l3 in read_string(Chars, 39, NextCh))
-                    {
-                        foreach (bool l4 in read_after_atom4(NextCh, Dict, Tokens, Chars))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 35))
-                {
-                    foreach (bool l3 in read_symbol(35, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 36))
-                {
-                    foreach (bool l3 in read_symbol(36, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 38))
-                {
-                    foreach (bool l3 in read_symbol(38, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 42))
-                {
-                    foreach (bool l3 in read_symbol(42, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 43))
-                {
-                    foreach (bool l3 in read_symbol(43, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 45))
-                {
-                    foreach (bool l3 in read_symbol(45, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 58))
-                {
-                    foreach (bool l3 in read_symbol(58, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 60))
-                {
-                    foreach (bool l3 in read_symbol(60, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 61))
-                {
-                    foreach (bool l3 in read_symbol(61, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 62))
-                {
-                    foreach (bool l3 in read_symbol(62, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 63))
-                {
-                    foreach (bool l3 in read_symbol(63, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 64))
-                {
-                    foreach (bool l3 in read_symbol(64, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 92))
-                {
-                    foreach (bool l3 in read_symbol(92, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 94))
-                {
-                    foreach (bool l3 in read_symbol(94, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 96))
-                {
-                    foreach (bool l3 in read_symbol(96, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Tokens = arg3;
-                foreach (bool l2 in YP.unify(arg1, 126))
-                {
-                    foreach (bool l3 in read_symbol(126, Dict, Tokens))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_symbol(object C1, object Dict, object Tokens)
-        {
-            {
-                Variable C2 = new Variable();
-                Variable Chars = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.get_code(C2))
-                {
-                    foreach (bool l3 in rest_symbol(C2, Chars, NextCh))
-                    {
-                        foreach (bool l4 in read_after_atom4(NextCh, Dict, Tokens, new ListPair(C1, Chars)))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> rest_symbol(object arg1, object arg2, object arg3)
-        {
-            {
-                object C2 = arg1;
-                object LastCh = arg3;
-                Variable Chars = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg2, new ListPair(C2, Chars)))
-                {
-                    if (YP.greaterThan(C2, 160))
-                    {
-                        if (YP.lessThan(C2, 192))
-                        {
-                            if (YP.notEqual(C2, 186))
-                            {
-                                if (YP.notEqual(C2, 170))
-                                {
-                                    foreach (bool l7 in YP.get_code(NextCh))
-                                    {
-                                        foreach (bool l8 in rest_symbol(NextCh, Chars, LastCh))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                    yield break;
-                                }
-                            }
-                        }
-                        goto cutIf1;
-                    }
-                    foreach (bool l3 in symbol_char(C2))
-                    {
-                        foreach (bool l4 in YP.get_code(NextCh))
-                        {
-                            foreach (bool l5 in rest_symbol(NextCh, Chars, LastCh))
-                            {
-                                yield return false;
-                            }
-                        }
-                        yield break;
-                    }
-                cutIf1:
-                    { }
-                }
-            }
-            {
-                Variable C2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, C2))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.NIL))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, C2))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> symbol_char(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, 35))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 36))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 38))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 42))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 43))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 45))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 46))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 47))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 58))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 60))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 61))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 62))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 63))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 64))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 92))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 94))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 96))
-                {
-                    yield return false;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 126))
-                {
-                    yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> get_current_position(object Pos)
-        {
-            {
-                foreach (bool l2 in YP.unify(Pos, 0))
-                {
-                    yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_after_atom4(object Ch, object Dict, object arg3, object Chars)
-        {
-            {
-                Variable Atom_1 = new Variable();
-                Variable Pos = new Variable();
-                Variable Tokens = new Variable();
-                foreach (bool l2 in YP.unify(arg3, new ListPair(new Functor2("atom", Atom_1, Pos), Tokens)))
-                {
-                    foreach (bool l3 in YP.unify(Pos, 0))
-                    {
-                        foreach (bool l4 in YP.atom_codes(Atom_1, Chars))
-                        {
-                            foreach (bool l5 in read_after_atom(Ch, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_after_atom(object arg1, object Dict, object arg3)
-        {
-            {
-                Variable Tokens = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, 40))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a("("), Tokens)))
-                    {
-                        foreach (bool l4 in YP.get_code(NextCh))
-                        {
-                            foreach (bool l5 in read_tokens(NextCh, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                        }
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Ch = arg1;
-                object Tokens = arg3;
-                foreach (bool l2 in read_tokens(Ch, Dict, Tokens))
-                {
-                    yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_string(object Chars, object Quote, object NextCh)
-        {
-            {
-                Variable Ch = new Variable();
-                Variable Char = new Variable();
-                Variable Next = new Variable();
-                foreach (bool l2 in YP.get_code(Ch))
-                {
-                    foreach (bool l3 in read_char(Ch, Quote, Char, Next))
-                    {
-                        foreach (bool l4 in rest_string5(Char, Next, Chars, Quote, NextCh))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> rest_string5(object arg1, object arg2, object arg3, object arg4, object arg5)
-        {
-            {
-                object _X = arg4;
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg1, -1))
-                {
-                    foreach (bool l3 in YP.unify(arg2, NextCh))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.NIL))
-                        {
-                            foreach (bool l5 in YP.unify(arg5, NextCh))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object Char = arg1;
-                object Next = arg2;
-                object Quote = arg4;
-                object NextCh = arg5;
-                Variable Chars = new Variable();
-                Variable Char2 = new Variable();
-                Variable Next2 = new Variable();
-                foreach (bool l2 in YP.unify(arg3, new ListPair(Char, Chars)))
-                {
-                    foreach (bool l3 in read_char(Next, Quote, Char2, Next2))
-                    {
-                        foreach (bool l4 in rest_string5(Char2, Next2, Chars, Quote, NextCh))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> escape_char(object arg1, object arg2)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, 110))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 10))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 78))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 10))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 116))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 9))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 84))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 9))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 114))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 13))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 82))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 13))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 118))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 11))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 86))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 11))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 98))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 8))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 66))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 8))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 102))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 12))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 70))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 12))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 101))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 27))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 69))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 27))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 100))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 127))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 68))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 127))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 115))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 32))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 83))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 32))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 122))
-                {
-                    foreach (bool l3 in YP.unify(arg2, -1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, 90))
-                {
-                    foreach (bool l3 in YP.unify(arg2, -1))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_variable(object C1, object Dict, object arg3)
-        {
-            {
-                Variable Var = new Variable();
-                Variable Name = new Variable();
-                Variable StartPos = new Variable();
-                Variable Tokens = new Variable();
-                Variable Chars = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in YP.unify(arg3, new ListPair(new Functor3("var", Var, Name, StartPos), Tokens)))
-                {
-                    foreach (bool l3 in get_current_position(StartPos))
-                    {
-                        foreach (bool l4 in read_name(C1, Chars, NextCh))
-                        {
-                            foreach (bool l5 in YP.atom_codes(Name, Chars))
-                            {
-                                if (YP.termEqual(Name, Atom.a("_")))
-                                {
-                                    foreach (bool l7 in read_after_atom(NextCh, Dict, Tokens))
-                                    {
-                                        yield return false;
-                                    }
-                                    goto cutIf1;
-                                }
-                                foreach (bool l6 in read_lookup(Dict, Name, Var))
-                                {
-                                    foreach (bool l7 in read_after_atom(NextCh, Dict, Tokens))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                            cutIf1:
-                                { }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_lookup(object arg1, object Name, object Var)
-        {
-            {
-                Variable N = new Variable();
-                Variable V = new Variable();
-                Variable L = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("=", N, V), L)))
-                {
-                    foreach (bool l3 in YP.unify(N, Name))
-                    {
-                        foreach (bool l4 in YP.unify(V, Var))
-                        {
-                            yield return false;
-                        }
-                        goto cutIf1;
-                    }
-                    foreach (bool l3 in read_lookup(L, Name, Var))
-                    {
-                        yield return false;
-                    }
-                cutIf1:
-                    { }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_solidus(object Ch, object LastCh)
-        {
-            {
-                Variable NextCh = new Variable();
-                if (YP.equal(Ch, 42))
-                {
-                    foreach (bool l3 in YP.get_code(NextCh))
-                    {
-                        if (YP.equal(NextCh, 47))
-                        {
-                            foreach (bool l5 in YP.get_code(LastCh))
-                            {
-                                yield return false;
-                            }
-                            goto cutIf2;
-                        }
-                        foreach (bool l4 in read_solidus(NextCh, LastCh))
-                        {
-                            yield return false;
-                        }
-                    cutIf2:
-                        { }
-                    }
-                    goto cutIf1;
-                }
-                if (YP.notEqual(Ch, -1))
-                {
-                    foreach (bool l3 in YP.get_code(NextCh))
-                    {
-                        foreach (bool l4 in read_solidus(NextCh, LastCh))
-                        {
-                            yield return false;
-                        }
-                    }
-                    goto cutIf3;
-                }
-                foreach (bool l2 in YP.unify(LastCh, Ch))
-                {
-                    foreach (bool l3 in formatError(Atom.a("user_error"), Atom.a("~N** end of file in /*comment~n"), Atom.NIL))
-                    {
-                        yield return false;
-                    }
-                }
-            cutIf3:
-            cutIf1:
-                { }
-            }
-        }
-
-        public static IEnumerable<bool> read_identifier(object C1, object Dict, object Tokens)
-        {
-            {
-                Variable Chars = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in read_name(C1, Chars, NextCh))
-                {
-                    foreach (bool l3 in read_after_atom4(NextCh, Dict, Tokens, Chars))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_name(object C1, object arg2, object LastCh)
-        {
-            {
-                Variable Chars = new Variable();
-                Variable C2 = new Variable();
-                foreach (bool l2 in YP.unify(arg2, new ListPair(C1, Chars)))
-                {
-                    foreach (bool l3 in YP.get_code(C2))
-                    {
-                        if (YP.greaterThanOrEqual(C2, new ListPair(97, Atom.NIL)))
-                        {
-                            if (YP.lessThanOrEqual(C2, new ListPair(122, Atom.NIL)))
-                            {
-                                foreach (bool l6 in read_name(C2, Chars, LastCh))
-                                {
-                                    yield return false;
-                                }
-                                goto cutIf2;
-                            }
-                            if (YP.lessThan(C2, 192))
-                            {
-                                if (YP.notEqual(YP.bitwiseOr(C2, 16), 186))
-                                {
-                                    foreach (bool l7 in YP.unify(Chars, Atom.NIL))
-                                    {
-                                        foreach (bool l8 in YP.unify(LastCh, C2))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                    goto cutIf3;
-                                }
-                            }
-                            if (YP.equal(YP.bitwiseOr(C2, 32), 247))
-                            {
-                                foreach (bool l6 in YP.unify(Chars, Atom.NIL))
-                                {
-                                    foreach (bool l7 in YP.unify(LastCh, C2))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                                goto cutIf4;
-                            }
-                            foreach (bool l5 in read_name(C2, Chars, LastCh))
-                            {
-                                yield return false;
-                            }
-                        cutIf4:
-                        cutIf3:
-                        cutIf2:
-                            goto cutIf1;
-                        }
-                        if (YP.greaterThanOrEqual(C2, new ListPair(65, Atom.NIL)))
-                        {
-                            if (YP.greaterThan(C2, new ListPair(90, Atom.NIL)))
-                            {
-                                if (YP.notEqual(C2, new ListPair(95, Atom.NIL)))
-                                {
-                                    foreach (bool l7 in YP.unify(Chars, Atom.NIL))
-                                    {
-                                        foreach (bool l8 in YP.unify(LastCh, C2))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                    goto cutIf6;
-                                }
-                            }
-                            foreach (bool l5 in read_name(C2, Chars, LastCh))
-                            {
-                                yield return false;
-                            }
-                        cutIf6:
-                            goto cutIf5;
-                        }
-                        if (YP.greaterThanOrEqual(C2, new ListPair(48, Atom.NIL)))
-                        {
-                            if (YP.lessThanOrEqual(C2, new ListPair(57, Atom.NIL)))
-                            {
-                                foreach (bool l6 in read_name(C2, Chars, LastCh))
-                                {
-                                    yield return false;
-                                }
-                                goto cutIf7;
-                            }
-                        }
-                        foreach (bool l4 in YP.unify(Chars, Atom.NIL))
-                        {
-                            foreach (bool l5 in YP.unify(LastCh, C2))
-                            {
-                                yield return false;
-                            }
-                        }
-                    cutIf7:
-                    cutIf5:
-                    cutIf1:
-                        { }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_fullstop(object Ch, object Dict, object Tokens)
-        {
-            {
-                Variable Number = new Variable();
-                Variable Tokens1 = new Variable();
-                Variable Chars = new Variable();
-                Variable NextCh = new Variable();
-                if (YP.lessThanOrEqual(Ch, new ListPair(57, Atom.NIL)))
-                {
-                    if (YP.greaterThanOrEqual(Ch, new ListPair(48, Atom.NIL)))
-                    {
-                        foreach (bool l4 in YP.unify(Tokens, new ListPair(new Functor1("number", Number), Tokens1)))
-                        {
-                            foreach (bool l5 in read_float(Number, Dict, Tokens1, new ListPair(48, Atom.NIL), Ch))
-                            {
-                                yield return false;
-                            }
-                        }
-                        goto cutIf1;
-                    }
-                }
-                if (YP.greaterThan(Ch, new ListPair(32, Atom.NIL)))
-                {
-                    foreach (bool l3 in rest_symbol(Ch, Chars, NextCh))
-                    {
-                        foreach (bool l4 in read_after_atom4(NextCh, Dict, Tokens, new ListPair(46, Chars)))
-                        {
-                            yield return false;
-                        }
-                    }
-                    goto cutIf2;
-                }
-                if (YP.greaterThanOrEqual(Ch, 0))
-                {
-                    foreach (bool l3 in YP.unify(Tokens, Atom.NIL))
-                    {
-                        yield return false;
-                    }
-                    goto cutIf3;
-                }
-                foreach (bool l2 in formatError(Atom.a("user_error"), Atom.a("~N** end of file just after full stop~n"), Atom.NIL))
-                {
-                }
-            cutIf3:
-            cutIf2:
-            cutIf1:
-                { }
-            }
-        }
-
-        public static IEnumerable<bool> read_float(object Number, object Dict, object Tokens, object Digits, object Digit)
-        {
-            {
-                Variable Chars = new Variable();
-                Variable Rest = new Variable();
-                Variable NextCh = new Variable();
-                foreach (bool l2 in prepend(Digits, Chars, Rest))
-                {
-                    foreach (bool l3 in read_float4(Digit, Rest, NextCh, Chars))
-                    {
-                        foreach (bool l4 in YP.number_codes(Number, Chars))
-                        {
-                            foreach (bool l5 in read_tokens(NextCh, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> prepend(object arg1, object arg2, object arg3)
-        {
-            {
-                object X = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(46, X)))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-            {
-                object Y = arg3;
-                Variable C = new Variable();
-                Variable Cs = new Variable();
-                Variable X = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(C, Cs)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(C, X)))
-                    {
-                        foreach (bool l4 in prepend(Cs, X, Y))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_float4(object C1, object arg2, object NextCh, object Total)
-        {
-            {
-                Variable Chars = new Variable();
-                Variable C2 = new Variable();
-                Variable C3 = new Variable();
-                Variable C4 = new Variable();
-                Variable More = new Variable();
-                foreach (bool l2 in YP.unify(arg2, new ListPair(C1, Chars)))
-                {
-                    foreach (bool l3 in YP.get_code(C2))
-                    {
-                        if (YP.greaterThanOrEqual(C2, new ListPair(48, Atom.NIL)))
-                        {
-                            if (YP.lessThanOrEqual(C2, new ListPair(57, Atom.NIL)))
-                            {
-                                foreach (bool l6 in read_float4(C2, Chars, NextCh, Total))
-                                {
-                                    yield return false;
-                                }
-                                goto cutIf1;
-                            }
-                        }
-                        if (YP.equal(YP.bitwiseOr(C2, 32), new ListPair(101, Atom.NIL)))
-                        {
-                            foreach (bool l5 in YP.get_code(C3))
-                            {
-                                if (YP.equal(C3, new ListPair(45, Atom.NIL)))
-                                {
-                                    foreach (bool l7 in YP.get_code(C4))
-                                    {
-                                        foreach (bool l8 in YP.unify(Chars, new ListPair(C2, new ListPair(45, More))))
-                                        {
-                                            if (YP.greaterThanOrEqual(C4, new ListPair(48, Atom.NIL)))
-                                            {
-                                                if (YP.lessThanOrEqual(C4, new ListPair(57, Atom.NIL)))
-                                                {
-                                                    foreach (bool l11 in read_exponent(C4, More, NextCh))
-                                                    {
-                                                        yield return false;
-                                                    }
-                                                    goto cutIf4;
-                                                }
-                                            }
-                                            foreach (bool l9 in YP.unify(More, Atom.NIL))
-                                            {
-                                                foreach (bool l10 in formatError(Atom.a("user_error"), Atom.a("~N** Missing exponent in ~s~n"), new ListPair(Total, Atom.NIL)))
-                                                {
-                                                }
-                                            }
-                                            foreach (bool l9 in YP.unify(More, new ListPair(48, Atom.NIL)))
-                                            {
-                                                foreach (bool l10 in YP.unify(NextCh, C4))
-                                                {
-                                                    yield return false;
-                                                }
-                                            }
-                                        cutIf4:
-                                            { }
-                                        }
-                                    }
-                                    goto cutIf3;
-                                }
-                                if (YP.equal(C3, new ListPair(43, Atom.NIL)))
-                                {
-                                    foreach (bool l7 in YP.get_code(C4))
-                                    {
-                                        foreach (bool l8 in YP.unify(Chars, new ListPair(C2, More)))
-                                        {
-                                            if (YP.greaterThanOrEqual(C4, new ListPair(48, Atom.NIL)))
-                                            {
-                                                if (YP.lessThanOrEqual(C4, new ListPair(57, Atom.NIL)))
-                                                {
-                                                    foreach (bool l11 in read_exponent(C4, More, NextCh))
-                                                    {
-                                                        yield return false;
-                                                    }
-                                                    goto cutIf6;
-                                                }
-                                            }
-                                            foreach (bool l9 in YP.unify(More, Atom.NIL))
-                                            {
-                                                foreach (bool l10 in formatError(Atom.a("user_error"), Atom.a("~N** Missing exponent in ~s~n"), new ListPair(Total, Atom.NIL)))
-                                                {
-                                                }
-                                            }
-                                            foreach (bool l9 in YP.unify(More, new ListPair(48, Atom.NIL)))
-                                            {
-                                                foreach (bool l10 in YP.unify(NextCh, C4))
-                                                {
-                                                    yield return false;
-                                                }
-                                            }
-                                        cutIf6:
-                                            { }
-                                        }
-                                    }
-                                    goto cutIf5;
-                                }
-                                foreach (bool l6 in YP.unify(C4, C3))
-                                {
-                                    foreach (bool l7 in YP.unify(Chars, new ListPair(C2, More)))
-                                    {
-                                        if (YP.greaterThanOrEqual(C4, new ListPair(48, Atom.NIL)))
-                                        {
-                                            if (YP.lessThanOrEqual(C4, new ListPair(57, Atom.NIL)))
-                                            {
-                                                foreach (bool l10 in read_exponent(C4, More, NextCh))
-                                                {
-                                                    yield return false;
-                                                }
-                                                goto cutIf7;
-                                            }
-                                        }
-                                        foreach (bool l8 in YP.unify(More, Atom.NIL))
-                                        {
-                                            foreach (bool l9 in formatError(Atom.a("user_error"), Atom.a("~N** Missing exponent in ~s~n"), new ListPair(Total, Atom.NIL)))
-                                            {
-                                            }
-                                        }
-                                        foreach (bool l8 in YP.unify(More, new ListPair(48, Atom.NIL)))
-                                        {
-                                            foreach (bool l9 in YP.unify(NextCh, C4))
-                                            {
-                                                yield return false;
-                                            }
-                                        }
-                                    cutIf7:
-                                        { }
-                                    }
-                                }
-                            cutIf5:
-                            cutIf3:
-                                { }
-                            }
-                            goto cutIf2;
-                        }
-                        foreach (bool l4 in YP.unify(Chars, Atom.NIL))
-                        {
-                            foreach (bool l5 in YP.unify(NextCh, C2))
-                            {
-                                yield return false;
-                            }
-                        }
-                    cutIf2:
-                    cutIf1:
-                        { }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_exponent(object C1, object arg2, object NextCh)
-        {
-            {
-                Variable Chars = new Variable();
-                Variable C2 = new Variable();
-                foreach (bool l2 in YP.unify(arg2, new ListPair(C1, Chars)))
-                {
-                    foreach (bool l3 in YP.get_code(C2))
-                    {
-                        if (YP.greaterThanOrEqual(C2, new ListPair(48, Atom.NIL)))
-                        {
-                            if (YP.lessThanOrEqual(C2, new ListPair(57, Atom.NIL)))
-                            {
-                                foreach (bool l6 in read_exponent(C2, Chars, NextCh))
-                                {
-                                    yield return false;
-                                }
-                                goto cutIf1;
-                            }
-                        }
-                        foreach (bool l4 in YP.unify(Chars, Atom.NIL))
-                        {
-                            foreach (bool l5 in YP.unify(NextCh, C2))
-                            {
-                                yield return false;
-                            }
-                        }
-                    cutIf1:
-                        { }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_number(object C1, object Dict, object arg3)
-        {
-            {
-                Variable Number = new Variable();
-                Variable Tokens = new Variable();
-                Variable C2 = new Variable();
-                Variable N = new Variable();
-                Variable C = new Variable();
-                Variable C3 = new Variable();
-                Variable Digits = new Variable();
-                foreach (bool l2 in YP.unify(arg3, new ListPair(new Functor1("number", Number), Tokens)))
-                {
-                    foreach (bool l3 in read_number4(C1, C2, 0, N))
-                    {
-                        if (YP.equal(C2, 39))
-                        {
-                            if (YP.greaterThanOrEqual(N, 2))
-                            {
-                                if (YP.lessThanOrEqual(N, 36))
-                                {
-                                    foreach (bool l7 in read_based(N, 0, Number, C))
-                                    {
-                                        foreach (bool l8 in read_tokens(C, Dict, Tokens))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                    goto cutIf2;
-                                }
-                            }
-                            if (YP.equal(N, 0))
-                            {
-                                foreach (bool l6 in YP.get_code(C3))
-                                {
-                                    foreach (bool l7 in read_char(C3, -1, Number, C))
-                                    {
-                                        foreach (bool l8 in read_tokens(C, Dict, Tokens))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                }
-                                goto cutIf3;
-                            }
-                            foreach (bool l5 in formatError(Atom.a("user_error"), Atom.a("~N** ~d' read as ~d '~n"), new ListPair(N, new ListPair(N, Atom.NIL))))
-                            {
-                                foreach (bool l6 in YP.unify(Number, N))
-                                {
-                                    foreach (bool l7 in YP.unify(C, C2))
-                                    {
-                                        foreach (bool l8 in read_tokens(C, Dict, Tokens))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                }
-                            }
-                        cutIf3:
-                        cutIf2:
-                            goto cutIf1;
-                        }
-                        if (YP.equal(C2, 46))
-                        {
-                            foreach (bool l5 in YP.get_code(C3))
-                            {
-                                if (YP.greaterThanOrEqual(C3, new ListPair(48, Atom.NIL)))
-                                {
-                                    if (YP.lessThanOrEqual(C3, new ListPair(57, Atom.NIL)))
-                                    {
-                                        foreach (bool l8 in YP.number_codes(N, Digits))
-                                        {
-                                            foreach (bool l9 in read_float(Number, Dict, Tokens, Digits, C3))
-                                            {
-                                                yield return false;
-                                            }
-                                        }
-                                        goto cutIf5;
-                                    }
-                                }
-                                foreach (bool l6 in YP.unify(Number, N))
-                                {
-                                    foreach (bool l7 in read_fullstop(C3, Dict, Tokens))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                            cutIf5:
-                                { }
-                            }
-                            goto cutIf4;
-                        }
-                        foreach (bool l4 in YP.unify(Number, N))
-                        {
-                            foreach (bool l5 in read_tokens(C2, Dict, Tokens))
-                            {
-                                yield return false;
-                            }
-                        }
-                    cutIf4:
-                    cutIf1:
-                        { }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_number4(object C0, object C, object N0, object N)
-        {
-            {
-                Variable N1 = new Variable();
-                Variable C1 = new Variable();
-                if (YP.greaterThanOrEqual(C0, new ListPair(48, Atom.NIL)))
-                {
-                    if (YP.lessThanOrEqual(C0, new ListPair(57, Atom.NIL)))
-                    {
-                        foreach (bool l4 in YP.unify(N1, YP.add(YP.subtract(YP.multiply(N0, 10), new ListPair(48, Atom.NIL)), C0)))
-                        {
-                            foreach (bool l5 in YP.get_code(C1))
-                            {
-                                foreach (bool l6 in read_number4(C1, C, N1, N))
-                                {
-                                    yield return false;
-                                }
-                            }
-                        }
-                        goto cutIf1;
-                    }
-                }
-                if (YP.equal(C0, 95))
-                {
-                    foreach (bool l3 in YP.get_code(C1))
-                    {
-                        foreach (bool l4 in read_number4(C1, C, N0, N))
-                        {
-                            yield return false;
-                        }
-                    }
-                    goto cutIf2;
-                }
-                foreach (bool l2 in YP.unify(C, C0))
-                {
-                    foreach (bool l3 in YP.unify(N, N0))
-                    {
-                        yield return false;
-                    }
-                }
-            cutIf2:
-            cutIf1:
-                { }
-            }
-        }
-
-        public static IEnumerable<bool> read_based(object Base, object N0, object N, object C)
-        {
-            {
-                Variable C1 = new Variable();
-                Variable Digit = new Variable();
-                Variable N1 = new Variable();
-                foreach (bool l2 in YP.get_code(C1))
-                {
-                    if (YP.greaterThanOrEqual(C1, new ListPair(48, Atom.NIL)))
-                    {
-                        if (YP.lessThanOrEqual(C1, new ListPair(57, Atom.NIL)))
-                        {
-                            foreach (bool l5 in YP.unify(Digit, YP.subtract(C1, new ListPair(48, Atom.NIL))))
-                            {
-                                if (YP.lessThan(Digit, Base))
-                                {
-                                    foreach (bool l7 in YP.unify(N1, YP.add(YP.multiply(N0, Base), Digit)))
-                                    {
-                                        foreach (bool l8 in read_based(Base, N1, N, C))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                    goto cutIf2;
-                                }
-                                if (YP.equal(C1, new ListPair(95, Atom.NIL)))
-                                {
-                                    foreach (bool l7 in read_based(Base, N0, N, C))
-                                    {
-                                        yield return false;
-                                    }
-                                    goto cutIf3;
-                                }
-                                foreach (bool l6 in YP.unify(N, N0))
-                                {
-                                    foreach (bool l7 in YP.unify(C, C1))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                            cutIf3:
-                            cutIf2:
-                                { }
-                            }
-                            goto cutIf1;
-                        }
-                    }
-                    if (YP.greaterThanOrEqual(C1, new ListPair(65, Atom.NIL)))
-                    {
-                        if (YP.lessThanOrEqual(C1, new ListPair(90, Atom.NIL)))
-                        {
-                            foreach (bool l5 in YP.unify(Digit, YP.subtract(C1, YP.subtract(new ListPair(65, Atom.NIL), 10))))
-                            {
-                                if (YP.lessThan(Digit, Base))
-                                {
-                                    foreach (bool l7 in YP.unify(N1, YP.add(YP.multiply(N0, Base), Digit)))
-                                    {
-                                        foreach (bool l8 in read_based(Base, N1, N, C))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                    goto cutIf5;
-                                }
-                                if (YP.equal(C1, new ListPair(95, Atom.NIL)))
-                                {
-                                    foreach (bool l7 in read_based(Base, N0, N, C))
-                                    {
-                                        yield return false;
-                                    }
-                                    goto cutIf6;
-                                }
-                                foreach (bool l6 in YP.unify(N, N0))
-                                {
-                                    foreach (bool l7 in YP.unify(C, C1))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                            cutIf6:
-                            cutIf5:
-                                { }
-                            }
-                            goto cutIf4;
-                        }
-                    }
-                    if (YP.greaterThanOrEqual(C1, new ListPair(97, Atom.NIL)))
-                    {
-                        if (YP.lessThanOrEqual(C1, new ListPair(122, Atom.NIL)))
-                        {
-                            foreach (bool l5 in YP.unify(Digit, YP.subtract(C1, YP.subtract(new ListPair(97, Atom.NIL), 10))))
-                            {
-                                if (YP.lessThan(Digit, Base))
-                                {
-                                    foreach (bool l7 in YP.unify(N1, YP.add(YP.multiply(N0, Base), Digit)))
-                                    {
-                                        foreach (bool l8 in read_based(Base, N1, N, C))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                    goto cutIf8;
-                                }
-                                if (YP.equal(C1, new ListPair(95, Atom.NIL)))
-                                {
-                                    foreach (bool l7 in read_based(Base, N0, N, C))
-                                    {
-                                        yield return false;
-                                    }
-                                    goto cutIf9;
-                                }
-                                foreach (bool l6 in YP.unify(N, N0))
-                                {
-                                    foreach (bool l7 in YP.unify(C, C1))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                            cutIf9:
-                            cutIf8:
-                                { }
-                            }
-                            goto cutIf7;
-                        }
-                    }
-                    foreach (bool l3 in YP.unify(Digit, 99))
-                    {
-                        if (YP.lessThan(Digit, Base))
-                        {
-                            foreach (bool l5 in YP.unify(N1, YP.add(YP.multiply(N0, Base), Digit)))
-                            {
-                                foreach (bool l6 in read_based(Base, N1, N, C))
-                                {
-                                    yield return false;
-                                }
-                            }
-                            goto cutIf10;
-                        }
-                        if (YP.equal(C1, new ListPair(95, Atom.NIL)))
-                        {
-                            foreach (bool l5 in read_based(Base, N0, N, C))
-                            {
-                                yield return false;
-                            }
-                            goto cutIf11;
-                        }
-                        foreach (bool l4 in YP.unify(N, N0))
-                        {
-                            foreach (bool l5 in YP.unify(C, C1))
-                            {
-                                yield return false;
-                            }
-                        }
-                    cutIf11:
-                    cutIf10:
-                        { }
-                    }
-                cutIf7:
-                cutIf4:
-                cutIf1:
-                    { }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> read_char(object Char, object Quote, object Result, object Next)
-        {
-            {
-                Variable C1 = new Variable();
-                Variable C2 = new Variable();
-                Variable C3 = new Variable();
-                Variable Ch = new Variable();
-                if (YP.equal(Char, 92))
-                {
-                    foreach (bool l3 in YP.get_code(C1))
-                    {
-                        if (YP.lessThan(C1, 0))
-                        {
-                            foreach (bool l5 in formatError(Atom.a("user_error"), Atom.a("~N** end of file in ~cquoted~c~n"), new ListPair(Quote, new ListPair(Quote, Atom.NIL))))
-                            {
-                                foreach (bool l6 in YP.unify(Result, -1))
-                                {
-                                    foreach (bool l7 in YP.unify(Next, C1))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                            }
-                            goto cutIf2;
-                        }
-                        if (YP.lessThanOrEqual(C1, new ListPair(32, Atom.NIL)))
-                        {
-                            foreach (bool l5 in YP.get_code(C2))
-                            {
-                                foreach (bool l6 in read_char(C2, Quote, Result, Next))
-                                {
-                                    yield return false;
-                                }
-                            }
-                            goto cutIf3;
-                        }
-                        if (YP.equal(YP.bitwiseOr(C1, 32), new ListPair(99, Atom.NIL)))
-                        {
-                            foreach (bool l5 in YP.get_code(C2))
-                            {
-                                foreach (bool l6 in read_char(C2, Quote, Result, Next))
-                                {
-                                    yield return false;
-                                }
-                            }
-                            goto cutIf4;
-                        }
-                        if (YP.lessThanOrEqual(C1, new ListPair(55, Atom.NIL)))
-                        {
-                            if (YP.greaterThanOrEqual(C1, new ListPair(48, Atom.NIL)))
-                            {
-                                foreach (bool l6 in YP.get_code(C2))
-                                {
-                                    if (YP.lessThanOrEqual(C2, new ListPair(55, Atom.NIL)))
-                                    {
-                                        if (YP.greaterThanOrEqual(C2, new ListPair(48, Atom.NIL)))
-                                        {
-                                            foreach (bool l9 in YP.get_code(C3))
-                                            {
-                                                if (YP.lessThanOrEqual(C3, new ListPair(55, Atom.NIL)))
-                                                {
-                                                    if (YP.greaterThanOrEqual(C3, new ListPair(48, Atom.NIL)))
-                                                    {
-                                                        foreach (bool l12 in YP.get_code(Next))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(Result, YP.subtract(YP.add(YP.multiply(YP.add(YP.multiply(C1, 8), C2), 8), C3), YP.multiply(73, new ListPair(48, Atom.NIL)))))
-                                                            {
-                                                                yield return false;
-                                                            }
-                                                        }
-                                                        goto cutIf7;
-                                                    }
-                                                }
-                                                foreach (bool l10 in YP.unify(Next, C3))
-                                                {
-                                                    foreach (bool l11 in YP.unify(Result, YP.subtract(YP.add(YP.multiply(C1, 8), C2), YP.multiply(9, new ListPair(48, Atom.NIL)))))
-                                                    {
-                                                        yield return false;
-                                                    }
-                                                }
-                                            cutIf7:
-                                                { }
-                                            }
-                                            goto cutIf6;
-                                        }
-                                    }
-                                    foreach (bool l7 in YP.unify(Next, C2))
-                                    {
-                                        foreach (bool l8 in YP.unify(Result, YP.subtract(C1, new ListPair(48, Atom.NIL))))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                cutIf6:
-                                    { }
-                                }
-                                goto cutIf5;
-                            }
-                        }
-                        if (YP.equal(C1, new ListPair(94, Atom.NIL)))
-                        {
-                            foreach (bool l5 in YP.get_code(C2))
-                            {
-                                if (YP.lessThan(C2, 0))
-                                {
-                                    foreach (bool l7 in formatError(Atom.a("user_error"), Atom.a("~N** end of file in ~c..~c^..~c~n"), ListPair.make(new object[] { Quote, 92, Quote })))
-                                    {
-                                        foreach (bool l8 in YP.unify(Result, -1))
-                                        {
-                                            foreach (bool l9 in YP.unify(Next, C2))
-                                            {
-                                                yield return false;
-                                            }
-                                        }
-                                    }
-                                    goto cutIf9;
-                                }
-                                if (YP.equal(C2, new ListPair(63, Atom.NIL)))
-                                {
-                                    foreach (bool l7 in YP.unify(Result, 127))
-                                    {
-                                        foreach (bool l8 in YP.get_code(Next))
-                                        {
-                                            yield return false;
-                                        }
-                                    }
-                                    goto cutIf10;
-                                }
-                                foreach (bool l6 in YP.unify(Result, YP.bitwiseAnd(C2, 31)))
-                                {
-                                    foreach (bool l7 in YP.get_code(Next))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                            cutIf10:
-                            cutIf9:
-                                { }
-                            }
-                            goto cutIf8;
-                        }
-                        foreach (bool l4 in escape_char(C1, Result))
-                        {
-                            foreach (bool l5 in YP.get_code(Next))
-                            {
-                                yield return false;
-                            }
-                            goto cutIf11;
-                        }
-                        foreach (bool l4 in YP.unify(Result, C1))
-                        {
-                            foreach (bool l5 in YP.get_code(Next))
-                            {
-                                yield return false;
-                            }
-                        }
-                    cutIf11:
-                    cutIf8:
-                    cutIf5:
-                    cutIf4:
-                    cutIf3:
-                    cutIf2:
-                        { }
-                    }
-                    goto cutIf1;
-                }
-                if (YP.equal(Char, Quote))
-                {
-                    foreach (bool l3 in YP.get_code(Ch))
-                    {
-                        if (YP.equal(Ch, Quote))
-                        {
-                            foreach (bool l5 in YP.unify(Result, Quote))
-                            {
-                                foreach (bool l6 in YP.get_code(Next))
-                                {
-                                    yield return false;
-                                }
-                            }
-                            goto cutIf13;
-                        }
-                        foreach (bool l4 in YP.unify(Result, -1))
-                        {
-                            foreach (bool l5 in YP.unify(Next, Ch))
-                            {
-                                yield return false;
-                            }
-                        }
-                    cutIf13:
-                        { }
-                    }
-                    goto cutIf12;
-                }
-                if (YP.lessThan(Char, new ListPair(32, Atom.NIL)))
-                {
-                    if (YP.notEqual(Char, 9))
-                    {
-                        if (YP.notEqual(Char, 10))
-                        {
-                            if (YP.notEqual(Char, 13))
-                            {
-                                foreach (bool l6 in YP.unify(Result, -1))
-                            {
-                                    foreach (bool l7 in YP.unify(Next, Char))
-                                {
-                                        foreach (bool l8 in formatError(Atom.a("user_error"), Atom.a("~N** Strange character ~d ends ~ctoken~c~n"), ListPair.make(new object[] { Char, Quote, Quote })))
-                                    {
-                                        yield return false;
-                                    }
-                                }
-                            }
-                            goto cutIf14;
-                            }
-                        }
-                    }
-                }
-                foreach (bool l2 in YP.unify(Result, Char))
-                {
-                    foreach (bool l3 in YP.get_code(Next))
-                    {
-                        yield return false;
-                    }
-                }
-            cutIf14:
-            cutIf12:
-            cutIf1:
-                { }
-            }
-        }
-        #pragma warning restore 0168, 0219, 0162
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/PrologException.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/PrologException.cs
deleted file mode 100644
index 9f5ae3d..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/PrologException.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    /// <summary>
-    /// A PrologException is used as the exception thrown by YP.throw(Term).
-    /// </summary>
-    public class PrologException : Exception
-    {
-        public readonly object _term;
-
-        /// <summary>
-        /// Create a PrologException with the given Term.  The printable exception message is the full Term.
-        /// </summary>
-        /// <param name="Term">the term of the exception</param>
-        public PrologException(object Term)
-            : base(YP.getValue(Term).ToString())
-        {
-            _term = YP.makeCopy(Term, new Variable.CopyStore());
-        }
-
-        /// <summary>
-        /// Create a PrologException where the Term is error(ErrorTerm, Message).
-        /// This uses YP.makeCopy to copy the ErrorTerm and Message so that they are valid after unbinding.
-        /// </summary>
-        /// <param name="ErrorTerm">the error term of the error</param>
-        /// <param name="Messsage">the message term of the error.  If this is a string, it is converted to an
-        /// Atom so it can be used by Prolog code.
-        /// Message, converted to a string, is use as the printable exception message.
-        /// </param>
-        public PrologException(object ErrorTerm, object Message)
-            : base(YP.getValue(Message).ToString())
-        {
-            if (Message is string)
-                Message = Atom.a((string)Message);
-            _term = YP.makeCopy(new Functor2(Atom.a("error"), ErrorTerm, Message), new Variable.CopyStore());
-        }
-
-        public class TypeErrorInfo
-        {
-            public readonly Atom _Type;
-            public readonly object _Culprit;
-            public readonly object _Message;
-
-            public TypeErrorInfo(Atom Type, object Culprit, object Message)
-            {
-                _Type = Type;
-                _Culprit = Culprit;
-                _Message = Message;
-            }
-        }
-        /// <summary>
-        /// Return the TypeErrorInfo for this exception, or null if _term does not match
-        ///   error(type_error(Type, Culprit), Message).
-        /// </summary>
-        /// <returns></returns>
-        public TypeErrorInfo getTypeErrorInfo()
-        {
-            if (!(_term is Functor2 && ((Functor2)_term)._name._name == "error"))
-                return null;
-            object errorTerm = ((Functor2)_term)._arg1;
-            if (!(errorTerm is Functor2 && ((Functor2)errorTerm)._name._name == "type_error"))
-                return null;
-            if (!(((Functor2)errorTerm)._arg1 is Atom))
-                return null;
-            return new TypeErrorInfo
-                ((Atom)((Functor2)errorTerm)._arg1, ((Functor2)errorTerm)._arg2, ((Functor2)_term)._arg2);
-        }
-
-        public class ExistenceErrorInfo
-        {
-            public readonly Atom _Type;
-            public readonly object _Culprit;
-            public readonly object _Message;
-
-            public ExistenceErrorInfo(Atom Type, object Culprit, object Message)
-            {
-                _Type = Type;
-                _Culprit = Culprit;
-                _Message = Message;
-            }
-
-            /// <summary>
-            /// If _Type is procedure and _Culprit is name/artity, return the name.  Otherwise return null.
-            /// </summary>
-            /// <returns></returns>
-            public object getProcedureName()
-            {
-                if (!(_Type._name == "procedure" &&
-                      _Culprit is Functor2 && ((Functor2)_Culprit)._name == Atom.SLASH))
-                    return null;
-                return ((Functor2)_Culprit)._arg1;
-            }
-
-            /// <summary>
-            /// If _Type is procedure and _Culprit is name/arity and arity is an integer, return the arity.
-            /// Otherwise return -1.
-            /// </summary>
-            /// <returns></returns>
-            public int getProcedureArity()
-            {
-                if (!(_Type._name == "procedure" &&
-                      _Culprit is Functor2 && ((Functor2)_Culprit)._name == Atom.SLASH))
-                    return -1;
-                if (!(((Functor2)_Culprit)._arg2 is int))
-                    return -1;
-                return (int)((Functor2)_Culprit)._arg2;
-            }
-        }
-        /// <summary>
-        /// Return the ExistenceErrorInfo for this exception, or null if _term does not match
-        ///   error(existence_error(Type, Culprit), Message).  If the returned ExistenceErrorInfo _Culprit is
-        ///   procedure, you can use its getProcedureName and getProcedureArity.
-        /// </summary>
-        /// <returns></returns>
-        public ExistenceErrorInfo getExistenceErrorInfo()
-        {
-            if (!(_term is Functor2 && ((Functor2)_term)._name._name == "error"))
-                return null;
-            object errorTerm = ((Functor2)_term)._arg1;
-            if (!(errorTerm is Functor2 && ((Functor2)errorTerm)._name._name == "existence_error"))
-                return null;
-            if (!(((Functor2)errorTerm)._arg1 is Atom))
-                return null;
-            return new ExistenceErrorInfo
-                ((Atom)((Functor2)errorTerm)._arg1, ((Functor2)errorTerm)._arg2, ((Functor2)_term)._arg2);
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/UndefinedPredicateException.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/UndefinedPredicateException.cs
deleted file mode 100644
index 4b6112f..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/UndefinedPredicateException.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    /// <summary>
-    /// An UndefinedPredicateException extends PrologException to create an existence_error exception.
-    /// </summary>
-    public class UndefinedPredicateException : PrologException
-    {
-        private Atom _predicateName;
-        private int _arity;
-
-        public UndefinedPredicateException(object message, Atom predicateName, int arity)
-            : base(new Functor2
-                   (Atom.a("existence_error"), Atom.a("procedure"), new Functor2(Atom.a("/"), predicateName, arity)),
-                   message)
-        {
-            _predicateName = predicateName;
-            _arity = arity;
-        }
-
-        public Atom PredicateName
-        {
-            get { return _predicateName; }
-        }
-
-        public int Arity
-        {
-            get { return _arity; }
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Variable.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Variable.cs
deleted file mode 100644
index ea5b7a6..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Variable.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-using System.Collections.Generic;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    public interface IUnifiable
-    {
-        IEnumerable<bool> unify(object arg);
-        void addUniqueVariables(List<Variable> variableSet);
-        object makeCopy(Variable.CopyStore copyStore);
-        bool termEqual(object term);
-        bool ground();
-    }
-
-    /// <summary>
-    /// A Variable is passed to a function so that it can be unified with
-    /// value or another Variable. See getValue and unify for details.
-    /// </summary>
-    public class Variable : IUnifiable
-    {
-        // Use _isBound separate from _value so that it can be bound to any value,
-        //   including null.
-        private bool _isBound = false;
-        private object _value;
-
-        /// <summary>
-        /// If this Variable is unbound, then just return this Variable.
-        /// Otherwise, if this has been bound to a value with unify, return the value.
-        /// If the bound value is another Variable, this follows the "variable chain"
-        /// to the end and returns the final value, or the final Variable if it is unbound.
-        /// For more details, see http://yieldprolog.sourceforge.net/tutorial1.html
-        /// </summary>
-        /// <returns></returns>
-        public object getValue()
-        {
-            if (!_isBound)
-                return this;
-
-            object result = _value;
-            while (result is Variable)
-            {
-                if (!((Variable)result)._isBound)
-                    return result;
-
-                // Keep following the Variable chain.
-                result = ((Variable)result)._value;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// If this Variable is bound, then just call YP.unify to unify this with arg.
-        /// (Note that if arg is an unbound Variable, then YP.unify will bind it to
-        /// this Variable's value.)
-        /// Otherwise, bind this Variable to YP.getValue(arg) and yield once.  After the
-        /// yield, return this Variable to the unbound state.
-        /// For more details, see http://yieldprolog.sourceforge.net/tutorial1.html
-        /// </summary>
-        /// <param name="arg"></param>
-        /// <returns></returns>
-        public IEnumerable<bool> unify(object arg)
-        {
-            if (!_isBound)
-            {
-                _value = YP.getValue(arg);
-                if (_value == this)
-                    // We are unifying this unbound variable with itself, so leave it unbound.
-                    yield return false;
-                else
-                {
-                    _isBound = true;
-                    try
-                    {
-                        yield return false;
-                    }
-                    finally
-                    {
-                        // Remove the binding.
-                        _isBound = false;
-                    }
-                }
-            }
-            else
-            {
-                // disable warning on l1, don't see how we can
-                // code this differently
-                #pragma warning disable 0168, 0219
-                foreach (bool l1 in YP.unify(this, arg))
-                    yield return false;
-                #pragma warning restore 0168, 0219
-            }
-        }
-
-        public override string ToString()
-        {
-            object value = getValue();
-            if (value == this)
-                return "_Variable";
-            else
-                return getValue().ToString();
-        }
-
-        /// <summary>
-        /// If bound, call YP.addUniqueVariables on the value.  Otherwise, if this unbound
-        /// variable is not already in variableSet, add it.
-        /// </summary>
-        /// <param name="variableSet"></param>
-        public void addUniqueVariables(List<Variable> variableSet)
-        {
-            if (_isBound)
-                YP.addUniqueVariables(getValue(), variableSet);
-            else
-            {
-                if (variableSet.IndexOf(this) < 0)
-                    variableSet.Add(this);
-            }
-        }
-
-        /// <summary>
-        /// If bound, return YP.makeCopy for the value, else return copyStore.getCopy(this).
-        /// However, if copyStore is null, just return this.
-        /// </summary>
-        /// <param name="copyStore"></param>
-        /// <returns></returns>
-        public object makeCopy(Variable.CopyStore copyStore)
-        {
-            if (_isBound)
-                return YP.makeCopy(getValue(), copyStore);
-            else
-                return copyStore == null ? this : copyStore.getCopy(this);
-        }
-
-        public bool termEqual(object term)
-        {
-            if (_isBound)
-                return YP.termEqual(getValue(), term);
-            else
-                return this == YP.getValue(term);
-        }
-
-        public bool ground()
-        {
-            if (_isBound)
-                // This is usually called by YP.ground which already did getValue, so this
-                //   should never be reached, but check anyway.
-                return YP.ground(getValue());
-            else
-                return false;
-        }
-
-        /// <summary>
-        /// A CopyStore is used by makeCopy to track which Variable objects have
-        /// been copied.
-        /// </summary>
-        public class CopyStore
-        {
-            private List<Variable> _inVariableSet = new List<Variable>();
-            private List<Variable> _outVariableSet = new List<Variable>();
-
-            /// <summary>
-            /// If inVariable has already been copied, return its copy. Otherwise,
-            /// return a fresh Variable associated with inVariable.
-            /// </summary>
-            /// <param name="inVariable"></param>
-            /// <returns></returns>
-            public Variable getCopy(Variable inVariable)
-            {
-                int index = _inVariableSet.IndexOf(inVariable);
-                if (index >= 0)
-                    return _outVariableSet[index];
-                else
-                {
-                    Variable outVariable = new Variable();
-                    _inVariableSet.Add(inVariable);
-                    _outVariableSet.Add(outVariable);
-                    return outVariable;
-                }
-            }
-
-            /// <summary>
-            /// Return the number of unique variables that have been copied.
-            /// </summary>
-            /// <returns></returns>
-            public int getNUniqueVariables()
-            {
-                return _inVariableSet.Count;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
deleted file mode 100644
index f2171dd..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
+++ /dev/null
@@ -1,2701 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- *
- * All rights reserved.
- *
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Net.Sockets;
-using System.Text;
-using System.Text.RegularExpressions;
-using log4net;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    /// <summary>
-    /// YP has static methods for general functions in Yield Prolog such as <see cref="getValue"/>
-    /// and <see cref="unify"/>.
-    /// </summary>
-    public class YP
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private static Fail _fail = new Fail();
-        private static Repeat _repeat = new Repeat();
-        private static Dictionary<NameArity, List<IClause>> _predicatesStore =
-            new Dictionary<NameArity, List<IClause>>();
-        private static TextWriter _outputStream = System.Console.Out;
-        private static TextReader _inputStream = System.Console.In;
-        private static IndexedAnswers _operatorTable = null;
-        private static Dictionary<string, object> _prologFlags = new Dictionary<string, object>();
-        public const int MAX_ARITY = 255;
-
-        /// <summary>
-        /// An IClause is used so that dynamic predicates can call match.
-        /// </summary>
-        public interface IClause
-        {
-            IEnumerable<bool> match(object[] args);
-            IEnumerable<bool> clause(object Head, object Body);
-        }
-
-        /// <summary>
-        /// If value is a Variable, then return its getValue.  Otherwise, just
-        /// return value.  You should call YP.getValue on any object that
-        /// may be a Variable to get the value to pass to other functions in
-        /// your system that are not part of Yield Prolog, such as math functions
-        /// or file I/O.
-        /// For more details, see http://yieldprolog.sourceforge.net/tutorial1.html
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static object getValue(object value)
-        {
-            if (value is Variable)
-                return ((Variable)value).getValue();
-            else
-                return value;
-        }
-
-        /// <summary>
-        /// If arg1 or arg2 is an object with a unify method (such as Variable or
-        /// Functor) then just call its unify with the other argument.  The object's
-        /// unify method will bind the values or check for equals as needed.
-        /// Otherwise, both arguments are "normal" (atomic) values so if they
-        /// are equal then succeed (yield once), else fail (don't yield).
-        /// For more details, see http://yieldprolog.sourceforge.net/tutorial1.html
-        /// </summary>
-        /// <param name="arg1"></param>
-        /// <param name="arg2"></param>
-        /// <returns></returns>
-        public static IEnumerable<bool> unify(object arg1, object arg2)
-        {
-            arg1 = getValue(arg1);
-            arg2 = getValue(arg2);
-            if (arg1 is IUnifiable)
-                return ((IUnifiable)arg1).unify(arg2);
-            else if (arg2 is IUnifiable)
-                return ((IUnifiable)arg2).unify(arg1);
-            else
-            {
-                // Arguments are "normal" types.
-                if (arg1.Equals(arg2))
-                    return new Succeed();
-                else
-                    return _fail;
-            }
-        }
-
-        /// <summary>
-        /// This is used for the lookup key in _factStore.
-        /// </summary>
-        public struct NameArity
-        {
-            public readonly Atom _name;
-            public readonly int _arity;
-
-            public NameArity(Atom name, int arity)
-            {
-                _name = name;
-                _arity = arity;
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (obj is NameArity)
-                {
-                    NameArity nameArity = (NameArity)obj;
-                    return nameArity._name.Equals(_name) && nameArity._arity.Equals(_arity);
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            public override int GetHashCode()
-            {
-                return _name.GetHashCode() ^ _arity.GetHashCode();
-            }
-        }
-
-        /// <summary>
-        /// Convert term to an int.
-        /// If term is a single-element List, use its first element
-        /// (to handle the char types like "a").
-        /// If can't convert, throw a PrologException for type_error evaluable (because this is only
-        ///   called from arithmetic functions).
-        /// </summary>
-        /// <param name="term"></param>
-        /// <returns></returns>
-        public static int convertInt(object term)
-        {
-            term = YP.getValue(term);
-            if (term is Functor2 && ((Functor2)term)._name == Atom.DOT &&
-                YP.getValue(((Functor2)term)._arg2) == Atom.NIL)
-                // Assume it is a char type like "a".
-                term = YP.getValue(((Functor2)term)._arg1);
-            if (term is Variable)
-                throw new PrologException(Atom.a("instantiation_error"),
-                    "Expected a number but the argument is an unbound variable");
-
-            try
-            {
-                return (int)term;
-            }
-            catch (InvalidCastException)
-            {
-                throw new PrologException
-                    (new Functor2
-                     ("type_error", Atom.a("evaluable"),
-                      new Functor2(Atom.SLASH, getFunctorName(term), getFunctorArgs(term).Length)),
-                     "Term must be an integer");
-            }
-        }
-
-        /// <summary>
-        /// Convert term to a double.  This may convert an int to a double, etc.
-        /// If term is a single-element List, use its first element
-        /// (to handle the char types like "a").
-        /// If can't convert, throw a PrologException for type_error evaluable (because this is only
-        ///   called from arithmetic functions).
-        /// </summary>
-        /// <param name="term"></param>
-        /// <returns></returns>
-        public static double convertDouble(object term)
-        {
-            term = YP.getValue(term);
-            if (term is Functor2 && ((Functor2)term)._name == Atom.DOT &&
-                YP.getValue(((Functor2)term)._arg2) == Atom.NIL)
-                // Assume it is a char type like "a".
-                term = YP.getValue(((Functor2)term)._arg1);
-            if (term is Variable)
-                throw new PrologException(Atom.a("instantiation_error"),
-                    "Expected a number but the argument is an unbound variable");
-
-            try
-            {
-                return Convert.ToDouble(term);
-            }
-            catch (InvalidCastException)
-            {
-                throw new PrologException
-                    (new Functor2
-                     ("type_error", Atom.a("evaluable"),
-                      new Functor2(Atom.SLASH, getFunctorName(term), getFunctorArgs(term).Length)),
-                     "Term must be an integer");
-            }
-        }
-
-        /// <summary>
-        /// If term is an integer, set intTerm.
-        /// If term is a single-element List, use its first element
-        /// (to handle the char types like "a").  Return true for success, false if can't convert.
-        /// We use a success return value because throwing an exception is inefficient.
-        /// </summary>
-        /// <param name="term"></param>
-        /// <returns></returns>
-        public static bool getInt(object term, out int intTerm)
-        {
-            term = YP.getValue(term);
-            if (term is Functor2 && ((Functor2)term)._name == Atom.DOT &&
-                YP.getValue(((Functor2)term)._arg2) == Atom.NIL)
-                // Assume it is a char type like "a".
-                term = YP.getValue(((Functor2)term)._arg1);
-
-            if (term is int)
-            {
-                intTerm = (int)term;
-                return true;
-            }
-
-            intTerm = 0;
-            return false;
-        }
-
-        public static bool equal(object x, object y)
-        {
-            x = YP.getValue(x);
-            if (x is DateTime)
-                return (DateTime)x == (DateTime)YP.getValue(y);
-            // Assume convertDouble converts an int to a double perfectly.
-            return YP.convertDouble(x) == YP.convertDouble(y);
-        }
-
-        public static bool notEqual(object x, object y)
-        {
-            x = YP.getValue(x);
-            if (x is DateTime)
-                return (DateTime)x != (DateTime)YP.getValue(y);
-            // Assume convertDouble converts an int to a double perfectly.
-            return YP.convertDouble(x) != YP.convertDouble(y);
-        }
-
-        public static bool greaterThan(object x, object y)
-        {
-            x = YP.getValue(x);
-            if (x is DateTime)
-                return (DateTime)x > (DateTime)YP.getValue(y);
-            // Assume convertDouble converts an int to a double perfectly.
-            return YP.convertDouble(x) > YP.convertDouble(y);
-        }
-
-        public static bool lessThan(object x, object y)
-        {
-            x = YP.getValue(x);
-            if (x is DateTime)
-                return (DateTime)x < (DateTime)YP.getValue(y);
-            // Assume convertDouble converts an int to a double perfectly.
-            return YP.convertDouble(x) < YP.convertDouble(y);
-        }
-
-        public static bool greaterThanOrEqual(object x, object y)
-        {
-            x = YP.getValue(x);
-            if (x is DateTime)
-                return (DateTime)x >= (DateTime)YP.getValue(y);
-            // Assume convertDouble converts an int to a double perfectly.
-            return YP.convertDouble(x) >= YP.convertDouble(y);
-        }
-
-        public static bool lessThanOrEqual(object x, object y)
-        {
-            x = YP.getValue(x);
-            if (x is DateTime)
-                return (DateTime)x <= (DateTime)YP.getValue(y);
-            // Assume convertDouble converts an int to a double perfectly.
-            return YP.convertDouble(x) <= YP.convertDouble(y);
-        }
-
-        public static object negate(object x)
-        {
-            int intX;
-            if (getInt(x, out intX))
-                return -intX;
-            return -convertDouble(x);
-        }
-
-        public static object abs(object x)
-        {
-            int intX;
-            if (getInt(x, out intX))
-                return Math.Abs(intX);
-            return Math.Abs(convertDouble(x));
-        }
-
-        public static object sign(object x)
-        {
-            int intX;
-            if (getInt(x, out intX))
-                return Math.Sign(intX);
-            return Math.Sign(convertDouble(x));
-        }
-
-        // Use toFloat instead of float because it is a reserved keyword.
-        public static object toFloat(object x)
-        {
-            return convertDouble(x);
-        }
-
-        /// <summary>
-        /// The ISO standard returns an int.
-        /// </summary>
-        /// <param name="x"></param>
-        /// <returns></returns>
-        public static object floor(object x)
-        {
-            return (int)Math.Floor(convertDouble(x));
-        }
-
-        /// <summary>
-        /// The ISO standard returns an int.
-        /// </summary>
-        /// <param name="x"></param>
-        /// <returns></returns>
-        public static object truncate(object x)
-        {
-            return (int)Math.Truncate(convertDouble(x));
-        }
-
-        /// <summary>
-        /// The ISO standard returns an int.
-        /// </summary>
-        /// <param name="x"></param>
-        /// <returns></returns>
-        public static object round(object x)
-        {
-            return (int)Math.Round(convertDouble(x));
-        }
-
-        /// <summary>
-        /// The ISO standard returns an int.
-        /// </summary>
-        /// <param name="x"></param>
-        /// <returns></returns>
-        public static object ceiling(object x)
-        {
-            return (int)Math.Ceiling(convertDouble(x));
-        }
-
-        public static object sin(object x)
-        {
-            return Math.Sin(YP.convertDouble(x));
-        }
-
-        public static object cos(object x)
-        {
-            return Math.Cos(YP.convertDouble(x));
-        }
-
-        public static object atan(object x)
-        {
-            return Math.Atan(YP.convertDouble(x));
-        }
-
-        public static object exp(object x)
-        {
-            return Math.Exp(YP.convertDouble(x));
-        }
-
-        public static object log(object x)
-        {
-            return Math.Log(YP.convertDouble(x));
-        }
-
-        public static object sqrt(object x)
-        {
-            return Math.Sqrt(convertDouble(x));
-        }
-
-        public static object bitwiseComplement(object x)
-        {
-            return ~YP.convertInt(x);
-        }
-
-        public static object add(object x, object y)
-        {
-            int intX, intY;
-            if (getInt(x, out intX) && getInt(y, out intY))
-                return intX + intY;
-            return convertDouble(x) + convertDouble(y);
-        }
-
-        public static object subtract(object x, object y)
-        {
-            int intX, intY;
-            if (getInt(x, out intX) && getInt(y, out intY))
-                return intX - intY;
-            return convertDouble(x) - convertDouble(y);
-        }
-
-        public static object multiply(object x, object y)
-        {
-            int intX, intY;
-            if (getInt(x, out intX) && getInt(y, out intY))
-                return intX * intY;
-            return convertDouble(x) * convertDouble(y);
-        }
-
-        /// <summary>
-        /// Return floating point, even if both arguments are integer.
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns></returns>
-        public static object divide(object x, object y)
-        {
-            return convertDouble(x) / convertDouble(y);
-        }
-
-        public static object intDivide(object x, object y)
-        {
-            int intX, intY;
-            if (getInt(x, out intX) && getInt(y, out intY))
-                return intX / intY;
-            // Still allow passing a double, but treat as an int.
-            return (int)convertDouble(x) / (int)convertDouble(y);
-        }
-
-        public static object mod(object x, object y)
-        {
-            int intX, intY;
-            if (getInt(x, out intX) && getInt(y, out intY))
-                return intX % intY;
-            // Still allow passing a double, but treat as an int.
-            return (int)convertDouble(x) % (int)convertDouble(y);
-        }
-
-        public static object pow(object x, object y)
-        {
-            return Math.Pow(YP.convertDouble(x), YP.convertDouble(y));
-        }
-
-        public static object bitwiseShiftRight(object x, object y)
-        {
-            return YP.convertInt(x) >> YP.convertInt(y);
-        }
-
-        public static object bitwiseShiftLeft(object x, object y)
-        {
-            return YP.convertInt(x) << YP.convertInt(y);
-        }
-
-        public static object bitwiseAnd(object x, object y)
-        {
-            return YP.convertInt(x) & YP.convertInt(y);
-        }
-
-        public static object bitwiseOr(object x, object y)
-        {
-            return YP.convertInt(x) | YP.convertInt(y);
-        }
-
-        public static object min(object x, object y)
-        {
-            int intX, intY;
-            if (getInt(x, out intX) && getInt(y, out intY))
-                return Math.Min(intX, intY);
-            return Math.Min(convertDouble(x), convertDouble(y));
-        }
-
-        public static object max(object x, object y)
-        {
-            int intX, intY;
-            if (getInt(x, out intX) && getInt(y, out intY))
-                return Math.Max(intX, intY);
-            return Math.Max(convertDouble(x), convertDouble(y));
-        }
-
-        public static IEnumerable<bool> copy_term(object inTerm, object outTerm)
-        {
-            return YP.unify(outTerm, YP.makeCopy(inTerm, new Variable.CopyStore()));
-        }
-
-        public static void addUniqueVariables(object term, List<Variable> variableSet)
-        {
-            term = YP.getValue(term);
-            if (term is IUnifiable)
-                ((IUnifiable)term).addUniqueVariables(variableSet);
-        }
-
-        public static object makeCopy(object term, Variable.CopyStore copyStore)
-        {
-            term = YP.getValue(term);
-            if (term is IUnifiable)
-                return ((IUnifiable)term).makeCopy(copyStore);
-            else
-                // term is a "normal" type. Assume it is ground.
-                return term;
-        }
-
-        /// <summary>
-        /// Sort the array in place according to termLessThan.  This does not remove duplicates
-        /// </summary>
-        /// <param name="array"></param>
-        public static void sortArray(object[] array)
-        {
-            Array.Sort(array, YP.compareTerms);
-        }
-
-        /// <summary>
-        /// Sort the array in place according to termLessThan.  This does not remove duplicates
-        /// </summary>
-        /// <param name="array"></param>
-        public static void sortArray(List<object> array)
-        {
-            array.Sort(YP.compareTerms);
-        }
-
-        /// <summary>
-        /// Sort List according to termLessThan, remove duplicates and unify with Sorted.
-        /// </summary>
-        /// <param name="List"></param>
-        /// <param name="Sorted"></param>
-        /// <returns></returns>
-        public static IEnumerable<bool> sort(object List, object Sorted)
-        {
-            object[] array = ListPair.toArray(List);
-            if (array == null)
-                return YP.fail();
-            if (array.Length > 1)
-                sortArray(array);
-            return YP.unify(Sorted, ListPair.makeWithoutRepeatedTerms(array));
-        }
-
-        /// <summary>
-        /// Use YP.unify to unify each of the elements of the two arrays, and yield
-        /// once if they all unify.
-        /// </summary>
-        /// <param name="array1"></param>
-        /// <param name="array2"></param>
-        /// <returns></returns>
-        public static IEnumerable<bool> unifyArrays(object[] array1, object[] array2)
-        {
-            if (array1.Length != array2.Length)
-                yield break;
-
-            IEnumerator<bool>[] iterators = new IEnumerator<bool>[array1.Length];
-            bool gotMatch = true;
-            int nIterators = 0;
-            // Try to bind all the arguments.
-            for (int i = 0; i < array1.Length; ++i)
-            {
-                IEnumerator<bool> iterator = YP.unify(array1[i], array2[i]).GetEnumerator();
-                iterators[nIterators++] = iterator;
-                // MoveNext() is true if YP.unify succeeds.
-                if (!iterator.MoveNext())
-                {
-                    gotMatch = false;
-                    break;
-                }
-            }
-            int z = 0;
-            try
-            {
-                if (gotMatch)
-                    yield return false;
-            }
-            finally
-            {
-                // Manually finalize all the iterators.
-                for (z = 0; z < nIterators; ++z)
-                    iterators[z].Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Return an iterator (which you can use in a for-in loop) which does
-        /// zero iterations.  This returns a pre-existing iterator which is
-        /// more efficient than letting the compiler generate a new one.
-        /// </summary>
-        /// <returns></returns>
-        public static IEnumerable<bool> fail()
-        {
-            return _fail;
-        }
-
-        /// <summary>
-        /// Return an iterator (which you can use in a for-in loop) which does
-        /// one iteration.  This returns a pre-existing iterator which is
-        /// more efficient than letting the compiler generate a new one.
-        /// </summary>
-        /// <returns></returns>
-        public static IEnumerable<bool> succeed()
-        {
-            return new Succeed();
-        }
-
-        /// <summary>
-        /// Return an iterator (which you can use in a for-in loop) which repeats
-        /// indefinitely.  This returns a pre-existing iterator which is
-        /// more efficient than letting the compiler generate a new one.
-        /// </summary>
-        /// <returns></returns>
-        public static IEnumerable<bool> repeat()
-        {
-            return _repeat;
-        }
-
-        // disable warning on l1, don't see how we can
-        // code this differently
-        #pragma warning disable 0168, 0219
-        public static IEnumerable<bool> univ(object Term, object List)
-        {
-            Term = YP.getValue(Term);
-            List = YP.getValue(List);
-
-            if (nonvar(Term))
-                return YP.unify(new ListPair
-                    (getFunctorName(Term), ListPair.make(getFunctorArgs(Term))), List);
-
-            Variable Name = new Variable();
-            Variable ArgList = new Variable();
-            foreach (bool l1 in new ListPair(Name, ArgList).unify(List))
-            {
-                object[] args = ListPair.toArray(ArgList);
-                if (args == null)
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("list"), ArgList),
-                        "Expected a list. Got: " + ArgList.getValue());
-                if (args.Length == 0)
-                    // Return the Name, even if it is not an Atom.
-                    return YP.unify(Term, Name);
-                if (args.Length > MAX_ARITY)
-                    throw new PrologException
-                        (new Functor1("representation_error", Atom.a("max_arity")),
-                         "Functor arity " + args.Length + " may not be greater than " + MAX_ARITY);
-                if (!atom(Name))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("atom"), Name),
-                        "Expected an atom. Got: " + Name.getValue());
-
-                return YP.unify(Term, Functor.make((Atom)YP.getValue(Name), args));
-            }
-
-            return YP.fail();
-        }
-
-        public static IEnumerable<bool> functor(object Term, object FunctorName, object Arity)
-        {
-            Term = YP.getValue(Term);
-            FunctorName = YP.getValue(FunctorName);
-            Arity = YP.getValue(Arity);
-
-            if (Term is Variable)
-            {
-                if (FunctorName is Variable)
-                    throw new PrologException(Atom.a("instantiation_error"),
-                        "Arg 2 FunctorName is an unbound variable");
-                if (Arity is Variable)
-                    throw new PrologException(Atom.a("instantiation_error"),
-                        "Arg 3 Arity is an unbound variable");
-                if (!(Arity is int))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("integer"), Arity), "Arity is not an integer");
-                if (!YP.atomic(FunctorName))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("atomic"), FunctorName), "FunctorName is not atomic");
-
-                if ((int)Arity < 0)
-                    throw new PrologException
-                        (new Functor2("domain_error", Atom.a("not_less_than_zero"), Arity),
-                         "Arity may not be less than zero");
-                else if ((int)Arity == 0)
-                {
-                    // Just unify Term with the atomic FunctorName.
-                    foreach (bool l1 in YP.unify(Term, FunctorName))
-                        yield return false;
-                }
-                else
-                {
-                    if ((int)Arity > MAX_ARITY)
-                        throw new PrologException
-                            (new Functor1("representation_error", Atom.a("max_arity")),
-                             "Functor arity " + Arity + " may not be greater than " + MAX_ARITY);
-                    if (!(FunctorName is Atom))
-                        throw new PrologException
-                            (new Functor2("type_error", Atom.a("atom"), FunctorName), "FunctorName is not an atom");
-                    // Construct a functor with unbound variables.
-                    object[] args = new object[(int)Arity];
-                    for (int i = 0; i < args.Length; ++i)
-                        args[i] = new Variable();
-                    foreach (bool l1 in YP.unify(Term, Functor.make((Atom)FunctorName, args)))
-                        yield return false;
-                }
-            }
-            else
-            {
-                foreach (bool l1 in YP.unify(FunctorName, getFunctorName(Term)))
-                {
-                    foreach (bool l2 in YP.unify(Arity, getFunctorArgs(Term).Length))
-                        yield return false;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> arg(object ArgNumber, object Term, object Value)
-        {
-            if (var(ArgNumber))
-                throw new PrologException(Atom.a("instantiation_error"), "Arg 1 ArgNumber is an unbound variable");
-            int argNumberInt;
-            if (!getInt(ArgNumber, out argNumberInt))
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("integer"), ArgNumber), "Arg 1 ArgNumber must be integer");
-            if (argNumberInt < 0)
-                throw new PrologException
-                    (new Functor2("domain_error", Atom.a("not_less_than_zero"), argNumberInt),
-                    "ArgNumber may not be less than zero");
-
-            if (YP.var(Term))
-                throw new PrologException(Atom.a("instantiation_error"),
-                    "Arg 2 Term is an unbound variable");
-            if (!YP.compound(Term))
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("compound"), Term), "Arg 2 Term must be compound");
-
-            object[] termArgs = YP.getFunctorArgs(Term);
-            // Silently fail if argNumberInt is out of range.
-            if (argNumberInt >= 1 && argNumberInt <= termArgs.Length)
-            {
-                // The first ArgNumber is at 1, not 0.
-                foreach (bool l1 in YP.unify(Value, termArgs[argNumberInt - 1]))
-                    yield return false;
-            }
-        }
-
-        public static bool termEqual(object Term1, object Term2)
-        {
-            Term1 = YP.getValue(Term1);
-            if (Term1 is IUnifiable)
-                return ((IUnifiable)Term1).termEqual(Term2);
-            return Term1.Equals(YP.getValue(Term2));
-        }
-
-        public static bool termNotEqual(object Term1, object Term2)
-        {
-            return !termEqual(Term1, Term2);
-        }
-
-        public static bool termLessThan(object Term1, object Term2)
-        {
-            Term1 = YP.getValue(Term1);
-            Term2 = YP.getValue(Term2);
-            int term1TypeCode = getTypeCode(Term1);
-            int term2TypeCode = getTypeCode(Term2);
-            if (term1TypeCode != term2TypeCode)
-                return term1TypeCode < term2TypeCode;
-
-            // The terms are the same type code.
-            if (term1TypeCode == -2)
-            {
-                // Variable.
-                // We always check for equality first because we want to be sure
-                //   that less than returns false if the terms are equal, in
-                //   case that the less than check really behaves like less than or equal.
-                if ((Variable)Term1 != (Variable)Term2)
-                    // The hash code should be unique to a Variable object.
-                    return Term1.GetHashCode() < Term2.GetHashCode();
-                return false;
-            }
-            if (term1TypeCode == 0)
-                return ((Atom)Term1)._name.CompareTo(((Atom)Term2)._name) < 0;
-            if (term1TypeCode == 1)
-                return ((Functor1)Term1).lessThan((Functor1)Term2);
-            if (term1TypeCode == 2)
-                return ((Functor2)Term1).lessThan((Functor2)Term2);
-            if (term1TypeCode == 3)
-                return ((Functor3)Term1).lessThan((Functor3)Term2);
-            if (term1TypeCode == 4)
-                return ((Functor)Term1).lessThan((Functor)Term2);
-
-            // Type code is -1 for general objects.  First compare their type names.
-            // Note that this puts Double before Int32 as required by ISO Prolog.
-            string term1TypeName = Term1.GetType().ToString();
-            string term2TypeName = Term2.GetType().ToString();
-            if (term1TypeName != term2TypeName)
-                return term1TypeName.CompareTo(term2TypeName) < 0;
-
-            // The terms are the same type name.
-            if (Term1 is int)
-                return (int)Term1 < (int)Term2;
-            else if (Term1 is double)
-                return (double)Term1 < (double)Term2;
-            else if (Term1 is DateTime)
-                return (DateTime)Term1 < (DateTime)Term2;
-            else if (Term1 is String)
-                return ((String)Term1).CompareTo((String)Term2) < 0;
-            // Debug: Should we try arrays, etc.?
-
-            if (!Term1.Equals(Term2))
-                // Could be equal or greater than.
-                return Term1.GetHashCode() < Term2.GetHashCode();
-            return false;
-        }
-
-        /// <summary>
-        /// Type code is -2 if term is a Variable, 0 if it is an Atom,
-        /// 1 if it is a Functor1, 2 if it is a Functor2, 3 if it is a Functor3,
-        /// 4 if it is Functor.
-        /// Otherwise, type code is -1.
-        /// This does not call YP.getValue(term).
-        /// </summary>
-        /// <param name="term"></param>
-        /// <returns></returns>
-        private static int getTypeCode(object term)
-        {
-            if (term is Variable)
-                return -2;
-            else if (term is Atom)
-                return 0;
-            else if (term is Functor1)
-                return 1;
-            else if (term is Functor2)
-                return 2;
-            else if (term is Functor3)
-                return 3;
-            else if (term is Functor)
-                return 4;
-            else
-                return -1;
-        }
-
-        public static bool termLessThanOrEqual(object Term1, object Term2)
-        {
-            if (YP.termEqual(Term1, Term2))
-                return true;
-            return YP.termLessThan(Term1, Term2);
-        }
-
-        public static bool termGreaterThan(object Term1, object Term2)
-        {
-            return !YP.termLessThanOrEqual(Term1, Term2);
-        }
-
-        public static bool termGreaterThanOrEqual(object Term1, object Term2)
-        {
-            // termLessThan should ensure that it returns false if terms are equal,
-            //   so that this would return true.
-            return !YP.termLessThan(Term1, Term2);
-        }
-
-        public static int compareTerms(object Term1, object Term2)
-        {
-            if (YP.termEqual(Term1, Term2))
-                return 0;
-            else if (YP.termLessThan(Term1, Term2))
-                return -1;
-            else
-                return 1;
-        }
-
-        public static bool ground(object Term)
-        {
-            Term = YP.getValue(Term);
-            if (Term is IUnifiable)
-                return ((IUnifiable)Term).ground();
-            return true;
-        }
-
-        public static IEnumerable<bool> current_op
-            (object Priority, object Specifier, object Operator)
-        {
-            if (_operatorTable == null)
-            {
-                // Initialize.
-                _operatorTable = new IndexedAnswers(3);
-                _operatorTable.addAnswer(new object[] { 1200, Atom.a("xfx"), Atom.a(":-") });
-                _operatorTable.addAnswer(new object[] { 1200, Atom.a("xfx"), Atom.a("-->") });
-                _operatorTable.addAnswer(new object[] { 1200, Atom.a("fx"), Atom.a(":-") });
-                _operatorTable.addAnswer(new object[] { 1200, Atom.a("fx"), Atom.a("?-") });
-                _operatorTable.addAnswer(new object[] { 1100, Atom.a("xfy"), Atom.a(";") });
-                _operatorTable.addAnswer(new object[] { 1050, Atom.a("xfy"), Atom.a("->") });
-                _operatorTable.addAnswer(new object[] { 1000, Atom.a("xfy"), Atom.a(",") });
-                _operatorTable.addAnswer(new object[] { 900, Atom.a("fy"), Atom.a("\\+") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("=") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("\\=") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("==") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("\\==") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("@<") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("@=<") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("@>") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("@>=") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("=..") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("is") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("=:=") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("=\\=") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("<") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a("=<") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a(">") });
-                _operatorTable.addAnswer(new object[] { 700, Atom.a("xfx"), Atom.a(">=") });
-                _operatorTable.addAnswer(new object[] { 600, Atom.a("xfy"), Atom.a(":") });
-                _operatorTable.addAnswer(new object[] { 500, Atom.a("yfx"), Atom.a("+") });
-                _operatorTable.addAnswer(new object[] { 500, Atom.a("yfx"), Atom.a("-") });
-                _operatorTable.addAnswer(new object[] { 500, Atom.a("yfx"), Atom.a("/\\") });
-                _operatorTable.addAnswer(new object[] { 500, Atom.a("yfx"), Atom.a("\\/") });
-                _operatorTable.addAnswer(new object[] { 400, Atom.a("yfx"), Atom.a("*") });
-                _operatorTable.addAnswer(new object[] { 400, Atom.a("yfx"), Atom.a("/") });
-                _operatorTable.addAnswer(new object[] { 400, Atom.a("yfx"), Atom.a("//") });
-                _operatorTable.addAnswer(new object[] { 400, Atom.a("yfx"), Atom.a("rem") });
-                _operatorTable.addAnswer(new object[] { 400, Atom.a("yfx"), Atom.a("mod") });
-                _operatorTable.addAnswer(new object[] { 400, Atom.a("yfx"), Atom.a("<<") });
-                _operatorTable.addAnswer(new object[] { 400, Atom.a("yfx"), Atom.a(">>") });
-                _operatorTable.addAnswer(new object[] { 200, Atom.a("xfx"), Atom.a("**") });
-                _operatorTable.addAnswer(new object[] { 200, Atom.a("xfy"), Atom.a("^") });
-                _operatorTable.addAnswer(new object[] { 200, Atom.a("fy"), Atom.a("-") });
-                _operatorTable.addAnswer(new object[] { 200, Atom.a("fy"), Atom.a("\\") });
-                // Debug: This is hacked in to run the Prolog test suite until we implement op/3.
-                _operatorTable.addAnswer(new object[] { 20, Atom.a("xfx"), Atom.a("<--") });
-            }
-
-            return _operatorTable.match(new object[] { Priority, Specifier, Operator });
-        }
-
-        public static IEnumerable<bool> atom_length(object atom, object Length)
-        {
-            atom = YP.getValue(atom);
-            Length = YP.getValue(Length);
-            if (atom is Variable)
-                throw new PrologException(Atom.a("instantiation_error"),
-                    "Expected atom(Arg1) but it is an unbound variable");
-            if (!(atom is Atom))
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("atom"), atom), "Arg 1 Atom is not an atom");
-            if (!(Length is Variable))
-            {
-                if (!(Length is int))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("integer"), Length), "Length must be var or integer");
-                if ((int)Length < 0)
-                    throw new PrologException
-                        (new Functor2("domain_error", Atom.a("not_less_than_zero"), Length),
-                        "Length must not be less than zero");
-            }
-            return YP.unify(Length, ((Atom)atom)._name.Length);
-        }
-
-        public static IEnumerable<bool> atom_concat(object Start, object End, object Whole)
-        {
-            // Debug: Should we try to preserve the _declaringClass?
-            Start = YP.getValue(Start);
-            End = YP.getValue(End);
-            Whole = YP.getValue(Whole);
-            if (Whole is Variable)
-            {
-                if (Start is Variable)
-                    throw new PrologException(Atom.a("instantiation_error"),
-                        "Arg 1 Start and arg 3 Whole are both var");
-                if (End is Variable)
-                    throw new PrologException(Atom.a("instantiation_error"),
-                        "Arg 2 End and arg 3 Whole are both var");
-                if (!(Start is Atom))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("atom"), Start), "Arg 1 Start is not an atom");
-                if (!(End is Atom))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("atom"), End), "Arg 2 End is not an atom");
-
-                foreach (bool l1 in YP.unify(Whole, Atom.a(((Atom)Start)._name + ((Atom)End)._name)))
-                    yield return false;
-            }
-            else
-            {
-                if (!(Whole is Atom))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("atom"), Whole), "Arg 3 Whole is not an atom");
-                bool gotStartLength = false;
-                int startLength = 0;
-                if (!(Start is Variable))
-                {
-                    if (!(Start is Atom))
-                        throw new PrologException
-                            (new Functor2("type_error", Atom.a("atom"), Start), "Arg 1 Start is not var or atom");
-                    startLength = ((Atom)Start)._name.Length;
-                    gotStartLength = true;
-                }
-
-                bool gotEndLength = false;
-                int endLength = 0;
-                if (!(End is Variable))
-                {
-                    if (!(End is Atom))
-                        throw new PrologException
-                            (new Functor2("type_error", Atom.a("atom"), End), "Arg 2 End is not var or atom");
-                    endLength = ((Atom)End)._name.Length;
-                    gotEndLength = true;
-                }
-
-                // We are doing a search through all possible Start and End which concatenate to Whole.
-                string wholeString = ((Atom)Whole)._name;
-                for (int i = 0; i <= wholeString.Length; ++i)
-                {
-                    // If we got either startLength or endLength, we know the lengths have to match so check
-                    //   the lengths instead of constructing an Atom to do it.
-                    if (gotStartLength && startLength != i)
-                        continue;
-                    if (gotEndLength && endLength != wholeString.Length - i)
-                        continue;
-                    foreach (bool l1 in YP.unify(Start, Atom.a(wholeString.Substring(0, i))))
-                    {
-                        foreach (bool l2 in YP.unify(End, Atom.a(wholeString.Substring(i, wholeString.Length - i))))
-                            yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> sub_atom
-            (object atom, object Before, object Length, object After, object Sub_atom)
-        {
-            // Debug: Should we try to preserve the _declaringClass?
-            atom = YP.getValue(atom);
-            Before = YP.getValue(Before);
-            Length = YP.getValue(Length);
-            After = YP.getValue(After);
-            Sub_atom = YP.getValue(Sub_atom);
-            if (atom is Variable)
-                throw new PrologException(Atom.a("instantiation_error"),
-                    "Expected atom(Arg1) but it is an unbound variable");
-            if (!(atom is Atom))
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("atom"), atom), "Arg 1 Atom is not an atom");
-            if (!(Sub_atom is Variable))
-            {
-                if (!(Sub_atom is Atom))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("atom"), Sub_atom), "Sub_atom is not var or atom");
-            }
-
-            bool beforeIsInt = false;
-            bool lengthIsInt = false;
-            bool afterIsInt = false;
-            if (!(Before is Variable))
-            {
-                if (!(Before is int))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("integer"), Before), "Before must be var or integer");
-                beforeIsInt = true;
-                if ((int)Before < 0)
-                    throw new PrologException
-                        (new Functor2("domain_error", Atom.a("not_less_than_zero"), Before),
-                        "Before must not be less than zero");
-            }
-            if (!(Length is Variable))
-            {
-                if (!(Length is int))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("integer"), Length), "Length must be var or integer");
-                lengthIsInt = true;
-                if ((int)Length < 0)
-                    throw new PrologException
-                        (new Functor2("domain_error", Atom.a("not_less_than_zero"), Length),
-                        "Length must not be less than zero");
-            }
-            if (!(After is Variable))
-            {
-                if (!(After is int))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("integer"), After), "After must be var or integer");
-                afterIsInt = true;
-                if ((int)After < 0)
-                    throw new PrologException
-                        (new Functor2("domain_error", Atom.a("not_less_than_zero"), After),
-                        "After must not be less than zero");
-            }
-
-            Atom atomAtom = (Atom)atom;
-            int atomLength = atomAtom._name.Length;
-            if (beforeIsInt && lengthIsInt)
-            {
-                // Special case: the caller is just trying to extract a substring, so do it quickly.
-                int xAfter = atomLength - (int)Before - (int)Length;
-                if (xAfter >= 0)
-                {
-                    foreach (bool l1 in YP.unify(After, xAfter))
-                    {
-                        foreach (bool l2 in YP.unify
-                            (Sub_atom, Atom.a(atomAtom._name.Substring((int)Before, (int)Length))))
-                            yield return false;
-                    }
-                }
-            }
-            else if (afterIsInt && lengthIsInt)
-            {
-                // Special case: the caller is just trying to extract a substring, so do it quickly.
-                int xBefore = atomLength - (int)After - (int)Length;
-                if (xBefore >= 0)
-                {
-                    foreach (bool l1 in YP.unify(Before, xBefore))
-                    {
-                        foreach (bool l2 in YP.unify
-                            (Sub_atom, Atom.a(atomAtom._name.Substring(xBefore, (int)Length))))
-                            yield return false;
-                    }
-                }
-            }
-            else
-            {
-                // We are underconstrained and doing a search, so go through all possibilities.
-                for (int xBefore = 0; xBefore <= atomLength; ++xBefore)
-                {
-                    foreach (bool l1 in YP.unify(Before, xBefore))
-                    {
-                        for (int xLength = 0; xLength <= (atomLength - xBefore); ++xLength)
-                        {
-                            foreach (bool l2 in YP.unify(Length, xLength))
-                            {
-                                foreach (bool l3 in YP.unify(After, atomLength - (xBefore + xLength)))
-                                {
-                                    foreach (bool l4 in YP.unify
-                                        (Sub_atom, Atom.a(atomAtom._name.Substring(xBefore, xLength))))
-                                        yield return false;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> atom_chars(object atom, object List)
-        {
-            atom = YP.getValue(atom);
-            List = YP.getValue(List);
-
-            if (atom is Variable)
-            {
-                if (List is Variable)
-                    throw new PrologException(Atom.a("instantiation_error"),
-                        "Arg 1 Atom and arg 2 List are both unbound variables");
-                object[] codeArray = ListPair.toArray(List);
-                if (codeArray == null)
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("list"), List), "Arg 2 List is not a list");
-
-                char[] charArray = new char[codeArray.Length];
-                for (int i = 0; i < codeArray.Length; ++i)
-                {
-                    object listAtom = YP.getValue(codeArray[i]);
-                    if (listAtom is Variable)
-                        throw new PrologException(Atom.a("instantiation_error"),
-                            "Arg 2 List has an element which is an unbound variable");
-                    if (!(listAtom is Atom && ((Atom)listAtom)._name.Length == 1))
-                        throw new PrologException
-                            (new Functor2("type_error", Atom.a("character"), listAtom),
-                             "Arg 2 List has an element which is not a one character atom");
-                    charArray[i] = ((Atom)listAtom)._name[0];
-                }
-                return YP.unify(atom, Atom.a(new String(charArray)));
-            }
-            else
-            {
-                if (!(atom is Atom))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("atom"), atom), "Arg 1 Atom is not var or atom");
-
-                string atomString = ((Atom)atom)._name;
-                object charList = Atom.NIL;
-                // Start from the back to make the list.
-                for (int i = atomString.Length - 1; i >= 0; --i)
-                    charList = new ListPair(Atom.a(atomString.Substring(i, 1)), charList);
-                return YP.unify(List, charList);
-            }
-        }
-
-        public static IEnumerable<bool> atom_codes(object atom, object List)
-        {
-            atom = YP.getValue(atom);
-            List = YP.getValue(List);
-
-            if (atom is Variable)
-            {
-                if (List is Variable)
-                    throw new PrologException(Atom.a("instantiation_error"),
-                        "Arg 1 Atom and arg 2 List are both unbound variables");
-                object[] codeArray = ListPair.toArray(List);
-                if (codeArray == null)
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("list"), List), "Arg 2 List is not a list");
-
-                char[] charArray = new char[codeArray.Length];
-                for (int i = 0; i < codeArray.Length; ++i)
-                {
-                    int codeInt;
-                    if (!getInt(codeArray[i], out codeInt) || codeInt < 0)
-                        throw new PrologException
-                            (new Functor1("representation_error", Atom.a("character_code")),
-                             "Element of Arg 2 List is not a character code");
-                    charArray[i] = (char)codeInt;
-                }
-                return YP.unify(atom, Atom.a(new String(charArray)));
-            }
-            else
-            {
-                if (!(atom is Atom))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("atom"), atom), "Arg 1 Atom is not var or atom");
-
-                string atomString = ((Atom)atom)._name;
-                object codeList = Atom.NIL;
-                // Start from the back to make the list.
-                for (int i = atomString.Length - 1; i >= 0; --i)
-                    codeList = new ListPair((int)atomString[i], codeList);
-                return YP.unify(List, codeList);
-            }
-        }
-
-        public static IEnumerable<bool> number_chars(object Number, object List)
-        {
-            Number = YP.getValue(Number);
-            List = YP.getValue(List);
-
-            if (Number is Variable)
-            {
-                if (List is Variable)
-                    throw new PrologException(Atom.a("instantiation_error"),
-                        "Arg 1 Number and arg 2 List are both unbound variables");
-                object[] codeArray = ListPair.toArray(List);
-                if (codeArray == null)
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("list"), List), "Arg 2 List is not a list");
-
-                char[] charArray = new char[codeArray.Length];
-                for (int i = 0; i < codeArray.Length; ++i)
-                {
-                    object listAtom = YP.getValue(codeArray[i]);
-                    if (listAtom is Variable)
-                        throw new PrologException(Atom.a("instantiation_error"),
-                            "Arg 2 List has an element which is an unbound variable");
-                    if (!(listAtom is Atom && ((Atom)listAtom)._name.Length == 1))
-                        throw new PrologException
-                            (new Functor2("type_error", Atom.a("character"), listAtom),
-                             "Arg 2 List has an element which is not a one character atom");
-                    charArray[i] = ((Atom)listAtom)._name[0];
-                }
-                return YP.unify(Number, parseNumberString(charArray));
-            }
-            else
-            {
-                string numberString = null;
-                // Try converting to an int first.
-                int intNumber;
-                if (YP.getInt(Number, out intNumber))
-                    numberString = intNumber.ToString();
-                else
-                {
-                    if (!YP.number(Number))
-                        throw new PrologException
-                            (new Functor2("type_error", Atom.a("number"), Number),
-                            "Arg 1 Number is not var or number");
-                    // We just checked, so convertDouble shouldn't throw an exception.
-                    numberString = YP.doubleToString(YP.convertDouble(Number));
-                }
-
-                object charList = Atom.NIL;
-                // Start from the back to make the list.
-                for (int i = numberString.Length - 1; i >= 0; --i)
-                    charList = new ListPair(Atom.a(numberString.Substring(i, 1)), charList);
-                return YP.unify(List, charList);
-            }
-        }
-
-        public static IEnumerable<bool> number_codes(object Number, object List)
-        {
-            Number = YP.getValue(Number);
-            List = YP.getValue(List);
-
-            if (Number is Variable)
-            {
-                if (List is Variable)
-                    throw new PrologException(Atom.a("instantiation_error"),
-                        "Arg 1 Number and arg 2 List are both unbound variables");
-                object[] codeArray = ListPair.toArray(List);
-                if (codeArray == null)
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("list"), List), "Arg 2 List is not a list");
-
-                char[] charArray = new char[codeArray.Length];
-                for (int i = 0; i < codeArray.Length; ++i)
-                {
-                    int codeInt;
-                    if (!getInt(codeArray[i], out codeInt) || codeInt < 0)
-                        throw new PrologException
-                            (new Functor1("representation_error", Atom.a("character_code")),
-                             "Element of Arg 2 List is not a character code");
-                    charArray[i] = (char)codeInt;
-                }
-                return YP.unify(Number, parseNumberString(charArray));
-            }
-            else
-            {
-                string numberString = null;
-                // Try converting to an int first.
-                int intNumber;
-                if (YP.getInt(Number, out intNumber))
-                    numberString = intNumber.ToString();
-                else
-                {
-                    if (!YP.number(Number))
-                        throw new PrologException
-                            (new Functor2("type_error", Atom.a("number"), Number),
-                            "Arg 1 Number is not var or number");
-                    // We just checked, so convertDouble shouldn't throw an exception.
-                    numberString = YP.doubleToString(YP.convertDouble(Number));
-                }
-
-                object codeList = Atom.NIL;
-                // Start from the back to make the list.
-                for (int i = numberString.Length - 1; i >= 0; --i)
-                    codeList = new ListPair((int)numberString[i], codeList);
-                return YP.unify(List, codeList);
-            }
-        }
-
-        /// <summary>
-        /// Used by number_chars and number_codes.  Return the number in charArray or
-        /// throw an exception if can't parse.
-        /// </summary>
-        /// <param name="numberString"></param>
-        /// <returns></returns>
-        private static object parseNumberString(char[] charArray)
-        {
-            string numberString = new String(charArray);
-            if (charArray.Length == 3 && numberString.StartsWith("0'"))
-                // This is a char code.
-                return (int)charArray[2];
-            if (numberString.StartsWith("0x"))
-            {
-                try
-                {
-                    return Int32.Parse
-                        (numberString.Substring(2), System.Globalization.NumberStyles.AllowHexSpecifier);
-                }
-                catch (FormatException)
-                {
-                    throw new PrologException
-                        (new Functor1("syntax_error", Atom.a("number_format: " + numberString)),
-                         "Arg 2 List is not a list for a hexadecimal number");
-                }
-            }
-            // Debug: Is there a way in C# to ask if a string parses as int without throwing an exception?
-            try
-            {
-                // Try an int first.
-                return Convert.ToInt32(numberString);
-            }
-            catch (FormatException) { }
-            try
-            {
-                return Convert.ToDouble(numberString);
-            }
-            catch (FormatException)
-            {
-                throw new PrologException
-                    (new Functor1("syntax_error", Atom.a("number_format: " + numberString)),
-                     "Arg 2 List is not a list for a number");
-            }
-        }
-
-        public static IEnumerable<bool> char_code(object Char, object Code)
-        {
-            Char = YP.getValue(Char);
-            Code = YP.getValue(Code);
-
-            int codeInt = 0;
-            if (!(Code is Variable))
-            {
-                // Get codeInt now so we type check it whether or not Char is Variable.
-                if (!getInt(Code, out codeInt))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("integer"), Code),
-                         "Arg 2 Code is not var or a character code");
-                if (codeInt < 0)
-                    throw new PrologException
-                        (new Functor1("representation_error", Atom.a("character_code")),
-                         "Arg 2 Code is not a character code");
-            }
-
-            if (Char is Variable)
-            {
-                if (Code is Variable)
-                    throw new PrologException(Atom.a("instantiation_error"),
-                        "Arg 1 Char and arg 2 Code are both unbound variables");
-
-                return YP.unify(Char, Atom.a(new String(new char[] {(char)codeInt})));
-            }
-            else
-            {
-                if (!(Char is Atom) || ((Atom)Char)._name.Length != 1)
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("character"), Char),
-                         "Arg 1 Char is not var or one-character atom");
-
-                if (Code is Variable)
-                    return YP.unify(Code, (int)((Atom)Char)._name[0]);
-                else
-                    // Use codeInt to handle whether Code is supplied as, e.g., 97 or 0'a .
-                    return YP.unify(codeInt, (int)((Atom)Char)._name[0]);
-            }
-        }
-
-        /// <summary>
-        /// If term is an Atom or functor type, return its name.
-        /// Otherwise, return term.
-        /// </summary>
-        /// <param name="term"></param>
-        /// <returns></returns>
-        public static object getFunctorName(object term)
-        {
-            term = YP.getValue(term);
-            if (term is Functor1)
-                return ((Functor1)term)._name;
-            else if (term is Functor2)
-                return ((Functor2)term)._name;
-            else if (term is Functor3)
-                return ((Functor3)term)._name;
-            else if (term is Functor)
-                return ((Functor)term)._name;
-            else
-                return term;
-        }
-
-        /// <summary>
-        /// If term is an Atom or functor type, return an array of its args.
-        /// Otherwise, return an empty array.
-        /// </summary>
-        /// <param name="term"></param>
-        /// <returns></returns>
-        public static object[] getFunctorArgs(object term)
-        {
-            term = YP.getValue(term);
-            if (term is Functor1)
-            {
-                Functor1 functor = (Functor1)term;
-                return new object[] { functor._arg1 };
-            }
-            else if (term is Functor2)
-            {
-                Functor2 functor = (Functor2)term;
-                return new object[] { functor._arg1, functor._arg2 };
-            }
-            else if (term is Functor3)
-            {
-                Functor3 functor = (Functor3)term;
-                return new object[] { functor._arg1, functor._arg2, functor._arg3 };
-            }
-            else if (term is Functor) {
-                Functor functor = (Functor)term;
-                return functor._args;
-            }
-            else
-                return new object[0];
-        }
-
-        public static bool var(object Term)
-        {
-            return YP.getValue(Term) is Variable;
-        }
-
-        public static bool nonvar(object Term)
-        {
-            return !YP.var(Term);
-        }
-
-        public static bool atom(object Term)
-        {
-            return YP.getValue(Term) is Atom;
-        }
-
-        public static bool integer(object Term)
-        {
-            // Debug: Should exhaustively check for all integer types.
-            return getValue(Term) is int;
-        }
-
-        // Use isFloat instead of float because it is a reserved keyword.
-        public static bool isFloat(object Term)
-        {
-            // Debug: Should exhaustively check for all float types.
-            return getValue(Term) is double;
-        }
-
-        public static bool number(object Term)
-        {
-            return YP.integer(Term) || YP.isFloat(Term);
-        }
-
-        public static bool atomic(object Term)
-        {
-            return YP.atom(Term) || YP.number(Term);
-        }
-
-        public static bool compound(object Term)
-        {
-            Term = getValue(Term);
-            return Term is Functor1 || Term is Functor2 || Term is Functor3 || Term is Functor;
-        }
-
-        /// <summary>
-        /// If input is a TextReader, use it. If input is an Atom or String, create a StreamReader with the
-        /// input as the filename.  If input is a Prolog list, then read character codes from it.
-        /// </summary>
-        /// <param name="input"></param>
-        public static void see(object input)
-        {
-            input = YP.getValue(input);
-            if (input is Variable)
-                throw new PrologException(Atom.a("instantiation_error"), "Arg is an unbound variable");
-
-            if (input == null)
-            {
-                _inputStream = null;
-                return;
-            }
-            if (input is TextReader)
-            {
-                _inputStream = (TextReader)input;
-                return;
-            }
-            else if (input is Atom)
-            {
-                _inputStream = new StreamReader(((Atom)input)._name);
-                return;
-            }
-            else if (input is String)
-            {
-                _inputStream = new StreamReader((String)input);
-                return;
-            }
-            else if (input is Functor2 && ((Functor2)input)._name == Atom.DOT)
-            {
-                _inputStream = new CodeListReader(input);
-                return;
-            }
-            else
-                throw new PrologException
-                    (new Functor2("domain_error", Atom.a("stream_or_alias"), input),
-                     "Input stream specifier not recognized");
-        }
-
-        public static void seen()
-        {
-            if (_inputStream == null)
-                return;
-            if (_inputStream == Console.In)
-                return;
-            _inputStream.Close();
-            _inputStream = Console.In;
-        }
-
-        public static IEnumerable<bool> current_input(object Stream)
-        {
-            return YP.unify(Stream, _inputStream);
-        }
-
-        /// <summary>
-        /// If output is a TextWriter, use it.  If output is an Atom or a String, create a StreamWriter
-        /// with the input as the filename.
-        /// </summary>
-        /// <param name="output"></param>
-        public static void tell(object output)
-        {
-            output = YP.getValue(output);
-            if (output is Variable)
-                throw new PrologException(Atom.a("instantiation_error"), "Arg is an unbound variable");
-
-            if (output == null)
-            {
-                _outputStream = null;
-                return;
-            }
-            if (output is TextWriter)
-            {
-                _outputStream = (TextWriter)output;
-                return;
-            }
-            else if (output is Atom)
-            {
-                _outputStream = new StreamWriter(((Atom)output)._name);
-                return;
-            }
-            else if (output is String)
-            {
-                _outputStream = new StreamWriter((String)output);
-                return;
-            }
-            else
-                throw new PrologException
-                    (new Functor2("domain_error", Atom.a("stream_or_alias"), output),
-                     "Can't open stream for " + output);
-        }
-
-        public static void told()
-        {
-            if (_outputStream == null)
-                return;
-            if (_outputStream == Console.Out)
-                return;
-            _outputStream.Close();
-            _outputStream = Console.Out;
-        }
-
-        public static IEnumerable<bool> current_output(object Stream)
-        {
-            return YP.unify(Stream, _outputStream);
-        }
-
-        public static void write(object x)
-        {
-            if (_outputStream == null)
-                return;
-            x = YP.getValue(x);
-            if (x is double)
-                _outputStream.Write(doubleToString((double)x));
-            else
-                _outputStream.Write(x.ToString());
-        }
-
-        /// <summary>
-        /// Format x as a string, making sure that it won't parse as an int later.  I.e., for 1.0, don't just
-        /// use "1" which will parse as an int.
-        /// </summary>
-        /// <param name="x"></param>
-        /// <returns></returns>
-        private static string doubleToString(double x)
-        {
-            string xString = x.ToString();
-            // Debug: Is there a way in C# to ask if a string parses as int without throwing an exception?
-            try
-            {
-                Convert.ToInt32(xString);
-                // The string will parse as an int, not a double, so re-format so that it does.
-                // Use float if possible, else exponential if it would be too big.
-                return x.ToString(x >= 100000.0 ? "E1" : "f1");
-            }
-            catch (FormatException)
-            {
-                // Assume it will parse as a double.
-            }
-            return xString;
-        }
-
-        public static void put_code(object x)
-        {
-            if (_outputStream == null)
-                return;
-            if (var(x))
-                throw new PrologException(Atom.a("instantiation_error"), "Arg 1 is an unbound variable");
-            int xInt;
-            if (!getInt(x, out xInt))
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("integer"), x), "Arg 1 must be integer");
-            _outputStream.Write((char)xInt);
-        }
-
-        public static void nl()
-        {
-            if (_outputStream == null)
-                return;
-            _outputStream.WriteLine();
-        }
-
-        public static IEnumerable<bool> get_code(object code)
-        {
-            if (_inputStream == null)
-                return YP.unify(code, -1);
-            else
-            return YP.unify(code, _inputStream.Read());
-        }
-
-        public static void asserta(object Term, Type declaringClass)
-        {
-            assertDynamic(Term, declaringClass, true);
-        }
-
-        public static void assertz(object Term, Type declaringClass)
-        {
-            assertDynamic(Term, declaringClass, false);
-        }
-
-        public static void assertDynamic(object Term, Type declaringClass, bool prepend)
-        {
-            Term = getValue(Term);
-            if (Term is Variable)
-                throw new PrologException("instantiation_error", "Term to assert is an unbound variable");
-
-            Variable.CopyStore copyStore = new Variable.CopyStore();
-            object TermCopy = makeCopy(Term, copyStore);
-            object Head, Body;
-            if (TermCopy is Functor2 && ((Functor2)TermCopy)._name == Atom.RULE)
-            {
-                Head = YP.getValue(((Functor2)TermCopy)._arg1);
-                Body = YP.getValue(((Functor2)TermCopy)._arg2);
-                if (Head is Variable)
-                    throw new PrologException("instantiation_error", "Head to assert is an unbound variable");
-                if (Body is Variable)
-                    throw new PrologException("instantiation_error", "Body to assert is an unbound variable");
-            }
-            else
-            {
-                Head = TermCopy;
-                Body = Atom.a("true");
-            }
-
-            Atom name = getFunctorName(Head) as Atom;
-            if (name == null)
-                // name is a non-Atom, such as a number.
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("callable"), Head), "Term to assert is not callable");
-            object[] args = getFunctorArgs(Head);
-            if (isSystemPredicate(name, args.Length))
-                throw new PrologException
-                    (new Functor3("permission_error", Atom.a("modify"), Atom.a("static_procedure"),
-                                  new Functor2(Atom.SLASH, name, args.Length)),
-                     "Assert cannot modify static predicate " + name + "/" + args.Length);
-
-            if (copyStore.getNUniqueVariables() == 0 && Body == Atom.a("true"))
-            {
-                // This is a fact with no unbound variables
-                // assertFact and prependFact use IndexedAnswers, so don't we don't need to compile.
-                if (prepend)
-                    prependFact(name, args);
-                else
-                    assertFact(name, args);
-
-                return;
-            }
-
-            IClause clause = YPCompiler.compileAnonymousClause(Head, Body, declaringClass);
-            // We expect clause to be a ClauseHeadAndBody (from Compiler.compileAnonymousFunction)
-            //   so we can set the Head and Body.
-            if (clause is ClauseHeadAndBody)
-                ((ClauseHeadAndBody)clause).setHeadAndBody(Head, Body);
-
-            // Add the clause to the entry in _predicatesStore.
-            NameArity nameArity = new NameArity(name, args.Length);
-            List<IClause> clauses;
-            if (!_predicatesStore.TryGetValue(nameArity, out clauses))
-                // Create an entry for the nameArity.
-                _predicatesStore[nameArity] = (clauses = new List<IClause>());
-
-            if (prepend)
-                clauses.Insert(0, clause);
-            else
-                clauses.Add(clause);
-        }
-
-        private static bool isSystemPredicate(Atom name, int arity)
-        {
-            if (arity == 2 && (name == Atom.a(",") || name == Atom.a(";") || name == Atom.DOT))
-                return true;
-            // Use the same mapping to static predicates in YP as the compiler.
-            foreach (bool l1 in YPCompiler.functorCallYPFunctionName(name, arity, new Variable()))
-                return true;
-            // Debug: Do we need to check if name._module is null?
-            return false;
-        }
-
-        /// <summary>
-        /// Assert values at the end of the set of facts for the predicate with the
-        /// name and with arity values.Length.
-        /// </summary>
-        /// <param name="name">must be an Atom</param>
-        /// <param name="values">the array of arguments to the fact predicate.
-        /// It is an error if an value has an unbound variable.</param>
-        public static void assertFact(Atom name, object[] values)
-        {
-            NameArity nameArity = new NameArity(name, values.Length);
-            List<IClause> clauses;
-            IndexedAnswers indexedAnswers;
-            if (!_predicatesStore.TryGetValue(nameArity, out clauses))
-            {
-                // Create an IndexedAnswers as the only clause of the predicate.
-                _predicatesStore[nameArity] = (clauses = new List<IClause>());
-                clauses.Add(indexedAnswers = new IndexedAnswers(values.Length));
-            }
-            else
-            {
-                indexedAnswers = null;
-                if (clauses.Count >= 1)
-                    indexedAnswers = clauses[clauses.Count - 1] as IndexedAnswers;
-                if (indexedAnswers == null)
-                    // The latest clause is not an IndexedAnswers, so add one.
-                    clauses.Add(indexedAnswers = new IndexedAnswers(values.Length));
-            }
-
-            indexedAnswers.addAnswer(values);
-        }
-
-        /// <summary>
-        /// Assert values, prepending to the front of the set of facts for the predicate with the
-        /// name and with arity values.Length.
-        /// </summary>
-        /// <param name="name">must be an Atom</param>
-        /// <param name="values">the array of arguments to the fact predicate.
-        /// It is an error if an value has an unbound variable.</param>
-        public static void prependFact(Atom name, object[] values)
-        {
-            NameArity nameArity = new NameArity(name, values.Length);
-            List<IClause> clauses;
-            IndexedAnswers indexedAnswers;
-            if (!_predicatesStore.TryGetValue(nameArity, out clauses))
-            {
-                // Create an IndexedAnswers as the only clause of the predicate.
-                _predicatesStore[nameArity] = (clauses = new List<IClause>());
-                clauses.Add(indexedAnswers = new IndexedAnswers(values.Length));
-            }
-            else
-            {
-                indexedAnswers = null;
-                if (clauses.Count >= 1)
-                    indexedAnswers = clauses[0] as IndexedAnswers;
-                if (indexedAnswers == null)
-                    // The first clause is not an IndexedAnswers, so prepend one.
-                    clauses.Insert(0, indexedAnswers = new IndexedAnswers(values.Length));
-            }
-
-            indexedAnswers.prependAnswer(values);
-        }
-
-        /// <summary>
-        /// Match all clauses of the dynamic predicate with the name and with arity
-        /// arguments.Length.
-        /// If the predicate is not defined, return the result of YP.unknownPredicate.
-        /// </summary>
-        /// <param name="name">must be an Atom</param>
-        /// <param name="arguments">an array of arity number of arguments</param>
-        /// <returns>an iterator which you can use in foreach</returns>
-        public static IEnumerable<bool> matchDynamic(Atom name, object[] arguments)
-        {
-            List<IClause> clauses;
-            if (!_predicatesStore.TryGetValue(new NameArity(name, arguments.Length), out clauses))
-                return unknownPredicate(name, arguments.Length,
-                     "Undefined dynamic predicate: " + name + "/" + arguments.Length);
-
-            if (clauses.Count == 1)
-                // Usually there is only one clause, so return it without needing to wrap it in an iterator.
-                return clauses[0].match(arguments);
-            else
-                return matchAllClauses(clauses, arguments);
-        }
-
-        /// <summary>
-        /// Call match(arguments) for each IClause in clauses.  We make this a separate
-        /// function so that matchDynamic itself does not need to be an iterator object.
-        /// </summary>
-        /// <param name="clauses"></param>
-        /// <param name="arguments"></param>
-        /// <returns></returns>
-        private static IEnumerable<bool> matchAllClauses(List<IClause> clauses, object[] arguments)
-        {
-            // Debug: If the caller asserts another clause into this same predicate during yield, the iterator
-            //   over clauses will be corrupted.  Should we take the time to copy clauses?
-            foreach (IClause clause in clauses)
-            {
-                foreach (bool lastCall in clause.match(arguments))
-                {
-                    yield return false;
-                    if (lastCall)
-                        // This happens after a cut in a clause.
-                        yield break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// If _prologFlags["unknown"] is fail then return fail(), else if
-        ///   _prologFlags["unknown"] is warning then write the message to YP.write and
-        ///   return fail(), else throw a PrologException for existence_error.  .
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="arity"></param>
-        /// <param name="message"></param>
-        /// <returns></returns>
-        public static IEnumerable<bool> unknownPredicate(Atom name, int arity, string message)
-        {
-            establishPrologFlags();
-
-            if (_prologFlags["unknown"] == Atom.a("fail"))
-                return fail();
-            else if (_prologFlags["unknown"] == Atom.a("warning"))
-            {
-                write(message);
-                nl();
-                return fail();
-            }
-            else
-                throw new PrologException
-                    (new Functor2
-                     (Atom.a("existence_error"), Atom.a("procedure"),
-                      new Functor2(Atom.SLASH, name, arity)), message);
-        }
-
-        /// <summary>
-        /// This is deprecated and just calls matchDynamic. This matches all clauses,
-        /// not just the ones defined with assertFact.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="arguments"></param>
-        /// <returns></returns>
-        public static IEnumerable<bool> matchFact(Atom name, object[] arguments)
-        {
-            return matchDynamic(name, arguments);
-        }
-
-        public static IEnumerable<bool> clause(object Head, object Body)
-        {
-            Head = getValue(Head);
-            Body = getValue(Body);
-            if (Head is Variable)
-                throw new PrologException("instantiation_error", "Head is an unbound variable");
-
-            Atom name = getFunctorName(Head) as Atom;
-            if (name == null)
-                // name is a non-Atom, such as a number.
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("callable"), Head), "Head is not callable");
-            object[] args = getFunctorArgs(Head);
-            if (isSystemPredicate(name, args.Length))
-                throw new PrologException
-                    (new Functor3("permission_error", Atom.a("access"), Atom.a("private_procedure"),
-                                  new Functor2(Atom.SLASH, name, args.Length)),
-                     "clause cannot access private predicate " + name + "/" + args.Length);
-            if (!(Body is Variable) && !(YP.getFunctorName(Body) is Atom))
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("callable"), Body), "Body is not callable");
-
-            List<IClause> clauses;
-            if (!_predicatesStore.TryGetValue(new NameArity(name, args.Length), out clauses))
-                yield break;
-            // The caller can assert another clause into this same predicate during yield, so we have to
-            //   make a copy of the clauses.
-            foreach (IClause predicateClause in clauses.ToArray())
-            {
-                foreach (bool l1 in predicateClause.clause(Head, Body))
-                    yield return false;
-            }
-        }
-
-        public static IEnumerable<bool> retract(object Term)
-        {
-            Term = getValue(Term);
-            if (Term is Variable)
-                throw new PrologException("instantiation_error", "Term to retract is an unbound variable");
-
-            object Head, Body;
-            if (Term is Functor2 && ((Functor2)Term)._name == Atom.RULE)
-            {
-                Head = YP.getValue(((Functor2)Term)._arg1);
-                Body = YP.getValue(((Functor2)Term)._arg2);
-            }
-            else
-            {
-                Head = Term;
-                Body = Atom.a("true");
-            }
-            if (Head is Variable)
-                throw new PrologException("instantiation_error", "Head is an unbound variable");
-
-            Atom name = getFunctorName(Head) as Atom;
-            if (name == null)
-                // name is a non-Atom, such as a number.
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("callable"), Head), "Head is not callable");
-            object[] args = getFunctorArgs(Head);
-            if (isSystemPredicate(name, args.Length))
-                throw new PrologException
-                    (new Functor3("permission_error", Atom.a("modify"), Atom.a("static_procedure"),
-                        new Functor2(Atom.SLASH, name, args.Length)),
-                     "clause cannot access private predicate " + name + "/" + args.Length);
-            if (!(Body is Variable) && !(YP.getFunctorName(Body) is Atom))
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("callable"), Body), "Body is not callable");
-
-            List<IClause> clauses;
-            if (!_predicatesStore.TryGetValue(new NameArity(name, args.Length), out clauses))
-                yield break;
-            // The caller can assert another clause into this same predicate during yield, so we have to
-            //   make a copy of the clauses.
-            foreach (IClause predicateClause in clauses.ToArray())
-            {
-                if (predicateClause is IndexedAnswers)
-                {
-                    // IndexedAnswers handles its own retract.  Even if it removes all of its
-                    //   answers, it is OK to leave it empty as one of the elements in clauses.
-                    foreach (bool l1 in ((IndexedAnswers)predicateClause).retract(Head, Body))
-                        yield return false;
-                }
-                else
-                {
-                    foreach (bool l1 in predicateClause.clause(Head, Body))
-                    {
-                        clauses.Remove(predicateClause);
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This is deprecated for backward compatibility.  You should use retractall.
-        /// </summary>
-        /// <param name="name">must be an Atom</param>
-        /// <param name="arguments">an array of arity number of arguments</param>
-        public static void retractFact(Atom name, object[] arguments)
-        {
-            retractall(Functor.make(name, arguments));
-        }
-
-        /// <summary>
-        /// Retract all dynamic clauses which unify with Head.  If this matches all clauses in a predicate,
-        /// the predicate is still defined.  To completely remove the predicate, see abolish.
-        /// </summary>
-        /// <param name="Head"></param>
-        public static void retractall(object Head)
-        {
-            object name = YP.getFunctorName(Head);
-            object[] arguments = getFunctorArgs(Head);
-            if (!(name is Atom))
-                return;
-            NameArity nameArity = new NameArity((Atom)name, arguments.Length);
-            List<IClause> clauses;
-            if (!_predicatesStore.TryGetValue(nameArity, out clauses))
-                // Can't find, so ignore.
-                return;
-
-            foreach (object arg in arguments)
-            {
-                if (!YP.var(arg))
-                    throw new InvalidOperationException
-                        ("Until matching retractall is supported, all arguments must be unbound to retract all clauses");
-            }
-            // Clear all clauses.
-            _predicatesStore[nameArity] = new List<IClause>();
-        }
-
-        /// <summary>
-        /// If NameSlashArity is var, match with all the dynamic predicates using the
-        /// Name/Artity form.
-        /// If NameSlashArity is not var, check if the Name/Arity exists as a static or
-        /// dynamic predicate.
-        /// </summary>
-        /// <param name="NameSlashArity"></param>
-        /// <param name="declaringClass">if not null, used to resolve references to the default
-        /// module Atom.a("")</param>
-        /// <returns></returns>
-        public static IEnumerable<bool> current_predicate(object NameSlashArity, Type declaringClass)
-        {
-            NameSlashArity = YP.getValue(NameSlashArity);
-            // First check if Name and Arity are nonvar so we can do a direct lookup.
-            if (YP.ground(NameSlashArity))
-            {
-                Functor2 NameArityFunctor = NameSlashArity as Functor2;
-                if (!(NameArityFunctor != null && NameArityFunctor._name == Atom.SLASH))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("predicate_indicator"), NameSlashArity),
-                         "Must be a name/arity predicate indicator");
-                object name = YP.getValue(NameArityFunctor._arg1);
-                object arity = YP.getValue(NameArityFunctor._arg2);
-                if (name is Variable || arity is Variable)
-                    throw new PrologException
-                        ("instantiation_error", "Predicate indicator name or arity is an unbound variable");
-                if (!(name is Atom && arity is int))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("predicate_indicator"), NameSlashArity),
-                         "Must be a name/arity predicate indicator");
-                if ((int)arity < 0)
-                    throw new PrologException
-                        (new Functor2("domain_error", Atom.a("not_less_than_zero"), arity),
-                         "Arity may not be less than zero");
-
-                if (YPCompiler.isCurrentPredicate((Atom)name, (int)arity, declaringClass))
-                    // The predicate is defined.
-                    yield return false;
-            }
-            else
-            {
-                foreach (NameArity key in _predicatesStore.Keys)
-                {
-                    foreach (bool l1 in YP.unify
-                        (new Functor2(Atom.SLASH, key._name, key._arity), NameSlashArity))
-                        yield return false;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Return true if the dynamic predicate store has an entry for the predicate
-        /// with name and arity.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="arity"></param>
-        /// <returns></returns>
-        public static bool isDynamicCurrentPredicate(Atom name, int arity)
-        {
-            return _predicatesStore.ContainsKey(new NameArity(name, arity));
-        }
-
-        public static void abolish(object NameSlashArity)
-        {
-            NameSlashArity = YP.getValue(NameSlashArity);
-            if (NameSlashArity is Variable)
-                throw new PrologException
-                    ("instantiation_error", "Predicate indicator is an unbound variable");
-            Functor2 NameArityFunctor = NameSlashArity as Functor2;
-            if (!(NameArityFunctor != null && NameArityFunctor._name == Atom.SLASH))
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("predicate_indicator"), NameSlashArity),
-                     "Must be a name/arity predicate indicator");
-            object name = YP.getValue(NameArityFunctor._arg1);
-            object arity = YP.getValue(NameArityFunctor._arg2);
-            if (name is Variable || arity is Variable)
-                throw new PrologException
-                    ("instantiation_error", "Predicate indicator name or arity is an unbound variable");
-            if (!(name is Atom))
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("atom"), name),
-                     "Predicate indicator name must be an atom");
-            if (!(arity is int))
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("integer"), arity),
-                     "Predicate indicator arity must be an integer");
-            if ((int)arity < 0)
-                throw new PrologException
-                    (new Functor2("domain_error", Atom.a("not_less_than_zero"), arity),
-                     "Arity may not be less than zero");
-            if ((int)arity > MAX_ARITY)
-                throw new PrologException
-                    (new Functor1("representation_error", Atom.a("max_arity")),
-                     "Arity may not be greater than " + MAX_ARITY);
-
-            if (isSystemPredicate((Atom)name, (int)arity))
-                throw new PrologException
-                    (new Functor3("permission_error", Atom.a("modify"), Atom.a("static_procedure"),
-                                  new Functor2(Atom.SLASH, name, arity)),
-                     "Abolish cannot modify static predicate " + name + "/" + arity);
-            _predicatesStore.Remove(new NameArity((Atom)name, (int)arity));
-        }
-
-        /// <summary>
-        /// If Goal is a simple predicate, call YP.getFunctorName(Goal) using arguments from
-        /// YP.getFunctorArgs(Goal). If not found, this throws a PrologException for existence_error.
-        /// Otherwise, compile the goal as a single clause predicate and invoke it.
-        /// </summary>
-        /// <param name="Goal"></param>
-        /// <param name="declaringClass">if not null, used to resolve references to the default
-        /// module Atom.a("")</param>
-        /// <returns></returns>
-        public static IEnumerable<bool> getIterator(object Goal, Type declaringClass)
-        {
-            Atom name;
-            object[] args;
-            while (true)
-            {
-                Goal = YP.getValue(Goal);
-                if (Goal is Variable)
-                    throw new PrologException("instantiation_error", "Goal to call is an unbound variable");
-                name = YP.getFunctorName(Goal) as Atom;
-                if (name == null)
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("callable"), Goal), "Goal to call is not callable");
-                args = YP.getFunctorArgs(Goal);
-                if (name == Atom.HAT && args.Length == 2)
-                    // Assume this is called from a bagof operation.  Skip the leading qualifiers.
-                    Goal = YP.getValue(((Functor2)Goal)._arg2);
-                else
-                    break;
-            }
-
-            IEnumerable<bool> simpleIterator = YPCompiler.getSimpleIterator(name, args, declaringClass);
-            if (simpleIterator != null)
-                // We don't need to compile since the goal is a simple predicate which we call directly.
-                return simpleIterator;
-
-            // Compile the goal as a clause.
-            List<Variable> variableSetList = new List<Variable>();
-            addUniqueVariables(Goal, variableSetList);
-            Variable[] variableSet = variableSetList.ToArray();
-
-            // Use Atom.F since it is ignored.
-            return YPCompiler.compileAnonymousClause
-                (Functor.make(Atom.F, variableSet), Goal, declaringClass).match(variableSet);
-        }
-
-        public static void throwException(object Term)
-        {
-            throw new PrologException(Term);
-        }
-        /// <summary>
-        /// This must be called by any function that uses YP._prologFlags to make sure
-        /// the initial defaults are loaded.
-        /// </summary>
-        private static void establishPrologFlags()
-        {
-            if (_prologFlags.Count > 0)
-                // Already established.
-                return;
-
-            // List these in the order they appear in the ISO standard.
-            _prologFlags["bounded"] = Atom.a("true");
-            _prologFlags["max_integer"] = Int32.MaxValue;
-            _prologFlags["min_integer"] = Int32.MinValue;
-            _prologFlags["integer_rounding_function"] = Atom.a("toward_zero");
-            _prologFlags["char_conversion"] = Atom.a("off");
-            _prologFlags["debug"] = Atom.a("off");
-            _prologFlags["max_arity"] = MAX_ARITY;
-            _prologFlags["unknown"] = Atom.a("error");
-            _prologFlags["double_quotes"] = Atom.a("codes");
-        }
-
-        public static IEnumerable<bool> current_prolog_flag(object Key, object Value)
-        {
-            establishPrologFlags();
-
-            Key = YP.getValue(Key);
-            Value = YP.getValue(Value);
-
-            if (Key is Variable)
-            {
-                // Bind all key values.
-                foreach (string key in _prologFlags.Keys)
-                {
-                    foreach (bool l1 in YP.unify(Key, Atom.a(key)))
-                    {
-                        foreach (bool l2 in YP.unify(Value, _prologFlags[key]))
-                            yield return false;
-                    }
-                }
-            }
-            else
-            {
-                if (!(Key is Atom))
-                    throw new PrologException
-                        (new Functor2("type_error", Atom.a("atom"), Key), "Arg 1 Key is not an atom");
-                if (!_prologFlags.ContainsKey(((Atom)Key)._name))
-                    throw new PrologException
-                        (new Functor2("domain_error", Atom.a("prolog_flag"), Key),
-                        "Arg 1 Key is not a recognized flag");
-
-                foreach (bool l1 in YP.unify(Value, _prologFlags[((Atom)Key)._name]))
-                    yield return false;
-            }
-        }
-
-        public static void set_prolog_flag(object Key, object Value)
-        {
-            establishPrologFlags();
-
-            Key = YP.getValue(Key);
-            Value = YP.getValue(Value);
-
-            if (Key is Variable)
-                throw new PrologException(Atom.a("instantiation_error"),
-                    "Arg 1 Key is an unbound variable");
-            if (Value is Variable)
-                throw new PrologException(Atom.a("instantiation_error"),
-                    "Arg 1 Key is an unbound variable");
-            if (!(Key is Atom))
-                throw new PrologException
-                    (new Functor2("type_error", Atom.a("atom"), Key), "Arg 1 Key is not an atom");
-
-            string keyName = ((Atom)Key)._name;
-            if (!_prologFlags.ContainsKey(keyName))
-                throw new PrologException
-                    (new Functor2("domain_error", Atom.a("prolog_flag"), Key),
-                    "Arg 1 Key " + Key + " is not a recognized flag");
-
-            bool valueIsOK = false;
-            if (keyName == "char_conversion")
-                valueIsOK = (Value == _prologFlags[keyName]);
-            else if (keyName == "debug")
-                valueIsOK = (Value == _prologFlags[keyName]);
-            else if (keyName == "unknown")
-                valueIsOK = (Value == Atom.a("fail") || Value == Atom.a("warning") ||
-                    Value == Atom.a("error"));
-            else if (keyName == "double_quotes")
-                valueIsOK = (Value == Atom.a("codes") || Value == Atom.a("chars") ||
-                    Value == Atom.a("atom"));
-            else
-                throw new PrologException
-                    (new Functor3("permission_error", Atom.a("modify"), Atom.a("flag"), Key),
-                     "May not modify Prolog flag " + Key);
-
-            if (!valueIsOK)
-                throw new PrologException
-                    (new Functor2("domain_error", Atom.a("flag_value"), new Functor2("+", Key, Value)),
-                    "May not set arg 1 Key " + Key + " to arg 2 Value " + Value);
-
-            _prologFlags[keyName] = Value;
-        }
-        /// <summary>
-        /// script_event calls hosting script with events as a callback method.
-        /// </summary>
-        /// <param name="script_event"></param>
-        /// <param name="script_params"></param>
-        /// <returns></returns>
-        public static IEnumerable<bool> script_event(object script_event, object script_params)
-        {
-            // string function = ((Atom)YP.getValue(script_event))._name;
-            object[] array = ListPair.toArray(script_params);
-            if (array == null)
-                yield return false;  // return; // YP.fail();
-            if (array.Length > 1)
-            {
-                //m_CmdManager.m_ScriptEngine.m_EventQueManager.AddToScriptQueue
-                //(localID, itemID, function, array);
-                // sortArray(array);
-            }
-            //return YP.unify(Sorted, ListPair.makeWithoutRepeatedTerms(array));
-            yield return false;
-        }
-
-        /* Non-prolog-ish functions for inline coding */
-        public static string regexString(string inData, string inPattern, string presep,string postsep)
-        {
-            //string str=cycMessage;
-            //string strMatch = @"\. \#\$(.*)\)";
-            string results = "";
-            for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch())
-            {
-                //m_log.Debug(m);
-                results += presep+ m + postsep;
-            }
-            return results;
-        }
-
-        public static string cycComm(object msgobj)
-        {
-            string cycInputString = msgobj.ToString();
-            string cycOutputString="";
-            TcpClient socketForServer;
-
-            try
-            {
-                socketForServer = new TcpClient("localHost", 3601);
-            }
-            catch
-            {
-                m_log.Error("Failed to connect to server at localhost:999");
-                return "";
-            }
-
-            NetworkStream networkStream = socketForServer.GetStream();
-
-            System.IO.StreamReader streamReader = new System.IO.StreamReader(networkStream);
-
-            System.IO.StreamWriter streamWriter = new System.IO.StreamWriter(networkStream);
-
-            try
-            {
-                // read the data from the host and display it
-
-                {
-
-                    streamWriter.WriteLine(cycInputString);
-                    streamWriter.Flush();
-
-                    cycOutputString = streamReader.ReadLine();
-                    m_log.Debug("Cycoutput:" + cycOutputString);
-                    //streamWriter.WriteLine("Client Message");
-                    //m_log.Debug("Client Message");
-                    streamWriter.Flush();
-                }
-
-            }
-            catch
-            {
-                m_log.Error("Exception reading from Server");
-                return "";
-            }
-            // tidy up
-            networkStream.Close();
-            return cycOutputString;
-
-        }
-        //public static void throwException(object Term)
-        //{
-        //    throw new PrologException(Term);
-        //}
-        /// <summary>
-        /// An enumerator that does zero loops.
-        /// </summary>
-        private class Fail : IEnumerator<bool>, IEnumerable<bool>
-        {
-            public bool MoveNext()
-            {
-                return false;
-            }
-
-            public IEnumerator<bool> GetEnumerator()
-            {
-                return (IEnumerator<bool>)this;
-            }
-
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
-
-            public bool Current
-            {
-                get { return true; }
-            }
-
-            object IEnumerator.Current
-            {
-                get { return true; }
-            }
-
-            public void Dispose()
-            {
-            }
-
-            public void Reset()
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        /// <summary>
-        /// An enumerator that does one iteration.
-        /// </summary>
-        private class Succeed : IEnumerator<bool>, IEnumerable<bool>
-        {
-            private bool _didIteration = false;
-
-            public bool MoveNext()
-            {
-                if (!_didIteration)
-                {
-                    _didIteration = true;
-                    return true;
-                }
-                else
-                    return false;
-            }
-
-            public IEnumerator<bool> GetEnumerator()
-            {
-                return (IEnumerator<bool>)this;
-            }
-
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
-
-            public bool Current
-            {
-                get { return false; }
-            }
-
-            object IEnumerator.Current
-            {
-                get { return false; }
-            }
-
-            public void Dispose()
-            {
-            }
-
-            public void Reset()
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        /// <summary>
-        /// An enumerator that repeats forever.
-        /// </summary>
-        private class Repeat : IEnumerator<bool>, IEnumerable<bool>
-        {
-            public bool MoveNext()
-            {
-                return true;
-            }
-
-            public IEnumerator<bool> GetEnumerator()
-            {
-                return (IEnumerator<bool>)this;
-            }
-
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
-
-            public bool Current
-            {
-                get { return false; }
-            }
-
-            object IEnumerator.Current
-            {
-                get { return false; }
-            }
-
-            public void Dispose()
-            {
-            }
-
-            public void Reset()
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        /// <summary>
-        /// An enumerator that wraps another enumerator in order to catch a PrologException.
-        /// </summary>
-        public class Catch : IEnumerator<bool>, IEnumerable<bool>
-        {
-            private IEnumerator<bool> _enumerator;
-            private PrologException _exception = null;
-
-            /// <summary>
-            /// Call YP.getIterator(Goal, declaringClass) and save the returned iterator.
-            /// If getIterator throws an exception, save it the same as MoveNext().
-            /// </summary>
-            /// <param name="Goal"></param>
-            /// <param name="declaringClass"></param>
-            public Catch(object Goal, Type declaringClass)
-            {
-                try
-            {
-                    _enumerator = getIterator(Goal, declaringClass).GetEnumerator();
-                }
-                catch (PrologException exception)
-                {
-                    // MoveNext() will check this.
-                    _exception = exception;
-                }
-            }
-
-            /// <summary>
-            /// Call _enumerator.MoveNext().  If it throws a PrologException, set _exception
-            /// and return false.  After this returns false, call unifyExceptionOrThrow.
-            /// </summary>
-            /// <returns></returns>
-            public bool MoveNext()
-            {
-                if (_exception != null)
-                    return false;
-
-                try
-                {
-                    return _enumerator.MoveNext();
-                }
-                catch (PrologException exception)
-                {
-                    _exception = exception;
-                    return false;
-                }
-            }
-
-            /// <summary>
-            /// Call this after MoveNext() returns false to check for an exception.  If
-            /// MoveNext did not get a PrologException, don't yield.
-            /// Otherwise, unify the exception with Catcher and yield so the caller can
-            /// do the handler code.  However, if can't unify with Catcher then throw the exception.
-            /// </summary>
-            /// <param name="Catcher"></param>
-            /// <returns></returns>
-            public IEnumerable<bool> unifyExceptionOrThrow(object Catcher)
-            {
-                if (_exception != null)
-                {
-                    bool didUnify = false;
-                    foreach (bool l1 in YP.unify(_exception._term, Catcher))
-                    {
-                        didUnify = true;
-                        yield return false;
-                    }
-                    if (!didUnify)
-                        throw _exception;
-                }
-            }
-
-            public IEnumerator<bool> GetEnumerator()
-            {
-                return (IEnumerator<bool>)this;
-            }
-
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
-
-            public bool Current
-            {
-                get { return _enumerator.Current; }
-            }
-
-            object IEnumerator.Current
-            {
-                get { return _enumerator.Current; }
-            }
-
-            public void Dispose()
-            {
-                if (_enumerator != null)
-                _enumerator.Dispose();
-            }
-
-            public void Reset()
-            {
-                throw new NotImplementedException();
-            }
-        }
-        #pragma warning restore 0168, 0219
-        /// <summary>
-        /// A ClauseHeadAndBody is used in Compiler.compileAnonymousFunction as a base class
-        /// in order to implement YP.IClause.  After creating the object, you must call setHeadAndBody.
-        /// </summary>
-        public class ClauseHeadAndBody
-        {
-            private object _Head;
-            private object _Body;
-
-            public void setHeadAndBody(object Head, object Body)
-            {
-                _Head = Head;
-                _Body = Body;
-            }
-
-            public IEnumerable<bool> clause(object Head, object Body)
-            {
-                if (_Head == null || _Body == null)
-                    yield break;
-
-                #pragma warning disable 0168, 0219
-                foreach (bool l1 in YP.unify(Head, _Head))
-                {
-                    foreach (bool l2 in YP.unify(Body, _Body))
-                        yield return false;
-                }
-                #pragma warning restore 0168, 0219
-            }
-        }
-
-        /// <summary>
-        /// CodeListReader extends TextReader and overrides Read to read the next code from
-        /// the CodeList which is a Prolog list of integer character codes.
-        /// </summary>
-        public class CodeListReader : TextReader
-        {
-            private object _CodeList;
-
-            public CodeListReader(object CodeList)
-            {
-                _CodeList = YP.getValue(CodeList);
-            }
-
-            /// <summary>
-            /// If the head of _CodeList is an integer, return it and advance the list.  Otherwise,
-            /// return -1 for end of file.
-            /// </summary>
-            /// <returns></returns>
-            public override int Read()
-            {
-                Functor2 CodeListPair = _CodeList as Functor2;
-                int code;
-                if (!(CodeListPair != null && CodeListPair._name == Atom.DOT &&
-                    getInt(CodeListPair._arg1, out code)))
-                {
-                    _CodeList = Atom.NIL;
-                    return -1;
-                }
-
-                // Advance.
-                _CodeList = YP.getValue(CodeListPair._arg2);
-                return code;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YPCompiler.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YPCompiler.cs
deleted file mode 100644
index c6a6748..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YPCompiler.cs
+++ /dev/null
@@ -1,6382 +0,0 @@
-/*
- * Copyright (C) 2007-2008, Jeff Thompson
- * 
- * All rights reserved.
- * 
- * 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 copyright holder 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 COPYRIGHT OWNER OR
- * 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.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.CodeDom.Compiler;
-using System.Reflection;
-
-namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
-{
-    public class YPCompiler
-    {
-        private class CompilerState
-        {
-            public IndexedAnswers _pred = new IndexedAnswers(4);
-            public Dictionary<YP.NameArity, Atom> _moduleForNameArity = new Dictionary<YP.NameArity, Atom>();
-            public int _gensymCounter;
-            public bool _useFinalCutCode;
-            public Variable _finalCutCode;
-            public bool _codeUsesYield;
-            public Atom _determinism;
-            // a list of '='(Name, Variable)
-            public List<object> _variableNames;
-
-            // Make these static functions that explicitly take the State so Prolog can call it.
-
-            /// <summary>
-            /// Make a new CompilerState and bind it to State.
-            /// </summary>
-            /// <param name="State"></param>
-            /// <returns></returns>
-            public static IEnumerable<bool> make(object State)
-            {
-                return YP.unify(State, new CompilerState());
-            }
-
-            public static void assertPred(object State, object Pred, object Determinism)
-            {
-                State = YP.getValue(State);
-                object functorName = YP.getFunctorName(Pred);
-                object[] functorArgs = YP.getFunctorArgs(Pred);
-                // Debug: Should check if it's already asserted and is the same.
-                ((CompilerState)State)._pred.addAnswer
-                    (new object[] { functorName, functorArgs.Length, Pred, YP.getValue(Determinism) });
-            }
-
-            public static void assertModuleForNameArity(object State, object Name, object Arity, object Module)
-            {
-                State = YP.getValue(State);
-                Name = YP.getValue(Name);
-                Arity = YP.getValue(Arity);
-                Module = YP.getValue(Module);
-                // If the Module Atom comes from the parser, it always has null _declaringClass.
-                if (Module is Atom && ((Atom)Module)._module == null && Name is Atom && Arity is int)
-                    // Replace a previous entry if it exists.
-                    ((CompilerState)State)._moduleForNameArity[new YP.NameArity((Atom)Name, (int)Arity)] =
-                        (Atom)Module;
-            }
-
-            public static void startFunction(object State, object Head)
-            {
-                State = YP.getValue(State);
-                ((CompilerState)State)._gensymCounter = 0;
-                ((CompilerState)State)._useFinalCutCode = false;
-                ((CompilerState)State)._finalCutCode = new Variable();
-                ((CompilerState)State)._codeUsesYield = false;
-                if (CompilerState.isDetNoneOut(State, Head))
-                    ((CompilerState)State)._determinism = Atom.a("detNoneOut");
-                else if (CompilerState.isSemidetNoneOut(State, Head))
-                    ((CompilerState)State)._determinism = Atom.a("semidetNoneOut");
-                else
-                    ((CompilerState)State)._determinism = Atom.a("nondet");
-            }
-
-            public static void setCodeUsesYield(object State)
-            {
-                State = YP.getValue(State);
-                ((CompilerState)State)._codeUsesYield = true;
-            }
-
-            public static bool codeUsesYield(object State)
-            {
-                State = YP.getValue(State);
-                return ((CompilerState)State)._codeUsesYield;
-            }
-
-            public static bool determinismEquals(object State, object Term)
-            {
-                State = YP.getValue(State);
-                return YP.termEqual(((CompilerState)State)._determinism, Term);
-            }
-
-            /// <summary>
-            /// Set _variableNames to a new list of (Name = Variable) for each unique variable in rule.
-            /// If the variable is in variableNameSuggestions, use it, otherwise use x1, x2, etc.
-            /// </summary>
-            /// <param name="State"></param>
-            /// <param name="rule"></param>
-            /// <param name="variableNameSuggestions"></param>
-            public static void newVariableNames(object State, object Rule, object VariableNameSuggestions)
-            {
-                State = YP.getValue(State);
-                List<Variable> variablesSet = new List<Variable>();
-                YP.addUniqueVariables(Rule, variablesSet);
-
-                ((CompilerState)State)._variableNames = new List<object>();
-                int xCounter = 0;
-                foreach (Variable variable in variablesSet)
-                    ((CompilerState)State)._variableNames.Add
-                        (new Functor2(Atom.a("="), makeVariableName(variable, VariableNameSuggestions, ++xCounter),
-                                      variable));
-            }
-
-            private static object makeVariableName(object variable, object variableNameSuggestions, int xCounter)
-            {
-                // Debug: should require named variables to start with _ or capital. Should
-                //   check for duplicates and clashes with keywords.
-                for (object element = YP.getValue(variableNameSuggestions);
-                     element is Functor2 && ((Functor2)element)._name == Atom.DOT;
-                     element = YP.getValue(((Functor2)element)._arg2))
-                {
-                    object suggestionPair = YP.getValue(((Functor2)element)._arg1);
-                    if (sameVariable(variable, ((Functor2)suggestionPair)._arg2))
-                    {
-                        Atom suggestion = (Atom)YP.getValue(((Functor2)suggestionPair)._arg1);
-                        if (suggestion.Equals(Atom.a("Atom")))
-                            suggestion = Atom.a("Atom_1");
-                        if (suggestion.Equals(Atom.a("Variable")))
-                            suggestion = Atom.a("Variable_1");
-                        if (suggestion.Equals(Atom.a("Functor")))
-                            suggestion = Atom.a("Functor_1");
-                        return suggestion;
-                    }
-                }
-
-                return Atom.a("x" + xCounter);
-            }
-
-            /// <summary>
-            /// Unify Result with the name assigned by CompilerState.newVariableNames in State._variableNames
-            ///   for variable.
-            /// </summary>
-            /// <param name="variable">a Variable</param>
-            /// <param name="State"></param>
-            /// <param name="Result">the assigned Name</param>
-            public static IEnumerable<bool> getVariableName(object State, object variable, object Result)
-            {
-                State = YP.getValue(State);
-                foreach (object variableInfo in ((CompilerState)State)._variableNames)
-                {
-                    if (variableInfo is Functor2 && ((Functor2)variableInfo)._name.Equals(Atom.a("=")))
-                    {
-                        if (sameVariable(variable, ((Functor2)variableInfo)._arg2))
-                            return YP.unify(Result, ((Functor2)variableInfo)._arg1);
-                    }
-                }
-
-                // We set up names for all unique variables, so this should never happen.
-                throw new PrologException(Atom.a("Can't find entry in _variableNames"));
-            }
-
-            public static IEnumerable<bool> variableNamesList(object State, object VariableNamesList)
-            {
-                State = YP.getValue(State);
-                return YP.unify(VariableNamesList, ListPair.make(((CompilerState)State)._variableNames));
-            }
-
-            public static IEnumerable<bool> gensym(object State, object Base, object Symbol)
-            {
-                State = YP.getValue(State);
-                return YP.unify(Symbol, Atom.a(Base.ToString() + ++((CompilerState)State)._gensymCounter));
-            }
-
-            // disable warning on l1, don't see how we can
-            // code this differently
-            #pragma warning disable 0168, 0164, 0162, 0219
-            public static bool isDetNoneOut(object State, object Term)
-            {
-                State = YP.getValue(State);
-                object functorName = YP.getFunctorName(Term);
-                object[] functorArgs = YP.getFunctorArgs(Term);
-
-                Variable pred = new Variable();
-                foreach (bool l1 in ((CompilerState)State)._pred.match
-                    (new object[] { functorName, functorArgs.Length, pred, Atom.a("det") }))
-                {
-                    if (CompilerState.isNoneOut(YP.getFunctorArgs(pred.getValue())))
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-
-            public static bool isSemidetNoneOut(object State, object Term)
-            {
-                State = YP.getValue(State);
-                object functorName = YP.getFunctorName(Term);
-                object[] functorArgs = YP.getFunctorArgs(Term);
-
-                Variable pred = new Variable();
-                foreach (bool l1 in ((CompilerState)State)._pred.match
-                    (new object[] { functorName, functorArgs.Length, pred, Atom.a("semidet") }))
-                {
-                    if (CompilerState.isNoneOut(YP.getFunctorArgs(pred.getValue())))
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-            #pragma warning restore 0168, 0164, 0162, 0219
-
-            /// <summary>
-            /// Return false if any of args is out, otherwise true.
-            /// args is an array of ::(Type,Mode) where Mode is in or out.
-            /// </summary>
-            /// <param name="args"></param>
-            /// <returns></returns>
-            private static bool isNoneOut(object[] args)
-            {
-                foreach (object arg in args)
-                {
-                    if (arg is Functor2 && ((Functor2)arg)._name == Atom.a("::") &&
-                        ((Functor2)arg)._arg2 == Atom.a("out"))
-                        return false;
-                }
-                return true;
-            }
-
-            public static bool nameArityHasModule(object State, object Name, object Arity, object Module)
-            {
-                State = YP.getValue(State);
-                Name = YP.getValue(Name);
-                Arity = YP.getValue(Arity);
-                Module = YP.getValue(Module);
-                if (Name is Atom && Arity is int)
-                {
-                    Atom FoundModule;
-                    if (!((CompilerState)State)._moduleForNameArity.TryGetValue
-                         (new YP.NameArity((Atom)Name, (int)Arity), out FoundModule))
-                        return false;
-                    return FoundModule == Module;
-                }
-                return false;
-            }
-        }
-
-        // disable warning on l1, don't see how we can
-        // code this differently
-        #pragma warning disable 0168, 0219,0164,0162
-
-        /// <summary>
-        /// Use makeFunctionPseudoCode, convertFunctionCSharp and compileAnonymousFunction
-        /// to return an anonymous YP.IClause for the Head and Body of a rule clause.
-        /// </summary>
-        /// <param name="Head">a prolog term such as new Functor2("test1", X, Y).
-        /// Note that the name of the head is ignored.
-        /// </param>
-        /// <param name="Body">a prolog term such as 
-        /// new Functor2(",", new Functor1(Atom.a("test2", Atom.a("")), X), 
-        ///              new Functor2("=", Y, X)).
-        /// This may not be null.  (For a head-only clause, set the Body to Atom.a("true").
-        /// </param>
-        /// <param name="declaringClass">if not null, the code is compiled as a subclass of this class
-        /// to resolve references to the default module Atom.a("")</param>
-        /// <returns>a new YP.IClause object on which you can call match(object[] args) where
-        /// args length is the arity of the Head</returns>
-        public static YP.IClause compileAnonymousClause(object Head, object Body, Type declaringClass)
-        {
-            object[] args = YP.getFunctorArgs(Head);
-            // compileAnonymousFunction wants "function".
-            object Rule = new Functor2(Atom.RULE, Functor.make("function", args), Body);
-            object RuleList = ListPair.make(new Functor2(Atom.F, Rule, Atom.NIL));
-
-            StringWriter functionCode = new StringWriter();
-            Variable SaveOutputStream = new Variable();
-            foreach (bool l1 in YP.current_output(SaveOutputStream))
-            {
-                try
-                {
-                    YP.tell(functionCode);
-                    Variable PseudoCode = new Variable();
-                    foreach (bool l2 in makeFunctionPseudoCode(RuleList, PseudoCode))
-                    {
-                        if (YP.termEqual(PseudoCode, Atom.a("getDeclaringClass")))
-                            // Ignore getDeclaringClass since we have access to the one passed in.
-                            continue;
-
-                        convertFunctionCSharp(PseudoCode);
-                    }
-                    YP.told();
-                }
-                finally
-                {
-                    // Restore after calling tell.
-                    YP.tell(SaveOutputStream.getValue());
-                }
-            }
-            return YPCompiler.compileAnonymousFunction
-                (functionCode.ToString(), args.Length, declaringClass);
-        }
-
-        /// <summary>
-        /// Use CodeDomProvider to compile the functionCode and return a YP.ClauseHeadAndBody
-        ///   which implements YP.IClause.
-        /// The function name must be "function" and have nArgs arguments.
-        /// </summary>
-        /// <param name="functionCode">the code for the iterator, such as
-        /// "public static IEnumerable<bool> function() { yield return false; }"
-        /// </param>
-        /// <param name="nArgs">the number of args in the function</param>
-        /// <param name="declaringClass">if not null, then use the functionCode inside a class which
-        /// inherits from contextClass, so that references in functionCode to methods in declaringClass don't
-        /// have to be qualified</param>
-        /// <returns>a new YP.IClause object on which you can call match(object[] args) where
-        /// args length is nArgs</returns>
-        public static YP.IClause compileAnonymousFunction(string functionCode, int nArgs, Type declaringClass)
-        {
-            CompilerParameters parameters = new CompilerParameters();
-            // This gets the location of the System assembly.
-            parameters.ReferencedAssemblies.Add(typeof(System.Int32).Assembly.Location);
-            // This gets the location of this assembly which also has YieldProlog.YP, etc.
-            parameters.ReferencedAssemblies.Add(typeof(YPCompiler).Assembly.Location);
-            if (declaringClass != null)
-                parameters.ReferencedAssemblies.Add(declaringClass.Assembly.Location);
-            parameters.GenerateInMemory = true;
-
-            StringBuilder sourceCode = new StringBuilder();
-            sourceCode.Append(@"
-using System;
-using System.Collections.Generic;
-using OpenSim.Region.ScriptEngine.Shared.YieldProlog;
-
-namespace Temporary {
-  public class Temporary : YP.ClauseHeadAndBody, YP.IClause {");
-            if (declaringClass == null)
-                // We don't extend a class with getDeclaringClass, so define it.
-                sourceCode.Append(@"
-    public class Inner {
-      public static System.Type getDeclaringClass() { return null; }
-");
-            else
-                sourceCode.Append(@"
-    public class Inner : " + declaringClass.FullName + @" {
-");
-            sourceCode.Append(functionCode);
-            // Basically, match applies the args to function.
-            sourceCode.Append(@"
-    }
-    public IEnumerable<bool> match(object[] args) {
-      return Inner.function(");
-            if (nArgs >= 1)
-                sourceCode.Append("args[0]");
-            for (int i = 1; i < nArgs; ++i)
-                sourceCode.Append(", args[" + i + "]");
-            sourceCode.Append(@");
-    }
-  }
-}
-");
-
-            CompilerResults results = CodeDomProvider.CreateProvider
-                ("CSharp").CompileAssemblyFromSource(parameters, sourceCode.ToString());
-            if (results.Errors.Count > 0)
-                throw new Exception("Error evaluating code: " + results.Errors[0]);
-
-            // Return a new Temporary.Temporary object.
-            return (YP.IClause)results.CompiledAssembly.GetType
-                ("Temporary.Temporary").GetConstructor(Type.EmptyTypes).Invoke(null);
-        }
-
-        /// <summary>
-        /// If the functor with name and args can be called directly as determined by
-        ///   functorCallFunctionName, then call it and return its iterator.  If the predicate is
-        ///   dynamic and undefined, or if static and the method cannot be found, return
-        ///   the result of YP.unknownPredicate.
-        /// This returns null if the functor has a special form than needs to be compiled 
-        ///   (including ,/2 and ;/2).
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="args"></param>
-        /// <param name="declaringClass">used to resolve references to the default 
-        /// module Atom.a(""). If a declaringClass is needed to resolve the reference but it is
-        ///   null, this throws a PrologException for existence_error</param>
-        /// <returns></returns>
-        public static IEnumerable<bool> getSimpleIterator(Atom name, object[] args, Type declaringClass)
-        {
-            CompilerState state = new CompilerState();
-            Variable FunctionName = new Variable();
-            foreach (bool l1 in functorCallFunctionName(state, name, args.Length, FunctionName))
-            {
-                Atom functionNameAtom = ((Atom)FunctionName.getValue());
-                if (functionNameAtom == Atom.NIL)
-                    // name is for a dynamic predicate.
-                    return YP.matchDynamic(name, args);
-
-                string methodName = functionNameAtom._name;
-                // Set the default for the method to call.
-                Type methodClass = declaringClass;
-
-                bool checkMode = false;
-                if (methodName.StartsWith("YP."))
-                {
-                    // Assume we only check mode in calls to standard Prolog predicates in YP.
-                    checkMode = true;
-
-                    // Use the method in class YP.
-                    methodName = methodName.Substring(3);
-                    methodClass = typeof(YP);
-                }
-                if (methodName.Contains("."))
-                    // We don't support calling inner classes, etc.
-                    return null;
-
-                if (methodClass == null)
-                    return YP.unknownPredicate
-                        (name, args.Length,
-                         "Cannot find predicate function for: " + name + "/" + args.Length + 
-                         " because declaringClass is null.  Set declaringClass to the class containing " +
-                         methodName);
-                try
-                {
-                    if (checkMode)
-                    {
-                        assertYPPred(state);
-                        object functor = Functor.make(name, args);
-                        if (CompilerState.isDetNoneOut(state, functor))
-                        {
-                            methodClass.InvokeMember
-                                (methodName, BindingFlags.InvokeMethod, null, null, args);
-                            return YP.succeed();
-                        }
-                        if (CompilerState.isSemidetNoneOut(state, functor))
-                        {
-                            if ((bool)methodClass.InvokeMember
-                                 (methodName, BindingFlags.InvokeMethod, null, null, args))
-                                return YP.succeed();
-                            else
-                                return YP.fail();
-                        }
-
-                    }
-                    return (IEnumerable<bool>)methodClass.InvokeMember
-                      (methodName, BindingFlags.InvokeMethod, null, null, args);
-                }
-                catch (TargetInvocationException exception)
-                {
-                    throw exception.InnerException;
-                }
-                catch (MissingMethodException)
-                {
-                    return YP.unknownPredicate
-                        (name, args.Length,
-                         "Cannot find predicate function " + methodName + " for " + name + "/" + args.Length + 
-                         " in " + methodClass.FullName);
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Return true if there is a dynamic or static predicate with name and arity.
-        /// This returns false for built-in predicates.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="arity"></param>
-        /// <param name="declaringClass">used to resolve references to the default 
-        /// module Atom.a(""). If a declaringClass is needed to resolve the reference but it is
-        ///   null, return false</param>
-        /// <returns></returns>
-        public static bool isCurrentPredicate(Atom name, int arity, Type declaringClass)
-        {
-            CompilerState state = new CompilerState();
-            Variable FunctionName = new Variable();
-            foreach (bool l1 in functorCallFunctionName(state, name, arity, FunctionName))
-            {
-                Atom functionNameAtom = ((Atom)FunctionName.getValue());
-                if (functionNameAtom == Atom.NIL)
-                    // name is for a dynamic predicate.
-                    return YP.isDynamicCurrentPredicate(name, arity);
-
-                string methodName = functionNameAtom._name;
-
-                if (methodName.StartsWith("YP."))
-                    // current_predicate/1 should fail for built-ins.
-                    return false;
-                if (methodName.Contains("."))
-                    // We don't support calling inner classes, etc.
-                    return false;
-                if (declaringClass == null)
-                    return false;
-
-                foreach (MemberInfo member in declaringClass.GetMember(methodName))
-                {
-                    MethodInfo method = member as MethodInfo;
-                    if (method == null)
-                        continue;
-                    if ((method.Attributes | MethodAttributes.Static) == 0)
-                        // Not a static method.
-                        continue;
-                    if (method.GetParameters().Length == arity)
-                        return true;
-                }
-            }
-
-            return false;
-        }
-
-        // Compiler output follows.
-
-        public class YPInnerClass { }
-        public static System.Type getDeclaringClass() { return typeof(YPInnerClass).DeclaringType; }
-
-        public static void repeatWrite(object arg1, object N)
-        {
-            {
-                object _Value = arg1;
-                if (YP.termEqual(N, 0))
-                {
-                    return;
-                }
-            }
-            {
-                object Value = arg1;
-                Variable NextN = new Variable();
-                YP.write(Value);
-                foreach (bool l2 in YP.unify(NextN, YP.subtract(N, 1)))
-                {
-                    repeatWrite(Value, NextN);
-                    return;
-                }
-            }
-        }
-
-        public static bool sameVariable(object Variable1, object Variable2)
-        {
-            {
-                if (YP.var(Variable1))
-                {
-                    if (YP.var(Variable2))
-                    {
-                        if (YP.termEqual(Variable1, Variable2))
-                        {
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-
-        public static IEnumerable<bool> makeFunctionPseudoCode(object RuleList, object FunctionCode)
-        {
-            {
-                Variable State = new Variable();
-                foreach (bool l2 in CompilerState.make(State))
-                {
-                    assertYPPred(State);
-                    processCompilerDirectives(RuleList, State);
-                    foreach (bool l3 in YP.unify(FunctionCode, Atom.a("getDeclaringClass")))
-                    {
-                        yield return false;
-                    }
-                    foreach (bool l3 in makeFunctionPseudoCode3(RuleList, State, FunctionCode))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static void assertYPPred(object State)
-        {
-            {
-                CompilerState.assertPred(State, Atom.a("nl"), Atom.a("det"));
-                CompilerState.assertPred(State, new Functor1("write", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("det"));
-                CompilerState.assertPred(State, new Functor1("put_code", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("det"));
-                CompilerState.assertPred(State, new Functor1("see", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("det"));
-                CompilerState.assertPred(State, Atom.a("seen"), Atom.a("det"));
-                CompilerState.assertPred(State, new Functor1("tell", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("det"));
-                CompilerState.assertPred(State, Atom.a("told"), Atom.a("det"));
-                CompilerState.assertPred(State, new Functor1("throw", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("det"));
-                CompilerState.assertPred(State, new Functor1("abolish", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("det"));
-                CompilerState.assertPred(State, new Functor1("retractall", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("det"));
-                CompilerState.assertPred(State, new Functor2("set_prolog_flag", new Functor2("::", Atom.a("univ"), Atom.a("in")), new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("det"));
-                CompilerState.assertPred(State, new Functor1("var", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor1("nonvar", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor1("atom", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor1("integer", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor1("float", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor1("number", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor1("atomic", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor1("compound", new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor2("==", new Functor2("::", Atom.a("univ"), Atom.a("in")), new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor2("\\==", new Functor2("::", Atom.a("univ"), Atom.a("in")), new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor2("@<", new Functor2("::", Atom.a("univ"), Atom.a("in")), new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor2("@=<", new Functor2("::", Atom.a("univ"), Atom.a("in")), new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor2("@>", new Functor2("::", Atom.a("univ"), Atom.a("in")), new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                CompilerState.assertPred(State, new Functor2("@>=", new Functor2("::", Atom.a("univ"), Atom.a("in")), new Functor2("::", Atom.a("univ"), Atom.a("in"))), Atom.a("semidet"));
-                return;
-            }
-        }
-
-        public static void processCompilerDirectives(object arg1, object arg2)
-        {
-            {
-                object _State = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    return;
-                }
-            }
-            {
-                object State = arg2;
-                Variable Pred = new Variable();
-                Variable Determinism = new Variable();
-                Variable x3 = new Variable();
-                Variable RestRules = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("f", new Functor1(":-", new Functor1("pred", new Functor2("is", Pred, Determinism))), x3), RestRules)))
-                {
-                    CompilerState.assertPred(State, Pred, Determinism);
-                    processCompilerDirectives(RestRules, State);
-                    return;
-                }
-            }
-            {
-                object State = arg2;
-                Variable Module = new Variable();
-                Variable PredicateList = new Variable();
-                Variable x3 = new Variable();
-                Variable RestRules = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("f", new Functor1(":-", new Functor2("import", Module, PredicateList)), x3), RestRules)))
-                {
-                    foreach (bool l3 in importPredicateList(State, Module, PredicateList))
-                    {
-                        processCompilerDirectives(RestRules, State);
-                        return;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable x1 = new Variable();
-                Variable x2 = new Variable();
-                Variable RestRules = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("f", new Functor1(":-", x1), x2), RestRules)))
-                {
-                    processCompilerDirectives(RestRules, State);
-                    return;
-                }
-            }
-            {
-                object State = arg2;
-                Variable Head = new Variable();
-                Variable _Body = new Variable();
-                Variable x3 = new Variable();
-                Variable RestRules = new Variable();
-                Variable Name = new Variable();
-                Variable Arity = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("f", new Functor2(":-", Head, _Body), x3), RestRules)))
-                {
-                    foreach (bool l3 in YP.functor(Head, Name, Arity))
-                    {
-                        CompilerState.assertModuleForNameArity(State, Name, Arity, Atom.a(""));
-                        processCompilerDirectives(RestRules, State);
-                        return;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable Fact = new Variable();
-                Variable x2 = new Variable();
-                Variable RestRules = new Variable();
-                Variable Name = new Variable();
-                Variable Arity = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("f", Fact, x2), RestRules)))
-                {
-                    foreach (bool l3 in YP.functor(Fact, Name, Arity))
-                    {
-                        CompilerState.assertModuleForNameArity(State, Name, Arity, Atom.a(""));
-                        processCompilerDirectives(RestRules, State);
-                        return;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable x1 = new Variable();
-                Variable RestRules = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(x1, RestRules)))
-                {
-                    processCompilerDirectives(RestRules, State);
-                    return;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> importPredicateList(object arg1, object arg2, object arg3)
-        {
-            {
-                object _State = arg1;
-                object _Module = arg2;
-                foreach (bool l2 in YP.unify(arg3, Atom.NIL))
-                {
-                    yield return true;
-                    yield break;
-                }
-            }
-            {
-                object State = arg1;
-                object Module = arg2;
-                Variable Name = new Variable();
-                Variable Arity = new Variable();
-                Variable Rest = new Variable();
-                foreach (bool l2 in YP.unify(arg3, new ListPair(new Functor2("/", Name, Arity), Rest)))
-                {
-                    CompilerState.assertModuleForNameArity(State, Name, Arity, Module);
-                    foreach (bool l3 in importPredicateList(State, Module, Rest))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg1;
-                object Module = arg2;
-                Variable x3 = new Variable();
-                Variable Rest = new Variable();
-                foreach (bool l2 in YP.unify(arg3, new ListPair(x3, Rest)))
-                {
-                    foreach (bool l3 in importPredicateList(State, Module, Rest))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> makeFunctionPseudoCode3(object RuleList, object State, object FunctionCode)
-        {
-            {
-                Variable SamePredicateRuleList = new Variable();
-                Variable RestRules = new Variable();
-                foreach (bool l2 in samePredicateRuleList(RuleList, SamePredicateRuleList, RestRules))
-                {
-                    if (YP.termNotEqual(SamePredicateRuleList, Atom.NIL))
-                    {
-                        foreach (bool l4 in compileSamePredicateFunction(SamePredicateRuleList, State, FunctionCode))
-                        {
-                            yield return false;
-                        }
-                        foreach (bool l4 in makeFunctionPseudoCode3(RestRules, State, FunctionCode))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> compileSamePredicateFunction(object SamePredicateRuleList, object State, object FunctionCode)
-        {
-            {
-                Variable FirstRule = new Variable();
-                Variable x5 = new Variable();
-                Variable x6 = new Variable();
-                Variable x7 = new Variable();
-                Variable Head = new Variable();
-                Variable x9 = new Variable();
-                Variable ArgAssignments = new Variable();
-                Variable Calls = new Variable();
-                Variable Rule = new Variable();
-                Variable VariableNameSuggestions = new Variable();
-                Variable ClauseBag = new Variable();
-                Variable Name = new Variable();
-                Variable ArgsList = new Variable();
-                Variable FunctionArgNames = new Variable();
-                Variable MergedArgName = new Variable();
-                Variable ArgName = new Variable();
-                Variable MergedArgNames = new Variable();
-                Variable FunctionArgs = new Variable();
-                Variable BodyCode = new Variable();
-                Variable ReturnType = new Variable();
-                Variable BodyWithReturn = new Variable();
-                foreach (bool l2 in YP.unify(new ListPair(new Functor2("f", FirstRule, x5), x6), SamePredicateRuleList))
-                {
-                    foreach (bool l3 in YP.unify(FirstRule, new Functor1(":-", x7)))
-                    {
-                        goto cutIf1;
-                    }
-                    foreach (bool l3 in YP.unify(new Functor2(":-", Head, x9), FirstRule))
-                    {
-                        CompilerState.startFunction(State, Head);
-                        FindallAnswers findallAnswers3 = new FindallAnswers(new Functor2("f", ArgAssignments, Calls));
-                        foreach (bool l4 in member(new Functor2("f", Rule, VariableNameSuggestions), SamePredicateRuleList))
-                        {
-                            foreach (bool l5 in compileBodyWithHeadBindings(Rule, VariableNameSuggestions, State, ArgAssignments, Calls))
-                            {
-                                findallAnswers3.add();
-                            }
-                        }
-                        foreach (bool l4 in findallAnswers3.result(ClauseBag))
-                        {
-                            foreach (bool l5 in YP.univ(Head, new ListPair(Name, ArgsList)))
-                            {
-                                foreach (bool l6 in getFunctionArgNames(ArgsList, 1, FunctionArgNames))
-                                {
-                                    FindallAnswers findallAnswers4 = new FindallAnswers(MergedArgName);
-                                    foreach (bool l7 in member(ArgName, FunctionArgNames))
-                                    {
-                                        foreach (bool l8 in argAssignedAll(ArgName, ClauseBag, MergedArgName))
-                                        {
-                                            findallAnswers4.add();
-                                            goto cutIf5;
-                                        }
-                                        foreach (bool l8 in YP.unify(MergedArgName, ArgName))
-                                        {
-                                            findallAnswers4.add();
-                                        }
-                                    cutIf5:
-                                        { }
-                                    }
-                                    foreach (bool l7 in findallAnswers4.result(MergedArgNames))
-                                    {
-                                        foreach (bool l8 in maplist_arg(MergedArgNames, FunctionArgs))
-                                        {
-                                            foreach (bool l9 in maplist_compileClause(ClauseBag, MergedArgNames, BodyCode))
-                                            {
-                                                if (CompilerState.determinismEquals(State, Atom.a("detNoneOut")))
-                                                {
-                                                    foreach (bool l11 in YP.unify(ReturnType, Atom.a("void")))
-                                                    {
-                                                        if (CompilerState.determinismEquals(State, Atom.a("semidetNoneOut")))
-                                                        {
-                                                            foreach (bool l13 in append(BodyCode, new ListPair(Atom.a("returnfalse"), Atom.NIL), BodyWithReturn))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf7;
-                                                        }
-                                                        if (CompilerState.determinismEquals(State, Atom.a("detNoneOut")))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(BodyWithReturn, BodyCode))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf8;
-                                                        }
-                                                        if (CompilerState.codeUsesYield(State))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(BodyWithReturn, BodyCode))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf9;
-                                                        }
-                                                        foreach (bool l12 in append(BodyCode, new ListPair(new Functor2("foreach", new Functor2("call", Atom.a("YP.fail"), Atom.NIL), new ListPair(Atom.a("yieldfalse"), Atom.NIL)), Atom.NIL), BodyWithReturn))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                            {
-                                                                yield return false;
-                                                            }
-                                                        }
-                                                    cutIf9:
-                                                    cutIf8:
-                                                    cutIf7:
-                                                        { }
-                                                    }
-                                                    goto cutIf6;
-                                                }
-                                                if (CompilerState.determinismEquals(State, Atom.a("semidetNoneOut")))
-                                                {
-                                                    foreach (bool l11 in YP.unify(ReturnType, Atom.a("bool")))
-                                                    {
-                                                        if (CompilerState.determinismEquals(State, Atom.a("semidetNoneOut")))
-                                                        {
-                                                            foreach (bool l13 in append(BodyCode, new ListPair(Atom.a("returnfalse"), Atom.NIL), BodyWithReturn))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf11;
-                                                        }
-                                                        if (CompilerState.determinismEquals(State, Atom.a("detNoneOut")))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(BodyWithReturn, BodyCode))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf12;
-                                                        }
-                                                        if (CompilerState.codeUsesYield(State))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(BodyWithReturn, BodyCode))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf13;
-                                                        }
-                                                        foreach (bool l12 in append(BodyCode, new ListPair(new Functor2("foreach", new Functor2("call", Atom.a("YP.fail"), Atom.NIL), new ListPair(Atom.a("yieldfalse"), Atom.NIL)), Atom.NIL), BodyWithReturn))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                            {
-                                                                yield return false;
-                                                            }
-                                                        }
-                                                    cutIf13:
-                                                    cutIf12:
-                                                    cutIf11:
-                                                        { }
-                                                    }
-                                                    goto cutIf10;
-                                                }
-                                                foreach (bool l10 in YP.unify(ReturnType, Atom.a("IEnumerable<bool>")))
-                                                {
-                                                    if (CompilerState.determinismEquals(State, Atom.a("semidetNoneOut")))
-                                                    {
-                                                        foreach (bool l12 in append(BodyCode, new ListPair(Atom.a("returnfalse"), Atom.NIL), BodyWithReturn))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                            {
-                                                                yield return false;
-                                                            }
-                                                        }
-                                                        goto cutIf14;
-                                                    }
-                                                    if (CompilerState.determinismEquals(State, Atom.a("detNoneOut")))
-                                                    {
-                                                        foreach (bool l12 in YP.unify(BodyWithReturn, BodyCode))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                            {
-                                                                yield return false;
-                                                            }
-                                                        }
-                                                        goto cutIf15;
-                                                    }
-                                                    if (CompilerState.codeUsesYield(State))
-                                                    {
-                                                        foreach (bool l12 in YP.unify(BodyWithReturn, BodyCode))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                            {
-                                                                yield return false;
-                                                            }
-                                                        }
-                                                        goto cutIf16;
-                                                    }
-                                                    foreach (bool l11 in append(BodyCode, new ListPair(new Functor2("foreach", new Functor2("call", Atom.a("YP.fail"), Atom.NIL), new ListPair(Atom.a("yieldfalse"), Atom.NIL)), Atom.NIL), BodyWithReturn))
-                                                    {
-                                                        foreach (bool l12 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                        {
-                                                            yield return false;
-                                                        }
-                                                    }
-                                                cutIf16:
-                                                cutIf15:
-                                                cutIf14:
-                                                    { }
-                                                }
-                                            cutIf10:
-                                            cutIf6:
-                                                { }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        goto cutIf2;
-                    }
-                    foreach (bool l3 in YP.unify(Head, FirstRule))
-                    {
-                        CompilerState.startFunction(State, Head);
-                        FindallAnswers findallAnswers17 = new FindallAnswers(new Functor2("f", ArgAssignments, Calls));
-                        foreach (bool l4 in member(new Functor2("f", Rule, VariableNameSuggestions), SamePredicateRuleList))
-                        {
-                            foreach (bool l5 in compileBodyWithHeadBindings(Rule, VariableNameSuggestions, State, ArgAssignments, Calls))
-                            {
-                                findallAnswers17.add();
-                            }
-                        }
-                        foreach (bool l4 in findallAnswers17.result(ClauseBag))
-                        {
-                            foreach (bool l5 in YP.univ(Head, new ListPair(Name, ArgsList)))
-                            {
-                                foreach (bool l6 in getFunctionArgNames(ArgsList, 1, FunctionArgNames))
-                                {
-                                    FindallAnswers findallAnswers18 = new FindallAnswers(MergedArgName);
-                                    foreach (bool l7 in member(ArgName, FunctionArgNames))
-                                    {
-                                        foreach (bool l8 in argAssignedAll(ArgName, ClauseBag, MergedArgName))
-                                        {
-                                            findallAnswers18.add();
-                                            goto cutIf19;
-                                        }
-                                        foreach (bool l8 in YP.unify(MergedArgName, ArgName))
-                                        {
-                                            findallAnswers18.add();
-                                        }
-                                    cutIf19:
-                                        { }
-                                    }
-                                    foreach (bool l7 in findallAnswers18.result(MergedArgNames))
-                                    {
-                                        foreach (bool l8 in maplist_arg(MergedArgNames, FunctionArgs))
-                                        {
-                                            foreach (bool l9 in maplist_compileClause(ClauseBag, MergedArgNames, BodyCode))
-                                            {
-                                                if (CompilerState.determinismEquals(State, Atom.a("detNoneOut")))
-                                                {
-                                                    foreach (bool l11 in YP.unify(ReturnType, Atom.a("void")))
-                                                    {
-                                                        if (CompilerState.determinismEquals(State, Atom.a("semidetNoneOut")))
-                                                        {
-                                                            foreach (bool l13 in append(BodyCode, new ListPair(Atom.a("returnfalse"), Atom.NIL), BodyWithReturn))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf21;
-                                                        }
-                                                        if (CompilerState.determinismEquals(State, Atom.a("detNoneOut")))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(BodyWithReturn, BodyCode))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf22;
-                                                        }
-                                                        if (CompilerState.codeUsesYield(State))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(BodyWithReturn, BodyCode))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf23;
-                                                        }
-                                                        foreach (bool l12 in append(BodyCode, new ListPair(new Functor2("foreach", new Functor2("call", Atom.a("YP.fail"), Atom.NIL), new ListPair(Atom.a("yieldfalse"), Atom.NIL)), Atom.NIL), BodyWithReturn))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                            {
-                                                                yield return false;
-                                                            }
-                                                        }
-                                                    cutIf23:
-                                                    cutIf22:
-                                                    cutIf21:
-                                                        { }
-                                                    }
-                                                    goto cutIf20;
-                                                }
-                                                if (CompilerState.determinismEquals(State, Atom.a("semidetNoneOut")))
-                                                {
-                                                    foreach (bool l11 in YP.unify(ReturnType, Atom.a("bool")))
-                                                    {
-                                                        if (CompilerState.determinismEquals(State, Atom.a("semidetNoneOut")))
-                                                        {
-                                                            foreach (bool l13 in append(BodyCode, new ListPair(Atom.a("returnfalse"), Atom.NIL), BodyWithReturn))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf25;
-                                                        }
-                                                        if (CompilerState.determinismEquals(State, Atom.a("detNoneOut")))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(BodyWithReturn, BodyCode))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf26;
-                                                        }
-                                                        if (CompilerState.codeUsesYield(State))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(BodyWithReturn, BodyCode))
-                                                            {
-                                                                foreach (bool l14 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                                {
-                                                                    yield return false;
-                                                                }
-                                                            }
-                                                            goto cutIf27;
-                                                        }
-                                                        foreach (bool l12 in append(BodyCode, new ListPair(new Functor2("foreach", new Functor2("call", Atom.a("YP.fail"), Atom.NIL), new ListPair(Atom.a("yieldfalse"), Atom.NIL)), Atom.NIL), BodyWithReturn))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                            {
-                                                                yield return false;
-                                                            }
-                                                        }
-                                                    cutIf27:
-                                                    cutIf26:
-                                                    cutIf25:
-                                                        { }
-                                                    }
-                                                    goto cutIf24;
-                                                }
-                                                foreach (bool l10 in YP.unify(ReturnType, Atom.a("IEnumerable<bool>")))
-                                                {
-                                                    if (CompilerState.determinismEquals(State, Atom.a("semidetNoneOut")))
-                                                    {
-                                                        foreach (bool l12 in append(BodyCode, new ListPair(Atom.a("returnfalse"), Atom.NIL), BodyWithReturn))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                            {
-                                                                yield return false;
-                                                            }
-                                                        }
-                                                        goto cutIf28;
-                                                    }
-                                                    if (CompilerState.determinismEquals(State, Atom.a("detNoneOut")))
-                                                    {
-                                                        foreach (bool l12 in YP.unify(BodyWithReturn, BodyCode))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                            {
-                                                                yield return false;
-                                                            }
-                                                        }
-                                                        goto cutIf29;
-                                                    }
-                                                    if (CompilerState.codeUsesYield(State))
-                                                    {
-                                                        foreach (bool l12 in YP.unify(BodyWithReturn, BodyCode))
-                                                        {
-                                                            foreach (bool l13 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                            {
-                                                                yield return false;
-                                                            }
-                                                        }
-                                                        goto cutIf30;
-                                                    }
-                                                    foreach (bool l11 in append(BodyCode, new ListPair(new Functor2("foreach", new Functor2("call", Atom.a("YP.fail"), Atom.NIL), new ListPair(Atom.a("yieldfalse"), Atom.NIL)), Atom.NIL), BodyWithReturn))
-                                                    {
-                                                        foreach (bool l12 in YP.unify(FunctionCode, new Functor("function", new object[] { ReturnType, Name, FunctionArgs, BodyWithReturn })))
-                                                        {
-                                                            yield return false;
-                                                        }
-                                                    }
-                                                cutIf30:
-                                                cutIf29:
-                                                cutIf28:
-                                                    { }
-                                                }
-                                            cutIf24:
-                                            cutIf20:
-                                                { }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                cutIf2:
-                cutIf1:
-                    { }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> samePredicateRuleList(object arg1, object arg2, object arg3)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.NIL))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.NIL))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                Variable First = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(First, Atom.NIL)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(First, Atom.NIL)))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.NIL))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object SamePredicateRuleList = arg2;
-                object RestRules = arg3;
-                Variable First = new Variable();
-                Variable Rest = new Variable();
-                Variable FirstRule = new Variable();
-                Variable x6 = new Variable();
-                Variable SecondRule = new Variable();
-                Variable x8 = new Variable();
-                Variable x9 = new Variable();
-                Variable FirstHead = new Variable();
-                Variable x11 = new Variable();
-                Variable SecondHead = new Variable();
-                Variable x13 = new Variable();
-                Variable Name = new Variable();
-                Variable Arity = new Variable();
-                Variable RestSamePredicates = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(First, Rest)))
-                {
-                    foreach (bool l3 in YP.unify(new Functor2("f", FirstRule, x6), First))
-                    {
-                        foreach (bool l4 in YP.unify(new ListPair(new Functor2("f", SecondRule, x8), x9), Rest))
-                        {
-                            foreach (bool l5 in YP.unify(new Functor2(":-", FirstHead, x11), FirstRule))
-                            {
-                                foreach (bool l6 in YP.unify(new Functor2(":-", SecondHead, x13), SecondRule))
-                                {
-                                    foreach (bool l7 in YP.functor(FirstHead, Name, Arity))
-                                    {
-                                        foreach (bool l8 in YP.functor(SecondHead, Name, Arity))
-                                        {
-                                            foreach (bool l9 in samePredicateRuleList(Rest, RestSamePredicates, RestRules))
-                                            {
-                                                foreach (bool l10 in YP.unify(SamePredicateRuleList, new ListPair(First, RestSamePredicates)))
-                                                {
-                                                    yield return true;
-                                                    yield break;
-                                                }
-                                            }
-                                            goto cutIf3;
-                                        }
-                                        foreach (bool l8 in YP.unify(SamePredicateRuleList, new ListPair(First, Atom.NIL)))
-                                        {
-                                            foreach (bool l9 in YP.unify(RestRules, Rest))
-                                            {
-                                                yield return true;
-                                                yield break;
-                                            }
-                                        }
-                                    cutIf3:
-                                        { }
-                                    }
-                                    goto cutIf2;
-                                }
-                                foreach (bool l6 in YP.unify(SecondHead, SecondRule))
-                                {
-                                    foreach (bool l7 in YP.functor(FirstHead, Name, Arity))
-                                    {
-                                        foreach (bool l8 in YP.functor(SecondHead, Name, Arity))
-                                        {
-                                            foreach (bool l9 in samePredicateRuleList(Rest, RestSamePredicates, RestRules))
-                                            {
-                                                foreach (bool l10 in YP.unify(SamePredicateRuleList, new ListPair(First, RestSamePredicates)))
-                                                {
-                                                    yield return true;
-                                                    yield break;
-                                                }
-                                            }
-                                            goto cutIf4;
-                                        }
-                                        foreach (bool l8 in YP.unify(SamePredicateRuleList, new ListPair(First, Atom.NIL)))
-                                        {
-                                            foreach (bool l9 in YP.unify(RestRules, Rest))
-                                            {
-                                                yield return true;
-                                                yield break;
-                                            }
-                                        }
-                                    cutIf4:
-                                        { }
-                                    }
-                                }
-                            cutIf2:
-                                goto cutIf1;
-                            }
-                            foreach (bool l5 in YP.unify(FirstHead, FirstRule))
-                            {
-                                foreach (bool l6 in YP.unify(new Functor2(":-", SecondHead, x13), SecondRule))
-                                {
-                                    foreach (bool l7 in YP.functor(FirstHead, Name, Arity))
-                                    {
-                                        foreach (bool l8 in YP.functor(SecondHead, Name, Arity))
-                                        {
-                                            foreach (bool l9 in samePredicateRuleList(Rest, RestSamePredicates, RestRules))
-                                            {
-                                                foreach (bool l10 in YP.unify(SamePredicateRuleList, new ListPair(First, RestSamePredicates)))
-                                                {
-                                                    yield return true;
-                                                    yield break;
-                                                }
-                                            }
-                                            goto cutIf6;
-                                        }
-                                        foreach (bool l8 in YP.unify(SamePredicateRuleList, new ListPair(First, Atom.NIL)))
-                                        {
-                                            foreach (bool l9 in YP.unify(RestRules, Rest))
-                                            {
-                                                yield return true;
-                                                yield break;
-                                            }
-                                        }
-                                    cutIf6:
-                                        { }
-                                    }
-                                    goto cutIf5;
-                                }
-                                foreach (bool l6 in YP.unify(SecondHead, SecondRule))
-                                {
-                                    foreach (bool l7 in YP.functor(FirstHead, Name, Arity))
-                                    {
-                                        foreach (bool l8 in YP.functor(SecondHead, Name, Arity))
-                                        {
-                                            foreach (bool l9 in samePredicateRuleList(Rest, RestSamePredicates, RestRules))
-                                            {
-                                                foreach (bool l10 in YP.unify(SamePredicateRuleList, new ListPair(First, RestSamePredicates)))
-                                                {
-                                                    yield return true;
-                                                    yield break;
-                                                }
-                                            }
-                                            goto cutIf7;
-                                        }
-                                        foreach (bool l8 in YP.unify(SamePredicateRuleList, new ListPair(First, Atom.NIL)))
-                                        {
-                                            foreach (bool l9 in YP.unify(RestRules, Rest))
-                                            {
-                                                yield return true;
-                                                yield break;
-                                            }
-                                        }
-                                    cutIf7:
-                                        { }
-                                    }
-                                }
-                            cutIf5:
-                                { }
-                            }
-                        cutIf1:
-                            { }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> maplist_compileClause(object arg1, object arg2, object arg3)
-        {
-            {
-                object _MergedArgNames = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg3, Atom.NIL))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object MergedArgNames = arg2;
-                Variable ArgAssignments = new Variable();
-                Variable Calls = new Variable();
-                Variable Rest = new Variable();
-                Variable ClauseCode = new Variable();
-                Variable RestResults = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("f", ArgAssignments, Calls), Rest)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor1("blockScope", ClauseCode), RestResults)))
-                    {
-                        foreach (bool l4 in prependArgAssignments(ArgAssignments, Calls, MergedArgNames, ClauseCode))
-                        {
-                            foreach (bool l5 in maplist_compileClause(Rest, MergedArgNames, RestResults))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> prependArgAssignments(object arg1, object arg2, object arg3, object arg4)
-        {
-            {
-                object _MergedArgNames = arg3;
-                Variable In = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg2, In))
-                    {
-                        foreach (bool l4 in YP.unify(arg4, In))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object In = arg2;
-                object MergedArgNames = arg3;
-                object ClauseCode = arg4;
-                Variable VariableName = new Variable();
-                Variable ArgName = new Variable();
-                Variable RestArgAssignments = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("f", VariableName, ArgName), RestArgAssignments)))
-                {
-                    foreach (bool l3 in member(VariableName, MergedArgNames))
-                    {
-                        foreach (bool l4 in prependArgAssignments(RestArgAssignments, In, MergedArgNames, ClauseCode))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                        goto cutIf1;
-                    }
-                    foreach (bool l3 in prependArgAssignments(RestArgAssignments, new ListPair(new Functor3("declare", Atom.a("object"), VariableName, new Functor1("var", ArgName)), In), MergedArgNames, ClauseCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                cutIf1:
-                    { }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> argAssignedAll(object arg1, object arg2, object VariableName)
-        {
-            {
-                object _ArgName = arg1;
-                foreach (bool l2 in YP.unify(arg2, Atom.NIL))
-                {
-                    if (YP.nonvar(VariableName))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object ArgName = arg1;
-                Variable ArgAssignments = new Variable();
-                Variable _Calls = new Variable();
-                Variable RestClauseBag = new Variable();
-                foreach (bool l2 in YP.unify(arg2, new ListPair(new Functor2("f", ArgAssignments, _Calls), RestClauseBag)))
-                {
-                    foreach (bool l3 in member(new Functor2("f", VariableName, ArgName), ArgAssignments))
-                    {
-                        foreach (bool l4 in argAssignedAll(ArgName, RestClauseBag, VariableName))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> maplist_arg(object arg1, object arg2)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.NIL))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                Variable First = new Variable();
-                Variable Rest = new Variable();
-                Variable RestResults = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(First, Rest)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(new Functor1("arg", First), RestResults)))
-                    {
-                        foreach (bool l4 in maplist_arg(Rest, RestResults))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> getFunctionArgNames(object arg1, object arg2, object arg3)
-        {
-            {
-                object _StartArgNumber = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg3, Atom.NIL))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object StartArgNumber = arg2;
-                Variable x1 = new Variable();
-                Variable Rest = new Variable();
-                Variable ArgName = new Variable();
-                Variable RestFunctionArgs = new Variable();
-                Variable NumberCodes = new Variable();
-                Variable NumberAtom = new Variable();
-                Variable NextArgNumber = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(x1, Rest)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(ArgName, RestFunctionArgs)))
-                    {
-                        foreach (bool l4 in YP.number_codes(StartArgNumber, NumberCodes))
-                        {
-                            foreach (bool l5 in YP.atom_codes(NumberAtom, NumberCodes))
-                            {
-                                foreach (bool l6 in YP.atom_concat(Atom.a("arg"), NumberAtom, ArgName))
-                                {
-                                    foreach (bool l7 in YP.unify(NextArgNumber, YP.add(StartArgNumber, 1)))
-                                    {
-                                        foreach (bool l8 in getFunctionArgNames(Rest, NextArgNumber, RestFunctionArgs))
-                                        {
-                                            yield return true;
-                                            yield break;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> compileBodyWithHeadBindings(object Rule, object VariableNameSuggestions, object State, object ArgAssignments, object Calls)
-        {
-            {
-                Variable Head = new Variable();
-                Variable Body = new Variable();
-                Variable x8 = new Variable();
-                Variable HeadArgs = new Variable();
-                Variable CompiledHeadArgs = new Variable();
-                Variable BodyCode = new Variable();
-                Variable VariableNamesList = new Variable();
-                Variable ArgUnifications = new Variable();
-                foreach (bool l2 in YP.unify(new Functor2(":-", Head, Body), Rule))
-                {
-                    CompilerState.newVariableNames(State, Rule, VariableNameSuggestions);
-                    foreach (bool l3 in YP.univ(Head, new ListPair(x8, HeadArgs)))
-                    {
-                        foreach (bool l4 in maplist_compileTerm(HeadArgs, State, CompiledHeadArgs))
-                        {
-                            foreach (bool l5 in compileRuleBody(Body, State, BodyCode))
-                            {
-                                foreach (bool l6 in CompilerState.variableNamesList(State, VariableNamesList))
-                                {
-                                    foreach (bool l7 in compileArgUnifications(HeadArgs, CompiledHeadArgs, 1, HeadArgs, BodyCode, ArgUnifications))
-                                    {
-                                        foreach (bool l8 in compileDeclarations(VariableNamesList, HeadArgs, Atom.NIL, ArgAssignments, ArgUnifications, Calls))
-                                        {
-                                            yield return true;
-                                            yield break;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in compileBodyWithHeadBindings(new Functor2(":-", Rule, Atom.a("true")), VariableNameSuggestions, State, ArgAssignments, Calls))
-                {
-                    yield return true;
-                    yield break;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> compileArgUnifications(object arg1, object arg2, object arg3, object arg4, object arg5, object arg6)
-        {
-            {
-                object x1 = arg2;
-                object x2 = arg3;
-                object x3 = arg4;
-                Variable BodyCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg5, BodyCode))
-                    {
-                        foreach (bool l4 in YP.unify(arg6, BodyCode))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object Index = arg3;
-                object AllHeadArgs = arg4;
-                object BodyCode = arg5;
-                object ArgUnifications = arg6;
-                Variable HeadArg = new Variable();
-                Variable RestHeadArgs = new Variable();
-                Variable x3 = new Variable();
-                Variable RestCompiledHeadArgs = new Variable();
-                Variable _ArgIndex1 = new Variable();
-                Variable NextIndex = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(HeadArg, RestHeadArgs)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(x3, RestCompiledHeadArgs)))
-                    {
-                        foreach (bool l4 in getVariableArgIndex1(HeadArg, AllHeadArgs, _ArgIndex1))
-                        {
-                            foreach (bool l5 in YP.unify(NextIndex, YP.add(Index, 1)))
-                            {
-                                foreach (bool l6 in compileArgUnifications(RestHeadArgs, RestCompiledHeadArgs, NextIndex, AllHeadArgs, BodyCode, ArgUnifications))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object Index = arg3;
-                object AllHeadArgs = arg4;
-                object BodyCode = arg5;
-                Variable _HeadArg = new Variable();
-                Variable RestHeadArgs = new Variable();
-                Variable CompiledHeadArg = new Variable();
-                Variable RestCompiledHeadArgs = new Variable();
-                Variable ArgName = new Variable();
-                Variable RestArgUnifications = new Variable();
-                Variable NumberCodes = new Variable();
-                Variable NumberAtom = new Variable();
-                Variable NextIndex = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(_HeadArg, RestHeadArgs)))
-                {
-                    foreach (bool l3 in YP.unify(arg2, new ListPair(CompiledHeadArg, RestCompiledHeadArgs)))
-                    {
-                        foreach (bool l4 in YP.unify(arg6, new ListPair(new Functor2("foreach", new Functor2("call", Atom.a("YP.unify"), new ListPair(new Functor1("var", ArgName), new ListPair(CompiledHeadArg, Atom.NIL))), RestArgUnifications), Atom.NIL)))
-                        {
-                            foreach (bool l5 in YP.number_codes(Index, NumberCodes))
-                            {
-                                foreach (bool l6 in YP.atom_codes(NumberAtom, NumberCodes))
-                                {
-                                    foreach (bool l7 in YP.atom_concat(Atom.a("arg"), NumberAtom, ArgName))
-                                    {
-                                        foreach (bool l8 in YP.unify(NextIndex, YP.add(Index, 1)))
-                                        {
-                                            foreach (bool l9 in compileArgUnifications(RestHeadArgs, RestCompiledHeadArgs, NextIndex, AllHeadArgs, BodyCode, RestArgUnifications))
-                                            {
-                                                yield return true;
-                                                yield break;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> compileDeclarations(object arg1, object arg2, object arg3, object arg4, object arg5, object arg6)
-        {
-            {
-                object _HeadArgs = arg2;
-                Variable ArgAssignmentsIn = new Variable();
-                Variable DeclarationsIn = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg3, ArgAssignmentsIn))
-                    {
-                        foreach (bool l4 in YP.unify(arg4, ArgAssignmentsIn))
-                        {
-                            foreach (bool l5 in YP.unify(arg5, DeclarationsIn))
-                            {
-                                foreach (bool l6 in YP.unify(arg6, DeclarationsIn))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object HeadArgs = arg2;
-                object ArgAssignmentsIn = arg3;
-                object ArgAssignmentsOut = arg4;
-                object DeclarationsIn = arg5;
-                object DeclarationsOut = arg6;
-                Variable VariableName = new Variable();
-                Variable Var = new Variable();
-                Variable RestVariableNames = new Variable();
-                Variable ArgIndex1 = new Variable();
-                Variable NumberCodes = new Variable();
-                Variable NumberAtom = new Variable();
-                Variable ArgName = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("=", VariableName, Var), RestVariableNames)))
-                {
-                    foreach (bool l3 in getVariableArgIndex1(Var, HeadArgs, ArgIndex1))
-                    {
-                        foreach (bool l4 in YP.number_codes(ArgIndex1, NumberCodes))
-                        {
-                            foreach (bool l5 in YP.atom_codes(NumberAtom, NumberCodes))
-                            {
-                                foreach (bool l6 in YP.atom_concat(Atom.a("arg"), NumberAtom, ArgName))
-                                {
-                                    foreach (bool l7 in compileDeclarations(RestVariableNames, HeadArgs, new ListPair(new Functor2("f", VariableName, ArgName), ArgAssignmentsIn), ArgAssignmentsOut, DeclarationsIn, DeclarationsOut))
-                                    {
-                                        yield return true;
-                                        yield break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object HeadArgs = arg2;
-                object ArgAssignmentsIn = arg3;
-                object ArgAssignmentsOut = arg4;
-                object DeclarationsIn = arg5;
-                Variable VariableName = new Variable();
-                Variable _Var = new Variable();
-                Variable RestVariableNames = new Variable();
-                Variable DeclarationsOut = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("=", VariableName, _Var), RestVariableNames)))
-                {
-                    foreach (bool l3 in YP.unify(arg6, new ListPair(new Functor3("declare", Atom.a("Variable"), VariableName, new Functor2("new", Atom.a("Variable"), Atom.NIL)), DeclarationsOut)))
-                    {
-                        foreach (bool l4 in compileDeclarations(RestVariableNames, HeadArgs, ArgAssignmentsIn, ArgAssignmentsOut, DeclarationsIn, DeclarationsOut))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> getVariableArgIndex1(object Var, object arg2, object arg3)
-        {
-            {
-                Variable FirstHeadArgs = new Variable();
-                Variable RestHeadArgs = new Variable();
-                Variable x4 = new Variable();
-                foreach (bool l2 in YP.unify(arg2, new ListPair(FirstHeadArgs, RestHeadArgs)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, 1))
-                    {
-                        if (sameVariable(Var, FirstHeadArgs))
-                        {
-                            foreach (bool l5 in getVariableArgIndex1(Var, RestHeadArgs, x4))
-                            {
-                                goto cutIf1;
-                            }
-                            yield return false;
-                        cutIf1:
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object Index = arg3;
-                Variable x2 = new Variable();
-                Variable RestHeadArgs = new Variable();
-                Variable RestIndex = new Variable();
-                foreach (bool l2 in YP.unify(arg2, new ListPair(x2, RestHeadArgs)))
-                {
-                    foreach (bool l3 in getVariableArgIndex1(Var, RestHeadArgs, RestIndex))
-                    {
-                        foreach (bool l4 in YP.unify(Index, YP.add(1, RestIndex)))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> compileRuleBody(object arg1, object arg2, object arg3)
-        {
-            {
-                object A = arg1;
-                object State = arg2;
-                object PseudoCode = arg3;
-                if (YP.var(A))
-                {
-                    foreach (bool l3 in compileRuleBody(new Functor2(",", new Functor1("call", A), Atom.a("true")), State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", A, B)))
-                {
-                    if (YP.var(A))
-                    {
-                        foreach (bool l4 in compileRuleBody(new Functor2(",", new Functor1("call", A), B), State, PseudoCode))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable ACode = new Variable();
-                Variable BCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", A, B)))
-                {
-                    foreach (bool l3 in compileFunctorCall(A, State, ACode))
-                    {
-                        if (CompilerState.isDetNoneOut(State, A))
-                        {
-                            foreach (bool l5 in compileRuleBody(B, State, BCode))
-                            {
-                                foreach (bool l6 in YP.unify(PseudoCode, new ListPair(ACode, BCode)))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                            }
-                        }
-                        if (CompilerState.isSemidetNoneOut(State, A))
-                        {
-                            foreach (bool l5 in compileRuleBody(B, State, BCode))
-                            {
-                                foreach (bool l6 in YP.unify(PseudoCode, new ListPair(new Functor2("if", ACode, BCode), Atom.NIL)))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                            }
-                        }
-                        foreach (bool l4 in compileRuleBody(B, State, BCode))
-                        {
-                            foreach (bool l5 in YP.unify(PseudoCode, new ListPair(new Functor2("foreach", ACode, BCode), Atom.NIL)))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable T = new Variable();
-                Variable B = new Variable();
-                Variable C = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor2(";", new Functor2("->", A, T), B), C)))
-                {
-                    foreach (bool l3 in compileRuleBody(new Functor2(";", new Functor2("->", A, new Functor2(",", T, C)), new Functor2(",", B, C)), State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable C = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor2(";", A, B), C)))
-                {
-                    foreach (bool l3 in compileRuleBody(new Functor2(";", new Functor2(",", A, C), new Functor2(",", B, C)), State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable ACode = new Variable();
-                Variable BCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor1("\\+", A), B)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("if", new Functor1("not", ACode), BCode), Atom.NIL)))
-                    {
-                        if (CompilerState.isSemidetNoneOut(State, A))
-                        {
-                            foreach (bool l5 in compileFunctorCall(A, State, ACode))
-                            {
-                                foreach (bool l6 in compileRuleBody(B, State, BCode))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor1("\\+", A), B)))
-                {
-                    foreach (bool l3 in compileRuleBody(new Functor2(",", new Functor2(";", new Functor2("->", A, Atom.a("fail")), Atom.a("true")), B), State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor1("once", A), B)))
-                {
-                    foreach (bool l3 in compileRuleBody(new Functor2(",", new Functor2(";", new Functor2("->", A, Atom.a("true")), Atom.a("fail")), B), State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable T = new Variable();
-                Variable B = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor2("->", A, T), B)))
-                {
-                    foreach (bool l3 in compileRuleBody(new Functor2(",", new Functor2(";", new Functor2("->", A, T), Atom.a("fail")), B), State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable C = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor2("\\=", A, B), C)))
-                {
-                    foreach (bool l3 in compileRuleBody(new Functor2(",", new Functor1("\\+", new Functor2("=", A, B)), C), State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable ACode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", Atom.a("!"), A)))
-                {
-                    foreach (bool l3 in compileRuleBody(A, State, ACode))
-                    {
-                        foreach (bool l4 in append(ACode, new ListPair(Atom.a("yieldbreak"), Atom.NIL), PseudoCode))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable Name = new Variable();
-                Variable A = new Variable();
-                Variable ACode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor1("$CUTIF", Name), A)))
-                {
-                    foreach (bool l3 in compileRuleBody(A, State, ACode))
-                    {
-                        foreach (bool l4 in append(ACode, new ListPair(new Functor1("breakBlock", Name), Atom.NIL), PseudoCode))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object _State = arg2;
-                Variable x1 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", Atom.a("fail"), x1)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, Atom.NIL))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", Atom.a("true"), A)))
-                {
-                    foreach (bool l3 in compileRuleBody(A, State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable A = new Variable();
-                Variable Term = new Variable();
-                Variable B = new Variable();
-                Variable ACode = new Variable();
-                Variable TermCode = new Variable();
-                Variable BCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor2("is", A, Term), B)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("foreach", new Functor2("call", Atom.a("YP.unify"), new ListPair(ACode, new ListPair(TermCode, Atom.NIL))), BCode), Atom.NIL)))
-                    {
-                        foreach (bool l4 in compileTerm(A, State, ACode))
-                        {
-                            foreach (bool l5 in compileExpression(Term, State, TermCode))
-                            {
-                                foreach (bool l6 in compileRuleBody(B, State, BCode))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable ACode = new Variable();
-                Variable B = new Variable();
-                Variable BCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor1("$DET_NONE_OUT", ACode), B)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(ACode, BCode)))
-                    {
-                        foreach (bool l4 in compileRuleBody(B, State, BCode))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable FunctionName = new Variable();
-                Variable X1Code = new Variable();
-                Variable X2Code = new Variable();
-                Variable BCode = new Variable();
-                Variable Name = new Variable();
-                Variable X1 = new Variable();
-                Variable X2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", A, B)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("if", new Functor2("call", FunctionName, new ListPair(X1Code, new ListPair(X2Code, Atom.NIL))), BCode), Atom.NIL)))
-                    {
-                        foreach (bool l4 in YP.univ(A, ListPair.make(new object[] { Name, X1, X2 })))
-                        {
-                            foreach (bool l5 in binaryExpressionConditional(Name, FunctionName))
-                            {
-                                foreach (bool l6 in compileExpression(X1, State, X1Code))
-                                {
-                                    foreach (bool l7 in compileExpression(X2, State, X2Code))
-                                    {
-                                        foreach (bool l8 in compileRuleBody(B, State, BCode))
-                                        {
-                                            yield return true;
-                                            yield break;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable Template = new Variable();
-                Variable Goal = new Variable();
-                Variable Bag = new Variable();
-                Variable B = new Variable();
-                Variable TemplateCode = new Variable();
-                Variable FindallAnswers = new Variable();
-                Variable GoalAndAddCode = new Variable();
-                Variable BagCode = new Variable();
-                Variable BCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor3("findall", Template, Goal, Bag), B)))
-                {
-                    foreach (bool l3 in compileTerm(Template, State, TemplateCode))
-                    {
-                        foreach (bool l4 in CompilerState.gensym(State, Atom.a("findallAnswers"), FindallAnswers))
-                        {
-                            foreach (bool l5 in compileRuleBody(new Functor2(",", Goal, new Functor2(",", new Functor1("$DET_NONE_OUT", new Functor3("callMember", new Functor1("var", FindallAnswers), Atom.a("add"), Atom.NIL)), Atom.a("fail"))), State, GoalAndAddCode))
-                            {
-                                foreach (bool l6 in compileTerm(Bag, State, BagCode))
-                                {
-                                    foreach (bool l7 in compileRuleBody(B, State, BCode))
-                                    {
-                                        foreach (bool l8 in append(new ListPair(new Functor3("declare", Atom.a("FindallAnswers"), FindallAnswers, new Functor2("new", Atom.a("FindallAnswers"), new ListPair(TemplateCode, Atom.NIL))), GoalAndAddCode), new ListPair(new Functor2("foreach", new Functor3("callMember", new Functor1("var", FindallAnswers), Atom.a("result"), new ListPair(BagCode, Atom.NIL)), BCode), Atom.NIL), PseudoCode))
-                                        {
-                                            yield return true;
-                                            yield break;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable Template = new Variable();
-                Variable Goal = new Variable();
-                Variable Bag = new Variable();
-                Variable B = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor3("bagof", Template, Goal, Bag), B)))
-                {
-                    foreach (bool l3 in compileBagof(Atom.a("result"), Template, Goal, Bag, B, State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable Template = new Variable();
-                Variable Goal = new Variable();
-                Variable Bag = new Variable();
-                Variable B = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor3("setof", Template, Goal, Bag), B)))
-                {
-                    foreach (bool l3 in compileBagof(Atom.a("resultSet"), Template, Goal, Bag, B, State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable ATermCode = new Variable();
-                Variable BCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor1("call", A), B)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("foreach", new Functor2("call", Atom.a("YP.getIterator"), new ListPair(ATermCode, new ListPair(new Functor2("call", Atom.a("getDeclaringClass"), Atom.NIL), Atom.NIL))), BCode), Atom.NIL)))
-                    {
-                        foreach (bool l4 in compileTerm(A, State, ATermCode))
-                        {
-                            foreach (bool l5 in compileRuleBody(B, State, BCode))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable ATermCode = new Variable();
-                Variable BCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor1("current_predicate", A), B)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("foreach", new Functor2("call", Atom.a("YP.current_predicate"), new ListPair(ATermCode, new ListPair(new Functor2("call", Atom.a("getDeclaringClass"), Atom.NIL), Atom.NIL))), BCode), Atom.NIL)))
-                    {
-                        foreach (bool l4 in compileTerm(A, State, ATermCode))
-                        {
-                            foreach (bool l5 in compileRuleBody(B, State, BCode))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable ATermCode = new Variable();
-                Variable BCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor1("asserta", A), B)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("call", Atom.a("YP.asserta"), new ListPair(ATermCode, new ListPair(new Functor2("call", Atom.a("getDeclaringClass"), Atom.NIL), Atom.NIL))), BCode)))
-                    {
-                        foreach (bool l4 in compileTerm(A, State, ATermCode))
-                        {
-                            foreach (bool l5 in compileRuleBody(B, State, BCode))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable ATermCode = new Variable();
-                Variable BCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor1("assertz", A), B)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("call", Atom.a("YP.assertz"), new ListPair(ATermCode, new ListPair(new Functor2("call", Atom.a("getDeclaringClass"), Atom.NIL), Atom.NIL))), BCode)))
-                    {
-                        foreach (bool l4 in compileTerm(A, State, ATermCode))
-                        {
-                            foreach (bool l5 in compileRuleBody(B, State, BCode))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor1("assert", A), B)))
-                {
-                    foreach (bool l3 in compileRuleBody(new Functor2(",", new Functor1("assertz", A), B), State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable Goal = new Variable();
-                Variable Catcher = new Variable();
-                Variable Handler = new Variable();
-                Variable B = new Variable();
-                Variable CatchGoal = new Variable();
-                Variable GoalTermCode = new Variable();
-                Variable BCode = new Variable();
-                Variable CatcherTermCode = new Variable();
-                Variable HandlerAndBCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor3("catch", Goal, Catcher, Handler), B)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, ListPair.make(new object[] { new Functor3("declare", Atom.a("YP.Catch"), CatchGoal, new Functor2("new", Atom.a("YP.Catch"), new ListPair(GoalTermCode, new ListPair(new Functor2("call", Atom.a("getDeclaringClass"), Atom.NIL), Atom.NIL)))), new Functor2("foreach", new Functor1("var", CatchGoal), BCode), new Functor2("foreach", new Functor3("callMember", new Functor1("var", CatchGoal), Atom.a("unifyExceptionOrThrow"), new ListPair(CatcherTermCode, Atom.NIL)), HandlerAndBCode) })))
-                    {
-                        foreach (bool l4 in CompilerState.gensym(State, Atom.a("catchGoal"), CatchGoal))
-                        {
-                            foreach (bool l5 in compileTerm(Goal, State, GoalTermCode))
-                            {
-                                foreach (bool l6 in compileTerm(Catcher, State, CatcherTermCode))
-                                {
-                                    foreach (bool l7 in compileRuleBody(B, State, BCode))
-                                    {
-                                        foreach (bool l8 in compileRuleBody(new Functor2(",", Handler, B), State, HandlerAndBCode))
-                                        {
-                                            yield return true;
-                                            yield break;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable C = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(",", new Functor2(",", A, B), C)))
-                {
-                    foreach (bool l3 in compileRuleBody(new Functor2(",", A, new Functor2(",", B, C)), State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(";", A, B)))
-                {
-                    if (YP.var(A))
-                    {
-                        foreach (bool l4 in compileRuleBody(new Functor2(";", new Functor1("call", A), B), State, PseudoCode))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable A = new Variable();
-                Variable T = new Variable();
-                Variable B = new Variable();
-                Variable CutIfLabel = new Variable();
-                Variable Code = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(";", new Functor2("->", A, T), B)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor2("breakableBlock", CutIfLabel, Code), Atom.NIL)))
-                    {
-                        foreach (bool l4 in CompilerState.gensym(State, Atom.a("cutIf"), CutIfLabel))
-                        {
-                            foreach (bool l5 in compileRuleBody(new Functor2(";", new Functor2(",", A, new Functor2(",", new Functor1("$CUTIF", CutIfLabel), T)), B), State, Code))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable _B = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(";", Atom.a("!"), _B)))
-                {
-                    foreach (bool l3 in compileRuleBody(Atom.a("!"), State, PseudoCode))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                object PseudoCode = arg3;
-                Variable A = new Variable();
-                Variable B = new Variable();
-                Variable ACode = new Variable();
-                Variable BCode = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2(";", A, B)))
-                {
-                    foreach (bool l3 in compileRuleBody(A, State, ACode))
-                    {
-                        foreach (bool l4 in compileRuleBody(B, State, BCode))
-                        {
-                            foreach (bool l5 in append(ACode, BCode, PseudoCode))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("!")))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a("return"), Atom.NIL)))
-                    {
-                        if (CompilerState.determinismEquals(State, Atom.a("detNoneOut")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("!")))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a("returntrue"), Atom.NIL)))
-                    {
-                        if (CompilerState.determinismEquals(State, Atom.a("semidetNoneOut")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("!")))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a("yieldtrue"), new ListPair(Atom.a("yieldbreak"), Atom.NIL))))
-                    {
-                        CompilerState.setCodeUsesYield(State);
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object _State = arg2;
-                Variable Name = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("$CUTIF", Name)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(new Functor1("breakBlock", Name), Atom.NIL)))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("true")))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a("return"), Atom.NIL)))
-                    {
-                        if (CompilerState.determinismEquals(State, Atom.a("detNoneOut")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("true")))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a("returntrue"), Atom.NIL)))
-                    {
-                        if (CompilerState.determinismEquals(State, Atom.a("semidetNoneOut")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.a("true")))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(Atom.a("yieldfalse"), Atom.NIL)))
-                    {
-                        CompilerState.setCodeUsesYield(State);
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object A = arg1;
-                object State = arg2;
-                object PseudoCode = arg3;
-                foreach (bool l2 in compileRuleBody(new Functor2(",", A, Atom.a("true")), State, PseudoCode))
-                {
-                    yield return true;
-                    yield break;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> compileBagof(object ResultMethod, object Template, object Goal, object Bag, object B, object State, object PseudoCode)
-        {
-            {
-                Variable TemplateCode = new Variable();
-                Variable GoalTermCode = new Variable();
-                Variable UnqualifiedGoal = new Variable();
-                Variable BagofAnswers = new Variable();
-                Variable GoalAndAddCode = new Variable();
-                Variable BagCode = new Variable();
-                Variable BCode = new Variable();
-                foreach (bool l2 in compileTerm(Template, State, TemplateCode))
-                {
-                    foreach (bool l3 in compileTerm(Goal, State, GoalTermCode))
-                    {
-                        foreach (bool l4 in unqualifiedGoal(Goal, UnqualifiedGoal))
-                        {
-                            foreach (bool l5 in CompilerState.gensym(State, Atom.a("bagofAnswers"), BagofAnswers))
-                            {
-                                foreach (bool l6 in compileRuleBody(new Functor2(",", UnqualifiedGoal, new Functor2(",", new Functor1("$DET_NONE_OUT", new Functor3("callMember", new Functor1("var", BagofAnswers), Atom.a("add"), Atom.NIL)), Atom.a("fail"))), State, GoalAndAddCode))
-                                {
-                                    foreach (bool l7 in compileTerm(Bag, State, BagCode))
-                                    {
-                                        foreach (bool l8 in compileRuleBody(B, State, BCode))
-                                        {
-                                            foreach (bool l9 in append(new ListPair(new Functor3("declare", Atom.a("BagofAnswers"), BagofAnswers, new Functor2("new", Atom.a("BagofAnswers"), new ListPair(TemplateCode, new ListPair(GoalTermCode, Atom.NIL)))), GoalAndAddCode), new ListPair(new Functor2("foreach", new Functor3("callMember", new Functor1("var", BagofAnswers), ResultMethod, new ListPair(BagCode, Atom.NIL)), BCode), Atom.NIL), PseudoCode))
-                                            {
-                                                yield return true;
-                                                yield break;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> unqualifiedGoal(object arg1, object arg2)
-        {
-            {
-                object Goal = arg1;
-                foreach (bool l2 in YP.unify(arg2, new Functor1("call", Goal)))
-                {
-                    if (YP.var(Goal))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object UnqualifiedGoal = arg2;
-                Variable x1 = new Variable();
-                Variable Goal = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("^", x1, Goal)))
-                {
-                    foreach (bool l3 in unqualifiedGoal(Goal, UnqualifiedGoal))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                Variable UnqualifiedGoal = new Variable();
-                foreach (bool l2 in YP.unify(arg1, UnqualifiedGoal))
-                {
-                    foreach (bool l3 in YP.unify(arg2, UnqualifiedGoal))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> binaryExpressionConditional(object arg1, object arg2)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("=:=")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.equal")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("=\\=")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.notEqual")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a(">")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.greaterThan")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("<")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.lessThan")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a(">=")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.greaterThanOrEqual")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("=<")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.lessThanOrEqual")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> compileFunctorCall(object Functor_1, object State, object PseudoCode)
-        {
-            {
-                Variable FunctorName = new Variable();
-                Variable FunctorArgs = new Variable();
-                Variable x6 = new Variable();
-                Variable Arity = new Variable();
-                Variable FunctionName = new Variable();
-                Variable CompiledArgs = new Variable();
-                foreach (bool l2 in YP.univ(Functor_1, new ListPair(FunctorName, FunctorArgs)))
-                {
-                    foreach (bool l3 in YP.functor(Functor_1, x6, Arity))
-                    {
-                        foreach (bool l4 in functorCallFunctionName(State, FunctorName, Arity, FunctionName))
-                        {
-                            foreach (bool l5 in maplist_compileTerm(FunctorArgs, State, CompiledArgs))
-                            {
-                                if (YP.termEqual(FunctionName, Atom.NIL))
-                                {
-                                    foreach (bool l7 in YP.unify(PseudoCode, new Functor2("call", Atom.a("YP.matchDynamic"), new ListPair(new Functor2("call", Atom.a("Atom.a"), new ListPair(new Functor1("object", FunctorName), Atom.NIL)), new ListPair(new Functor1("objectArray", CompiledArgs), Atom.NIL)))))
-                                    {
-                                        yield return true;
-                                        yield break;
-                                    }
-                                    goto cutIf1;
-                                }
-                                foreach (bool l6 in YP.unify(PseudoCode, new Functor3("functorCall", FunctionName, FunctorArgs, CompiledArgs)))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                            cutIf1:
-                                { }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> functorCallFunctionName(object arg1, object arg2, object arg3, object arg4)
-        {
-            {
-                object _State = arg1;
-                object Name = arg2;
-                object Arity = arg3;
-                object x4 = arg4;
-                if (functorCallIsSpecialForm(Name, Arity))
-                {
-                    yield break;
-                }
-            }
-            {
-                object x1 = arg1;
-                object Name = arg2;
-                object Arity = arg3;
-                object FunctionName = arg4;
-                foreach (bool l2 in functorCallYPFunctionName(Name, Arity, FunctionName))
-                {
-                    yield return true;
-                    yield break;
-                }
-            }
-            {
-                object State = arg1;
-                object Arity = arg3;
-                Variable Name = new Variable();
-                foreach (bool l2 in YP.unify(arg2, Name))
-                {
-                    foreach (bool l3 in YP.unify(arg4, Name))
-                    {
-                        if (CompilerState.nameArityHasModule(State, Name, Arity, Atom.a("")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object _State = arg1;
-                object _Arity = arg3;
-                Variable Name = new Variable();
-                foreach (bool l2 in YP.unify(arg2, Name))
-                {
-                    foreach (bool l3 in YP.unify(arg4, Name))
-                    {
-                        foreach (bool l4 in Atom.module(Name, Atom.a("")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object _State = arg1;
-                object Name = arg2;
-                object _Arity = arg3;
-                foreach (bool l2 in YP.unify(arg4, Atom.NIL))
-                {
-                    foreach (bool l3 in Atom.module(Name, Atom.NIL))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object _State = arg1;
-                object Name = arg2;
-                object Arity = arg3;
-                object x4 = arg4;
-                Variable Module = new Variable();
-                Variable Message = new Variable();
-                foreach (bool l2 in Atom.module(Name, Module))
-                {
-                    foreach (bool l3 in YP.atom_concat(Atom.a("Not supporting calls to external module: "), Module, Message))
-                    {
-                        YP.throwException(new Functor2("error", new Functor2("type_error", Atom.a("callable"), new Functor2("/", Name, Arity)), Message));
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object _State = arg1;
-                object Name = arg2;
-                object _Arity = arg3;
-                object x4 = arg4;
-                YP.throwException(new Functor2("error", new Functor2("type_error", Atom.a("callable"), Name), Atom.a("Term is not callable")));
-                yield return true;
-                yield break;
-            }
-        }
-
-        public static bool functorCallIsSpecialForm(object Name, object Arity)
-        {
-            {
-                Variable x3 = new Variable();
-                if (YP.termEqual(Arity, 0))
-                {
-                    if (YP.termEqual(Name, Atom.a("!")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("fail")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("true")))
-                    {
-                        return true;
-                    }
-                }
-                if (YP.termEqual(Arity, 1))
-                {
-                    if (YP.termEqual(Name, Atom.a("\\+")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("once")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("$CUTIF")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("$DET_NONE_OUT")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("call")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("current_predicate")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("asserta")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("assertz")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("assert")))
-                    {
-                        return true;
-                    }
-                }
-                if (YP.termEqual(Arity, 2))
-                {
-                    if (YP.termEqual(Name, Atom.a(";")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a(",")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("->")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("\\=")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("is")))
-                    {
-                        return true;
-                    }
-                    foreach (bool l3 in binaryExpressionConditional(Name, x3))
-                    {
-                        return true;
-                    }
-                }
-                if (YP.termEqual(Arity, 3))
-                {
-                    if (YP.termEqual(Name, Atom.a("findall")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("bagof")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("setof")))
-                    {
-                        return true;
-                    }
-                    if (YP.termEqual(Name, Atom.a("catch")))
-                    {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-
-        public static IEnumerable<bool> functorCallYPFunctionName(object arg1, object arg2, object arg3)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("=")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.unify")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("=..")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.univ")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("var")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.var")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("nonvar")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.nonvar")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("arg")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 3))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.arg")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("functor")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 3))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.functor")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("repeat")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 0))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.repeat")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("get_code")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.get_code")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("current_op")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 3))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.current_op")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("atom_length")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.atom_length")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("atom_concat")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 3))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.atom_concat")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("sub_atom")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 5))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.sub_atom")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("atom_chars")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.atom_chars")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("atom_codes")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.atom_codes")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("char_code")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.char_code")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("number_chars")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.number_chars")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("number_codes")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.number_codes")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("copy_term")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.copy_term")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("sort")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.sort")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-            // Manually included : script_event for callback to LSL/C#
-
-                //object x1 = arg1;
-                foreach (bool l2 in YP.unify(arg1, Atom.a(@"script_event")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a(@"YP.script_event")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("nl")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 0))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.nl")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("write")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.write")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("put_code")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.put_code")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("see")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.see")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("seen")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 0))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.seen")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("tell")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.tell")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("told")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 0))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.told")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("clause")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.clause")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("retract")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.retract")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("abolish")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.abolish")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("retractall")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.retractall")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("atom")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.atom")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("integer")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.integer")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("float")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.isFloat")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("number")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.number")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("atomic")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.atomic")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("compound")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.compound")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("==")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.termEqual")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("\\==")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.termNotEqual")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("@<")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.termLessThan")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("@=<")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.termLessThanOrEqual")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("@>")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.termGreaterThan")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("@>=")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.termGreaterThanOrEqual")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("throw")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.throwException")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("current_prolog_flag")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.current_prolog_flag")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("set_prolog_flag")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.set_prolog_flag")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("current_input")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.current_input")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("current_output")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("YP.current_output")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("read_term")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("Parser.read_term2")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("read_term")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 3))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("Parser.read_term3")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("read")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 1))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("Parser.read1")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("read")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, 2))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, Atom.a("Parser.read2")))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> compileTerm(object arg1, object arg2, object arg3)
-        {
-            {
-                object Term = arg1;
-                object State = arg2;
-                Variable VariableName = new Variable();
-                foreach (bool l2 in YP.unify(arg3, new Functor1("var", VariableName)))
-                {
-                    if (YP.var(Term))
-                    {
-                        foreach (bool l4 in CompilerState.getVariableName(State, Term, VariableName))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-            {
-                object _State = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new Functor1("var", Atom.a("Atom.NIL"))))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Term = arg1;
-                object State = arg2;
-                object Code = arg3;
-                Variable ModuleCode = new Variable();
-                if (YP.atom(Term))
-                {
-                    foreach (bool l3 in compileAtomModule(Term, 0, State, ModuleCode))
-                    {
-                        foreach (bool l4 in YP.unify(Code, new Functor2("call", Atom.a("Atom.a"), new ListPair(new Functor1("object", Term), new ListPair(ModuleCode, Atom.NIL)))))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                        goto cutIf1;
-                    }
-                    foreach (bool l3 in YP.unify(Code, new Functor2("call", Atom.a("Atom.a"), new ListPair(new Functor1("object", Term), Atom.NIL))))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                cutIf1:
-                    { }
-                }
-            }
-            {
-                object State = arg2;
-                Variable First = new Variable();
-                Variable Rest = new Variable();
-                Variable CompiledList = new Variable();
-                Variable x5 = new Variable();
-                Variable Rest2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(First, Rest)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new Functor2("call", Atom.a("ListPair.make"), new ListPair(new Functor1("objectArray", CompiledList), Atom.NIL))))
-                    {
-                        if (YP.nonvar(Rest))
-                        {
-                            foreach (bool l5 in YP.unify(Rest, new ListPair(x5, Rest2)))
-                            {
-                                if (YP.termNotEqual(Rest2, Atom.NIL))
-                                {
-                                    foreach (bool l7 in maplist_compileTerm(new ListPair(First, Rest), State, CompiledList))
-                                    {
-                                        yield return true;
-                                        yield break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable First = new Variable();
-                Variable Rest = new Variable();
-                Variable Arg1 = new Variable();
-                Variable Arg2 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(First, Rest)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new Functor2("new", Atom.a("ListPair"), new ListPair(Arg1, new ListPair(Arg2, Atom.NIL)))))
-                    {
-                        foreach (bool l4 in compileTerm(First, State, Arg1))
-                        {
-                            foreach (bool l5 in compileTerm(Rest, State, Arg2))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object Term = arg1;
-                object State = arg2;
-                object Result = arg3;
-                Variable Name = new Variable();
-                Variable TermArgs = new Variable();
-                Variable x6 = new Variable();
-                Variable Arity = new Variable();
-                Variable ModuleCode = new Variable();
-                Variable NameCode = new Variable();
-                Variable X1 = new Variable();
-                Variable Arg1 = new Variable();
-                Variable X2 = new Variable();
-                Variable Arg2 = new Variable();
-                Variable X3 = new Variable();
-                Variable Arg3 = new Variable();
-                Variable Args = new Variable();
-                foreach (bool l2 in YP.univ(Term, new ListPair(Name, TermArgs)))
-                {
-                    if (YP.termEqual(TermArgs, Atom.NIL))
-                    {
-                        foreach (bool l4 in YP.unify(Result, new Functor1("object", Name)))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                        goto cutIf2;
-                    }
-                    foreach (bool l3 in YP.functor(Term, x6, Arity))
-                    {
-                        foreach (bool l4 in compileAtomModule(Name, Arity, State, ModuleCode))
-                        {
-                            foreach (bool l5 in YP.unify(NameCode, new Functor2("call", Atom.a("Atom.a"), new ListPair(new Functor1("object", Name), new ListPair(ModuleCode, Atom.NIL)))))
-                            {
-                                foreach (bool l6 in YP.unify(TermArgs, new ListPair(X1, Atom.NIL)))
-                                {
-                                    foreach (bool l7 in compileTerm(X1, State, Arg1))
-                                    {
-                                        foreach (bool l8 in YP.unify(Result, new Functor2("new", Atom.a("Functor1"), new ListPair(NameCode, new ListPair(Arg1, Atom.NIL)))))
-                                        {
-                                            yield return true;
-                                            yield break;
-                                        }
-                                    }
-                                    goto cutIf4;
-                                }
-                                foreach (bool l6 in YP.unify(TermArgs, new ListPair(X1, new ListPair(X2, Atom.NIL))))
-                                {
-                                    foreach (bool l7 in compileTerm(X1, State, Arg1))
-                                    {
-                                        foreach (bool l8 in compileTerm(X2, State, Arg2))
-                                        {
-                                            foreach (bool l9 in YP.unify(Result, new Functor2("new", Atom.a("Functor2"), ListPair.make(new object[] { NameCode, Arg1, Arg2 }))))
-                                            {
-                                                yield return true;
-                                                yield break;
-                                            }
-                                        }
-                                    }
-                                    goto cutIf5;
-                                }
-                                foreach (bool l6 in YP.unify(TermArgs, ListPair.make(new object[] { X1, X2, X3 })))
-                                {
-                                    foreach (bool l7 in compileTerm(X1, State, Arg1))
-                                    {
-                                        foreach (bool l8 in compileTerm(X2, State, Arg2))
-                                        {
-                                            foreach (bool l9 in compileTerm(X3, State, Arg3))
-                                            {
-                                                foreach (bool l10 in YP.unify(Result, new Functor2("new", Atom.a("Functor3"), ListPair.make(new object[] { NameCode, Arg1, Arg2, Arg3 }))))
-                                                {
-                                                    yield return true;
-                                                    yield break;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                                foreach (bool l6 in maplist_compileTerm(TermArgs, State, Args))
-                                {
-                                    foreach (bool l7 in YP.unify(Result, new Functor2("new", Atom.a("Functor"), new ListPair(NameCode, new ListPair(new Functor1("objectArray", Args), Atom.NIL)))))
-                                    {
-                                        yield return true;
-                                        yield break;
-                                    }
-                                }
-                            cutIf5:
-                            cutIf4:
-                                { }
-                            }
-                            goto cutIf3;
-                        }
-                        foreach (bool l4 in YP.unify(NameCode, new Functor1("object", Name)))
-                        {
-                            foreach (bool l5 in YP.unify(TermArgs, new ListPair(X1, Atom.NIL)))
-                            {
-                                foreach (bool l6 in compileTerm(X1, State, Arg1))
-                                {
-                                    foreach (bool l7 in YP.unify(Result, new Functor2("new", Atom.a("Functor1"), new ListPair(NameCode, new ListPair(Arg1, Atom.NIL)))))
-                                    {
-                                        yield return true;
-                                        yield break;
-                                    }
-                                }
-                                goto cutIf6;
-                            }
-                            foreach (bool l5 in YP.unify(TermArgs, new ListPair(X1, new ListPair(X2, Atom.NIL))))
-                            {
-                                foreach (bool l6 in compileTerm(X1, State, Arg1))
-                                {
-                                    foreach (bool l7 in compileTerm(X2, State, Arg2))
-                                    {
-                                        foreach (bool l8 in YP.unify(Result, new Functor2("new", Atom.a("Functor2"), ListPair.make(new object[] { NameCode, Arg1, Arg2 }))))
-                                        {
-                                            yield return true;
-                                            yield break;
-                                        }
-                                    }
-                                }
-                                goto cutIf7;
-                            }
-                            foreach (bool l5 in YP.unify(TermArgs, ListPair.make(new object[] { X1, X2, X3 })))
-                            {
-                                foreach (bool l6 in compileTerm(X1, State, Arg1))
-                                {
-                                    foreach (bool l7 in compileTerm(X2, State, Arg2))
-                                    {
-                                        foreach (bool l8 in compileTerm(X3, State, Arg3))
-                                        {
-                                            foreach (bool l9 in YP.unify(Result, new Functor2("new", Atom.a("Functor3"), ListPair.make(new object[] { NameCode, Arg1, Arg2, Arg3 }))))
-                                            {
-                                                yield return true;
-                                                yield break;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            foreach (bool l5 in maplist_compileTerm(TermArgs, State, Args))
-                            {
-                                foreach (bool l6 in YP.unify(Result, new Functor2("new", Atom.a("Functor"), new ListPair(NameCode, new ListPair(new Functor1("objectArray", Args), Atom.NIL)))))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                            }
-                        cutIf7:
-                        cutIf6:
-                            { }
-                        }
-                    cutIf3:
-                        { }
-                    }
-                cutIf2:
-                    { }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> compileAtomModule(object Name, object arg2, object arg3, object ModuleCode)
-        {
-            {
-                object Arity = arg2;
-                object State = arg3;
-                if (CompilerState.nameArityHasModule(State, Name, Arity, Atom.a("")))
-                {
-                    foreach (bool l3 in YP.unify(ModuleCode, new Functor2("call", Atom.a("Atom.a"), new ListPair(new Functor1("object", Atom.a("")), Atom.NIL))))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object _Arity = arg2;
-                object _State = arg3;
-                Variable Module = new Variable();
-                foreach (bool l2 in Atom.module(Name, Module))
-                {
-                    if (YP.termNotEqual(Module, Atom.NIL))
-                    {
-                        foreach (bool l4 in YP.unify(ModuleCode, new Functor2("call", Atom.a("Atom.a"), new ListPair(new Functor1("object", Module), Atom.NIL))))
-                        {
-                            yield return true;
-                            yield break;
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> maplist_compileTerm(object arg1, object arg2, object arg3)
-        {
-            {
-                object _State = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg3, Atom.NIL))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object State = arg2;
-                Variable First = new Variable();
-                Variable Rest = new Variable();
-                Variable FirstResult = new Variable();
-                Variable RestResults = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(First, Rest)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(FirstResult, RestResults)))
-                    {
-                        if (YP.nonvar(Rest))
-                        {
-                            foreach (bool l5 in compileTerm(First, State, FirstResult))
-                        {
-                                foreach (bool l6 in maplist_compileTerm(Rest, State, RestResults))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        }
-
-        public static IEnumerable<bool> compileExpression(object Term, object State, object Result)
-        {
-            {
-                Variable Name = new Variable();
-                Variable TermArgs = new Variable();
-                Variable X1 = new Variable();
-                Variable FunctionName = new Variable();
-                Variable Arg1 = new Variable();
-                Variable x9 = new Variable();
-                Variable X2 = new Variable();
-                Variable Arg2 = new Variable();
-                Variable x12 = new Variable();
-                Variable Arity = new Variable();
-                if (YP.nonvar(Term))
-                {
-                    foreach (bool l3 in YP.univ(Term, new ListPair(Name, TermArgs)))
-                    {
-                        if (YP.atom(Name))
-                        {
-                            foreach (bool l5 in YP.unify(TermArgs, new ListPair(X1, Atom.NIL)))
-                            {
-                                foreach (bool l6 in unaryFunction(Name, FunctionName))
-                                {
-                                    foreach (bool l7 in compileExpression(X1, State, Arg1))
-                                    {
-                                        foreach (bool l8 in YP.unify(Result, new Functor2("call", FunctionName, new ListPair(Arg1, Atom.NIL))))
-                                        {
-                                            yield return true;
-                                            yield break;
-                                        }
-                                    }
-                                    goto cutIf1;
-                                }
-                            }
-                            foreach (bool l5 in YP.unify(Term, new ListPair(x9, Atom.NIL)))
-                            {
-                                foreach (bool l6 in compileTerm(Term, State, Result))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                                goto cutIf2;
-                            }
-                            foreach (bool l5 in YP.unify(TermArgs, new ListPair(X1, new ListPair(X2, Atom.NIL))))
-                            {
-                                foreach (bool l6 in binaryFunction(Name, FunctionName))
-                                {
-                                    foreach (bool l7 in compileExpression(X1, State, Arg1))
-                                    {
-                                        foreach (bool l8 in compileExpression(X2, State, Arg2))
-                                        {
-                                            foreach (bool l9 in YP.unify(Result, new Functor2("call", FunctionName, new ListPair(Arg1, new ListPair(Arg2, Atom.NIL)))))
-                                            {
-                                                yield return true;
-                                                yield break;
-                                            }
-                                        }
-                                    }
-                                    goto cutIf3;
-                                }
-                            }
-                            foreach (bool l5 in YP.functor(Term, x12, Arity))
-                            {
-                                YP.throwException(new Functor2("error", new Functor2("type_error", Atom.a("evaluable"), new Functor2("/", Name, Arity)), Atom.a("Not an expression function")));
-                                yield return false;
-                            }
-                        cutIf3:
-                        cutIf2:
-                        cutIf1:
-                            { }
-                        }
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in compileTerm(Term, State, Result))
-                {
-                    yield return true;
-                    yield break;
-                }
-            }
-        }
-
-        public static IEnumerable<bool> unaryFunction(object arg1, object arg2)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("-")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.negate")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("abs")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.abs")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("sign")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.sign")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("float")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.toFloat")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("floor")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.floor")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("truncate")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.truncate")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("round")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.round")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("ceiling")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.ceiling")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("sin")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.sin")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("cos")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.cos")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("atan")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.atan")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("exp")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.exp")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("log")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.log")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("sqrt")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.sqrt")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("\\")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.bitwiseComplement")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> binaryFunction(object arg1, object arg2)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("+")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.add")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("-")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.subtract")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("*")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.multiply")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("/")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.divide")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("//")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.intDivide")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("mod")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.mod")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("**")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.pow")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a(">>")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.bitwiseShiftRight")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("<<")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.bitwiseShiftLeft")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("/\\")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.bitwiseAnd")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("\\/")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.bitwiseOr")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("min")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.min")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("max")))
-                {
-                    foreach (bool l3 in YP.unify(arg2, Atom.a("YP.max")))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-        }
-
-        public static void convertFunctionCSharp(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("getDeclaringClass")))
-                {
-                    YP.write(Atom.a("public class YPInnerClass {}"));
-                    YP.nl();
-                    YP.write(Atom.a("public static System.Type getDeclaringClass() { return typeof(YPInnerClass).DeclaringType; }"));
-                    YP.nl();
-                    YP.nl();
-                    return;
-                }
-            }
-            {
-                Variable ReturnType = new Variable();
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                Variable Body = new Variable();
-                Variable Level = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor("function", new object[] { ReturnType, Name, ArgList, Body })))
-                {
-                    YP.write(Atom.a("public static "));
-                    YP.write(ReturnType);
-                    YP.write(Atom.a(" "));
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListCSharp(ArgList);
-                    YP.write(Atom.a(") {"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(Level, 1))
-                    {
-                        convertStatementListCSharp(Body, Level);
-                        YP.write(Atom.a("}"));
-                        YP.nl();
-                        YP.nl();
-                        return;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> convertStatementListCSharp(object arg1, object x1, object x2)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    yield return true;
-                    yield break;
-                }
-            }
-        }
-
-        public static void convertStatementListCSharp(object arg1, object Level)
-        {
-            {
-                Variable Name = new Variable();
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NewStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("breakableBlock", Name, Body), RestStatements)))
-                {
-                    foreach (bool l3 in append(Body, new ListPair(new Functor1("label", Name), RestStatements), NewStatements))
-                    {
-                        convertStatementListCSharp(NewStatements, Level);
-                        return;
-                    }
-                }
-            }
-            {
-                Variable Type = new Variable();
-                Variable Name = new Variable();
-                Variable Expression = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor3("declare", Type, Name, Expression), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Type);
-                    YP.write(Atom.a(" "));
-                    YP.write(Name);
-                    YP.write(Atom.a(" = "));
-                    convertExpressionCSharp(Expression);
-                    YP.write(Atom.a(";"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable Expression = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("assign", Name, Expression), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Name);
-                    YP.write(Atom.a(" = "));
-                    convertExpressionCSharp(Expression);
-                    YP.write(Atom.a(";"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("yieldtrue"), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Atom.a("yield return true;"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("yieldfalse"), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Atom.a("yield return false;"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("yieldbreak"), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Atom.a("yield break;"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("return"), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Atom.a("return;"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("returntrue"), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Atom.a("return true;"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("returnfalse"), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Atom.a("return false;"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor1("label", Name), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Name);
-                    YP.write(Atom.a(":"));
-                    YP.nl();
-                    if (YP.termEqual(RestStatements, Atom.NIL))
-                    {
-                        convertIndentationCSharp(Level);
-                        YP.write(Atom.a("{}"));
-                        YP.nl();
-                        convertStatementListCSharp(RestStatements, Level);
-                        return;
-                        goto cutIf1;
-                    }
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                cutIf1:
-                    { }
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor1("breakBlock", Name), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Atom.a("goto "));
-                    YP.write(Name);
-                    YP.write(Atom.a(";"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("call", Name, ArgList), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListCSharp(ArgList);
-                    YP.write(Atom.a(");"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable _FunctorArgs = new Variable();
-                Variable ArgList = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor3("functorCall", Name, _FunctorArgs, ArgList), RestStatements)))
-                {
-                    convertStatementListCSharp(new ListPair(new Functor2("call", Name, ArgList), RestStatements), Level);
-                    return;
-                }
-            }
-            {
-                Variable Obj = new Variable();
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor3("callMember", new Functor1("var", Obj), Name, ArgList), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Obj);
-                    YP.write(Atom.a("."));
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListCSharp(ArgList);
-                    YP.write(Atom.a(");"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NextLevel = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor1("blockScope", Body), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Atom.a("{"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(NextLevel, YP.add(Level, 1)))
-                    {
-                        convertStatementListCSharp(Body, NextLevel);
-                        convertIndentationCSharp(Level);
-                        YP.write(Atom.a("}"));
-                        YP.nl();
-                        convertStatementListCSharp(RestStatements, Level);
-                        return;
-                    }
-                }
-            }
-            {
-                Variable Expression = new Variable();
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NextLevel = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("if", Expression, Body), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Atom.a("if ("));
-                    convertExpressionCSharp(Expression);
-                    YP.write(Atom.a(") {"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(NextLevel, YP.add(Level, 1)))
-                    {
-                        convertStatementListCSharp(Body, NextLevel);
-                        convertIndentationCSharp(Level);
-                        YP.write(Atom.a("}"));
-                        YP.nl();
-                        convertStatementListCSharp(RestStatements, Level);
-                        return;
-                    }
-                }
-            }
-            {
-                Variable Expression = new Variable();
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NextLevel = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("foreach", Expression, Body), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Atom.a("foreach (bool l"));
-                    YP.write(Level);
-                    YP.write(Atom.a(" in "));
-                    convertExpressionCSharp(Expression);
-                    YP.write(Atom.a(") {"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(NextLevel, YP.add(Level, 1)))
-                    {
-                        convertStatementListCSharp(Body, NextLevel);
-                        convertIndentationCSharp(Level);
-                        YP.write(Atom.a("}"));
-                        YP.nl();
-                        convertStatementListCSharp(RestStatements, Level);
-                        return;
-                    }
-                }
-            }
-            {
-                Variable Expression = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor1("throw", Expression), RestStatements)))
-                {
-                    convertIndentationCSharp(Level);
-                    YP.write(Atom.a("throw "));
-                    convertExpressionCSharp(Expression);
-                    YP.write(Atom.a(";"));
-                    YP.nl();
-                    convertStatementListCSharp(RestStatements, Level);
-                    return;
-                }
-            }
-        }
-
-        public static void convertIndentationCSharp(object Level)
-        {
-            {
-                Variable N = new Variable();
-                foreach (bool l2 in YP.unify(N, YP.multiply(Level, 2)))
-                {
-                    repeatWrite(Atom.a(" "), N);
-                    return;
-                }
-            }
-        }
-
-        public static void convertArgListCSharp(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    return;
-                }
-            }
-            {
-                Variable Head = new Variable();
-                Variable Tail = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Head, Tail)))
-                {
-                    convertExpressionCSharp(Head);
-                    if (YP.termNotEqual(Tail, Atom.NIL))
-                    {
-                        YP.write(Atom.a(", "));
-                        convertArgListCSharp(Tail);
-                        return;
-                        goto cutIf1;
-                    }
-                    convertArgListCSharp(Tail);
-                    return;
-                cutIf1:
-                    { }
-                }
-            }
-        }
-
-        public static void convertExpressionCSharp(object arg1)
-        {
-            {
-                Variable X = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("arg", X)))
-                {
-                    YP.write(Atom.a("object "));
-                    YP.write(X);
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("call", Name, ArgList)))
-                {
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListCSharp(ArgList);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable _FunctorArgs = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3("functorCall", Name, _FunctorArgs, ArgList)))
-                {
-                    convertExpressionCSharp(new Functor2("call", Name, ArgList));
-                    return;
-                }
-            }
-            {
-                Variable Obj = new Variable();
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3("callMember", new Functor1("var", Obj), Name, ArgList)))
-                {
-                    YP.write(Obj);
-                    YP.write(Atom.a("."));
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListCSharp(ArgList);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("new", Name, ArgList)))
-                {
-                    YP.write(Atom.a("new "));
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListCSharp(ArgList);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("var", Name)))
-                {
-                    YP.write(Name);
-                    return;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("null")))
-                {
-                    YP.write(Atom.a("null"));
-                    return;
-                }
-            }
-            {
-                Variable X = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("not", X)))
-                {
-                    YP.write(Atom.a("!("));
-                    convertExpressionCSharp(X);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable X = new Variable();
-                Variable Y = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("and", X, Y)))
-                {
-                    YP.write(Atom.a("("));
-                    convertExpressionCSharp(X);
-                    YP.write(Atom.a(") && ("));
-                    convertExpressionCSharp(Y);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("objectArray", ArgList)))
-                {
-                    YP.write(Atom.a("new object[] {"));
-                    convertArgListCSharp(ArgList);
-                    YP.write(Atom.a("}"));
-                    return;
-                }
-            }
-            {
-                Variable X = new Variable();
-                Variable Codes = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("object", X)))
-                {
-                    if (YP.atom(X))
-                    {
-                        YP.write(Atom.a("\""));
-                        foreach (bool l4 in YP.atom_codes(X, Codes))
-                        {
-                            convertStringCodesCSharp(Codes);
-                            YP.write(Atom.a("\""));
-                            return;
-                        }
-                    }
-                }
-            }
-            {
-                Variable X = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("object", X)))
-                {
-                    YP.write(X);
-                    return;
-                }
-            }
-        }
-
-        public static void convertStringCodesCSharp(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    return;
-                }
-            }
-            {
-                Variable Code = new Variable();
-                Variable RestCodes = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Code, RestCodes)))
-                {
-                    foreach (bool l3 in putCStringCode(Code))
-                    {
-                        convertStringCodesCSharp(RestCodes);
-                        return;
-                    }
-                }
-            }
-        }
-
-        public static void convertFunctionJavascript(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("getDeclaringClass")))
-                {
-                    YP.write(Atom.a("function getDeclaringClass() { return null; }"));
-                    YP.nl();
-                    YP.nl();
-                    return;
-                }
-            }
-            {
-                Variable x1 = new Variable();
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                Variable Body = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor("function", new object[] { x1, Name, ArgList, Body })))
-                {
-                    YP.write(Atom.a("function "));
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListJavascript(ArgList);
-                    YP.write(Atom.a(") {"));
-                    YP.nl();
-                    convertStatementListJavascript(Body, 1);
-                    YP.write(Atom.a("}"));
-                    YP.nl();
-                    YP.nl();
-                    return;
-                }
-            }
-        }
-
-        public static void convertStatementListJavascript(object arg1, object arg2)
-        {
-            {
-                object x1 = arg2;
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable Name = new Variable();
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NextLevel = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("breakableBlock", Name, Body), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Name);
-                    YP.write(Atom.a(":"));
-                    YP.nl();
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("{"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(NextLevel, YP.add(Level, 1)))
-                    {
-                        convertStatementListJavascript(Body, NextLevel);
-                        convertIndentationJavascript(Level);
-                        YP.write(Atom.a("}"));
-                        YP.nl();
-                        convertStatementListJavascript(RestStatements, Level);
-                        return;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                Variable _Type = new Variable();
-                Variable Name = new Variable();
-                Variable Expression = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor3("declare", _Type, Name, Expression), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("var "));
-                    YP.write(Name);
-                    YP.write(Atom.a(" = "));
-                    convertExpressionJavascript(Expression);
-                    YP.write(Atom.a(";"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable Name = new Variable();
-                Variable Expression = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("assign", Name, Expression), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Name);
-                    YP.write(Atom.a(" = "));
-                    convertExpressionJavascript(Expression);
-                    YP.write(Atom.a(";"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("yieldtrue"), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("yield true;"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("yieldfalse"), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("yield false;"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("yieldbreak"), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("return;"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("return"), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("return;"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("returntrue"), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("return true;"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("returnfalse"), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("return false;"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable Name = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor1("breakBlock", Name), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("break "));
-                    YP.write(Name);
-                    YP.write(Atom.a(";"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("call", Name, ArgList), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListJavascript(ArgList);
-                    YP.write(Atom.a(");"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable Name = new Variable();
-                Variable _FunctorArgs = new Variable();
-                Variable ArgList = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor3("functorCall", Name, _FunctorArgs, ArgList), RestStatements)))
-                {
-                    convertStatementListJavascript(new ListPair(new Functor2("call", Name, ArgList), RestStatements), Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable Obj = new Variable();
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor3("callMember", new Functor1("var", Obj), Name, ArgList), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Obj);
-                    YP.write(Atom.a("."));
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListJavascript(ArgList);
-                    YP.write(Atom.a(");"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-            {
-                object Level = arg2;
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NextLevel = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor1("blockScope", Body), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("{"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(NextLevel, YP.add(Level, 1)))
-                    {
-                        convertStatementListJavascript(Body, NextLevel);
-                        convertIndentationJavascript(Level);
-                        YP.write(Atom.a("}"));
-                        YP.nl();
-                        convertStatementListJavascript(RestStatements, Level);
-                        return;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                Variable Expression = new Variable();
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NextLevel = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("if", Expression, Body), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("if ("));
-                    convertExpressionJavascript(Expression);
-                    YP.write(Atom.a(") {"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(NextLevel, YP.add(Level, 1)))
-                    {
-                        convertStatementListJavascript(Body, NextLevel);
-                        convertIndentationJavascript(Level);
-                        YP.write(Atom.a("}"));
-                        YP.nl();
-                        convertStatementListJavascript(RestStatements, Level);
-                        return;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                Variable Expression = new Variable();
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NextLevel = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("foreach", Expression, Body), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("for each (var l"));
-                    YP.write(Level);
-                    YP.write(Atom.a(" in "));
-                    convertExpressionJavascript(Expression);
-                    YP.write(Atom.a(") {"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(NextLevel, YP.add(Level, 1)))
-                    {
-                        convertStatementListJavascript(Body, NextLevel);
-                        convertIndentationJavascript(Level);
-                        YP.write(Atom.a("}"));
-                        YP.nl();
-                        convertStatementListJavascript(RestStatements, Level);
-                        return;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                Variable Expression = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor1("throw", Expression), RestStatements)))
-                {
-                    convertIndentationJavascript(Level);
-                    YP.write(Atom.a("throw "));
-                    convertExpressionJavascript(Expression);
-                    YP.write(Atom.a(";"));
-                    YP.nl();
-                    convertStatementListJavascript(RestStatements, Level);
-                    return;
-                }
-            }
-        }
-
-        public static void convertIndentationJavascript(object Level)
-        {
-            {
-                Variable N = new Variable();
-                foreach (bool l2 in YP.unify(N, YP.multiply(Level, 2)))
-                {
-                    repeatWrite(Atom.a(" "), N);
-                    return;
-                }
-            }
-        }
-
-        public static void convertArgListJavascript(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    return;
-                }
-            }
-            {
-                Variable Head = new Variable();
-                Variable Tail = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Head, Tail)))
-                {
-                    convertExpressionJavascript(Head);
-                    if (YP.termNotEqual(Tail, Atom.NIL))
-                    {
-                        YP.write(Atom.a(", "));
-                        convertArgListJavascript(Tail);
-                        return;
-                        goto cutIf1;
-                    }
-                    convertArgListJavascript(Tail);
-                    return;
-                cutIf1:
-                    { }
-                }
-            }
-        }
-
-        public static void convertExpressionJavascript(object arg1)
-        {
-            {
-                Variable X = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("arg", X)))
-                {
-                    YP.write(X);
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("call", Name, ArgList)))
-                {
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListJavascript(ArgList);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable _FunctorArgs = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3("functorCall", Name, _FunctorArgs, ArgList)))
-                {
-                    convertExpressionJavascript(new Functor2("call", Name, ArgList));
-                    return;
-                }
-            }
-            {
-                Variable Obj = new Variable();
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3("callMember", new Functor1("var", Obj), Name, ArgList)))
-                {
-                    YP.write(Obj);
-                    YP.write(Atom.a("."));
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListJavascript(ArgList);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("new", Name, ArgList)))
-                {
-                    YP.write(Atom.a("new "));
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListJavascript(ArgList);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("var", Name)))
-                {
-                    YP.write(Name);
-                    return;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("null")))
-                {
-                    YP.write(Atom.a("null"));
-                    return;
-                }
-            }
-            {
-                Variable X = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("not", X)))
-                {
-                    YP.write(Atom.a("!("));
-                    convertExpressionJavascript(X);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable X = new Variable();
-                Variable Y = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("and", X, Y)))
-                {
-                    YP.write(Atom.a("("));
-                    convertExpressionJavascript(X);
-                    YP.write(Atom.a(") && ("));
-                    convertExpressionJavascript(Y);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("objectArray", ArgList)))
-                {
-                    YP.write(Atom.a("["));
-                    convertArgListJavascript(ArgList);
-                    YP.write(Atom.a("]"));
-                    return;
-                }
-            }
-            {
-                Variable X = new Variable();
-                Variable Codes = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("object", X)))
-                {
-                    if (YP.atom(X))
-                    {
-                        YP.write(Atom.a("\""));
-                        foreach (bool l4 in YP.atom_codes(X, Codes))
-                        {
-                            convertStringCodesJavascript(Codes);
-                            YP.write(Atom.a("\""));
-                            return;
-                        }
-                    }
-                }
-            }
-            {
-                Variable X = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("object", X)))
-                {
-                    YP.write(X);
-                    return;
-                }
-            }
-        }
-
-        public static void convertStringCodesJavascript(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    return;
-                }
-            }
-            {
-                Variable Code = new Variable();
-                Variable RestCodes = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Code, RestCodes)))
-                {
-                    foreach (bool l3 in putCStringCode(Code))
-                    {
-                        convertStringCodesJavascript(RestCodes);
-                        return;
-                    }
-                }
-            }
-        }
-
-        public static void convertFunctionPython(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("getDeclaringClass")))
-                {
-                    YP.write(Atom.a("def getDeclaringClass():"));
-                    YP.nl();
-                    YP.write(Atom.a("  return None"));
-                    YP.nl();
-                    YP.nl();
-                    return;
-                }
-            }
-            {
-                Variable x1 = new Variable();
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                Variable Body = new Variable();
-                Variable Level = new Variable();
-                Variable HasBreakableBlock = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor("function", new object[] { x1, Name, ArgList, Body })))
-                {
-                    YP.write(Atom.a("def "));
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListPython(ArgList);
-                    YP.write(Atom.a("):"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(Level, 1))
-                    {
-                        if (hasBreakableBlockPython(Body))
-                        {
-                            foreach (bool l5 in YP.unify(HasBreakableBlock, 1))
-                            {
-                                if (YP.termEqual(HasBreakableBlock, 1))
-                                {
-                                    convertIndentationPython(Level);
-                                    YP.write(Atom.a("doBreak = False"));
-                                    YP.nl();
-                                    foreach (bool l7 in convertStatementListPython(Body, Level, HasBreakableBlock))
-                                    {
-                                        YP.nl();
-                                        return;
-                                    }
-                                    goto cutIf2;
-                                }
-                                foreach (bool l6 in convertStatementListPython(Body, Level, HasBreakableBlock))
-                                {
-                                    YP.nl();
-                                    return;
-                                }
-                            cutIf2:
-                                { }
-                            }
-                            goto cutIf1;
-                        }
-                        foreach (bool l4 in YP.unify(HasBreakableBlock, 0))
-                        {
-                            if (YP.termEqual(HasBreakableBlock, 1))
-                            {
-                                convertIndentationPython(Level);
-                                YP.write(Atom.a("doBreak = False"));
-                                YP.nl();
-                                foreach (bool l6 in convertStatementListPython(Body, Level, HasBreakableBlock))
-                                {
-                                    YP.nl();
-                                    return;
-                                }
-                                goto cutIf3;
-                            }
-                            foreach (bool l5 in convertStatementListPython(Body, Level, HasBreakableBlock))
-                            {
-                                YP.nl();
-                                return;
-                            }
-                        cutIf3:
-                            { }
-                        }
-                    cutIf1:
-                        { }
-                    }
-                }
-            }
-        }
-
-        public static bool hasBreakableBlockPython(object arg1)
-        {
-            {
-                Variable _Name = new Variable();
-                Variable _Body = new Variable();
-                Variable _RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("breakableBlock", _Name, _Body), _RestStatements)))
-                {
-                    return true;
-                }
-            }
-            {
-                Variable Body = new Variable();
-                Variable _RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor1("blockScope", Body), _RestStatements)))
-                {
-                    if (hasBreakableBlockPython(Body))
-                    {
-                        return true;
-                    }
-                }
-            }
-            {
-                Variable _Expression = new Variable();
-                Variable Body = new Variable();
-                Variable _RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("if", _Expression, Body), _RestStatements)))
-                {
-                    if (hasBreakableBlockPython(Body))
-                    {
-                        return true;
-                    }
-                }
-            }
-            {
-                Variable _Expression = new Variable();
-                Variable Body = new Variable();
-                Variable _RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("foreach", _Expression, Body), _RestStatements)))
-                {
-                    if (hasBreakableBlockPython(Body))
-                    {
-                        return true;
-                    }
-                }
-            }
-            {
-                Variable x1 = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(x1, RestStatements)))
-                {
-                    if (hasBreakableBlockPython(RestStatements))
-                    {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-
-        public static IEnumerable<bool> convertStatementListPython(object arg1, object arg2, object arg3)
-        {
-            {
-                object x1 = arg2;
-                object x2 = arg3;
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    yield return true;
-                    yield break;
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable Name = new Variable();
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NextLevel = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("breakableBlock", Name, Body), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Name);
-                    YP.write(Atom.a(" = False"));
-                    YP.nl();
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("for _ in [1]:"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(NextLevel, YP.add(Level, 1)))
-                    {
-                        foreach (bool l4 in convertStatementListPython(Body, NextLevel, HasBreakableBlock))
-                        {
-                            convertIndentationPython(Level);
-                            YP.write(Atom.a("if "));
-                            YP.write(Name);
-                            YP.write(Atom.a(":"));
-                            YP.nl();
-                            convertIndentationPython(NextLevel);
-                            YP.write(Atom.a("doBreak = False"));
-                            YP.nl();
-                            convertIndentationPython(Level);
-                            YP.write(Atom.a("if doBreak:"));
-                            YP.nl();
-                            convertIndentationPython(NextLevel);
-                            YP.write(Atom.a("break"));
-                            YP.nl();
-                            foreach (bool l5 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable _Type = new Variable();
-                Variable Name = new Variable();
-                Variable Expression = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor3("declare", _Type, Name, Expression), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Name);
-                    YP.write(Atom.a(" = "));
-                    convertExpressionPython(Expression);
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable Name = new Variable();
-                Variable Expression = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("assign", Name, Expression), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Name);
-                    YP.write(Atom.a(" = "));
-                    convertExpressionPython(Expression);
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("yieldtrue"), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("yield True"));
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("yieldfalse"), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("yield False"));
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("yieldbreak"), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("return"));
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("return"), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("return"));
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("returntrue"), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("return True"));
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Atom.a("returnfalse"), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("return False"));
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable Name = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor1("breakBlock", Name), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Name);
-                    YP.write(Atom.a(" = True"));
-                    YP.nl();
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("doBreak = True"));
-                    YP.nl();
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("break"));
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("call", Name, ArgList), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListPython(ArgList);
-                    YP.write(Atom.a(")"));
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable Name = new Variable();
-                Variable _FunctorArgs = new Variable();
-                Variable ArgList = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor3("functorCall", Name, _FunctorArgs, ArgList), RestStatements)))
-                {
-                    foreach (bool l3 in convertStatementListPython(new ListPair(new Functor2("call", Name, ArgList), RestStatements), Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable Obj = new Variable();
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor3("callMember", new Functor1("var", Obj), Name, ArgList), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Obj);
-                    YP.write(Atom.a("."));
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListPython(ArgList);
-                    YP.write(Atom.a(")"));
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NextLevel = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor1("blockScope", Body), RestStatements)))
-                {
-                    if (YP.termEqual(HasBreakableBlock, 1))
-                    {
-                        convertIndentationPython(Level);
-                        YP.write(Atom.a("for _ in [1]:"));
-                        YP.nl();
-                        foreach (bool l4 in YP.unify(NextLevel, YP.add(Level, 1)))
-                        {
-                            foreach (bool l5 in convertStatementListPython(Body, NextLevel, HasBreakableBlock))
-                            {
-                                if (YP.termEqual(HasBreakableBlock, 1))
-                                {
-                                    if (YP.greaterThan(Level, 1))
-                                    {
-                                        convertIndentationPython(Level);
-                                        YP.write(Atom.a("if doBreak:"));
-                                        YP.nl();
-                                        convertIndentationPython(NextLevel);
-                                        YP.write(Atom.a("break"));
-                                        YP.nl();
-                                        foreach (bool l8 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                                        {
-                                            yield return true;
-                                            yield break;
-                                        }
-                                        goto cutIf3;
-                                    }
-                                    foreach (bool l7 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                                    {
-                                        yield return true;
-                                        yield break;
-                                    }
-                                cutIf3:
-                                    goto cutIf2;
-                                }
-                                foreach (bool l6 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                            cutIf2:
-                                { }
-                            }
-                        }
-                        goto cutIf1;
-                    }
-                    foreach (bool l3 in YP.unify(NextLevel, Level))
-                    {
-                        foreach (bool l4 in convertStatementListPython(Body, NextLevel, HasBreakableBlock))
-                        {
-                            if (YP.termEqual(HasBreakableBlock, 1))
-                            {
-                                if (YP.greaterThan(Level, 1))
-                                {
-                                    convertIndentationPython(Level);
-                                    YP.write(Atom.a("if doBreak:"));
-                                    YP.nl();
-                                    convertIndentationPython(NextLevel);
-                                    YP.write(Atom.a("break"));
-                                    YP.nl();
-                                    foreach (bool l7 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                                    {
-                                        yield return true;
-                                        yield break;
-                                    }
-                                    goto cutIf5;
-                                }
-                                foreach (bool l6 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                            cutIf5:
-                                goto cutIf4;
-                            }
-                            foreach (bool l5 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        cutIf4:
-                            { }
-                        }
-                    }
-                cutIf1:
-                    { }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable Expression = new Variable();
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NextLevel = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("if", Expression, Body), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("if "));
-                    convertExpressionPython(Expression);
-                    YP.write(Atom.a(":"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(NextLevel, YP.add(Level, 1)))
-                    {
-                        foreach (bool l4 in convertStatementListPython(Body, NextLevel, HasBreakableBlock))
-                        {
-                            foreach (bool l5 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        }
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable Expression = new Variable();
-                Variable Body = new Variable();
-                Variable RestStatements = new Variable();
-                Variable NextLevel = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor2("foreach", Expression, Body), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("for l"));
-                    YP.write(Level);
-                    YP.write(Atom.a(" in "));
-                    convertExpressionPython(Expression);
-                    YP.write(Atom.a(":"));
-                    YP.nl();
-                    foreach (bool l3 in YP.unify(NextLevel, YP.add(Level, 1)))
-                    {
-                        foreach (bool l4 in convertStatementListPython(Body, NextLevel, HasBreakableBlock))
-                        {
-                            if (YP.termEqual(HasBreakableBlock, 1))
-                            {
-                                convertIndentationPython(Level);
-                                YP.write(Atom.a("if doBreak:"));
-                                YP.nl();
-                                convertIndentationPython(NextLevel);
-                                YP.write(Atom.a("break"));
-                                YP.nl();
-                                foreach (bool l6 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                                {
-                                    yield return true;
-                                    yield break;
-                                }
-                                goto cutIf6;
-                            }
-                            foreach (bool l5 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                            {
-                                yield return true;
-                                yield break;
-                            }
-                        cutIf6:
-                            { }
-                        }
-                    }
-                }
-            }
-            {
-                object Level = arg2;
-                object HasBreakableBlock = arg3;
-                Variable Expression = new Variable();
-                Variable RestStatements = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(new Functor1("throw", Expression), RestStatements)))
-                {
-                    convertIndentationPython(Level);
-                    YP.write(Atom.a("raise "));
-                    convertExpressionPython(Expression);
-                    YP.nl();
-                    foreach (bool l3 in convertStatementListPython(RestStatements, Level, HasBreakableBlock))
-                    {
-                        yield return true;
-                        yield break;
-                    }
-                }
-            }
-        }
-
-        public static void convertIndentationPython(object Level)
-        {
-            {
-                Variable N = new Variable();
-                foreach (bool l2 in YP.unify(N, YP.multiply(Level, 2)))
-                {
-                    repeatWrite(Atom.a(" "), N);
-                    return;
-                }
-            }
-        }
-
-        public static void convertArgListPython(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    return;
-                }
-            }
-            {
-                Variable Head = new Variable();
-                Variable Tail = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Head, Tail)))
-                {
-                    convertExpressionPython(Head);
-                    if (YP.termNotEqual(Tail, Atom.NIL))
-                    {
-                        YP.write(Atom.a(", "));
-                        convertArgListPython(Tail);
-                        return;
-                        goto cutIf1;
-                    }
-                    convertArgListPython(Tail);
-                    return;
-                cutIf1:
-                    { }
-                }
-            }
-        }
-
-        public static void convertExpressionPython(object arg1)
-        {
-            {
-                Variable X = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("arg", X)))
-                {
-                    YP.write(X);
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("call", Name, ArgList)))
-                {
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListPython(ArgList);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable _FunctorArgs = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3("functorCall", Name, _FunctorArgs, ArgList)))
-                {
-                    convertExpressionPython(new Functor2("call", Name, ArgList));
-                    return;
-                }
-            }
-            {
-                Variable Obj = new Variable();
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor3("callMember", new Functor1("var", Obj), Name, ArgList)))
-                {
-                    YP.write(Obj);
-                    YP.write(Atom.a("."));
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListPython(ArgList);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("new", Name, ArgList)))
-                {
-                    YP.write(Name);
-                    YP.write(Atom.a("("));
-                    convertArgListPython(ArgList);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable Name = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("var", Name)))
-                {
-                    YP.write(Name);
-                    return;
-                }
-            }
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.a("null")))
-                {
-                    YP.write(Atom.a("None"));
-                    return;
-                }
-            }
-            {
-                Variable X = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("not", X)))
-                {
-                    YP.write(Atom.a("not ("));
-                    convertExpressionPython(X);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable X = new Variable();
-                Variable Y = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor2("and", X, Y)))
-                {
-                    YP.write(Atom.a("("));
-                    convertExpressionPython(X);
-                    YP.write(Atom.a(") and ("));
-                    convertExpressionPython(Y);
-                    YP.write(Atom.a(")"));
-                    return;
-                }
-            }
-            {
-                Variable ArgList = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("objectArray", ArgList)))
-                {
-                    YP.write(Atom.a("["));
-                    convertArgListPython(ArgList);
-                    YP.write(Atom.a("]"));
-                    return;
-                }
-            }
-            {
-                Variable X = new Variable();
-                Variable Codes = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("object", X)))
-                {
-                    if (YP.atom(X))
-                    {
-                        YP.write(Atom.a("\""));
-                        foreach (bool l4 in YP.atom_codes(X, Codes))
-                        {
-                            convertStringCodesPython(Codes);
-                            YP.write(Atom.a("\""));
-                            return;
-                        }
-                    }
-                }
-            }
-            {
-                Variable X = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new Functor1("object", X)))
-                {
-                    YP.write(X);
-                    return;
-                }
-            }
-        }
-
-        public static void convertStringCodesPython(object arg1)
-        {
-            {
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    return;
-                }
-            }
-            {
-                Variable Code = new Variable();
-                Variable RestCodes = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(Code, RestCodes)))
-                {
-                    if (YP.termEqual(Code, 34))
-                    {
-                        YP.put_code(92);
-                        YP.put_code(Code);
-                        convertStringCodesPython(RestCodes);
-                        return;
-                        goto cutIf1;
-                    }
-                    if (YP.termEqual(Code, 92))
-                    {
-                        YP.put_code(92);
-                        YP.put_code(Code);
-                        convertStringCodesPython(RestCodes);
-                        return;
-                        goto cutIf1;
-                    }
-                    YP.put_code(Code);
-                    convertStringCodesPython(RestCodes);
-                    return;
-                cutIf1:
-                    { }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> putCStringCode(object Code)
-        {
-            {
-                Variable HexDigit = new Variable();
-                Variable HexChar = new Variable();
-                if (YP.lessThanOrEqual(Code, 31))
-                {
-                    if (YP.lessThanOrEqual(Code, 15))
-                    {
-                        YP.write(Atom.a("\\u000"));
-                        foreach (bool l4 in YP.unify(HexDigit, Code))
-                        {
-                            if (YP.lessThanOrEqual(HexDigit, 9))
-                            {
-                                foreach (bool l6 in YP.unify(HexChar, YP.add(HexDigit, 48)))
-                                {
-                                    YP.put_code(HexChar);
-                                    yield return true;
-                                    yield break;
-                                }
-                                goto cutIf2;
-                            }
-                            foreach (bool l5 in YP.unify(HexChar, YP.add(HexDigit, 55)))
-                            {
-                                YP.put_code(HexChar);
-                                yield return true;
-                                yield break;
-                            }
-                        cutIf2:
-                            { }
-                        }
-                        goto cutIf1;
-                    }
-                    YP.write(Atom.a("\\u001"));
-                    foreach (bool l3 in YP.unify(HexDigit, YP.subtract(Code, 16)))
-                    {
-                        if (YP.lessThanOrEqual(HexDigit, 9))
-                        {
-                            foreach (bool l5 in YP.unify(HexChar, YP.add(HexDigit, 48)))
-                            {
-                                YP.put_code(HexChar);
-                                yield return true;
-                                yield break;
-                            }
-                            goto cutIf3;
-                        }
-                        foreach (bool l4 in YP.unify(HexChar, YP.add(HexDigit, 55)))
-                        {
-                            YP.put_code(HexChar);
-                            yield return true;
-                            yield break;
-                        }
-                    cutIf3:
-                        { }
-                    }
-                cutIf1:
-                    { }
-                }
-            }
-            {
-                if (YP.termEqual(Code, 34))
-                {
-                    YP.put_code(92);
-                    YP.put_code(34);
-                    yield return true;
-                    yield break;
-                }
-            }
-            {
-                if (YP.termEqual(Code, 92))
-                {
-                    YP.put_code(92);
-                    YP.put_code(92);
-                    yield return true;
-                    yield break;
-                }
-            }
-            {
-                YP.put_code(Code);
-                yield return true;
-                yield break;
-            }
-        }
-
-        public static IEnumerable<bool> member(object X, object arg2)
-        {
-            {
-                Variable x2 = new Variable();
-                foreach (bool l2 in YP.unify(arg2, new ListPair(X, x2)))
-                {
-                    yield return false;
-                }
-            }
-            {
-                Variable x2 = new Variable();
-                Variable Rest = new Variable();
-                foreach (bool l2 in YP.unify(arg2, new ListPair(x2, Rest)))
-                {
-                    foreach (bool l3 in member(X, Rest))
-                    {
-                        yield return false;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<bool> append(object arg1, object arg2, object arg3)
-        {
-            {
-                Variable List = new Variable();
-                foreach (bool l2 in YP.unify(arg1, Atom.NIL))
-                {
-                    foreach (bool l3 in YP.unify(arg2, List))
-                    {
-                        foreach (bool l4 in YP.unify(arg3, List))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-            {
-                object List2 = arg2;
-                Variable X = new Variable();
-                Variable List1 = new Variable();
-                Variable List12 = new Variable();
-                foreach (bool l2 in YP.unify(arg1, new ListPair(X, List1)))
-                {
-                    foreach (bool l3 in YP.unify(arg3, new ListPair(X, List12)))
-                    {
-                        foreach (bool l4 in append(List1, List2, List12))
-                        {
-                            yield return false;
-                        }
-                    }
-                }
-            }
-        }
-        #pragma warning restore 0168, 0219, 0164,0162
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index 6aa717d..4e0c273 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -162,7 +162,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             m_braceCount++;
 
             // line number
-            m_CSharpLine += 3;
+            m_CSharpLine += 9;
 
             // here's the payload
             retstr += GenerateLine();
@@ -626,11 +626,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             string labelStatement;
 
             if (m_insertCoopTerminationChecks)
-                labelStatement = m_coopTerminationCheck + "\n";
+                labelStatement = m_coopTerminationCheck;
             else
-                labelStatement = "NoOp();\n";
+                labelStatement = "NoOp();";
 
-            return Generate(String.Format("{0}: ", CheckName(jl.LabelName)), jl) + labelStatement;
+            return GenerateLine(String.Format("{0}: {1}", CheckName(jl.LabelName), labelStatement), jl);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index a1b8d85..af324bf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -58,9 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         {
             lsl = 0,
             cs = 1,
-            vb = 2,
-            js = 3,
-            yp = 4
+            vb = 2
         }
 
         /// <summary>
@@ -85,9 +83,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
         private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
         private static VBCodeProvider VBcodeProvider = new VBCodeProvider();
-//        private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider();
-        private static CSharpCodeProvider YPcodeProvider = new CSharpCodeProvider(); // YP is translated into CSharp
-        private static YP2CSConverter YP_Converter = new YP2CSConverter();
 
         // private static int instanceID = new Random().Next(0, int.MaxValue);                 // Unique number to use on our compiled files
         private static UInt64 scriptCompileCounter = 0;                                     // And a counter
@@ -123,7 +118,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             if (in_startup)
             {
                 in_startup = false;
-                CreateScriptsDirectory();
+                CheckOrCreateScriptsDirectory();
                 
                 // First time we start? Delete old files
                 if (DeleteScriptsOnStartup)
@@ -134,8 +129,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             LanguageMapping.Add(enumCompileType.cs.ToString(), enumCompileType.cs);
             LanguageMapping.Add(enumCompileType.vb.ToString(), enumCompileType.vb);
             LanguageMapping.Add(enumCompileType.lsl.ToString(), enumCompileType.lsl);
-            LanguageMapping.Add(enumCompileType.js.ToString(), enumCompileType.js);
-            LanguageMapping.Add(enumCompileType.yp.ToString(), enumCompileType.yp);
 
             // Allowed compilers
             string allowComp = m_scriptEngine.Config.GetString("AllowedCompilers", "lsl");
@@ -192,13 +185,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             }
 
             // We now have an allow-list, a mapping list, and a default language
-
         }
 
         /// <summary>
-        /// Create the directory where compiled scripts are stored.
+        /// Create the directory where compiled scripts are stored if it does not already exist.
         /// </summary>
-        private void CreateScriptsDirectory()
+        private void CheckOrCreateScriptsDirectory()
         {
             if (!Directory.Exists(ScriptEnginesPath))
             {
@@ -288,15 +280,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             return GetCompilerOutput(assetID.ToString());
         }
 
-        /// <summary>
-        /// Converts script from LSL to CS and calls CompileFromCSText
-        /// </summary>
-        /// <param name="Script">LSL script</param>
-        /// <returns>Filename to .dll assembly</returns>
-        public void PerformScriptCompile(string Script, string asset, UUID ownerUUID,
+        public void PerformScriptCompile(
+            string source, string asset, UUID ownerUUID,
+            out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap)
+        {
+            PerformScriptCompile(source, asset, ownerUUID, false, out assembly, out linemap);
+        }
+
+        public void PerformScriptCompile(
+            string source, string asset, UUID ownerUUID, bool alwaysRecompile,
             out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap)
         {
-//            m_log.DebugFormat("[Compiler]: Compiling script\n{0}", Script);
+//            m_log.DebugFormat("[Compiler]: Checking script for asset {0} in {1}\n{2}", asset, m_scriptEngine.World.Name, source);
 
             IScriptModuleComms comms = m_scriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
 
@@ -305,33 +300,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
             assembly = GetCompilerOutput(asset);
 
-            if (!Directory.Exists(ScriptEnginesPath))
-            {
-                try
-                {
-                    Directory.CreateDirectory(ScriptEnginesPath);
-                }
-                catch (Exception)
-                {
-                }
-            }
+//            m_log.DebugFormat("[Compiler]: Retrieved assembly {0} for asset {1} in {2}", assembly, asset, m_scriptEngine.World.Name);
 
-            if (!Directory.Exists(Path.Combine(ScriptEnginesPath,
-                                               m_scriptEngine.World.RegionInfo.RegionID.ToString())))
-            {
-                try
-                {
-                    Directory.CreateDirectory(ScriptEnginesPath);
-                }
-                catch (Exception)
-                {
-                }
-            }
+            CheckOrCreateScriptsDirectory();
 
-            // Don't recompile if we already have it
+            // Don't recompile if we're not forced to and we already have it
             // Performing 3 file exists tests for every script can still be slow
-            if (File.Exists(assembly) && File.Exists(assembly + ".text") && File.Exists(assembly + ".map"))
+            if (!alwaysRecompile && File.Exists(assembly) && File.Exists(assembly + ".text") && File.Exists(assembly + ".map"))
             {
+//                m_log.DebugFormat("[Compiler]: Found existing assembly {0} for asset {1} in {2}", assembly, asset, m_scriptEngine.World.Name);
+
                 // If we have already read this linemap file, then it will be in our dictionary. 
                 // Don't build another copy of the dictionary (saves memory) and certainly
                 // don't keep reading the same file from disk multiple times. 
@@ -341,31 +319,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 return;
             }
 
-            if (Script == String.Empty)
-            {
+//            m_log.DebugFormat("[Compiler]: Compiling assembly {0} for asset {1} in {2}", assembly, asset, m_scriptEngine.World.Name);
+
+            if (source == String.Empty)
                 throw new Exception("Cannot find script assembly and no script text present");
-            }
 
             enumCompileType language = DefaultCompileLanguage;
 
-            if (Script.StartsWith("//c#", true, CultureInfo.InvariantCulture))
+            if (source.StartsWith("//c#", true, CultureInfo.InvariantCulture))
                 language = enumCompileType.cs;
-            if (Script.StartsWith("//vb", true, CultureInfo.InvariantCulture))
+            if (source.StartsWith("//vb", true, CultureInfo.InvariantCulture))
             {
                 language = enumCompileType.vb;
                 // We need to remove //vb, it won't compile with that
 
-                Script = Script.Substring(4, Script.Length - 4);
+                source = source.Substring(4, source.Length - 4);
             }
-            if (Script.StartsWith("//lsl", true, CultureInfo.InvariantCulture))
+            if (source.StartsWith("//lsl", true, CultureInfo.InvariantCulture))
                 language = enumCompileType.lsl;
 
-            if (Script.StartsWith("//js", true, CultureInfo.InvariantCulture))
-                language = enumCompileType.js;
-
-            if (Script.StartsWith("//yp", true, CultureInfo.InvariantCulture))
-                language = enumCompileType.yp;
-
 //            m_log.DebugFormat("[Compiler]: Compile language is {0}", language);
 
             if (!AllowedCompilers.ContainsKey(language.ToString()))
@@ -384,13 +356,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 throw new Exception(errtext);
             }
 
-            string compileScript = Script;
+            string compileScript = source;
 
             if (language == enumCompileType.lsl)
             {
                 // Its LSL, convert it to C#
                 LSL_Converter = (ICodeConverter)new CSCodeGenerator(comms, m_insertCoopTerminationCalls);
-                compileScript = LSL_Converter.Convert(Script);
+                compileScript = LSL_Converter.Convert(source);
 
                 // copy converter warnings into our warnings.
                 foreach (string warning in LSL_Converter.GetWarnings())
@@ -404,12 +376,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 WriteMapFile(assembly + ".map", linemap);
             }
 
-            if (language == enumCompileType.yp)
-            {
-                // Its YP, convert it to C#
-                compileScript = YP_Converter.Convert(Script);
-            }
-
             switch (language)
             {
                 case enumCompileType.cs:
@@ -424,13 +390,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                     compileScript = CreateVBCompilerScript(
                         compileScript, m_scriptEngine.ScriptClassName, m_scriptEngine.ScriptBaseClassName);
                     break;
-//                case enumCompileType.js:
-//                    compileScript = CreateJSCompilerScript(compileScript, m_scriptEngine.ScriptBaseClassName);
-//                    break;
-                case enumCompileType.yp:
-                    compileScript = CreateYPCompilerScript(
-                        compileScript, m_scriptEngine.ScriptClassName,m_scriptEngine.ScriptBaseClassName);
-                    break;
             }
 
             assembly = CompileFromDotNetText(compileScript, language, asset, assembly);
@@ -460,7 +419,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 //            return compileScript;
 //        }
 
-        private static string CreateCSCompilerScript(
+        public static string CreateCSCompilerScript(
             string compileScript, string className, string baseClassName, ParameterInfo[] constructorParameters)
         {
             compileScript = string.Format(    
@@ -488,23 +447,7 @@ namespace SecondLife
             return compileScript;
         }
 
-        private static string CreateYPCompilerScript(string compileScript, string className, string baseClassName)
-        {
-            compileScript = String.Empty +
-                       "using OpenSim.Region.ScriptEngine.Shared.YieldProlog; " +
-                        "using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\r\n" +
-                        String.Empty + "namespace SecondLife { " +
-                        String.Empty + "public class " + className + " : " + baseClassName + " { \r\n" +
-                        //@"public Script() { } " +
-                        @"static OpenSim.Region.ScriptEngine.Shared.YieldProlog.YP YP=null; " +
-                        @"public " + className + "() {  YP= new OpenSim.Region.ScriptEngine.Shared.YieldProlog.YP(); } " +
-                        compileScript +
-                        "} }\r\n";
-
-            return compileScript;
-        }
-
-        private static string CreateVBCompilerScript(string compileScript, string className, string baseClassName)
+        public static string CreateVBCompilerScript(string compileScript, string className, string baseClassName)
         {
             compileScript = String.Empty +
                 "Imports OpenSim.Region.ScriptEngine.Shared: Imports System.Collections.Generic: " +
@@ -532,7 +475,11 @@ namespace SecondLife
             scriptCompileCounter++;
             try
             {
-                File.Delete(assembly);
+                if (File.Exists(assembly))
+                {
+                    File.SetAttributes(assembly, FileAttributes.Normal);
+                    File.Delete(assembly);
+                }
             }
             catch (Exception e) // NOTLEGIT - Should be just FileIOException
             {
@@ -580,12 +527,6 @@ namespace SecondLife
                     m_scriptEngine.ScriptReferencedAssemblies, 
                     a => parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, a)));
 
-            if (lang == enumCompileType.yp)
-            {
-                parameters.ReferencedAssemblies.Add(Path.Combine(rootPath,
-                        "OpenSim.Region.ScriptEngine.Shared.YieldProlog.dll"));
-            }
-
             parameters.GenerateExecutable = false;
             parameters.OutputAssembly = assembly;
             parameters.IncludeDebugInformation = CompileWithDebugInformation;
@@ -635,14 +576,6 @@ namespace SecondLife
                         }
                     } while (!complete);
                     break;
-//                case enumCompileType.js:
-//                    results = JScodeProvider.CompileAssemblyFromSource(
-//                        parameters, Script);
-//                    break;
-                case enumCompileType.yp:
-                    results = YPcodeProvider.CompileAssemblyFromSource(
-                        parameters, Script);
-                    break;
                 default:
                     throw new Exception("Compiler is not able to recongnize " +
                                         "language type \"" + lang.ToString() + "\"");
@@ -740,9 +673,8 @@ namespace SecondLife
 
             try
             {
-                FileStream fs = File.Open(assembly, FileMode.Open, FileAccess.Read);
-                fs.Read(data, 0, data.Length);
-                fs.Close();
+                using (FileStream fs = File.Open(assembly, FileMode.Open, FileAccess.Read))
+                    fs.Read(data, 0, data.Length);
             }
             catch (Exception)
             {
@@ -757,19 +689,19 @@ namespace SecondLife
 
             Byte[] buf = Encoding.ASCII.GetBytes(filetext);
 
-            FileStream sfs = File.Create(assembly + ".text");
-            sfs.Write(buf, 0, buf.Length);
-            sfs.Close();
+            using (FileStream sfs = File.Create(assembly + ".text"))
+                sfs.Write(buf, 0, buf.Length);
 
             return assembly;
         }
 
-        private class kvpSorter : IComparer<KeyValuePair<int, int>>
+        private class kvpSorter : IComparer<KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>>>
         {
-            public int Compare(KeyValuePair<int, int> a,
-                    KeyValuePair<int, int> b)
+            public int Compare(KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> a,
+                               KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> b)
             {
-                return a.Key.CompareTo(b.Key);
+                int kc = a.Key.Key.CompareTo(b.Key.Key);
+                return (kc != 0) ? kc : a.Key.Value.CompareTo(b.Key.Value);
             }
         }
 
@@ -786,30 +718,46 @@ namespace SecondLife
                     out ret))
                 return ret;
 
-            List<KeyValuePair<int, int>> sorted =
-                    new List<KeyValuePair<int, int>>(positionMap.Keys);
+            var sorted = new List<KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>>>(positionMap);
 
             sorted.Sort(new kvpSorter());
 
             int l = 1;
             int c = 1;
+            int pl = 1;
 
-            foreach (KeyValuePair<int, int> cspos in sorted)
+            foreach (KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> posmap in sorted)
             {
-                if (cspos.Key >= line)
+                //m_log.DebugFormat("[Compiler]: Scanning line map {0},{1} --> {2},{3}", posmap.Key.Key, posmap.Key.Value, posmap.Value.Key, posmap.Value.Value);
+                int nl = posmap.Value.Key + line - posmap.Key.Key;      // New, translated LSL line and column.
+                int nc = posmap.Value.Value + col - posmap.Key.Value;
+                // Keep going until we find the first point passed line,col.
+                if (posmap.Key.Key > line)
                 {
-                    if (cspos.Key > line)
-                        return new KeyValuePair<int, int>(l, c);
-                    if (cspos.Value > col)
-                        return new KeyValuePair<int, int>(l, c);
-                    c = cspos.Value;
-                    if (c == 0)
-                        c++;
+                  //m_log.DebugFormat("[Compiler]: Line is larger than requested {0},{1}, returning {2},{3}", line, col, l, c);
+                  if (pl < line)
+                  {
+                    //m_log.DebugFormat("[Compiler]: Previous line ({0}) is less than requested line ({1}), setting column to 1.", pl, line);
+                    c = 1;
+                  }
+                  break;
                 }
-                else
+                if (posmap.Key.Key == line && posmap.Key.Value > col)
                 {
-                    l = cspos.Key;
+                  // Never move l,c backwards.
+                  if (nl > l || (nl == l && nc > c))
+                  {
+                    //m_log.DebugFormat("[Compiler]: Using offset relative to this: {0} + {1} - {2}, {3} + {4} - {5} = {6}, {7}",
+                    //    posmap.Value.Key, line, posmap.Key.Key, posmap.Value.Value, col, posmap.Key.Value, nl, nc);
+                    l = nl;
+                    c = nc;
+                  }
+                  //m_log.DebugFormat("[Compiler]: Column is larger than requested {0},{1}, returning {2},{3}", line, col, l, c);
+                  break;
                 }
+                pl = posmap.Key.Key;
+                l = posmap.Value.Key;
+                c = posmap.Value.Value;
             }
             return new KeyValuePair<int, int>(l, c);
         }
@@ -835,7 +783,6 @@ namespace SecondLife
             return message;
         }
 
-
         private static void WriteMapFile(string filename, Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap)
         {
             string mapstring = String.Empty;
@@ -847,40 +794,42 @@ namespace SecondLife
             }
 
             Byte[] mapbytes = Encoding.ASCII.GetBytes(mapstring);
-            FileStream mfs = File.Create(filename);
-            mfs.Write(mapbytes, 0, mapbytes.Length);
-            mfs.Close();
-        }
 
+            using (FileStream mfs = File.Create(filename))
+                mfs.Write(mapbytes, 0, mapbytes.Length);
+        }
 
         private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> ReadMapFile(string filename)
         {
             Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap;
             try
             {
-                StreamReader r = File.OpenText(filename);
-                linemap = new Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>();
-
-                string line;
-                while ((line = r.ReadLine()) != null)
+                using (StreamReader r = File.OpenText(filename))
                 {
-                    String[] parts = line.Split(new Char[] { ',' });
-                    int kk = System.Convert.ToInt32(parts[0]);
-                    int kv = System.Convert.ToInt32(parts[1]);
-                    int vk = System.Convert.ToInt32(parts[2]);
-                    int vv = System.Convert.ToInt32(parts[3]);
+                    linemap = new Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>();
 
-                    KeyValuePair<int, int> k = new KeyValuePair<int, int>(kk, kv);
-                    KeyValuePair<int, int> v = new KeyValuePair<int, int>(vk, vv);
+                    string line;
+                    while ((line = r.ReadLine()) != null)
+                    {
+                        String[] parts = line.Split(new Char[] { ',' });
+                        int kk = System.Convert.ToInt32(parts[0]);
+                        int kv = System.Convert.ToInt32(parts[1]);
+                        int vk = System.Convert.ToInt32(parts[2]);
+                        int vv = System.Convert.ToInt32(parts[3]);
 
-                    linemap[k] = v;
+                        KeyValuePair<int, int> k = new KeyValuePair<int, int>(kk, kv);
+                        KeyValuePair<int, int> v = new KeyValuePair<int, int>(vk, vv);
+
+                        linemap[k] = v;
+                    }
                 }
             }
             catch
             {
                 linemap = new Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>();
             }
+
             return linemap;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
index d163438..4df09ef 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
index 05a8756..b476e32 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
@@ -25,12 +25,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.IO;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using Microsoft.CSharp;
 using NUnit.Framework;
 using OpenSim.Region.ScriptEngine.Shared.CodeTools;
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Tests.Common;
 
 namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
@@ -46,7 +48,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
         private string m_testDir;
         private CSharpCodeProvider m_CSCodeProvider;
         private CompilerParameters m_compilerParameters;
-        private CompilerResults m_compilerResults;
+        // private CompilerResults m_compilerResults;
+        private ResolveEventHandler m_resolveEventHandler;
 
         /// <summary>
         /// Creates a temporary directory where build artifacts are stored.
@@ -61,14 +64,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
                 // Create the temporary directory for housing build artifacts.
                 Directory.CreateDirectory(m_testDir);
             }
+        }
+
+        [SetUp]
+        public override void SetUp()
+        {
+            base.SetUp();
 
             // Create a CSCodeProvider and CompilerParameters.
             m_CSCodeProvider = new CSharpCodeProvider();
             m_compilerParameters = new CompilerParameters();
 
-            string rootPath = Path.Combine(Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory), "bin");
+            string rootPath = System.AppDomain.CurrentDomain.BaseDirectory;
+
+            m_resolveEventHandler = new ResolveEventHandler(AssemblyResolver.OnAssemblyResolve);
+
+            System.AppDomain.CurrentDomain.AssemblyResolve += m_resolveEventHandler;
+                
             m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll"));
             m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll"));
+            m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll"));
             m_compilerParameters.GenerateExecutable = false;
         }
 
@@ -76,9 +91,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
         /// Removes the temporary build directory and any build artifacts
         /// inside it.
         /// </summary>
-        [TestFixtureTearDown]
+        [TearDown]
         public void CleanUp()
         {
+            System.AppDomain.CurrentDomain.AssemblyResolve -= m_resolveEventHandler;
+
             if (Directory.Exists(m_testDir))
             {
                 // Blow away the temporary directory with artifacts.
@@ -86,52 +103,100 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
             }
         }
 
+        private CompilerResults CompileScript(
+            string input, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> positionMap)
+        {
+            m_compilerParameters.OutputAssembly = Path.Combine(m_testDir, Path.GetRandomFileName() + ".dll");
+
+            CSCodeGenerator cg = new CSCodeGenerator();
+            string output = cg.Convert(input);
+
+            output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null);         
+            //            System.Console.WriteLine(output);
+
+            positionMap = cg.PositionMap;
+
+            CompilerResults compilerResults = m_CSCodeProvider.CompileAssemblyFromSource(m_compilerParameters, output);
+
+            //            foreach (KeyValuePair<int, int> key in positionMap.Keys)
+            //            {
+            //                KeyValuePair<int, int> val = positionMap[key];
+            //
+            //                System.Console.WriteLine("{0},{1} => {2},{3}", key.Key, key.Value, val.Key, val.Value);
+            //            }
+            //
+            //            foreach (CompilerError compErr in m_compilerResults.Errors)
+            //            {
+            //                System.Console.WriteLine("Error: {0},{1} => {2}", compErr.Line, compErr.Column, compErr);
+            //            }
+
+            return compilerResults;
+        }
+
+        /// <summary>
+        /// Test that line number errors are resolved as expected when preceding code contains a jump.
+        /// </summary>
+        [Test]
+        public void TestJumpAndSyntaxError()
+        {
+            TestHelpers.InMethod();
+
+            Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> positionMap;
+
+            CompilerResults compilerResults = CompileScript(
+@"default
+{
+    state_entry()
+    {
+        jump l;
+        @l;
+        i = 1;
+    }
+}", out positionMap);           
+
+            Assert.AreEqual(
+                new KeyValuePair<int, int>(7, 9),
+                positionMap[new KeyValuePair<int, int>(compilerResults.Errors[0].Line, compilerResults.Errors[0].Column)]);
+        }
+
         /// <summary>
         /// Test the C# compiler error message can be mapped to the correct
         /// line/column in the LSL source when an undeclared variable is used.
         /// </summary>
-        //[Test]
+        [Test]
         public void TestUseUndeclaredVariable()
         {
             TestHelpers.InMethod();
 
-            m_compilerParameters.OutputAssembly = Path.Combine(m_testDir, Path.GetRandomFileName() + ".dll");
+            Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> positionMap;
 
-            string input = @"default
+            CompilerResults compilerResults = CompileScript(
+@"default
 {
     state_entry()
     {
         integer y = x + 3;
     }
-}";
+}", out positionMap);
 
-            CSCodeGenerator cg = new CSCodeGenerator();
-            string output = "using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\n" +
-                            "namespace SecondLife { " +
-                            "public class Script : OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass {\n" +
-                            "public Script() { } " +
-                            cg.Convert(input) +
-                            "} }\n";
-            Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> positionMap = cg.PositionMap;
-
-            m_compilerResults = m_CSCodeProvider.CompileAssemblyFromSource(m_compilerParameters, output);
-
-            Assert.AreEqual(new KeyValuePair<int, int>(5, 21),
-                            positionMap[new KeyValuePair<int, int>(m_compilerResults.Errors[0].Line, m_compilerResults.Errors[0].Column)]);
+            Assert.AreEqual(
+                new KeyValuePair<int, int>(5, 21),
+                positionMap[new KeyValuePair<int, int>(compilerResults.Errors[0].Line, compilerResults.Errors[0].Column)]);
         }
 
         /// <summary>
         /// Test that a string can be cast to string and another string
         /// concatenated.
         /// </summary>
-        //[Test]
+        [Test]
         public void TestCastAndConcatString()
         {
             TestHelpers.InMethod();
 
-            m_compilerParameters.OutputAssembly = Path.Combine(m_testDir, Path.GetRandomFileName() + ".dll");
+            Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> positionMap;
 
-            string input = @"string s = "" a string"";
+            CompilerResults compilerResults = CompileScript(
+@"string s = "" a string"";
 
 default
 {
@@ -141,18 +206,9 @@ default
         string tmp = (string) gAvatarKey + s;
         llSay(0, tmp);
     }
-}";
+}", out positionMap);
 
-            CSCodeGenerator cg = new CSCodeGenerator();
-            string output = "using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\n" +
-                            "namespace SecondLife { " +
-                            "public class Script : OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass {\n" +
-                            "public Script() { } " +
-                            cg.Convert(input) +
-                            "} }\n";
-            m_compilerResults = m_CSCodeProvider.CompileAssemblyFromSource(m_compilerParameters, output);
-
-            Assert.AreEqual(0, m_compilerResults.Errors.Count);
+            Assert.AreEqual(0, compilerResults.Errors.Count);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs
deleted file mode 100644
index 7ea3cfc..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-* 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.IO;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-using OpenSim.Region.ScriptEngine.Shared.YieldProlog;
-
-namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
-{
-    public class YP2CSConverter
-    {
-        public YP2CSConverter()
-        {
-        }
-
-        public string Convert(string Script)
-        {
-            string CS_code = GenCode(Script);
-            return CS_code;
-        }
-
-        static string GenCode(string myCode)
-        {
-            Variable TermList = new Variable();
-            Variable FunctionCode = new Variable();
-
-            string CS_code = "";
-
-            int cs_pointer = myCode.IndexOf("\n//cs");
-            if (cs_pointer > 0)
-            {
-                CS_code = myCode.Substring(cs_pointer); // CS code comes after
-                myCode = myCode.Substring(0, cs_pointer);
-            }
-            myCode.Replace("//yp", "%YPCode");
-
-            StringWriter myCS_SW = new StringWriter();
-            StringReader myCode_SR = new StringReader(" yp_nop_header_nop. \n "+myCode + "\n");
-
-            YP.see(myCode_SR);
-            YP.tell(myCS_SW);
-
-            //m_log.Debug("Mycode\n ===================================\n" + myCode+"\n");
-
-// disable warning: don't see how we can code this differently short
-// of rewriting the whole thing
-#pragma warning disable 0168, 0219
-            foreach (bool l1 in Parser.parseInput(TermList))
-            {
-                foreach (bool l2 in YPCompiler.makeFunctionPseudoCode(TermList, FunctionCode))
-                {
-                    // ListPair VFC = new ListPair(FunctionCode, new Variable());
-                    //m_log.Debug("-------------------------")
-                    //m_log.Debug(FunctionCode.ToString())
-                    //m_log.Debug("-------------------------")
-                    YPCompiler.convertFunctionCSharp(FunctionCode);
-                    //YPCompiler.convertStringCodesCSharp(VFC);
-                }
-            }
-#pragma warning restore 0168, 0219
-            YP.seen();
-            myCS_SW.Close();
-            YP.told();
-            StringBuilder bu = myCS_SW.GetStringBuilder();
-            string finalcode = "//YPEncoded\n" + bu.ToString();
-            // FIX script events (we're in the same script)
-            // 'YP.script_event(Atom.a(@"sayit"),' ==> 'sayit('
-            finalcode = Regex.Replace(finalcode,
-                                        @"YP.script_event\(Atom.a\(\@\""(.*?)""\)\,",
-                                        @"this.$1(",
-                                        RegexOptions.Compiled | RegexOptions.Singleline);
-            finalcode = Regex.Replace(finalcode,
-                                        @"YP.script_event\(Atom.a\(\""(.*?)""\)\,",
-                                        @"this.$1(",
-                                        RegexOptions.Compiled | RegexOptions.Singleline);
-            finalcode = Regex.Replace(finalcode,
-                            @" static ",
-                            @" ",
-                            RegexOptions.Compiled | RegexOptions.Singleline);
-
-            finalcode = CS_code+"\n\r"+ finalcode;
-            finalcode = Regex.Replace(finalcode,
-                                        @"PrologCallback",
-                                        @"public IEnumerable<bool> ",
-                                        RegexOptions.Compiled | RegexOptions.Singleline);
-            return finalcode;
-        }
-    }
-}
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
index cad27b7..f87f446 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
@@ -357,21 +357,25 @@ public override int yynum { get { return 90; }}
 public class HTTP_REQUEST_EVENT : TOKEN{ public override string yyname { get { return "HTTP_REQUEST_EVENT";}}
 public override int yynum { get { return 91; }}
  public HTTP_REQUEST_EVENT(Lexer yyl):base(yyl) {}}
-//%IDENT+92
-public class IDENT : TOKEN{ public override string yyname { get { return "IDENT";}}
+//%TRANSACTION_RESULT_EVENT+92
+public class TRANSACTION_RESULT_EVENT : TOKEN{ public override string yyname { get { return "TRANSACTION_RESULT_EVENT";}}
 public override int yynum { get { return 92; }}
+ public TRANSACTION_RESULT_EVENT(Lexer yyl):base(yyl) {}}
+//%IDENT+93
+public class IDENT : TOKEN{ public override string yyname { get { return "IDENT";}}
+public override int yynum { get { return 93; }}
  public IDENT(Lexer yyl):base(yyl) {}}
-//%INTEGER_CONSTANT+93
+//%INTEGER_CONSTANT+94
 public class INTEGER_CONSTANT : TOKEN{ public override string yyname { get { return "INTEGER_CONSTANT";}}
-public override int yynum { get { return 93; }}
+public override int yynum { get { return 94; }}
  public INTEGER_CONSTANT(Lexer yyl):base(yyl) {}}
-//%HEX_INTEGER_CONSTANT+94
+//%HEX_INTEGER_CONSTANT+95
 public class HEX_INTEGER_CONSTANT : TOKEN{ public override string yyname { get { return "HEX_INTEGER_CONSTANT";}}
-public override int yynum { get { return 94; }}
+public override int yynum { get { return 95; }}
  public HEX_INTEGER_CONSTANT(Lexer yyl):base(yyl) {}}
-//%FLOAT_CONSTANT+95
+//%FLOAT_CONSTANT+96
 public class FLOAT_CONSTANT : TOKEN{ public override string yyname { get { return "FLOAT_CONSTANT";}}
-public override int yynum { get { return 95; }}
+public override int yynum { get { return 96; }}
  public FLOAT_CONSTANT(Lexer yyl):base(yyl) {}}
 //%|LSLTokens
 public class yyLSLTokens : YyLexer {
@@ -476,9 +480,9 @@ public class yyLSLTokens : YyLexer {
 2,1,3,56,0,
 2,1,3,57,0,
 2,1,7,9,122,
-9,1,9,3,96,
-33,123,5,1,3,
-96,33,2,1,7,
+9,1,9,3,238,
+22,123,5,1,3,
+238,22,2,1,7,
 10,124,9,1,10,
 3,178,0,125,5,
 1,3,178,0,2,
@@ -502,8 +506,8 @@ public class yyLSLTokens : YyLexer {
 9,0,2,1,3,
 10,0,2,1,7,
 15,134,9,1,15,
-3,15,7,135,5,
-1,3,15,7,2,
+3,0,6,135,5,
+1,3,0,6,2,
 1,7,17,136,9,
 1,17,3,0,224,
 137,5,1,3,0,
@@ -573,18 +577,18 @@ public class yyLSLTokens : YyLexer {
 79,0,77,0,77,
 0,69,0,78,0,
 84,0,160,12,1,
-1073,161,5,119,3,
+1095,161,5,119,3,
 1,0,162,12,1,
-1074,163,5,0,164,
-11,1,1041,0,165,
+1096,163,5,0,164,
+11,1,1063,0,165,
 4,0,1,-1,3,
 9,0,162,3,10,
-0,166,12,1,1275,
+0,166,12,1,1297,
 167,5,0,168,11,
-1,1045,0,165,1,
+1,1067,0,165,1,
 -1,3,13,0,162,
 3,0,3,162,3,
-96,33,162,3,32,
+0,6,162,3,32,
 0,162,3,33,0,
 162,3,34,0,162,
 3,35,0,162,3,
@@ -593,12 +597,12 @@ public class yyLSLTokens : YyLexer {
 162,3,40,0,162,
 3,41,0,162,3,
 42,0,169,12,1,
-1414,170,5,1,3,
+1436,170,5,1,3,
 47,0,171,12,1,
-1518,172,5,0,173,
-11,1,1027,0,165,
+1540,172,5,0,173,
+11,1,1049,0,165,
 1,-1,174,11,1,
-1041,0,165,1,-1,
+1063,0,165,1,-1,
 3,43,0,162,3,
 44,0,162,3,45,
 0,162,3,46,0,
@@ -641,15 +645,15 @@ public class yyLSLTokens : YyLexer {
 162,3,93,0,162,
 3,94,0,162,3,
 95,0,162,3,96,
-0,162,3,97,0,
+0,162,3,238,22,
 162,3,98,0,162,
 3,99,0,162,3,
 100,0,162,3,101,
-0,162,3,102,0,
+0,162,3,97,0,
 162,3,103,0,162,
 3,104,0,162,3,
 105,0,162,3,106,
-0,162,3,107,0,
+0,162,3,102,0,
 162,3,108,0,162,
 3,109,0,162,3,
 110,0,162,3,111,
@@ -665,11 +669,11 @@ public class yyLSLTokens : YyLexer {
 162,3,123,0,162,
 3,124,0,162,3,
 125,0,162,3,96,
-6,162,3,126,0,
-162,3,58,15,162,
-3,59,15,162,3,
-136,4,162,3,160,
-0,162,3,15,7,
+6,162,3,107,0,
+162,3,126,0,162,
+3,58,15,162,3,
+59,15,162,3,136,
+4,162,3,160,0,
 162,3,170,0,162,
 3,171,0,162,3,
 172,0,162,3,173,
@@ -687,17 +691,17 @@ public class yyLSLTokens : YyLexer {
 78,0,73,0,84,
 0,73,0,65,0,
 76,0,176,12,1,
-1674,177,5,91,3,
+1696,177,5,91,3,
 9,0,178,12,1,
-40509,179,5,0,180,
-11,1,1050,0,165,
+42571,179,5,0,180,
+11,1,1072,0,165,
 1,-1,3,10,0,
 178,3,13,0,178,
 3,32,0,178,3,
 33,0,181,12,1,
-43542,182,5,1,3,
+45604,182,5,1,3,
 61,0,183,12,1,
-43657,184,5,0,185,
+45719,184,5,0,185,
 11,1,142,0,186,
 4,36,69,0,88,
 0,67,0,76,0,
@@ -714,13 +718,13 @@ public class yyLSLTokens : YyLexer {
 65,0,84,0,73,
 0,79,0,78,0,
 1,-1,3,34,0,
-189,12,1,43783,190,
+189,12,1,45845,190,
 5,0,191,11,1,
-941,0,165,1,-1,
+963,0,165,1,-1,
 3,37,0,192,12,
-1,41733,193,5,1,
+1,43795,193,5,1,
 3,61,0,194,12,
-1,41848,195,5,0,
+1,43910,195,5,0,
 196,11,1,40,0,
 197,4,28,80,0,
 69,0,82,0,67,
@@ -734,9 +738,9 @@ public class yyLSLTokens : YyLexer {
 82,0,67,0,69,
 0,78,0,84,0,
 1,-1,3,38,0,
-200,12,1,41974,201,
+200,12,1,44036,201,
 5,1,3,38,0,
-202,12,1,42074,203,
+202,12,1,44136,203,
 5,0,204,11,1,
 185,0,205,4,14,
 65,0,77,0,80,
@@ -746,7 +750,7 @@ public class yyLSLTokens : YyLexer {
 0,207,4,6,65,
 0,77,0,80,0,
 1,-1,3,40,0,
-208,12,1,41246,209,
+208,12,1,43308,209,
 5,0,210,11,1,
 71,0,211,4,20,
 76,0,69,0,70,
@@ -754,7 +758,7 @@ public class yyLSLTokens : YyLexer {
 80,0,65,0,82,
 0,69,0,78,0,
 1,-1,3,41,0,
-212,12,1,41610,213,
+212,12,1,43672,213,
 5,0,214,11,1,
 76,0,215,4,22,
 82,0,73,0,71,
@@ -763,9 +767,9 @@ public class yyLSLTokens : YyLexer {
 0,82,0,69,0,
 78,0,1,-1,3,
 42,0,216,12,1,
-42215,217,5,1,3,
+44277,217,5,1,3,
 61,0,218,12,1,
-42330,219,5,0,220,
+44392,219,5,0,220,
 11,1,28,0,221,
 4,22,83,0,84,
 0,65,0,82,0,
@@ -777,9 +781,9 @@ public class yyLSLTokens : YyLexer {
 0,84,0,65,0,
 82,0,1,-1,3,
 43,0,224,12,1,
-45231,225,5,2,3,
+47293,225,5,2,3,
 61,0,226,12,1,
-45346,227,5,0,228,
+47408,227,5,0,228,
 11,1,16,0,229,
 4,22,80,0,76,
 0,85,0,83,0,
@@ -787,7 +791,7 @@ public class yyLSLTokens : YyLexer {
 0,85,0,65,0,
 76,0,83,0,1,
 -1,3,43,0,230,
-12,1,45468,231,5,
+12,1,47530,231,5,
 0,232,11,1,2,
 0,233,4,18,73,
 0,78,0,67,0,
@@ -798,15 +802,15 @@ public class yyLSLTokens : YyLexer {
 4,8,80,0,76,
 0,85,0,83,0,
 1,-1,3,44,0,
-236,12,1,42456,237,
+236,12,1,44518,237,
 5,0,238,11,1,
 61,0,239,4,10,
 67,0,79,0,77,
 0,77,0,65,0,
 1,-1,3,45,0,
-240,12,1,40641,241,
+240,12,1,42703,241,
 5,2,3,45,0,
-242,12,1,40728,243,
+242,12,1,42790,243,
 5,0,244,11,1,
 10,0,245,4,18,
 68,0,69,0,67,
@@ -814,7 +818,7 @@ public class yyLSLTokens : YyLexer {
 77,0,69,0,78,
 0,84,0,1,-1,
 3,61,0,246,12,
-1,40876,247,5,0,
+1,42938,247,5,0,
 248,11,1,22,0,
 249,4,24,77,0,
 73,0,78,0,85,
@@ -827,9 +831,9 @@ public class yyLSLTokens : YyLexer {
 0,78,0,85,0,
 83,0,1,-1,3,
 46,0,252,12,1,
-42577,253,5,14,3,
+44639,253,5,14,3,
 48,0,254,12,1,
-40243,255,5,14,3,
+42305,255,5,14,3,
 48,0,254,3,49,
 0,254,3,50,0,
 254,3,51,0,254,
@@ -839,11 +843,11 @@ public class yyLSLTokens : YyLexer {
 254,3,56,0,254,
 3,57,0,254,3,
 101,0,256,12,1,
-39706,257,5,12,3,
+41768,257,5,12,3,
 43,0,258,12,1,
-40033,259,5,10,3,
+42095,259,5,10,3,
 48,0,260,12,1,
-39768,261,5,12,3,
+41830,261,5,12,3,
 48,0,260,3,49,
 0,260,3,50,0,
 260,3,51,0,260,
@@ -853,8 +857,8 @@ public class yyLSLTokens : YyLexer {
 260,3,56,0,260,
 3,57,0,260,3,
 102,0,262,12,1,
-39774,263,5,0,264,
-11,1,882,0,265,
+41836,263,5,0,264,
+11,1,904,0,265,
 4,28,70,0,76,
 0,79,0,65,0,
 84,0,95,0,67,
@@ -862,7 +866,7 @@ public class yyLSLTokens : YyLexer {
 83,0,84,0,65,
 0,78,0,84,0,
 1,-1,3,70,0,
-262,266,11,1,882,
+262,266,11,1,904,
 0,265,1,-1,3,
 49,0,260,3,50,
 0,260,3,51,0,
@@ -884,7 +888,7 @@ public class yyLSLTokens : YyLexer {
 1,-1,3,102,0,
 262,3,69,0,256,
 3,70,0,262,267,
-11,1,882,0,265,
+11,1,904,0,265,
 1,-1,3,49,0,
 254,3,50,0,254,
 3,51,0,254,3,
@@ -901,15 +905,15 @@ public class yyLSLTokens : YyLexer {
 0,82,0,73,0,
 79,0,68,0,1,
 -1,3,47,0,270,
-12,1,42698,271,5,
+12,1,44760,271,5,
 3,3,47,0,272,
-12,1,42922,273,5,
+12,1,44984,273,5,
 118,3,1,0,274,
-12,1,42923,275,5,
+12,1,44985,275,5,
 118,3,1,0,274,
 3,9,0,274,3,
-96,33,274,3,13,
-0,274,3,0,3,
+13,0,274,3,0,
+3,274,3,0,6,
 274,3,32,0,274,
 3,33,0,274,3,
 34,0,274,3,35,
@@ -960,16 +964,16 @@ public class yyLSLTokens : YyLexer {
 0,274,3,93,0,
 274,3,94,0,274,
 3,95,0,274,3,
-96,0,274,3,97,
-0,274,3,98,0,
+96,0,274,3,238,
+22,274,3,98,0,
 274,3,99,0,274,
 3,100,0,274,3,
-101,0,274,3,102,
+101,0,274,3,97,
 0,274,3,103,0,
 274,3,104,0,274,
 3,105,0,274,3,
-106,0,274,3,107,
-0,274,3,15,7,
+106,0,274,3,102,
+0,274,3,108,0,
 274,3,109,0,274,
 3,110,0,274,3,
 111,0,274,3,112,
@@ -981,10 +985,10 @@ public class yyLSLTokens : YyLexer {
 274,3,119,0,274,
 3,120,0,274,3,
 121,0,274,3,122,
-0,274,3,108,0,
+0,274,3,123,0,
 274,3,124,0,274,
 3,125,0,274,3,
-96,6,274,3,123,
+96,6,274,3,107,
 0,274,3,126,0,
 274,3,58,15,274,
 3,59,15,274,3,
@@ -1001,11 +1005,11 @@ public class yyLSLTokens : YyLexer {
 274,3,0,224,274,
 3,40,32,274,3,
 63,32,274,276,11,
-1,1054,0,165,1,
+1,1076,0,165,1,
 -1,3,9,0,274,
-3,96,33,274,3,
-13,0,274,3,0,
-3,274,3,32,0,
+3,13,0,274,3,
+0,3,274,3,0,
+6,274,3,32,0,
 274,3,33,0,274,
 3,34,0,274,3,
 35,0,274,3,36,
@@ -1056,16 +1060,16 @@ public class yyLSLTokens : YyLexer {
 0,274,3,94,0,
 274,3,95,0,274,
 3,96,0,274,3,
-97,0,274,3,98,
+238,22,274,3,98,
 0,274,3,99,0,
 274,3,100,0,274,
 3,101,0,274,3,
-102,0,274,3,103,
+97,0,274,3,103,
 0,274,3,104,0,
 274,3,105,0,274,
 3,106,0,274,3,
-107,0,274,3,15,
-7,274,3,109,0,
+102,0,274,3,108,
+0,274,3,109,0,
 274,3,110,0,274,
 3,111,0,274,3,
 112,0,274,3,113,
@@ -1076,11 +1080,11 @@ public class yyLSLTokens : YyLexer {
 0,274,3,119,0,
 274,3,120,0,274,
 3,121,0,274,3,
-122,0,274,3,108,
+122,0,274,3,123,
 0,274,3,124,0,
 274,3,125,0,274,
 3,96,6,274,3,
-123,0,274,3,126,
+107,0,274,3,126,
 0,274,3,58,15,
 274,3,59,15,274,
 3,136,4,274,3,
@@ -1096,9 +1100,9 @@ public class yyLSLTokens : YyLexer {
 1,274,3,0,224,
 274,3,40,32,274,
 3,63,32,274,277,
-11,1,1054,0,165,
+11,1,1076,0,165,
 1,-1,3,61,0,
-278,12,1,43173,279,
+278,12,1,45235,279,
 5,0,280,11,1,
 34,0,281,4,24,
 83,0,76,0,65,
@@ -1107,19 +1111,19 @@ public class yyLSLTokens : YyLexer {
 0,85,0,65,0,
 76,0,83,0,1,
 -1,3,42,0,282,
-12,1,42799,283,5,
-0,284,11,1,1015,
+12,1,44861,283,5,
+0,284,11,1,1037,
 0,165,1,-1,285,
 11,1,96,0,286,
 4,10,83,0,76,
 0,65,0,83,0,
 72,0,1,-1,3,
 48,0,287,12,1,
-39296,288,5,13,3,
+41358,288,5,13,3,
 120,0,289,12,1,
-39320,290,5,22,3,
+41382,290,5,22,3,
 102,0,291,12,1,
-39321,292,5,22,3,
+41383,292,5,22,3,
 102,0,291,3,48,
 0,291,3,49,0,
 291,3,50,0,291,
@@ -1138,7 +1142,7 @@ public class yyLSLTokens : YyLexer {
 3,68,0,291,3,
 69,0,291,3,70,
 0,291,293,11,1,
-863,0,294,4,40,
+885,0,294,4,40,
 72,0,69,0,88,
 0,95,0,73,0,
 78,0,84,0,69,
@@ -1166,9 +1170,9 @@ public class yyLSLTokens : YyLexer {
 0,291,3,70,0,
 291,0,165,1,-1,
 3,48,0,295,12,
-1,39598,296,5,11,
+1,41660,296,5,11,
 3,46,0,297,12,
-1,39701,298,5,14,
+1,41763,298,5,14,
 3,48,0,254,3,
 49,0,254,3,50,
 0,254,3,51,0,
@@ -1180,7 +1184,7 @@ public class yyLSLTokens : YyLexer {
 3,101,0,256,3,
 102,0,262,3,69,
 0,256,3,70,0,
-262,299,11,1,882,
+262,299,11,1,904,
 0,265,1,-1,3,
 48,0,295,3,49,
 0,295,3,50,0,
@@ -1190,7 +1194,7 @@ public class yyLSLTokens : YyLexer {
 0,295,3,55,0,
 295,3,56,0,295,
 3,57,0,295,300,
-11,1,857,0,301,
+11,1,879,0,301,
 4,32,73,0,78,
 0,84,0,69,0,
 71,0,69,0,82,
@@ -1207,7 +1211,7 @@ public class yyLSLTokens : YyLexer {
 56,0,295,3,54,
 0,295,3,46,0,
 297,3,57,0,295,
-302,11,1,857,0,
+302,11,1,879,0,
 301,1,-1,3,49,
 0,295,3,50,0,
 295,3,51,0,295,
@@ -1217,16 +1221,16 @@ public class yyLSLTokens : YyLexer {
 295,3,56,0,295,
 3,57,0,295,3,
 59,0,303,12,1,
-43300,304,5,0,305,
+45362,304,5,0,305,
 11,1,46,0,306,
 4,18,83,0,69,
 0,77,0,73,0,
 67,0,79,0,76,
 0,79,0,78,0,
 1,-1,3,60,0,
-307,12,1,44268,308,
+307,12,1,46330,308,
 5,2,3,60,0,
-309,12,1,44382,310,
+309,12,1,46444,310,
 5,0,311,11,1,
 197,0,312,4,20,
 76,0,69,0,70,
@@ -1234,7 +1238,7 @@ public class yyLSLTokens : YyLexer {
 83,0,72,0,73,
 0,70,0,84,0,
 1,-1,3,61,0,
-313,12,1,44503,314,
+313,12,1,46565,314,
 5,0,315,11,1,
 148,0,316,4,22,
 76,0,69,0,83,
@@ -1249,9 +1253,9 @@ public class yyLSLTokens : YyLexer {
 0,71,0,76,0,
 69,0,1,-1,3,
 61,0,319,12,1,
-44629,320,5,1,3,
+46691,320,5,1,3,
 61,0,321,12,1,
-44744,322,5,0,323,
+46806,322,5,0,323,
 11,1,136,0,324,
 4,26,69,0,81,
 0,85,0,65,0,
@@ -1264,9 +1268,9 @@ public class yyLSLTokens : YyLexer {
 81,0,85,0,65,
 0,76,0,83,0,
 1,-1,3,62,0,
-327,12,1,44870,328,
+327,12,1,46932,328,
 5,2,3,61,0,
-329,12,1,44985,330,
+329,12,1,47047,330,
 5,0,331,11,1,
 154,0,332,4,28,
 71,0,82,0,69,
@@ -1276,7 +1280,7 @@ public class yyLSLTokens : YyLexer {
 85,0,65,0,76,
 0,83,0,1,-1,
 3,62,0,333,12,
-1,45106,334,5,0,
+1,47168,334,5,0,
 335,11,1,203,0,
 336,4,22,82,0,
 73,0,71,0,72,
@@ -1291,13 +1295,13 @@ public class yyLSLTokens : YyLexer {
 0,71,0,76,0,
 69,0,1,-1,3,
 64,0,339,12,1,
-43421,340,5,0,341,
+45483,340,5,0,341,
 11,1,106,0,342,
 4,4,65,0,84,
 0,1,-1,3,65,
-0,343,12,1,1675,
+0,343,12,1,1697,
 344,5,63,3,109,
-0,345,12,1,1676,
+0,345,12,1,1698,
 346,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -1349,7 +1353,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-347,11,1,845,0,
+347,11,1,867,0,
 348,4,10,73,0,
 68,0,69,0,78,
 0,84,0,1,-1,
@@ -1403,7 +1407,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,349,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,66,0,343,
 3,67,0,343,3,
 68,0,343,3,69,
@@ -1425,7 +1429,7 @@ public class yyLSLTokens : YyLexer {
 88,0,343,3,89,
 0,343,3,90,0,
 343,3,91,0,350,
-12,1,41124,351,5,
+12,1,43186,351,5,
 0,352,11,1,126,
 0,353,4,24,76,
 0,69,0,70,0,
@@ -1434,7 +1438,7 @@ public class yyLSLTokens : YyLexer {
 67,0,75,0,69,
 0,84,0,1,-1,
 3,93,0,354,12,
-1,41489,355,5,0,
+1,43551,355,5,0,
 356,11,1,131,0,
 357,4,26,82,0,
 73,0,71,0,72,
@@ -1443,21 +1447,21 @@ public class yyLSLTokens : YyLexer {
 0,67,0,75,0,
 69,0,84,0,1,
 -1,3,94,0,358,
-12,1,45593,359,5,
+12,1,47655,359,5,
 0,360,11,1,170,
 0,361,4,10,67,
 0,65,0,82,0,
 69,0,84,0,1,
 -1,3,95,0,343,
 3,97,0,362,12,
-1,20677,363,5,63,
+1,22739,363,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
 115,0,345,3,116,
-0,364,12,1,20712,
+0,364,12,1,22774,
 365,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -1465,7 +1469,7 @@ public class yyLSLTokens : YyLexer {
 113,0,345,3,114,
 0,345,3,115,0,
 345,3,116,0,366,
-12,1,20747,367,5,
+12,1,22809,367,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -1508,7 +1512,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,90,0,
 345,3,95,0,345,
 3,97,0,368,12,
-1,20790,369,5,63,
+1,22852,369,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -1552,7 +1556,7 @@ public class yyLSLTokens : YyLexer {
 3,95,0,345,3,
 97,0,345,3,98,
 0,345,3,99,0,
-370,12,1,20835,371,
+370,12,1,22897,371,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -1601,7 +1605,7 @@ public class yyLSLTokens : YyLexer {
 345,3,102,0,345,
 3,103,0,345,3,
 104,0,372,12,1,
-20885,373,5,63,3,
+22947,373,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -1662,7 +1666,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,376,11,1,845,
+345,376,11,1,867,
 0,348,1,-1,3,
 100,0,345,3,101,
 0,345,3,102,0,
@@ -1671,7 +1675,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-377,11,1,845,0,
+377,11,1,867,0,
 348,1,-1,3,98,
 0,345,3,99,0,
 345,3,100,0,345,
@@ -1682,7 +1686,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,378,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,117,0,345,3,
 118,0,345,3,119,
 0,345,3,120,0,
@@ -1717,17 +1721,17 @@ public class yyLSLTokens : YyLexer {
 345,3,88,0,345,
 3,89,0,345,3,
 90,0,345,3,95,
-0,379,12,1,21278,
+0,379,12,1,23340,
 380,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
-0,381,12,1,21311,
+0,381,12,1,23373,
 382,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,383,
-12,1,21341,384,5,
+12,1,23403,384,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -1735,7 +1739,7 @@ public class yyLSLTokens : YyLexer {
 345,3,114,0,345,
 3,115,0,345,3,
 116,0,385,12,1,
-21376,386,5,63,3,
+23438,386,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -1777,14 +1781,14 @@ public class yyLSLTokens : YyLexer {
 345,3,89,0,345,
 3,90,0,345,3,
 95,0,387,12,1,
-21462,388,5,63,3,
+23524,388,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
 0,345,3,116,0,
-389,12,1,21497,390,
+389,12,1,23559,390,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -1827,13 +1831,13 @@ public class yyLSLTokens : YyLexer {
 89,0,345,3,90,
 0,345,3,95,0,
 345,3,97,0,391,
-12,1,21540,392,5,
+12,1,23602,392,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
 0,345,3,113,0,
 345,3,114,0,393,
-12,1,21573,394,5,
+12,1,23635,394,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -1881,7 +1885,7 @@ public class yyLSLTokens : YyLexer {
 345,3,101,0,345,
 3,102,0,345,3,
 103,0,395,12,1,
-21622,396,5,63,3,
+23684,396,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -1927,14 +1931,14 @@ public class yyLSLTokens : YyLexer {
 345,3,99,0,345,
 3,100,0,345,3,
 101,0,397,12,1,
-21669,398,5,63,3,
+23731,398,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
 0,345,3,116,0,
-399,12,1,21704,400,
+399,12,1,23766,400,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -2040,19 +2044,19 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,403,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,404,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,104,0,345,
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,405,11,1,845,
+345,405,11,1,867,
 0,348,1,-1,3,
 115,0,345,3,116,
 0,345,3,117,0,
@@ -2100,7 +2104,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,406,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
@@ -2110,7 +2114,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,407,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,117,0,
 345,3,118,0,345,
 3,119,0,345,3,
@@ -2156,7 +2160,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,408,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,97,0,345,3,
 98,0,345,3,99,
 0,345,3,100,0,
@@ -2167,7 +2171,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,409,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,117,0,345,
 3,118,0,345,3,
 119,0,345,3,120,
@@ -2212,7 +2216,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,410,11,1,845,
+345,410,11,1,867,
 0,348,1,-1,3,
 112,0,345,3,113,
 0,345,3,114,0,
@@ -2262,10 +2266,10 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,411,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,115,0,
 345,3,116,0,412,
-12,1,22513,413,5,
+12,1,24575,413,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -2308,13 +2312,13 @@ public class yyLSLTokens : YyLexer {
 0,345,3,90,0,
 345,3,95,0,345,
 3,97,0,414,12,
-1,22556,415,5,63,
+1,24618,415,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,416,12,
-1,22589,417,5,63,
+1,24651,417,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -2361,7 +2365,7 @@ public class yyLSLTokens : YyLexer {
 345,3,100,0,345,
 3,101,0,345,3,
 102,0,345,3,103,
-0,418,12,1,22638,
+0,418,12,1,24700,
 419,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -2407,7 +2411,7 @@ public class yyLSLTokens : YyLexer {
 345,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
-0,420,12,1,22685,
+0,420,12,1,24747,
 421,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -2415,7 +2419,7 @@ public class yyLSLTokens : YyLexer {
 113,0,345,3,114,
 0,345,3,115,0,
 345,3,116,0,422,
-12,1,22720,423,5,
+12,1,24782,423,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -2519,20 +2523,20 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,426,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,102,0,345,
 3,103,0,345,3,
 104,0,345,3,105,
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,427,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,104,0,
 345,3,105,0,345,
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,428,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,115,0,345,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -2579,7 +2583,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,429,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
@@ -2589,7 +2593,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-430,11,1,845,0,
+430,11,1,867,0,
 348,1,-1,3,117,
 0,345,3,118,0,
 345,3,119,0,345,
@@ -2635,7 +2639,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,431,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,97,0,345,
 3,98,0,345,3,
 99,0,345,3,100,
@@ -2646,7 +2650,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,432,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,117,0,
 345,3,118,0,345,
 3,119,0,345,3,
@@ -2692,16 +2696,16 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,433,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,98,0,343,3,
 99,0,434,12,1,
-23439,435,5,63,3,
+25501,435,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
-436,12,1,23469,437,
+436,12,1,25531,437,
 5,63,3,109,0,
 345,3,110,0,438,
-12,1,23498,439,5,
+12,1,25560,439,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -2709,16 +2713,16 @@ public class yyLSLTokens : YyLexer {
 345,3,114,0,345,
 3,115,0,345,3,
 116,0,440,12,1,
-23533,441,5,63,3,
+25595,441,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,442,12,1,
-23566,443,5,63,3,
+25628,443,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
-444,12,1,23596,445,
+444,12,1,25658,445,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -2770,7 +2774,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,446,12,
-1,23650,447,5,63,
+1,25712,447,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -2829,7 +2833,7 @@ public class yyLSLTokens : YyLexer {
 0,69,0,86,0,
 69,0,78,0,84,
 0,1,-1,450,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
@@ -2878,7 +2882,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,451,11,1,845,
+345,451,11,1,867,
 0,348,1,-1,3,
 115,0,345,3,116,
 0,345,3,117,0,
@@ -2926,7 +2930,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,452,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,117,0,345,3,
 118,0,345,3,119,
 0,345,3,120,0,
@@ -2971,7 +2975,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-453,11,1,845,0,
+453,11,1,867,0,
 348,1,-1,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
@@ -3021,7 +3025,7 @@ public class yyLSLTokens : YyLexer {
 345,3,105,0,345,
 3,106,0,345,3,
 107,0,345,3,108,
-0,454,12,1,24123,
+0,454,12,1,26185,
 455,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -3073,7 +3077,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,456,
-12,1,24177,457,5,
+12,1,26239,457,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -3122,14 +3126,14 @@ public class yyLSLTokens : YyLexer {
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
-458,12,1,24228,459,
+458,12,1,26290,459,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
 345,3,115,0,460,
-12,1,24262,461,5,
+12,1,26324,461,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -3178,14 +3182,14 @@ public class yyLSLTokens : YyLexer {
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
-462,12,1,24313,463,
+462,12,1,26375,463,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,464,12,
-1,24343,465,5,63,
+1,26405,465,5,63,
 3,109,0,345,3,
 110,0,466,12,1,
-24372,467,5,63,3,
+26434,467,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -3227,13 +3231,13 @@ public class yyLSLTokens : YyLexer {
 345,3,89,0,345,
 3,90,0,345,3,
 95,0,468,12,1,
-24458,469,5,63,3,
+26520,469,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
-0,470,12,1,24492,
+0,470,12,1,26554,
 471,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -3241,7 +3245,7 @@ public class yyLSLTokens : YyLexer {
 113,0,345,3,114,
 0,345,3,115,0,
 345,3,116,0,472,
-12,1,24527,473,5,
+12,1,26589,473,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -3284,20 +3288,20 @@ public class yyLSLTokens : YyLexer {
 0,345,3,90,0,
 345,3,95,0,345,
 3,97,0,474,12,
-1,24570,475,5,63,
+1,26632,475,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,476,12,
-1,24603,477,5,63,
+1,26665,477,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
 115,0,345,3,116,
-0,478,12,1,24638,
+0,478,12,1,26700,
 479,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -3404,7 +3408,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,482,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,115,0,345,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -3451,7 +3455,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,483,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
@@ -3461,7 +3465,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-484,11,1,845,0,
+484,11,1,867,0,
 348,1,-1,3,117,
 0,345,3,118,0,
 345,3,119,0,345,
@@ -3507,7 +3511,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,485,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,116,0,345,
 3,117,0,345,3,
 118,0,345,3,119,
@@ -3547,10 +3551,10 @@ public class yyLSLTokens : YyLexer {
 345,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
-0,486,12,1,25105,
+0,486,12,1,27167,
 487,5,63,3,109,
 0,345,3,110,0,
-488,12,1,25134,489,
+488,12,1,27196,489,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -3595,7 +3599,7 @@ public class yyLSLTokens : YyLexer {
 345,3,97,0,345,
 3,98,0,345,3,
 99,0,345,3,100,
-0,490,12,1,25180,
+0,490,12,1,27242,
 491,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -3663,7 +3667,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-494,11,1,845,0,
+494,11,1,867,0,
 348,1,-1,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
@@ -3714,14 +3718,14 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,495,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,496,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,97,0,345,
 3,98,0,345,3,
 99,0,345,3,100,
@@ -3789,7 +3793,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,499,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
@@ -3838,11 +3842,11 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,500,11,1,845,
+345,500,11,1,867,
 0,348,1,-1,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,501,11,1,845,
+345,501,11,1,867,
 0,348,1,-1,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -3889,14 +3893,14 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,502,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,106,0,345,
 3,107,0,345,3,
 108,0,345,503,11,
-1,845,0,348,1,
--1,504,11,1,845,
+1,867,0,348,1,
+-1,504,11,1,867,
 0,348,1,-1,505,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
@@ -3942,7 +3946,7 @@ public class yyLSLTokens : YyLexer {
 3,101,0,345,3,
 102,0,345,3,103,
 0,345,3,104,0,
-506,12,1,26129,507,
+506,12,1,28191,507,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -3985,10 +3989,10 @@ public class yyLSLTokens : YyLexer {
 89,0,345,3,90,
 0,345,3,95,0,
 345,3,97,0,508,
-12,1,26172,509,5,
+12,1,28234,509,5,
 63,3,109,0,345,
 3,110,0,510,12,
-1,26201,511,5,63,
+1,28263,511,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -4035,7 +4039,7 @@ public class yyLSLTokens : YyLexer {
 345,3,100,0,345,
 3,101,0,345,3,
 102,0,345,3,103,
-0,512,12,1,26250,
+0,512,12,1,28312,
 513,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -4081,7 +4085,7 @@ public class yyLSLTokens : YyLexer {
 345,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
-0,514,12,1,26297,
+0,514,12,1,28359,
 515,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -4127,7 +4131,7 @@ public class yyLSLTokens : YyLexer {
 345,3,98,0,345,
 3,99,0,345,3,
 100,0,516,12,1,
-26343,517,5,63,3,
+28405,517,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -4192,20 +4196,20 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,520,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,102,0,
 345,3,103,0,345,
 3,104,0,345,3,
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-521,11,1,845,0,
+521,11,1,867,0,
 348,1,-1,3,104,
 0,345,3,105,0,
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,522,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
@@ -4255,7 +4259,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-523,11,1,845,0,
+523,11,1,867,0,
 348,1,-1,3,98,
 0,345,3,99,0,
 345,3,100,0,345,
@@ -4266,17 +4270,17 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,524,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,525,11,1,845,
+345,525,11,1,867,
 0,348,1,-1,3,
 100,0,526,12,1,
-26920,527,5,63,3,
+28982,527,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
-528,12,1,26950,529,
+528,12,1,29012,529,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -4370,14 +4374,14 @@ public class yyLSLTokens : YyLexer {
 0,345,3,90,0,
 345,3,95,0,345,
 3,97,0,532,12,
-1,27083,533,5,63,
+1,29145,533,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
 115,0,345,3,116,
-0,534,12,1,27118,
+0,534,12,1,29180,
 535,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -4420,14 +4424,14 @@ public class yyLSLTokens : YyLexer {
 3,89,0,345,3,
 90,0,345,3,95,
 0,345,3,97,0,
-536,12,1,27161,537,
+536,12,1,29223,537,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
 345,3,115,0,538,
-12,1,27195,539,5,
+12,1,29257,539,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -4473,13 +4477,13 @@ public class yyLSLTokens : YyLexer {
 98,0,345,3,99,
 0,345,3,100,0,
 345,3,101,0,540,
-12,1,27242,541,5,
+12,1,29304,541,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
 0,345,3,113,0,
 345,3,114,0,542,
-12,1,27275,543,5,
+12,1,29337,543,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -4488,7 +4492,7 @@ public class yyLSLTokens : YyLexer {
 3,115,0,345,3,
 116,0,345,3,117,
 0,345,3,118,0,
-544,12,1,27312,545,
+544,12,1,29374,545,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -4534,13 +4538,13 @@ public class yyLSLTokens : YyLexer {
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
-546,12,1,27359,547,
+546,12,1,29421,547,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
-548,12,1,27392,549,
+548,12,1,29454,549,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -4646,14 +4650,14 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,552,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,102,0,
 345,3,103,0,345,
 3,104,0,345,3,
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-553,11,1,845,0,
+553,11,1,867,0,
 348,1,-1,3,119,
 0,345,3,120,0,
 345,3,121,0,345,
@@ -4697,7 +4701,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-554,11,1,845,0,
+554,11,1,867,0,
 348,1,-1,3,115,
 0,345,3,116,0,
 345,3,117,0,345,
@@ -4744,7 +4748,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,555,11,1,845,
+345,555,11,1,867,
 0,348,1,-1,3,
 102,0,345,3,103,
 0,345,3,104,0,
@@ -4752,7 +4756,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,556,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,116,0,345,3,
 117,0,345,3,118,
 0,345,3,119,0,
@@ -4798,7 +4802,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,557,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,98,0,
 345,3,99,0,345,
 3,100,0,345,3,
@@ -4808,7 +4812,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,558,11,1,845,
+345,558,11,1,867,
 0,348,1,-1,3,
 117,0,345,3,118,
 0,345,3,119,0,
@@ -4854,12 +4858,12 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,559,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,98,0,
 345,3,99,0,345,
 3,100,0,345,3,
 101,0,560,12,1,
-28167,561,5,63,3,
+30229,561,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -4905,7 +4909,7 @@ public class yyLSLTokens : YyLexer {
 345,3,99,0,345,
 3,100,0,345,3,
 101,0,345,3,102,
-0,562,12,1,28215,
+0,562,12,1,30277,
 563,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -4948,7 +4952,7 @@ public class yyLSLTokens : YyLexer {
 3,89,0,345,3,
 90,0,345,3,95,
 0,345,3,97,0,
-564,12,1,28258,565,
+564,12,1,30320,565,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -4957,7 +4961,7 @@ public class yyLSLTokens : YyLexer {
 345,3,115,0,345,
 3,116,0,345,3,
 117,0,566,12,1,
-28294,567,5,63,3,
+30356,567,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -5008,7 +5012,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-568,12,1,28348,569,
+568,12,1,30410,569,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -5016,7 +5020,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,114,0,
 345,3,115,0,345,
 3,116,0,570,12,
-1,28383,571,5,63,
+1,30445,571,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -5119,8 +5123,8 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,574,11,
-1,845,0,348,1,
--1,575,11,1,845,
+1,867,0,348,1,
+-1,575,11,1,867,
 0,348,1,-1,3,
 118,0,345,3,119,
 0,345,3,120,0,
@@ -5165,7 +5169,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-576,11,1,845,0,
+576,11,1,867,0,
 348,1,-1,3,98,
 0,345,3,99,0,
 345,3,100,0,345,
@@ -5176,24 +5180,24 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,577,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,103,0,345,3,
 104,0,345,3,105,
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,578,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,102,0,
 345,3,103,0,345,
 3,104,0,345,3,
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-579,11,1,845,0,
+579,11,1,867,0,
 348,1,-1,3,101,
-0,580,12,1,28961,
+0,580,12,1,31023,
 581,5,63,3,109,
-0,582,12,1,28989,
+0,582,12,1,31051,
 583,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -5236,7 +5240,7 @@ public class yyLSLTokens : YyLexer {
 3,89,0,345,3,
 90,0,345,3,95,
 0,345,3,97,0,
-584,12,1,29032,585,
+584,12,1,31094,585,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -5285,7 +5289,7 @@ public class yyLSLTokens : YyLexer {
 345,3,102,0,345,
 3,103,0,345,3,
 104,0,345,3,105,
-0,586,12,1,29083,
+0,586,12,1,31145,
 587,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -5337,7 +5341,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,588,
-12,1,29137,589,5,
+12,1,31199,589,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -5395,11 +5399,11 @@ public class yyLSLTokens : YyLexer {
 0,95,0,69,0,
 86,0,69,0,78,
 0,84,0,1,-1,
-592,11,1,845,0,
+592,11,1,867,0,
 348,1,-1,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-593,11,1,845,0,
+593,11,1,867,0,
 348,1,-1,3,98,
 0,345,3,99,0,
 345,3,100,0,345,
@@ -5410,7 +5414,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,594,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,110,0,345,3,
 111,0,345,3,112,
 0,345,3,113,0,
@@ -5461,13 +5465,13 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,595,12,1,
-29495,596,5,63,3,
+31557,596,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
-0,597,12,1,29529,
+0,597,12,1,31591,
 598,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -5513,7 +5517,7 @@ public class yyLSLTokens : YyLexer {
 345,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
-0,599,12,1,29576,
+0,599,12,1,31638,
 600,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -5574,7 +5578,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,603,11,1,845,
+345,603,11,1,867,
 0,348,1,-1,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -5621,20 +5625,20 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,604,11,
-1,845,0,348,1,
--1,605,11,1,845,
+1,867,0,348,1,
+-1,605,11,1,867,
 0,348,1,-1,3,
 102,0,606,12,1,
-29922,607,5,63,3,
+31984,607,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
-608,12,1,29952,609,
+608,12,1,32014,609,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
-610,12,1,29985,611,
+610,12,1,32047,611,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -5735,7 +5739,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,614,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
@@ -5784,11 +5788,11 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-615,12,1,30216,616,
+615,12,1,32278,616,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,617,12,
-1,30246,618,5,63,
+1,32308,618,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -5831,14 +5835,14 @@ public class yyLSLTokens : YyLexer {
 345,3,90,0,345,
 3,95,0,345,3,
 97,0,619,12,1,
-30289,620,5,63,3,
+32351,620,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
 0,345,3,116,0,
-621,12,1,30324,622,
+621,12,1,32386,622,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -5940,7 +5944,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,625,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,98,0,
 345,3,99,0,345,
 3,100,0,345,3,
@@ -5950,7 +5954,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,626,11,1,845,
+345,626,11,1,867,
 0,348,1,-1,3,
 112,0,345,3,113,
 0,345,3,114,0,
@@ -6000,19 +6004,19 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,627,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,628,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,103,0,343,3,
 104,0,629,12,1,
-30764,630,5,63,3,
+32826,630,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
 0,345,3,116,0,
-631,12,1,30799,632,
+631,12,1,32861,632,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -6020,11 +6024,11 @@ public class yyLSLTokens : YyLexer {
 0,345,3,114,0,
 345,3,115,0,345,
 3,116,0,633,12,
-1,30834,634,5,63,
+1,32896,634,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
-635,12,1,30865,636,
+635,12,1,32927,636,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -6066,13 +6070,13 @@ public class yyLSLTokens : YyLexer {
 3,88,0,345,3,
 89,0,345,3,90,
 0,345,3,95,0,
-637,12,1,30951,638,
+637,12,1,33013,638,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
-639,12,1,30984,640,
+639,12,1,33046,640,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -6118,12 +6122,12 @@ public class yyLSLTokens : YyLexer {
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
-641,12,1,31031,642,
+641,12,1,33093,642,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
-0,643,12,1,31063,
+0,643,12,1,33125,
 644,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -6132,7 +6136,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,115,0,
 345,3,116,0,345,
 3,117,0,645,12,
-1,31099,646,5,63,
+1,33161,646,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -6178,21 +6182,21 @@ public class yyLSLTokens : YyLexer {
 0,345,3,99,0,
 345,3,100,0,345,
 3,101,0,647,12,
-1,31146,648,5,63,
+1,33208,648,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
 115,0,649,12,1,
-31180,650,5,63,3,
+33242,650,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
 0,345,3,116,0,
-651,12,1,31215,652,
+651,12,1,33277,652,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -6297,7 +6301,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-655,11,1,845,0,
+655,11,1,867,0,
 348,1,-1,3,116,
 0,345,3,117,0,
 345,3,118,0,345,
@@ -6344,14 +6348,14 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,656,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,657,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,118,0,345,
 3,119,0,345,3,
 120,0,345,3,121,
@@ -6396,27 +6400,27 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,658,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,114,0,345,3,
 115,0,659,12,1,
-31665,660,5,63,3,
+33727,660,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,661,
-12,1,31696,662,5,
+12,1,33758,662,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,663,12,1,
-31726,664,5,63,3,
+33788,664,5,63,3,
 109,0,345,3,110,
-0,665,12,1,31755,
+0,665,12,1,33817,
 666,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
 0,345,3,115,0,
-667,12,1,31789,668,
+667,12,1,33851,668,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -6462,7 +6466,7 @@ public class yyLSLTokens : YyLexer {
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
-669,12,1,31836,670,
+669,12,1,33898,670,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -6529,7 +6533,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-673,11,1,845,0,
+673,11,1,867,0,
 348,1,-1,3,116,
 0,345,3,117,0,
 345,3,118,0,345,
@@ -6576,7 +6580,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,674,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
@@ -6626,7 +6630,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,675,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
@@ -6676,7 +6680,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,676,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,113,0,345,3,
 114,0,345,3,115,
 0,345,3,116,0,
@@ -6724,7 +6728,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,677,11,1,845,
+345,677,11,1,867,
 0,348,1,-1,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -6771,14 +6775,14 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,678,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,102,0,345,
 3,103,0,345,3,
 104,0,345,3,105,
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,679,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,115,0,
 345,3,116,0,345,
 3,117,0,345,3,
@@ -6825,7 +6829,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-680,11,1,845,0,
+680,11,1,867,0,
 348,1,-1,3,97,
 0,345,3,98,0,
 345,3,99,0,345,
@@ -6836,7 +6840,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,681,11,1,845,
+345,681,11,1,867,
 0,348,1,-1,3,
 113,0,345,3,114,
 0,345,3,115,0,
@@ -6885,7 +6889,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-682,11,1,845,0,
+682,11,1,867,0,
 348,1,-1,3,117,
 0,345,3,118,0,
 345,3,119,0,345,
@@ -6931,7 +6935,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,683,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,117,0,345,
 3,118,0,345,3,
 119,0,345,3,120,
@@ -6976,12 +6980,12 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,684,11,1,845,
+345,684,11,1,867,
 0,348,1,-1,3,
 105,0,685,12,1,
-32925,686,5,63,3,
+34987,686,5,63,3,
 109,0,345,3,110,
-0,687,12,1,32954,
+0,687,12,1,35016,
 688,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -6989,7 +6993,7 @@ public class yyLSLTokens : YyLexer {
 113,0,345,3,114,
 0,345,3,115,0,
 345,3,116,0,689,
-12,1,32989,690,5,
+12,1,35051,690,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -7035,7 +7039,7 @@ public class yyLSLTokens : YyLexer {
 98,0,345,3,99,
 0,345,3,100,0,
 345,3,101,0,691,
-12,1,33036,692,5,
+12,1,35098,692,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -7083,7 +7087,7 @@ public class yyLSLTokens : YyLexer {
 345,3,101,0,345,
 3,102,0,345,3,
 103,0,693,12,1,
-33085,694,5,63,3,
+35147,694,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -7129,13 +7133,13 @@ public class yyLSLTokens : YyLexer {
 345,3,99,0,345,
 3,100,0,345,3,
 101,0,695,12,1,
-33132,696,5,63,3,
+35194,696,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,697,12,1,
-33165,698,5,63,3,
+35227,698,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -7239,27 +7243,27 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,701,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,102,0,345,
 3,103,0,345,3,
 104,0,345,3,105,
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,702,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,104,0,
 345,3,105,0,345,
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,703,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,704,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,117,0,345,
 3,118,0,345,3,
 119,0,345,3,120,
@@ -7304,7 +7308,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,705,11,1,845,
+345,705,11,1,867,
 0,348,1,-1,3,
 111,0,345,3,112,
 0,345,3,113,0,
@@ -7350,7 +7354,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,100,0,
 345,3,101,0,345,
 3,102,0,706,12,
-1,33693,707,5,63,
+1,35755,707,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -7409,9 +7413,9 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-710,11,1,845,0,
+710,11,1,867,0,
 348,1,-1,3,106,
-0,711,12,1,33886,
+0,711,12,1,35948,
 712,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -7420,13 +7424,13 @@ public class yyLSLTokens : YyLexer {
 0,345,3,115,0,
 345,3,116,0,345,
 3,117,0,713,12,
-1,33922,714,5,63,
+1,35984,714,5,63,
 3,109,0,715,12,
-1,33950,716,5,63,
+1,36012,716,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
-717,12,1,33981,718,
+717,12,1,36043,718,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -7529,7 +7533,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,721,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
@@ -7580,7 +7584,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,722,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,118,0,
 345,3,119,0,345,
 3,120,0,345,3,
@@ -7625,9 +7629,9 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,723,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,107,0,724,
-12,1,34367,725,5,
+12,1,36429,725,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -7673,7 +7677,7 @@ public class yyLSLTokens : YyLexer {
 98,0,345,3,99,
 0,345,3,100,0,
 345,3,101,0,726,
-12,1,34414,727,5,
+12,1,36476,727,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -7685,7 +7689,7 @@ public class yyLSLTokens : YyLexer {
 345,3,119,0,345,
 3,120,0,345,3,
 121,0,728,12,1,
-34454,729,5,63,3,
+36516,729,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -7782,16 +7786,16 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,732,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,733,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,108,0,734,
-12,1,34728,735,5,
+12,1,36790,735,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -7834,10 +7838,10 @@ public class yyLSLTokens : YyLexer {
 0,345,3,90,0,
 345,3,95,0,345,
 3,97,0,736,12,
-1,34771,737,5,63,
+1,36833,737,5,63,
 3,109,0,345,3,
 110,0,738,12,1,
-34800,739,5,63,3,
+36862,739,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -7882,7 +7886,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,98,0,
 345,3,99,0,345,
 3,100,0,740,12,
-1,34846,741,5,63,
+1,36908,741,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -7924,7 +7928,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,89,0,
 345,3,90,0,345,
 3,95,0,742,12,
-1,34932,743,5,63,
+1,36994,743,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -7968,11 +7972,11 @@ public class yyLSLTokens : YyLexer {
 3,95,0,345,3,
 97,0,345,3,98,
 0,345,3,99,0,
-744,12,1,34977,745,
+744,12,1,37039,745,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,746,12,
-1,35007,747,5,63,
+1,37069,747,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -8023,7 +8027,7 @@ public class yyLSLTokens : YyLexer {
 345,3,105,0,345,
 3,106,0,345,3,
 107,0,345,3,108,
-0,748,12,1,35061,
+0,748,12,1,37123,
 749,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -8075,7 +8079,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,750,
-12,1,35115,751,5,
+12,1,37177,751,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -8124,14 +8128,14 @@ public class yyLSLTokens : YyLexer {
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
-752,12,1,35166,753,
+752,12,1,37228,753,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
 345,3,115,0,754,
-12,1,35200,755,5,
+12,1,37262,755,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -8180,14 +8184,14 @@ public class yyLSLTokens : YyLexer {
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
-756,12,1,35251,757,
+756,12,1,37313,757,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,758,12,
-1,35281,759,5,63,
+1,37343,759,5,63,
 3,109,0,345,3,
 110,0,760,12,1,
-35310,761,5,63,3,
+37372,761,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -8229,13 +8233,13 @@ public class yyLSLTokens : YyLexer {
 345,3,89,0,345,
 3,90,0,345,3,
 95,0,762,12,1,
-35396,763,5,63,3,
+37458,763,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
-0,764,12,1,35430,
+0,764,12,1,37492,
 765,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -8243,7 +8247,7 @@ public class yyLSLTokens : YyLexer {
 113,0,345,3,114,
 0,345,3,115,0,
 345,3,116,0,766,
-12,1,35465,767,5,
+12,1,37527,767,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -8286,20 +8290,20 @@ public class yyLSLTokens : YyLexer {
 0,345,3,90,0,
 345,3,95,0,345,
 3,97,0,768,12,
-1,35508,769,5,63,
+1,37570,769,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,770,12,
-1,35541,771,5,63,
+1,37603,771,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
 115,0,345,3,116,
-0,772,12,1,35576,
+0,772,12,1,37638,
 773,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -8408,7 +8412,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,776,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,115,0,345,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -8455,7 +8459,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,777,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
@@ -8465,7 +8469,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-778,11,1,845,0,
+778,11,1,867,0,
 348,1,-1,3,117,
 0,345,3,118,0,
 345,3,119,0,345,
@@ -8511,7 +8515,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,779,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,116,0,345,
 3,117,0,345,3,
 118,0,345,3,119,
@@ -8551,10 +8555,10 @@ public class yyLSLTokens : YyLexer {
 345,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
-0,780,12,1,36043,
+0,780,12,1,38105,
 781,5,63,3,109,
 0,345,3,110,0,
-782,12,1,36072,783,
+782,12,1,38134,783,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -8599,7 +8603,7 @@ public class yyLSLTokens : YyLexer {
 345,3,97,0,345,
 3,98,0,345,3,
 99,0,345,3,100,
-0,784,12,1,36118,
+0,784,12,1,38180,
 785,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -8669,7 +8673,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-788,11,1,845,0,
+788,11,1,867,0,
 348,1,-1,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
@@ -8720,14 +8724,14 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,789,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,790,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,97,0,345,
 3,98,0,345,3,
 99,0,345,3,100,
@@ -8797,7 +8801,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,793,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
@@ -8846,11 +8850,11 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,794,11,1,845,
+345,794,11,1,867,
 0,348,1,-1,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,795,11,1,845,
+345,795,11,1,867,
 0,348,1,-1,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -8897,14 +8901,14 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,796,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,106,0,345,
 3,107,0,345,3,
 108,0,345,797,11,
-1,845,0,348,1,
--1,798,11,1,845,
+1,867,0,348,1,
+-1,798,11,1,867,
 0,348,1,-1,799,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
@@ -8954,7 +8958,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,800,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,100,0,345,3,
 101,0,345,3,102,
 0,345,3,103,0,
@@ -8962,7 +8966,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,801,11,1,845,
+345,801,11,1,867,
 0,348,1,-1,3,
 97,0,345,3,98,
 0,345,3,99,0,
@@ -8974,7 +8978,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,802,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,101,0,345,3,
 102,0,345,3,103,
 0,345,3,104,0,
@@ -8982,7 +8986,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,803,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
@@ -9032,7 +9036,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,804,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,98,0,
 345,3,99,0,345,
 3,100,0,345,3,
@@ -9040,10 +9044,10 @@ public class yyLSLTokens : YyLexer {
 0,345,3,103,0,
 345,3,104,0,345,
 3,105,0,805,12,
-1,37419,806,5,63,
+1,39481,806,5,63,
 3,109,0,345,3,
 110,0,807,12,1,
-37448,808,5,63,3,
+39510,808,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -9093,7 +9097,7 @@ public class yyLSLTokens : YyLexer {
 345,3,104,0,345,
 3,105,0,345,3,
 106,0,345,3,107,
-0,809,12,1,37501,
+0,809,12,1,39563,
 810,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -9135,9 +9139,9 @@ public class yyLSLTokens : YyLexer {
 345,3,88,0,345,
 3,89,0,345,3,
 90,0,345,3,95,
-0,811,12,1,37587,
+0,811,12,1,39649,
 812,5,63,3,109,
-0,813,12,1,37615,
+0,813,12,1,39677,
 814,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -9183,21 +9187,21 @@ public class yyLSLTokens : YyLexer {
 345,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
-0,815,12,1,37662,
+0,815,12,1,39724,
 816,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
 0,345,3,115,0,
-817,12,1,37696,818,
+817,12,1,39758,818,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
 345,3,115,0,819,
-12,1,37730,820,5,
+12,1,39792,820,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -9240,7 +9244,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,90,0,
 345,3,95,0,345,
 3,97,0,821,12,
-1,37773,822,5,63,
+1,39835,822,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -9287,7 +9291,7 @@ public class yyLSLTokens : YyLexer {
 345,3,100,0,345,
 3,101,0,345,3,
 102,0,345,3,103,
-0,823,12,1,37822,
+0,823,12,1,39884,
 824,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -9333,7 +9337,7 @@ public class yyLSLTokens : YyLexer {
 345,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
-0,825,12,1,37869,
+0,825,12,1,39931,
 826,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -9400,13 +9404,13 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,829,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,104,0,
 345,3,105,0,345,
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,830,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
@@ -9416,7 +9420,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,831,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,116,0,
 345,3,117,0,345,
 3,118,0,345,3,
@@ -9462,7 +9466,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,832,11,1,845,
+345,832,11,1,867,
 0,348,1,-1,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -9509,14 +9513,14 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,833,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,102,0,345,
 3,103,0,345,3,
 104,0,345,3,105,
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,834,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,110,0,
 345,3,111,0,345,
 3,112,0,345,3,
@@ -9567,7 +9571,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-835,11,1,845,0,
+835,11,1,867,0,
 348,1,-1,3,97,
 0,345,3,98,0,
 345,3,99,0,345,
@@ -9578,15 +9582,15 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,836,11,1,845,
+345,836,11,1,867,
 0,348,1,-1,3,
 108,0,345,837,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
 0,345,3,115,0,
-838,12,1,38653,839,
+838,12,1,40715,839,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -9594,7 +9598,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,114,0,
 345,3,115,0,345,
 3,116,0,840,12,
-1,38688,841,5,63,
+1,40750,841,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -9640,10 +9644,10 @@ public class yyLSLTokens : YyLexer {
 0,345,3,99,0,
 345,3,100,0,345,
 3,101,0,842,12,
-1,38735,843,5,63,
+1,40797,843,5,63,
 3,109,0,345,3,
 110,0,844,12,1,
-38764,845,5,63,3,
+40826,845,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -9750,7 +9754,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,848,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,102,0,
 345,3,103,0,345,
 3,104,0,345,3,
@@ -9807,7 +9811,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,851,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,116,0,345,
 3,117,0,345,3,
 118,0,345,3,119,
@@ -9853,20 +9857,20 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-852,11,1,845,0,
+852,11,1,867,0,
 348,1,-1,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-853,11,1,845,0,
+853,11,1,867,0,
 348,1,-1,3,109,
-0,854,12,1,1942,
+0,854,12,1,1964,
 855,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,856,
-12,1,1972,857,5,
+12,1,1994,857,5,
 63,3,109,0,345,
 3,110,0,858,12,
-1,2001,859,5,63,
+1,2023,859,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -9912,7 +9916,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,99,0,
 345,3,100,0,345,
 3,101,0,860,12,
-1,2048,861,5,63,
+1,2070,861,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -9923,7 +9927,7 @@ public class yyLSLTokens : YyLexer {
 345,3,118,0,345,
 3,119,0,345,3,
 120,0,345,3,121,
-0,862,12,1,2088,
+0,862,12,1,2110,
 863,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -10022,14 +10026,14 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,866,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,867,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
@@ -10037,7 +10041,7 @@ public class yyLSLTokens : YyLexer {
 345,3,116,0,345,
 3,117,0,345,3,
 118,0,868,12,1,
-2369,869,5,63,3,
+2391,869,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -10086,10 +10090,10 @@ public class yyLSLTokens : YyLexer {
 0,345,3,103,0,
 345,3,104,0,345,
 3,105,0,870,12,
-1,2420,871,5,63,
+1,2442,871,5,63,
 3,109,0,345,3,
 110,0,872,12,1,
-2449,873,5,63,3,
+2471,873,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -10136,7 +10140,7 @@ public class yyLSLTokens : YyLexer {
 3,100,0,345,3,
 101,0,345,3,102,
 0,345,3,103,0,
-874,12,1,2498,875,
+874,12,1,2520,875,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -10178,14 +10182,14 @@ public class yyLSLTokens : YyLexer {
 3,88,0,345,3,
 89,0,345,3,90,
 0,345,3,95,0,
-876,12,1,2584,877,
+876,12,1,2606,877,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
 345,3,115,0,878,
-12,1,2618,879,5,
+12,1,2640,879,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -10193,7 +10197,7 @@ public class yyLSLTokens : YyLexer {
 345,3,114,0,345,
 3,115,0,345,3,
 116,0,880,12,1,
-2653,881,5,63,3,
+2675,881,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -10235,13 +10239,13 @@ public class yyLSLTokens : YyLexer {
 345,3,89,0,345,
 3,90,0,345,3,
 95,0,345,3,97,
-0,882,12,1,2696,
+0,882,12,1,2718,
 883,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
-0,884,12,1,2729,
+0,884,12,1,2751,
 885,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -10249,7 +10253,7 @@ public class yyLSLTokens : YyLexer {
 113,0,345,3,114,
 0,345,3,115,0,
 345,3,116,0,886,
-12,1,2764,887,5,
+12,1,2786,887,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -10354,7 +10358,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,890,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,115,0,
 345,3,116,0,345,
 3,117,0,345,3,
@@ -10401,7 +10405,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-891,11,1,845,0,
+891,11,1,867,0,
 348,1,-1,3,98,
 0,345,3,99,0,
 345,3,100,0,345,
@@ -10412,7 +10416,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,892,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,117,0,345,3,
 118,0,345,3,119,
 0,345,3,120,0,
@@ -10457,7 +10461,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-893,11,1,845,0,
+893,11,1,867,0,
 348,1,-1,3,116,
 0,345,3,117,0,
 345,3,118,0,345,
@@ -10498,10 +10502,10 @@ public class yyLSLTokens : YyLexer {
 0,345,3,99,0,
 345,3,100,0,345,
 3,101,0,894,12,
-1,3231,895,5,63,
+1,3253,895,5,63,
 3,109,0,345,3,
 110,0,896,12,1,
-3260,897,5,63,3,
+3282,897,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -10546,7 +10550,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,98,0,
 345,3,99,0,345,
 3,100,0,898,12,
-1,3306,899,5,63,
+1,3328,899,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -10612,7 +10616,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,902,11,1,845,
+345,902,11,1,867,
 0,348,1,-1,3,
 111,0,345,3,112,
 0,345,3,113,0,
@@ -10663,14 +10667,14 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,903,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,102,0,345,
 3,103,0,345,3,
 104,0,345,3,105,
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,904,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,97,0,
 345,3,98,0,345,
 3,99,0,345,3,
@@ -10681,13 +10685,13 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-905,11,1,845,0,
+905,11,1,867,0,
 348,1,-1,3,104,
 0,345,3,105,0,
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,906,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
@@ -10737,11 +10741,11 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-907,11,1,845,0,
+907,11,1,867,0,
 348,1,-1,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-908,11,1,845,0,
+908,11,1,867,0,
 348,1,-1,3,119,
 0,345,3,120,0,
 345,3,121,0,345,
@@ -10785,7 +10789,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-909,11,1,845,0,
+909,11,1,867,0,
 348,1,-1,3,112,
 0,345,3,113,0,
 345,3,114,0,345,
@@ -10835,20 +10839,20 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,910,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,110,0,911,
-12,1,4103,912,5,
+12,1,4125,912,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,913,12,1,
-4133,914,5,63,3,
+4155,914,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
 0,345,3,116,0,
-915,12,1,4168,916,
+915,12,1,4190,916,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -10890,7 +10894,7 @@ public class yyLSLTokens : YyLexer {
 3,88,0,345,3,
 89,0,345,3,90,
 0,345,3,95,0,
-917,12,1,4254,918,
+917,12,1,4276,918,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -10933,7 +10937,7 @@ public class yyLSLTokens : YyLexer {
 89,0,345,3,90,
 0,345,3,95,0,
 345,3,97,0,919,
-12,1,4297,920,5,
+12,1,4319,920,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -10941,7 +10945,7 @@ public class yyLSLTokens : YyLexer {
 345,3,114,0,345,
 3,115,0,345,3,
 116,0,921,12,1,
-4332,922,5,63,3,
+4354,922,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -10983,16 +10987,16 @@ public class yyLSLTokens : YyLexer {
 345,3,89,0,345,
 3,90,0,345,3,
 95,0,923,12,1,
-4418,924,5,63,3,
+4440,924,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,925,12,1,
-4451,926,5,63,3,
+4473,926,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
-927,12,1,4481,928,
+927,12,1,4503,928,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -11000,7 +11004,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,114,0,
 345,3,115,0,345,
 3,116,0,929,12,
-1,4516,930,5,63,
+1,4538,930,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -11042,14 +11046,14 @@ public class yyLSLTokens : YyLexer {
 0,345,3,89,0,
 345,3,90,0,345,
 3,95,0,931,12,
-1,4602,932,5,63,
+1,4624,932,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
 115,0,345,3,116,
-0,933,12,1,4637,
+0,933,12,1,4659,
 934,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -11092,13 +11096,13 @@ public class yyLSLTokens : YyLexer {
 3,89,0,345,3,
 90,0,345,3,95,
 0,345,3,97,0,
-935,12,1,4680,936,
+935,12,1,4702,936,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
-937,12,1,4713,938,
+937,12,1,4735,938,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -11146,7 +11150,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,101,0,
 345,3,102,0,345,
 3,103,0,939,12,
-1,4762,940,5,63,
+1,4784,940,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -11192,14 +11196,14 @@ public class yyLSLTokens : YyLexer {
 0,345,3,99,0,
 345,3,100,0,345,
 3,101,0,941,12,
-1,4809,942,5,63,
+1,4831,942,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
 115,0,345,3,116,
-0,943,12,1,4844,
+0,943,12,1,4866,
 944,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -11306,7 +11310,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,947,11,1,845,
+345,947,11,1,867,
 0,348,1,-1,3,
 102,0,345,3,103,
 0,345,3,104,0,
@@ -11314,12 +11318,12 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,948,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,104,0,345,3,
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-949,11,1,845,0,
+949,11,1,867,0,
 348,1,-1,3,115,
 0,345,3,116,0,
 345,3,117,0,345,
@@ -11366,7 +11370,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,950,11,1,845,
+345,950,11,1,867,
 0,348,1,-1,3,
 98,0,345,3,99,
 0,345,3,100,0,
@@ -11377,7 +11381,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,951,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,117,0,345,
 3,118,0,345,3,
 119,0,345,3,120,
@@ -11422,7 +11426,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,952,11,1,845,
+345,952,11,1,867,
 0,348,1,-1,3,
 97,0,345,3,98,
 0,345,3,99,0,
@@ -11434,7 +11438,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,953,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,117,0,345,3,
 118,0,345,3,119,
 0,345,3,120,0,
@@ -11479,7 +11483,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-954,11,1,845,0,
+954,11,1,867,0,
 348,1,-1,3,112,
 0,345,3,113,0,
 345,3,114,0,345,
@@ -11529,10 +11533,10 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,955,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,115,0,345,
 3,116,0,956,12,
-1,5653,957,5,63,
+1,5675,957,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -11575,13 +11579,13 @@ public class yyLSLTokens : YyLexer {
 345,3,90,0,345,
 3,95,0,345,3,
 97,0,958,12,1,
-5696,959,5,63,3,
+5718,959,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,960,12,1,
-5729,961,5,63,3,
+5751,961,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -11628,7 +11632,7 @@ public class yyLSLTokens : YyLexer {
 3,100,0,345,3,
 101,0,345,3,102,
 0,345,3,103,0,
-962,12,1,5778,963,
+962,12,1,5800,963,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -11674,7 +11678,7 @@ public class yyLSLTokens : YyLexer {
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
-964,12,1,5825,965,
+964,12,1,5847,965,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -11682,7 +11686,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,114,0,
 345,3,115,0,345,
 3,116,0,966,12,
-1,5860,967,5,63,
+1,5882,967,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -11787,20 +11791,20 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-970,11,1,845,0,
+970,11,1,867,0,
 348,1,-1,3,102,
 0,345,3,103,0,
 345,3,104,0,345,
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,971,11,1,845,
+345,971,11,1,867,
 0,348,1,-1,3,
 104,0,345,3,105,
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,972,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,115,0,
 345,3,116,0,345,
 3,117,0,345,3,
@@ -11847,7 +11851,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-973,11,1,845,0,
+973,11,1,867,0,
 348,1,-1,3,98,
 0,345,3,99,0,
 345,3,100,0,345,
@@ -11858,7 +11862,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,974,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,117,0,345,3,
 118,0,345,3,119,
 0,345,3,120,0,
@@ -11903,7 +11907,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-975,11,1,845,0,
+975,11,1,867,0,
 348,1,-1,3,97,
 0,345,3,98,0,
 345,3,99,0,345,
@@ -11914,7 +11918,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,976,11,1,845,
+345,976,11,1,867,
 0,348,1,-1,3,
 117,0,345,3,118,
 0,345,3,119,0,
@@ -11960,7 +11964,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,977,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,98,0,
 345,3,99,0,345,
 3,100,0,345,3,
@@ -11970,7 +11974,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,978,11,1,845,
+345,978,11,1,867,
 0,348,1,-1,3,
 97,0,345,3,98,
 0,345,3,99,0,
@@ -11982,7 +11986,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,979,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,117,0,345,3,
 118,0,345,3,119,
 0,345,3,120,0,
@@ -12017,14 +12021,14 @@ public class yyLSLTokens : YyLexer {
 345,3,88,0,345,
 3,89,0,345,3,
 90,0,345,3,95,
-0,980,12,1,6739,
+0,980,12,1,6761,
 981,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
 0,345,3,115,0,
-982,12,1,6773,983,
+982,12,1,6795,983,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -12070,26 +12074,26 @@ public class yyLSLTokens : YyLexer {
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
-984,12,1,6820,985,
+984,12,1,6842,985,
 5,63,3,109,0,
 345,3,110,0,986,
-12,1,6849,987,5,
+12,1,6871,987,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
 0,345,3,113,0,
 345,3,114,0,345,
 3,115,0,988,12,
-1,6883,989,5,63,
+1,6905,989,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
-0,990,12,1,6913,
+0,990,12,1,6935,
 991,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
-0,992,12,1,6946,
+0,992,12,1,6968,
 993,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -12195,7 +12199,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,996,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
@@ -12244,7 +12248,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,997,11,1,845,
+345,997,11,1,867,
 0,348,1,-1,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -12291,7 +12295,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,998,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
@@ -12341,14 +12345,14 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-999,11,1,845,0,
+999,11,1,867,0,
 348,1,-1,3,102,
 0,345,3,103,0,
 345,3,104,0,345,
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1000,11,1,845,
+345,1000,11,1,867,
 0,348,1,-1,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -12395,7 +12399,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1001,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,97,0,345,
 3,98,0,345,3,
 99,0,345,3,100,
@@ -12406,7 +12410,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1002,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
@@ -12456,12 +12460,12 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1003,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,111,0,1004,12,
-1,7704,1005,5,63,
+1,7726,1005,5,63,
 3,109,0,345,3,
 110,0,1006,12,1,
-7733,1007,5,63,3,
+7755,1007,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -12503,13 +12507,13 @@ public class yyLSLTokens : YyLexer {
 345,3,89,0,345,
 3,90,0,345,3,
 95,0,1008,12,1,
-7819,1009,5,63,3,
+7841,1009,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,1010,12,1,
-7852,1011,5,63,3,
+7874,1011,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -12555,7 +12559,7 @@ public class yyLSLTokens : YyLexer {
 345,3,99,0,345,
 3,100,0,345,3,
 101,0,1012,12,1,
-7899,1013,5,63,3,
+7921,1013,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -12567,7 +12571,7 @@ public class yyLSLTokens : YyLexer {
 119,0,345,3,120,
 0,345,3,121,0,
 345,3,122,0,1014,
-12,1,7940,1015,5,
+12,1,7962,1015,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -12665,14 +12669,14 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1018,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,102,0,345,
 3,103,0,345,3,
 104,0,345,3,105,
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1019,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,115,0,
 345,3,116,0,345,
 3,117,0,345,3,
@@ -12719,7 +12723,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1020,11,1,845,0,
+1020,11,1,867,0,
 348,1,-1,3,97,
 0,345,3,98,0,
 345,3,99,0,345,
@@ -12730,7 +12734,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1021,11,1,845,
+345,1021,11,1,867,
 0,348,1,-1,3,
 111,0,345,3,112,
 0,345,3,113,0,
@@ -12773,7 +12777,7 @@ public class yyLSLTokens : YyLexer {
 345,3,95,0,345,
 3,97,0,345,3,
 98,0,1022,12,1,
-8348,1023,5,63,3,
+8370,1023,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -12823,7 +12827,7 @@ public class yyLSLTokens : YyLexer {
 345,3,104,0,345,
 3,105,0,345,3,
 106,0,1024,12,1,
-8400,1025,5,63,3,
+8422,1025,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -12869,7 +12873,7 @@ public class yyLSLTokens : YyLexer {
 345,3,99,0,345,
 3,100,0,345,3,
 101,0,1026,12,1,
-8447,1027,5,63,3,
+8469,1027,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -12913,7 +12917,7 @@ public class yyLSLTokens : YyLexer {
 95,0,345,3,97,
 0,345,3,98,0,
 345,3,99,0,1028,
-12,1,8492,1029,5,
+12,1,8514,1029,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -12921,7 +12925,7 @@ public class yyLSLTokens : YyLexer {
 345,3,114,0,345,
 3,115,0,345,3,
 116,0,1030,12,1,
-8527,1031,5,63,3,
+8549,1031,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -12963,13 +12967,13 @@ public class yyLSLTokens : YyLexer {
 345,3,89,0,345,
 3,90,0,345,3,
 95,0,1032,12,1,
-8613,1033,5,63,3,
+8635,1033,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,1034,12,1,
-8646,1035,5,63,3,
+8668,1035,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -13015,7 +13019,7 @@ public class yyLSLTokens : YyLexer {
 345,3,99,0,345,
 3,100,0,345,3,
 101,0,1036,12,1,
-8693,1037,5,63,3,
+8715,1037,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -13027,7 +13031,7 @@ public class yyLSLTokens : YyLexer {
 119,0,345,3,120,
 0,345,3,121,0,
 345,3,122,0,1038,
-12,1,8734,1039,5,
+12,1,8756,1039,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -13126,7 +13130,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1042,11,1,845,
+345,1042,11,1,867,
 0,348,1,-1,3,
 102,0,345,3,103,
 0,345,3,104,0,
@@ -13134,7 +13138,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1043,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,115,0,345,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -13181,7 +13185,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1044,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,97,0,345,
 3,98,0,345,3,
 99,0,345,3,100,
@@ -13192,7 +13196,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1045,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,117,0,
 345,3,118,0,345,
 3,119,0,345,3,
@@ -13238,7 +13242,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1046,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,100,0,345,3,
 101,0,345,3,102,
 0,345,3,103,0,
@@ -13246,7 +13250,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1047,11,1,845,
+345,1047,11,1,867,
 0,348,1,-1,3,
 102,0,345,3,103,
 0,345,3,104,0,
@@ -13254,10 +13258,10 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1048,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,107,0,345,3,
 108,0,345,1049,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,99,0,345,
 3,100,0,345,3,
 101,0,345,3,102,
@@ -13266,22 +13270,22 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1050,11,1,845,
+345,1050,11,1,867,
 0,348,1,-1,3,
 112,0,343,3,113,
 0,343,3,114,0,
-1051,12,1,9507,1052,
+1051,12,1,9529,1052,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,1053,12,
-1,9537,1054,5,63,
+1,9559,1054,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
 115,0,345,3,116,
-0,1055,12,1,9572,
+0,1055,12,1,9594,
 1056,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -13324,7 +13328,7 @@ public class yyLSLTokens : YyLexer {
 3,89,0,345,3,
 90,0,345,3,95,
 0,345,3,97,0,
-1057,12,1,9615,1058,
+1057,12,1,9637,1058,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -13332,7 +13336,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,114,0,
 345,3,115,0,345,
 3,116,0,1059,12,
-1,9650,1060,5,63,
+1,9672,1060,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -13381,13 +13385,13 @@ public class yyLSLTokens : YyLexer {
 102,0,345,3,103,
 0,345,3,104,0,
 345,3,105,0,1061,
-12,1,9701,1062,5,
+12,1,9723,1062,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,1063,12,1,
-9731,1064,5,63,3,
+9753,1064,5,63,3,
 109,0,345,3,110,
-0,1065,12,1,9760,
+0,1065,12,1,9782,
 1066,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -13495,7 +13499,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1069,11,1,845,0,
+1069,11,1,867,0,
 348,1,-1,3,112,
 0,345,3,113,0,
 345,3,114,0,345,
@@ -13545,11 +13549,11 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1070,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1071,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,117,0,345,
 3,118,0,345,3,
 119,0,345,3,120,
@@ -13594,7 +13598,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1072,11,1,845,
+345,1072,11,1,867,
 0,348,1,-1,3,
 98,0,345,3,99,
 0,345,3,100,0,
@@ -13605,7 +13609,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1073,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,117,0,345,
 3,118,0,345,3,
 119,0,345,3,120,
@@ -13650,16 +13654,16 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1074,11,1,845,
+345,1074,11,1,867,
 0,348,1,-1,3,
 112,0,345,3,113,
 0,345,3,114,0,
 345,3,115,0,345,
 3,116,0,345,3,
 117,0,1075,12,1,
-10383,1076,5,63,3,
+10405,1076,5,63,3,
 109,0,345,3,110,
-0,1077,12,1,10412,
+0,1077,12,1,10434,
 1078,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -13701,7 +13705,7 @@ public class yyLSLTokens : YyLexer {
 345,3,88,0,345,
 3,89,0,345,3,
 90,0,345,3,95,
-0,1079,12,1,10498,
+0,1079,12,1,10520,
 1080,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -13709,7 +13713,7 @@ public class yyLSLTokens : YyLexer {
 113,0,345,3,114,
 0,345,3,115,0,
 345,3,116,0,1081,
-12,1,10533,1082,5,
+12,1,10555,1082,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -13758,9 +13762,9 @@ public class yyLSLTokens : YyLexer {
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
-1083,12,1,10584,1084,
+1083,12,1,10606,1084,
 5,63,3,109,0,
-1085,12,1,10612,1086,
+1085,12,1,10634,1086,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -13806,7 +13810,7 @@ public class yyLSLTokens : YyLexer {
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
-1087,12,1,10659,1088,
+1087,12,1,10681,1088,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -13848,12 +13852,12 @@ public class yyLSLTokens : YyLexer {
 3,88,0,345,3,
 89,0,345,3,90,
 0,345,3,95,0,
-1089,12,1,10745,1090,
+1089,12,1,10767,1090,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,1091,12,1,
-10776,1092,5,63,3,
+10798,1092,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -13899,15 +13903,15 @@ public class yyLSLTokens : YyLexer {
 345,3,99,0,345,
 3,100,0,345,3,
 101,0,1093,12,1,
-10823,1094,5,63,3,
+10845,1094,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,1095,12,1,
-10856,1096,5,63,3,
+10878,1096,5,63,3,
 109,0,1097,12,1,
-10884,1098,5,63,3,
+10906,1098,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -13956,20 +13960,20 @@ public class yyLSLTokens : YyLexer {
 0,345,3,103,0,
 345,3,104,0,345,
 3,105,0,1099,12,
-1,10935,1100,5,63,
+1,10957,1100,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
 115,0,1101,12,1,
-10969,1102,5,63,3,
+10991,1102,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
-0,1103,12,1,11003,
+0,1103,12,1,11025,
 1104,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -14019,20 +14023,20 @@ public class yyLSLTokens : YyLexer {
 345,3,103,0,345,
 3,104,0,345,3,
 105,0,1105,12,1,
-11054,1106,5,63,3,
+11076,1106,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
-1107,12,1,11084,1108,
+1107,12,1,11106,1108,
 5,63,3,109,0,
 345,3,110,0,1109,
-12,1,11113,1110,5,
+12,1,11135,1110,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
 0,345,3,113,0,
 345,3,114,0,345,
 3,115,0,1111,12,
-1,11147,1112,5,63,
+1,11169,1112,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -14141,7 +14145,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1115,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
@@ -14191,7 +14195,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1116,11,1,845,0,
+1116,11,1,867,0,
 348,1,-1,3,112,
 0,345,3,113,0,
 345,3,114,0,345,
@@ -14241,11 +14245,11 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1117,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1118,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,116,0,345,
 3,117,0,345,3,
 118,0,345,3,119,
@@ -14291,7 +14295,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1119,11,1,845,0,
+1119,11,1,867,0,
 348,1,-1,3,116,
 0,345,3,117,0,
 345,3,118,0,345,
@@ -14338,11 +14342,11 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1120,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1121,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,110,0,345,3,
 111,0,345,3,112,
 0,345,3,113,0,
@@ -14393,7 +14397,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1122,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,115,0,345,
 3,116,0,345,3,
 117,0,345,3,118,
@@ -14440,14 +14444,14 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1123,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,102,0,
 345,3,103,0,345,
 3,104,0,345,3,
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1124,11,1,845,0,
+1124,11,1,867,0,
 348,1,-1,3,113,
 0,345,3,114,0,
 345,3,115,0,345,
@@ -14496,7 +14500,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1125,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,97,0,
 345,3,98,0,345,
 3,99,0,345,3,
@@ -14507,14 +14511,14 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1126,11,1,845,0,
+1126,11,1,867,0,
 348,1,-1,3,102,
 0,345,3,103,0,
 345,3,104,0,345,
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1127,11,1,845,
+345,1127,11,1,867,
 0,348,1,-1,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -14566,11 +14570,11 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1128,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1129,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,117,0,345,3,
 118,0,345,3,119,
 0,345,3,120,0,
@@ -14615,7 +14619,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1130,11,1,845,0,
+1130,11,1,867,0,
 348,1,-1,3,97,
 0,345,3,98,0,
 345,3,99,0,345,
@@ -14626,7 +14630,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1131,11,1,845,
+345,1131,11,1,867,
 0,348,1,-1,3,
 111,0,345,3,112,
 0,345,3,113,0,
@@ -14677,7 +14681,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1132,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,118,0,345,
 3,119,0,345,3,
 120,0,345,3,121,
@@ -14716,12 +14720,12 @@ public class yyLSLTokens : YyLexer {
 0,345,3,99,0,
 345,3,100,0,345,
 3,101,0,1133,12,
-1,12674,1134,5,63,
+1,12696,1134,5,63,
 3,109,0,1135,12,
-1,12702,1136,5,63,
+1,12724,1136,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
-0,1137,12,1,12732,
+0,1137,12,1,12754,
 1138,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -14729,7 +14733,7 @@ public class yyLSLTokens : YyLexer {
 113,0,345,3,114,
 0,345,3,115,0,
 345,3,116,0,1139,
-12,1,12767,1140,5,
+12,1,12789,1140,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -14775,7 +14779,7 @@ public class yyLSLTokens : YyLexer {
 98,0,345,3,99,
 0,345,3,100,0,
 345,3,101,0,1141,
-12,1,12814,1142,5,
+12,1,12836,1142,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -14817,7 +14821,7 @@ public class yyLSLTokens : YyLexer {
 88,0,345,3,89,
 0,345,3,90,0,
 345,3,95,0,1143,
-12,1,12900,1144,5,
+12,1,12922,1144,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -14862,7 +14866,7 @@ public class yyLSLTokens : YyLexer {
 3,97,0,345,3,
 98,0,345,3,99,
 0,345,3,100,0,
-1145,12,1,12946,1146,
+1145,12,1,12968,1146,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -14905,7 +14909,7 @@ public class yyLSLTokens : YyLexer {
 89,0,345,3,90,
 0,345,3,95,0,
 345,3,97,0,1147,
-12,1,12989,1148,5,
+12,1,13011,1148,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -14913,7 +14917,7 @@ public class yyLSLTokens : YyLexer {
 345,3,114,0,345,
 3,115,0,345,3,
 116,0,1149,12,1,
-13024,1150,5,63,3,
+13046,1150,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -14955,7 +14959,7 @@ public class yyLSLTokens : YyLexer {
 345,3,89,0,345,
 3,90,0,345,3,
 95,0,345,3,97,
-0,1151,12,1,13067,
+0,1151,12,1,13089,
 1152,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -15025,7 +15029,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1155,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,117,0,345,
 3,118,0,345,3,
 119,0,345,3,120,
@@ -15070,7 +15074,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1156,11,1,845,
+345,1156,11,1,867,
 0,348,1,-1,3,
 98,0,345,3,99,
 0,345,3,100,0,
@@ -15081,7 +15085,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1157,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,101,0,345,
 3,102,0,345,3,
 103,0,345,3,104,
@@ -15089,7 +15093,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1158,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,97,0,345,
 3,98,0,345,3,
 99,0,345,3,100,
@@ -15100,14 +15104,14 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1159,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,102,0,
 345,3,103,0,345,
 3,104,0,345,3,
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1160,11,1,845,0,
+1160,11,1,867,0,
 348,1,-1,3,117,
 0,345,3,118,0,
 345,3,119,0,345,
@@ -15153,7 +15157,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1161,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
@@ -15202,14 +15206,14 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1162,11,1,845,
+345,1162,11,1,867,
 0,348,1,-1,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,345,3,
 115,0,345,3,116,
-0,1163,12,1,13789,
+0,1163,12,1,13811,
 1164,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -15218,16 +15222,16 @@ public class yyLSLTokens : YyLexer {
 0,345,3,115,0,
 345,3,116,0,345,
 3,117,0,1165,12,
-1,13825,1166,5,63,
+1,13847,1166,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
 345,3,113,0,345,
 3,114,0,1167,12,
-1,13858,1168,5,63,
+1,13880,1168,5,63,
 3,109,0,345,3,
 110,0,1169,12,1,
-13887,1170,5,63,3,
+13909,1170,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -15332,7 +15336,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1173,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,115,0,345,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -15379,7 +15383,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1174,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,118,0,345,
 3,119,0,345,3,
 120,0,345,3,121,
@@ -15424,7 +15428,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1175,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,117,0,345,3,
 118,0,345,3,119,
 0,345,3,120,0,
@@ -15469,30 +15473,30 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1176,11,1,845,0,
+1176,11,1,867,0,
 348,1,-1,3,102,
 0,345,3,103,0,
 345,3,104,0,345,
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1177,11,1,845,
+345,1177,11,1,867,
 0,348,1,-1,3,
 115,0,1178,12,1,
-14428,1179,5,63,3,
+14450,1179,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
 0,345,3,116,0,
-1180,12,1,14463,1181,
+1180,12,1,14485,1181,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
-1182,12,1,14496,1183,
+1182,12,1,14518,1183,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -15541,10 +15545,10 @@ public class yyLSLTokens : YyLexer {
 345,3,102,0,345,
 3,103,0,345,3,
 104,0,345,3,105,
-0,1184,12,1,14547,
+0,1184,12,1,14569,
 1185,5,63,3,109,
 0,345,3,110,0,
-1186,12,1,14576,1187,
+1186,12,1,14598,1187,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -15592,7 +15596,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,101,0,
 345,3,102,0,345,
 3,103,0,1188,12,
-1,14625,1189,5,63,
+1,14647,1189,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -15654,7 +15658,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1192,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
@@ -15704,11 +15708,11 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1193,11,1,845,
+345,1193,11,1,867,
 0,348,1,-1,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1194,11,1,845,
+345,1194,11,1,867,
 0,348,1,-1,3,
 115,0,345,3,116,
 0,345,3,117,0,
@@ -15747,14 +15751,14 @@ public class yyLSLTokens : YyLexer {
 345,3,90,0,345,
 3,95,0,345,3,
 97,0,1195,12,1,
-14986,1196,5,63,3,
+15008,1196,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,345,3,115,
 0,345,3,116,0,
-1197,12,1,15021,1198,
+1197,12,1,15043,1198,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -15800,7 +15804,7 @@ public class yyLSLTokens : YyLexer {
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
-1199,12,1,15068,1200,
+1199,12,1,15090,1200,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -15842,7 +15846,7 @@ public class yyLSLTokens : YyLexer {
 3,88,0,345,3,
 89,0,345,3,90,
 0,345,3,95,0,
-1201,12,1,15154,1202,
+1201,12,1,15176,1202,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -15888,10 +15892,10 @@ public class yyLSLTokens : YyLexer {
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
-1203,12,1,15201,1204,
+1203,12,1,15223,1204,
 5,63,3,109,0,
 345,3,110,0,1205,
-12,1,15230,1206,5,
+12,1,15252,1206,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -15899,13 +15903,13 @@ public class yyLSLTokens : YyLexer {
 345,3,114,0,345,
 3,115,0,345,3,
 116,0,1207,12,1,
-15265,1208,5,63,3,
+15287,1208,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
 114,0,1209,12,1,
-15298,1210,5,63,3,
+15320,1210,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -15916,7 +15920,7 @@ public class yyLSLTokens : YyLexer {
 3,118,0,345,3,
 119,0,345,3,120,
 0,345,3,121,0,
-1211,12,1,15338,1212,
+1211,12,1,15360,1212,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -16017,7 +16021,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1215,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,115,0,345,
 3,116,0,345,3,
 117,0,345,3,118,
@@ -16064,7 +16068,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1216,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,117,0,
 345,3,118,0,345,
 3,119,0,345,3,
@@ -16110,7 +16114,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1217,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
@@ -16119,7 +16123,7 @@ public class yyLSLTokens : YyLexer {
 117,0,345,3,118,
 0,345,3,119,0,
 345,3,120,0,1218,
-12,1,15720,1219,5,
+12,1,15742,1219,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -16168,7 +16172,7 @@ public class yyLSLTokens : YyLexer {
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
-1220,12,1,15771,1221,
+1220,12,1,15793,1221,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -16176,7 +16180,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,114,0,
 345,3,115,0,345,
 3,116,0,1222,12,
-1,15806,1223,5,63,
+1,15828,1223,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -16280,11 +16284,11 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1226,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1227,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,121,0,
 345,3,122,0,345,
 3,48,0,345,3,
@@ -16326,7 +16330,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1228,11,1,845,
+345,1228,11,1,867,
 0,348,1,-1,3,
 102,0,345,3,103,
 0,345,3,104,0,
@@ -16334,7 +16338,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1229,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,97,0,345,3,
 98,0,345,3,99,
 0,345,3,100,0,
@@ -16354,7 +16358,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1232,11,1,845,
+345,1232,11,1,867,
 0,348,1,-1,3,
 117,0,345,3,118,
 0,345,3,119,0,
@@ -16400,7 +16404,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1233,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,98,0,
 345,3,99,0,345,
 3,100,0,345,3,
@@ -16410,7 +16414,7 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1234,11,1,845,
+345,1234,11,1,867,
 0,348,1,-1,3,
 117,0,345,3,118,
 0,345,3,119,0,
@@ -16450,26 +16454,26 @@ public class yyLSLTokens : YyLexer {
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
-1235,12,1,16515,1236,
+1235,12,1,16537,1236,
 5,63,3,109,0,
 345,3,110,0,1237,
-12,1,16544,1238,5,
+12,1,16566,1238,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
 0,345,3,113,0,
 345,3,114,0,345,
 3,115,0,1239,12,
-1,16578,1240,5,63,
+1,16600,1240,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
-0,1241,12,1,16608,
+0,1241,12,1,16630,
 1242,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
-0,1243,12,1,16641,
+0,1243,12,1,16663,
 1244,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -16574,7 +16578,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1247,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,112,0,345,3,
 113,0,345,3,114,
 0,345,3,115,0,
@@ -16623,7 +16627,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1248,11,1,845,0,
+1248,11,1,867,0,
 348,1,-1,3,116,
 0,345,3,117,0,
 345,3,118,0,345,
@@ -16670,7 +16674,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1249,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
@@ -16720,20 +16724,20 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1250,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,102,0,
 345,3,103,0,345,
 3,104,0,345,3,
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1251,11,1,845,0,
+1251,11,1,867,0,
 348,1,-1,3,116,
-0,1252,12,1,17189,
+0,1252,12,1,17211,
 1253,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,1254,
-12,1,17219,1255,5,
+12,1,17241,1255,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -16741,7 +16745,7 @@ public class yyLSLTokens : YyLexer {
 345,3,114,0,345,
 3,115,0,345,3,
 116,0,345,3,117,
-0,1256,12,1,17255,
+0,1256,12,1,17277,
 1257,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -16786,7 +16790,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,97,0,
 345,3,98,0,345,
 3,99,0,1258,12,
-1,17300,1259,5,63,
+1,17322,1259,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -16834,7 +16838,7 @@ public class yyLSLTokens : YyLexer {
 3,101,0,345,3,
 102,0,345,3,103,
 0,345,3,104,0,
-1260,12,1,17350,1261,
+1260,12,1,17372,1261,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -16876,14 +16880,14 @@ public class yyLSLTokens : YyLexer {
 3,88,0,345,3,
 89,0,345,3,90,
 0,345,3,95,0,
-1262,12,1,17436,1263,
+1262,12,1,17458,1263,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
 345,3,115,0,1264,
-12,1,17470,1265,5,
+12,1,17492,1265,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -16891,7 +16895,7 @@ public class yyLSLTokens : YyLexer {
 345,3,114,0,345,
 3,115,0,345,3,
 116,0,1266,12,1,
-17505,1267,5,63,3,
+17527,1267,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -16933,13 +16937,13 @@ public class yyLSLTokens : YyLexer {
 345,3,89,0,345,
 3,90,0,345,3,
 95,0,345,3,97,
-0,1268,12,1,17548,
+0,1268,12,1,17570,
 1269,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
-0,1270,12,1,17581,
+0,1270,12,1,17603,
 1271,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -16947,7 +16951,7 @@ public class yyLSLTokens : YyLexer {
 113,0,345,3,114,
 0,345,3,115,0,
 345,3,116,0,1272,
-12,1,17616,1273,5,
+12,1,17638,1273,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -17052,7 +17056,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1276,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,115,0,345,3,
 116,0,345,3,117,
 0,345,3,118,0,
@@ -17099,7 +17103,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1277,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
@@ -17109,7 +17113,7 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1278,11,1,845,0,
+1278,11,1,867,0,
 348,1,-1,3,117,
 0,345,3,118,0,
 345,3,119,0,345,
@@ -17155,7 +17159,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1279,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,116,0,345,
 3,117,0,345,3,
 118,0,345,3,119,
@@ -17195,10 +17199,10 @@ public class yyLSLTokens : YyLexer {
 345,3,98,0,345,
 3,99,0,345,3,
 100,0,345,3,101,
-0,1280,12,1,18083,
+0,1280,12,1,18105,
 1281,5,63,3,109,
 0,345,3,110,0,
-1282,12,1,18112,1283,
+1282,12,1,18134,1283,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -17243,7 +17247,7 @@ public class yyLSLTokens : YyLexer {
 345,3,97,0,345,
 3,98,0,345,3,
 99,0,345,3,100,
-0,1284,12,1,18158,
+0,1284,12,1,18180,
 1285,5,63,3,109,
 0,345,3,110,0,
 345,3,111,0,345,
@@ -17310,7 +17314,7 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1288,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
 3,111,0,345,3,
 112,0,345,3,113,
 0,345,3,114,0,
@@ -17360,14 +17364,14 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1289,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,102,0,
 345,3,103,0,345,
 3,104,0,345,3,
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1290,11,1,845,0,
+1290,11,1,867,0,
 348,1,-1,3,97,
 0,345,3,98,0,
 345,3,99,0,345,
@@ -17388,7 +17392,7 @@ public class yyLSLTokens : YyLexer {
 0,345,3,106,0,
 345,3,107,0,345,
 3,108,0,345,1293,
-11,1,845,0,348,
+11,1,867,0,348,
 1,-1,3,100,0,
 345,3,101,0,345,
 3,102,0,345,3,
@@ -17397,7 +17401,7 @@ public class yyLSLTokens : YyLexer {
 345,3,106,0,345,
 3,107,0,345,3,
 108,0,345,1294,11,
-1,845,0,348,1,
+1,867,0,348,1,
 -1,3,118,0,345,
 3,119,0,345,3,
 120,0,345,3,121,
@@ -17442,7 +17446,13 @@ public class yyLSLTokens : YyLexer {
 3,106,0,345,3,
 107,0,345,3,108,
 0,345,1295,11,1,
-845,0,348,1,-1,
+867,0,348,1,-1,
+3,112,0,345,3,
+113,0,345,3,114,
+0,1296,12,1,18804,
+1297,5,63,3,109,
+0,345,3,110,0,
+345,3,111,0,345,
 3,112,0,345,3,
 113,0,345,3,114,
 0,345,3,115,0,
@@ -17482,16 +17492,60 @@ public class yyLSLTokens : YyLexer {
 3,89,0,345,3,
 90,0,345,3,95,
 0,345,3,97,0,
-345,3,98,0,345,
-3,99,0,345,3,
-100,0,345,3,101,
-0,345,3,102,0,
-345,3,103,0,345,
-3,104,0,345,3,
-105,0,1296,12,1,
-18800,1297,5,63,3,
-109,0,1298,12,1,
-18828,1299,5,63,3,
+1298,12,1,18847,1299,
+5,63,3,109,0,
+345,3,110,0,1300,
+12,1,18876,1301,5,
+63,3,109,0,345,
+3,110,0,345,3,
+111,0,345,3,112,
+0,345,3,113,0,
+345,3,114,0,345,
+3,115,0,1302,12,
+1,18910,1303,5,63,
+3,109,0,345,3,
+110,0,345,3,111,
+0,345,3,112,0,
+345,3,113,0,345,
+3,114,0,345,3,
+115,0,345,3,116,
+0,345,3,117,0,
+345,3,118,0,345,
+3,119,0,345,3,
+120,0,345,3,121,
+0,345,3,122,0,
+345,3,48,0,345,
+3,49,0,345,3,
+50,0,345,3,51,
+0,345,3,52,0,
+345,3,53,0,345,
+3,54,0,345,3,
+55,0,345,3,56,
+0,345,3,57,0,
+345,3,65,0,345,
+3,66,0,345,3,
+67,0,345,3,68,
+0,345,3,69,0,
+345,3,70,0,345,
+3,71,0,345,3,
+72,0,345,3,73,
+0,345,3,74,0,
+345,3,75,0,345,
+3,76,0,345,3,
+77,0,345,3,78,
+0,345,3,79,0,
+345,3,80,0,345,
+3,81,0,345,3,
+82,0,345,3,83,
+0,345,3,84,0,
+345,3,85,0,345,
+3,86,0,345,3,
+87,0,345,3,88,
+0,345,3,89,0,
+345,3,90,0,345,
+3,95,0,345,3,
+97,0,1304,12,1,
+18953,1305,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -17534,16 +17588,240 @@ public class yyLSLTokens : YyLexer {
 3,90,0,345,3,
 95,0,345,3,97,
 0,345,3,98,0,
-345,3,99,0,345,
-3,100,0,345,3,
-101,0,1300,12,1,
-18875,1301,5,63,3,
+345,3,99,0,1306,
+12,1,18998,1307,5,
+63,3,109,0,345,
+3,110,0,345,3,
+111,0,345,3,112,
+0,345,3,113,0,
+345,3,114,0,345,
+3,115,0,345,3,
+116,0,1308,12,1,
+19033,1309,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
 3,113,0,345,3,
-114,0,1302,12,1,
-18908,1303,5,63,3,
+114,0,345,3,115,
+0,345,3,116,0,
+345,3,117,0,345,
+3,118,0,345,3,
+119,0,345,3,120,
+0,345,3,121,0,
+345,3,122,0,345,
+3,48,0,345,3,
+49,0,345,3,50,
+0,345,3,51,0,
+345,3,52,0,345,
+3,53,0,345,3,
+54,0,345,3,55,
+0,345,3,56,0,
+345,3,57,0,345,
+3,65,0,345,3,
+66,0,345,3,67,
+0,345,3,68,0,
+345,3,69,0,345,
+3,70,0,345,3,
+71,0,345,3,72,
+0,345,3,73,0,
+345,3,74,0,345,
+3,75,0,345,3,
+76,0,345,3,77,
+0,345,3,78,0,
+345,3,79,0,345,
+3,80,0,345,3,
+81,0,345,3,82,
+0,345,3,83,0,
+345,3,84,0,345,
+3,85,0,345,3,
+86,0,345,3,87,
+0,345,3,88,0,
+345,3,89,0,345,
+3,90,0,345,3,
+95,0,345,3,97,
+0,345,3,98,0,
+345,3,99,0,345,
+3,100,0,345,3,
+101,0,345,3,102,
+0,345,3,103,0,
+345,3,104,0,345,
+3,105,0,1310,12,
+1,19084,1311,5,63,
+3,109,0,345,3,
+110,0,345,3,111,
+0,1312,12,1,19114,
+1313,5,63,3,109,
+0,345,3,110,0,
+1314,12,1,19143,1315,
+5,63,3,109,0,
+345,3,110,0,345,
+3,111,0,345,3,
+112,0,345,3,113,
+0,345,3,114,0,
+345,3,115,0,345,
+3,116,0,345,3,
+117,0,345,3,118,
+0,345,3,119,0,
+345,3,120,0,345,
+3,121,0,345,3,
+122,0,345,3,48,
+0,345,3,49,0,
+345,3,50,0,345,
+3,51,0,345,3,
+52,0,345,3,53,
+0,345,3,54,0,
+345,3,55,0,345,
+3,56,0,345,3,
+57,0,345,3,65,
+0,345,3,66,0,
+345,3,67,0,345,
+3,68,0,345,3,
+69,0,345,3,70,
+0,345,3,71,0,
+345,3,72,0,345,
+3,73,0,345,3,
+74,0,345,3,75,
+0,345,3,76,0,
+345,3,77,0,345,
+3,78,0,345,3,
+79,0,345,3,80,
+0,345,3,81,0,
+345,3,82,0,345,
+3,83,0,345,3,
+84,0,345,3,85,
+0,345,3,86,0,
+345,3,87,0,345,
+3,88,0,345,3,
+89,0,345,3,90,
+0,345,3,95,0,
+1316,12,1,19229,1317,
+5,63,3,109,0,
+345,3,110,0,345,
+3,111,0,345,3,
+112,0,345,3,113,
+0,345,3,114,0,
+1318,12,1,19262,1319,
+5,63,3,109,0,
+345,3,110,0,345,
+3,111,0,345,3,
+112,0,345,3,113,
+0,345,3,114,0,
+345,3,115,0,345,
+3,116,0,345,3,
+117,0,345,3,118,
+0,345,3,119,0,
+345,3,120,0,345,
+3,121,0,345,3,
+122,0,345,3,48,
+0,345,3,49,0,
+345,3,50,0,345,
+3,51,0,345,3,
+52,0,345,3,53,
+0,345,3,54,0,
+345,3,55,0,345,
+3,56,0,345,3,
+57,0,345,3,65,
+0,345,3,66,0,
+345,3,67,0,345,
+3,68,0,345,3,
+69,0,345,3,70,
+0,345,3,71,0,
+345,3,72,0,345,
+3,73,0,345,3,
+74,0,345,3,75,
+0,345,3,76,0,
+345,3,77,0,345,
+3,78,0,345,3,
+79,0,345,3,80,
+0,345,3,81,0,
+345,3,82,0,345,
+3,83,0,345,3,
+84,0,345,3,85,
+0,345,3,86,0,
+345,3,87,0,345,
+3,88,0,345,3,
+89,0,345,3,90,
+0,345,3,95,0,
+345,3,97,0,345,
+3,98,0,345,3,
+99,0,345,3,100,
+0,345,3,101,0,
+1320,12,1,19309,1321,
+5,63,3,109,0,
+345,3,110,0,345,
+3,111,0,345,3,
+112,0,345,3,113,
+0,345,3,114,0,
+345,3,115,0,1322,
+12,1,19343,1323,5,
+63,3,109,0,345,
+3,110,0,345,3,
+111,0,345,3,112,
+0,345,3,113,0,
+345,3,114,0,345,
+3,115,0,345,3,
+116,0,345,3,117,
+0,1324,12,1,19379,
+1325,5,63,3,109,
+0,345,3,110,0,
+345,3,111,0,345,
+3,112,0,345,3,
+113,0,345,3,114,
+0,345,3,115,0,
+345,3,116,0,345,
+3,117,0,345,3,
+118,0,345,3,119,
+0,345,3,120,0,
+345,3,121,0,345,
+3,122,0,345,3,
+48,0,345,3,49,
+0,345,3,50,0,
+345,3,51,0,345,
+3,52,0,345,3,
+53,0,345,3,54,
+0,345,3,55,0,
+345,3,56,0,345,
+3,57,0,345,3,
+65,0,345,3,66,
+0,345,3,67,0,
+345,3,68,0,345,
+3,69,0,345,3,
+70,0,345,3,71,
+0,345,3,72,0,
+345,3,73,0,345,
+3,74,0,345,3,
+75,0,345,3,76,
+0,345,3,77,0,
+345,3,78,0,345,
+3,79,0,345,3,
+80,0,345,3,81,
+0,345,3,82,0,
+345,3,83,0,345,
+3,84,0,345,3,
+85,0,345,3,86,
+0,345,3,87,0,
+345,3,88,0,345,
+3,89,0,345,3,
+90,0,345,3,95,
+0,345,3,97,0,
+345,3,98,0,345,
+3,99,0,345,3,
+100,0,345,3,101,
+0,345,3,102,0,
+345,3,103,0,345,
+3,104,0,345,3,
+105,0,345,3,106,
+0,345,3,107,0,
+345,3,108,0,1326,
+12,1,19433,1327,5,
+63,3,109,0,345,
+3,110,0,345,3,
+111,0,345,3,112,
+0,345,3,113,0,
+345,3,114,0,345,
+3,115,0,345,3,
+116,0,1328,12,1,
+19468,1329,5,63,3,
 109,0,345,3,110,
 0,345,3,111,0,
 345,3,112,0,345,
@@ -17594,15 +17872,65 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1304,11,1,783,
-0,1305,4,22,84,
-0,73,0,77,0,
-69,0,82,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,-1,3,115,
-0,345,3,116,0,
-345,3,117,0,345,
+345,1330,11,1,845,
+0,1331,4,48,84,
+0,82,0,65,0,
+78,0,83,0,65,
+0,67,0,84,0,
+73,0,79,0,78,
+0,95,0,82,0,
+69,0,83,0,85,
+0,76,0,84,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,-1,3,
+117,0,345,3,118,
+0,345,3,119,0,
+345,3,120,0,345,
+3,121,0,345,3,
+122,0,345,3,48,
+0,345,3,49,0,
+345,3,50,0,345,
+3,51,0,345,3,
+52,0,345,3,53,
+0,345,3,54,0,
+345,3,55,0,345,
+3,56,0,345,3,
+57,0,345,3,65,
+0,345,3,66,0,
+345,3,67,0,345,
+3,68,0,345,3,
+69,0,345,3,70,
+0,345,3,71,0,
+345,3,72,0,345,
+3,73,0,345,3,
+74,0,345,3,75,
+0,345,3,76,0,
+345,3,77,0,345,
+3,78,0,345,3,
+79,0,345,3,80,
+0,345,3,81,0,
+345,3,82,0,345,
+3,83,0,345,3,
+84,0,345,3,85,
+0,345,3,86,0,
+345,3,87,0,345,
+3,88,0,345,3,
+89,0,345,3,90,
+0,345,3,95,0,
+345,3,97,0,345,
+3,98,0,345,3,
+99,0,345,3,100,
+0,345,3,101,0,
+345,3,102,0,345,
+3,103,0,345,3,
+104,0,345,3,105,
+0,345,3,106,0,
+345,3,107,0,345,
+3,108,0,345,1332,
+11,1,867,0,348,
+1,-1,1333,11,1,
+867,0,348,1,-1,
 3,118,0,345,3,
 119,0,345,3,120,
 0,345,3,121,0,
@@ -17646,20 +17974,8 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1306,11,1,845,
+345,1334,11,1,867,
 0,348,1,-1,3,
-102,0,345,3,103,
-0,345,3,104,0,
-345,3,105,0,345,
-3,106,0,345,3,
-107,0,345,3,108,
-0,345,1307,11,1,
-845,0,348,1,-1,
-3,110,0,345,3,
-111,0,345,3,112,
-0,345,3,113,0,
-345,3,114,0,345,
-3,115,0,345,3,
 116,0,345,3,117,
 0,345,3,118,0,
 345,3,119,0,345,
@@ -17704,179 +18020,15 @@ public class yyLSLTokens : YyLexer {
 0,345,3,105,0,
 345,3,106,0,345,
 3,107,0,345,3,
-108,0,345,1308,11,
-1,845,0,348,1,
--1,3,106,0,345,
-3,107,0,345,3,
-108,0,345,1309,11,
-1,845,0,348,1,
--1,3,117,0,343,
-3,118,0,1310,12,
-1,19351,1311,5,63,
-3,109,0,345,3,
-110,0,345,3,111,
-0,345,3,112,0,
-345,3,113,0,345,
-3,114,0,345,3,
-115,0,345,3,116,
-0,345,3,117,0,
-345,3,118,0,345,
-3,119,0,345,3,
-120,0,345,3,121,
-0,345,3,122,0,
-345,3,48,0,345,
-3,49,0,345,3,
-50,0,345,3,51,
-0,345,3,52,0,
-345,3,53,0,345,
-3,54,0,345,3,
-55,0,345,3,56,
-0,345,3,57,0,
-345,3,65,0,345,
-3,66,0,345,3,
-67,0,345,3,68,
-0,345,3,69,0,
-345,3,70,0,345,
-3,71,0,345,3,
-72,0,345,3,73,
-0,345,3,74,0,
-345,3,75,0,345,
-3,76,0,345,3,
-77,0,345,3,78,
-0,345,3,79,0,
-345,3,80,0,345,
-3,81,0,345,3,
-82,0,345,3,83,
-0,345,3,84,0,
-345,3,85,0,345,
-3,86,0,345,3,
-87,0,345,3,88,
-0,345,3,89,0,
-345,3,90,0,345,
-3,95,0,345,3,
-97,0,345,3,98,
-0,345,3,99,0,
-345,3,100,0,345,
-3,101,0,1312,12,
-1,19398,1313,5,63,
-3,109,0,345,3,
-110,0,345,3,111,
-0,345,3,112,0,
-345,3,113,0,345,
-3,114,0,345,3,
-115,0,345,3,116,
-0,345,3,117,0,
-345,3,118,0,345,
-3,119,0,345,3,
-120,0,345,3,121,
-0,345,3,122,0,
-345,3,48,0,345,
-3,49,0,345,3,
-50,0,345,3,51,
-0,345,3,52,0,
-345,3,53,0,345,
-3,54,0,345,3,
-55,0,345,3,56,
-0,345,3,57,0,
-345,3,65,0,345,
-3,66,0,345,3,
-67,0,345,3,68,
-0,345,3,69,0,
-345,3,70,0,345,
-3,71,0,345,3,
-72,0,345,3,73,
-0,345,3,74,0,
-345,3,75,0,345,
-3,76,0,345,3,
-77,0,345,3,78,
-0,345,3,79,0,
-345,3,80,0,345,
-3,81,0,345,3,
-82,0,345,3,83,
-0,345,3,84,0,
-345,3,85,0,345,
-3,86,0,345,3,
-87,0,345,3,88,
-0,345,3,89,0,
-345,3,90,0,345,
-3,95,0,345,3,
-97,0,345,3,98,
-0,345,3,99,0,
-1314,12,1,19443,1315,
-5,63,3,109,0,
-345,3,110,0,345,
-3,111,0,345,3,
-112,0,345,3,113,
-0,345,3,114,0,
-345,3,115,0,345,
-3,116,0,1316,12,
-1,19478,1317,5,63,
-3,109,0,345,3,
-110,0,345,3,111,
-0,1318,12,1,19508,
-1319,5,63,3,109,
-0,345,3,110,0,
-345,3,111,0,345,
-3,112,0,345,3,
-113,0,345,3,114,
-0,1320,12,1,19541,
-1321,5,63,3,109,
-0,345,3,110,0,
-345,3,111,0,345,
-3,112,0,345,3,
-113,0,345,3,114,
-0,345,3,115,0,
-345,3,116,0,345,
-3,117,0,345,3,
-118,0,345,3,119,
-0,345,3,120,0,
-345,3,121,0,345,
-3,122,0,345,3,
-48,0,345,3,49,
-0,345,3,50,0,
-345,3,51,0,345,
-3,52,0,345,3,
-53,0,345,3,54,
-0,345,3,55,0,
-345,3,56,0,345,
-3,57,0,345,3,
-65,0,345,3,66,
-0,345,3,67,0,
-345,3,68,0,345,
-3,69,0,345,3,
-70,0,345,3,71,
-0,345,3,72,0,
-345,3,73,0,345,
-3,74,0,345,3,
-75,0,345,3,76,
-0,345,3,77,0,
-345,3,78,0,345,
-3,79,0,345,3,
-80,0,345,3,81,
-0,345,3,82,0,
-345,3,83,0,345,
-3,84,0,345,3,
-85,0,345,3,86,
-0,345,3,87,0,
-345,3,88,0,345,
-3,89,0,345,3,
-90,0,345,3,95,
-0,345,3,97,0,
-345,3,98,0,345,
-3,99,0,345,3,
-100,0,345,3,101,
-0,345,3,102,0,
-345,3,103,0,345,
-3,104,0,345,3,
-105,0,345,3,106,
-0,345,3,107,0,
-345,3,108,0,345,
-1322,11,1,320,0,
-1323,4,22,86,0,
-69,0,67,0,84,
-0,79,0,82,0,
-95,0,84,0,89,
-0,80,0,69,0,
+108,0,345,1335,11,
+1,867,0,348,1,
+-1,3,102,0,345,
+3,103,0,345,3,
+104,0,345,3,105,
+0,345,3,106,0,
+345,3,107,0,345,
+3,108,0,345,1336,
+11,1,867,0,348,
 1,-1,3,115,0,
 345,3,116,0,345,
 3,117,0,345,3,
@@ -17923,8 +18075,20 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1324,11,1,845,0,
-348,1,-1,3,112,
+1337,11,1,867,0,
+348,1,-1,3,97,
+0,345,3,98,0,
+345,3,99,0,345,
+3,100,0,345,3,
+101,0,345,3,102,
+0,345,3,103,0,
+345,3,104,0,345,
+3,105,0,345,3,
+106,0,345,3,107,
+0,345,3,108,0,
+345,1338,11,1,867,
+0,348,1,-1,3,
+111,0,345,3,112,
 0,345,3,113,0,
 345,3,114,0,345,
 3,115,0,345,3,
@@ -17972,9 +18136,13 @@ public class yyLSLTokens : YyLexer {
 0,345,3,105,0,
 345,3,106,0,345,
 3,107,0,345,3,
-108,0,345,1325,11,
-1,845,0,348,1,
--1,3,117,0,345,
+108,0,345,1339,11,
+1,867,0,348,1,
+-1,3,112,0,345,
+3,113,0,345,3,
+114,0,345,3,115,
+0,345,3,116,0,
+345,3,117,0,345,
 3,118,0,345,3,
 119,0,345,3,120,
 0,345,3,121,0,
@@ -18018,8 +18186,68 @@ public class yyLSLTokens : YyLexer {
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1326,11,1,845,
+345,1340,11,1,867,
+0,348,1,-1,3,
+106,0,345,3,107,
+0,345,3,108,0,
+345,1341,11,1,867,
 0,348,1,-1,3,
+117,0,345,3,118,
+0,345,3,119,0,
+345,3,120,0,345,
+3,121,0,345,3,
+122,0,345,3,48,
+0,345,3,49,0,
+345,3,50,0,345,
+3,51,0,345,3,
+52,0,345,3,53,
+0,345,3,54,0,
+345,3,55,0,345,
+3,56,0,345,3,
+57,0,345,3,65,
+0,345,3,66,0,
+345,3,67,0,345,
+3,68,0,345,3,
+69,0,345,3,70,
+0,345,3,71,0,
+345,3,72,0,345,
+3,73,0,345,3,
+74,0,345,3,75,
+0,345,3,76,0,
+345,3,77,0,345,
+3,78,0,345,3,
+79,0,345,3,80,
+0,345,3,81,0,
+345,3,82,0,345,
+3,83,0,345,3,
+84,0,345,3,85,
+0,345,3,86,0,
+345,3,87,0,345,
+3,88,0,345,3,
+89,0,345,3,90,
+0,345,3,95,0,
+345,3,97,0,345,
+3,98,0,345,3,
+99,0,345,3,100,
+0,345,3,101,0,
+345,3,102,0,345,
+3,103,0,345,3,
+104,0,345,3,105,
+0,345,3,106,0,
+345,3,107,0,345,
+3,108,0,345,1342,
+11,1,867,0,348,
+1,-1,3,100,0,
+345,3,101,0,345,
+3,102,0,345,3,
+103,0,345,3,104,
+0,345,3,105,0,
+345,3,106,0,345,
+3,107,0,345,3,
+108,0,345,1343,11,
+1,867,0,348,1,
+-1,3,98,0,345,
+3,99,0,345,3,
 100,0,345,3,101,
 0,345,3,102,0,
 345,3,103,0,345,
@@ -18027,65 +18255,213 @@ public class yyLSLTokens : YyLexer {
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1327,11,1,845,0,
-348,1,-1,3,102,
+1344,11,1,867,0,
+348,1,-1,3,116,
+0,345,3,117,0,
+345,3,118,0,345,
+3,119,0,345,3,
+120,0,345,3,121,
+0,345,3,122,0,
+345,3,48,0,345,
+3,49,0,345,3,
+50,0,345,3,51,
+0,345,3,52,0,
+345,3,53,0,345,
+3,54,0,345,3,
+55,0,345,3,56,
+0,345,3,57,0,
+345,3,65,0,345,
+3,66,0,345,3,
+67,0,345,3,68,
+0,345,3,69,0,
+345,3,70,0,345,
+3,71,0,345,3,
+72,0,345,3,73,
+0,345,3,74,0,
+345,3,75,0,345,
+3,76,0,345,3,
+77,0,345,3,78,
+0,345,3,79,0,
+345,3,80,0,345,
+3,81,0,345,3,
+82,0,345,3,83,
+0,345,3,84,0,
+345,3,85,0,345,
+3,86,0,345,3,
+87,0,345,3,88,
+0,345,3,89,0,
+345,3,90,0,345,
+3,95,0,345,3,
+97,0,345,3,98,
+0,345,3,99,0,
+345,3,100,0,345,
+3,101,0,345,3,
+102,0,345,3,103,
+0,345,3,104,0,
+345,3,105,0,345,
+3,106,0,345,3,
+107,0,345,3,108,
+0,345,1345,11,1,
+867,0,348,1,-1,
+3,111,0,345,3,
+112,0,345,3,113,
+0,345,3,114,0,
+345,3,115,0,345,
+3,116,0,345,3,
+117,0,345,3,118,
+0,345,3,119,0,
+345,3,120,0,345,
+3,121,0,345,3,
+122,0,345,3,48,
+0,345,3,49,0,
+345,3,50,0,345,
+3,51,0,345,3,
+52,0,345,3,53,
+0,345,3,54,0,
+345,3,55,0,345,
+3,56,0,345,3,
+57,0,345,3,65,
+0,345,3,66,0,
+345,3,67,0,345,
+3,68,0,345,3,
+69,0,345,3,70,
+0,345,3,71,0,
+345,3,72,0,345,
+3,73,0,345,3,
+74,0,345,3,75,
+0,345,3,76,0,
+345,3,77,0,345,
+3,78,0,345,3,
+79,0,345,3,80,
+0,345,3,81,0,
+345,3,82,0,345,
+3,83,0,345,3,
+84,0,345,3,85,
+0,345,3,86,0,
+345,3,87,0,345,
+3,88,0,345,3,
+89,0,345,3,90,
+0,345,3,95,0,
+345,3,97,0,345,
+3,98,0,345,3,
+99,0,345,3,100,
+0,345,3,101,0,
+345,3,102,0,345,
+3,103,0,345,3,
+104,0,345,3,105,
+0,345,3,106,0,
+345,3,107,0,345,
+3,108,0,345,1346,
+11,1,867,0,348,
+1,-1,3,98,0,
+345,3,99,0,345,
+3,100,0,345,3,
+101,0,345,3,102,
 0,345,3,103,0,
 345,3,104,0,345,
 3,105,0,345,3,
 106,0,345,3,107,
 0,345,3,108,0,
-345,1328,11,1,845,
+345,1347,11,1,867,
 0,348,1,-1,3,
-119,0,1329,12,1,
-20072,1330,5,63,3,
-109,0,345,3,110,
-0,345,3,111,0,
-345,3,112,0,345,
-3,113,0,345,3,
-114,0,345,3,115,
-0,345,3,116,0,
-345,3,117,0,345,
-3,118,0,345,3,
-119,0,345,3,120,
-0,345,3,121,0,
-345,3,122,0,345,
-3,48,0,345,3,
-49,0,345,3,50,
-0,345,3,51,0,
-345,3,52,0,345,
-3,53,0,345,3,
-54,0,345,3,55,
-0,345,3,56,0,
-345,3,57,0,345,
-3,65,0,345,3,
-66,0,345,3,67,
-0,345,3,68,0,
-345,3,69,0,345,
-3,70,0,345,3,
-71,0,345,3,72,
-0,345,3,73,0,
-345,3,74,0,345,
-3,75,0,345,3,
-76,0,345,3,77,
-0,345,3,78,0,
-345,3,79,0,345,
-3,80,0,345,3,
-81,0,345,3,82,
-0,345,3,83,0,
-345,3,84,0,345,
-3,85,0,345,3,
-86,0,345,3,87,
-0,345,3,88,0,
-345,3,89,0,345,
-3,90,0,345,3,
-95,0,345,3,97,
-0,345,3,98,0,
-345,3,99,0,345,
-3,100,0,345,3,
-101,0,345,3,102,
-0,345,3,103,0,
-345,3,104,0,1331,
-12,1,20122,1332,5,
+115,0,345,3,116,
+0,345,3,117,0,
+345,3,118,0,345,
+3,119,0,345,3,
+120,0,345,3,121,
+0,345,3,122,0,
+345,3,48,0,345,
+3,49,0,345,3,
+50,0,345,3,51,
+0,345,3,52,0,
+345,3,53,0,345,
+3,54,0,345,3,
+55,0,345,3,56,
+0,345,3,57,0,
+345,3,65,0,345,
+3,66,0,345,3,
+67,0,345,3,68,
+0,345,3,69,0,
+345,3,70,0,345,
+3,71,0,345,3,
+72,0,345,3,73,
+0,345,3,74,0,
+345,3,75,0,345,
+3,76,0,345,3,
+77,0,345,3,78,
+0,345,3,79,0,
+345,3,80,0,345,
+3,81,0,345,3,
+82,0,345,3,83,
+0,345,3,84,0,
+345,3,85,0,345,
+3,86,0,345,3,
+87,0,345,3,88,
+0,345,3,89,0,
+345,3,90,0,345,
+3,95,0,345,3,
+97,0,345,3,98,
+0,345,3,99,0,
+345,3,100,0,345,
+3,101,0,345,3,
+102,0,345,3,103,
+0,345,3,104,0,
+345,3,105,0,1348,
+12,1,20862,1349,5,
+63,3,109,0,1350,
+12,1,20890,1351,5,
+63,3,109,0,345,
+3,110,0,345,3,
+111,0,345,3,112,
+0,345,3,113,0,
+345,3,114,0,345,
+3,115,0,345,3,
+116,0,345,3,117,
+0,345,3,118,0,
+345,3,119,0,345,
+3,120,0,345,3,
+121,0,345,3,122,
+0,345,3,48,0,
+345,3,49,0,345,
+3,50,0,345,3,
+51,0,345,3,52,
+0,345,3,53,0,
+345,3,54,0,345,
+3,55,0,345,3,
+56,0,345,3,57,
+0,345,3,65,0,
+345,3,66,0,345,
+3,67,0,345,3,
+68,0,345,3,69,
+0,345,3,70,0,
+345,3,71,0,345,
+3,72,0,345,3,
+73,0,345,3,74,
+0,345,3,75,0,
+345,3,76,0,345,
+3,77,0,345,3,
+78,0,345,3,79,
+0,345,3,80,0,
+345,3,81,0,345,
+3,82,0,345,3,
+83,0,345,3,84,
+0,345,3,85,0,
+345,3,86,0,345,
+3,87,0,345,3,
+88,0,345,3,89,
+0,345,3,90,0,
+345,3,95,0,345,
+3,97,0,345,3,
+98,0,345,3,99,
+0,345,3,100,0,
+345,3,101,0,1352,
+12,1,20937,1353,5,
+63,3,109,0,345,
+3,110,0,345,3,
+111,0,345,3,112,
+0,345,3,113,0,
+345,3,114,0,1354,
+12,1,20970,1355,5,
 63,3,109,0,345,
 3,110,0,345,3,
 111,0,345,3,112,
@@ -18134,7 +18510,127 @@ public class yyLSLTokens : YyLexer {
 3,102,0,345,3,
 103,0,345,3,104,
 0,345,3,105,0,
-1333,12,1,20173,1334,
+345,3,106,0,345,
+3,107,0,345,3,
+108,0,345,1356,11,
+1,783,0,1357,4,
+22,84,0,73,0,
+77,0,69,0,82,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,-1,
+3,115,0,345,3,
+116,0,345,3,117,
+0,345,3,118,0,
+345,3,119,0,345,
+3,120,0,345,3,
+121,0,345,3,122,
+0,345,3,48,0,
+345,3,49,0,345,
+3,50,0,345,3,
+51,0,345,3,52,
+0,345,3,53,0,
+345,3,54,0,345,
+3,55,0,345,3,
+56,0,345,3,57,
+0,345,3,65,0,
+345,3,66,0,345,
+3,67,0,345,3,
+68,0,345,3,69,
+0,345,3,70,0,
+345,3,71,0,345,
+3,72,0,345,3,
+73,0,345,3,74,
+0,345,3,75,0,
+345,3,76,0,345,
+3,77,0,345,3,
+78,0,345,3,79,
+0,345,3,80,0,
+345,3,81,0,345,
+3,82,0,345,3,
+83,0,345,3,84,
+0,345,3,85,0,
+345,3,86,0,345,
+3,87,0,345,3,
+88,0,345,3,89,
+0,345,3,90,0,
+345,3,95,0,345,
+3,97,0,345,3,
+98,0,345,3,99,
+0,345,3,100,0,
+345,3,101,0,345,
+3,102,0,345,3,
+103,0,345,3,104,
+0,345,3,105,0,
+345,3,106,0,345,
+3,107,0,345,3,
+108,0,345,1358,11,
+1,867,0,348,1,
+-1,3,102,0,345,
+3,103,0,345,3,
+104,0,345,3,105,
+0,345,3,106,0,
+345,3,107,0,345,
+3,108,0,345,1359,
+11,1,867,0,348,
+1,-1,3,110,0,
+345,3,111,0,345,
+3,112,0,345,3,
+113,0,345,3,114,
+0,345,3,115,0,
+345,3,116,0,345,
+3,117,0,345,3,
+118,0,345,3,119,
+0,345,3,120,0,
+345,3,121,0,345,
+3,122,0,345,3,
+48,0,345,3,49,
+0,345,3,50,0,
+345,3,51,0,345,
+3,52,0,345,3,
+53,0,345,3,54,
+0,345,3,55,0,
+345,3,56,0,345,
+3,57,0,345,3,
+65,0,345,3,66,
+0,345,3,67,0,
+345,3,68,0,345,
+3,69,0,345,3,
+70,0,345,3,71,
+0,345,3,72,0,
+345,3,73,0,345,
+3,74,0,345,3,
+75,0,345,3,76,
+0,345,3,77,0,
+345,3,78,0,345,
+3,79,0,345,3,
+80,0,345,3,81,
+0,345,3,82,0,
+345,3,83,0,345,
+3,84,0,345,3,
+85,0,345,3,86,
+0,345,3,87,0,
+345,3,88,0,345,
+3,89,0,345,3,
+90,0,345,3,95,
+0,345,3,97,0,
+345,3,98,0,345,
+3,99,0,345,3,
+100,0,345,3,101,
+0,345,3,102,0,
+345,3,103,0,345,
+3,104,0,345,3,
+105,0,345,3,106,
+0,345,3,107,0,
+345,3,108,0,345,
+1360,11,1,867,0,
+348,1,-1,3,106,
+0,345,3,107,0,
+345,3,108,0,345,
+1361,11,1,867,0,
+348,1,-1,3,117,
+0,343,3,118,0,
+1362,12,1,21413,1363,
 5,63,3,109,0,
 345,3,110,0,345,
 3,111,0,345,3,
@@ -18180,13 +18676,69 @@ public class yyLSLTokens : YyLexer {
 3,98,0,345,3,
 99,0,345,3,100,
 0,345,3,101,0,
-345,3,102,0,345,
-3,103,0,345,3,
-104,0,345,3,105,
-0,345,3,106,0,
-345,3,107,0,345,
-3,108,0,1335,12,
-1,20227,1336,5,63,
+1364,12,1,21460,1365,
+5,63,3,109,0,
+345,3,110,0,345,
+3,111,0,345,3,
+112,0,345,3,113,
+0,345,3,114,0,
+345,3,115,0,345,
+3,116,0,345,3,
+117,0,345,3,118,
+0,345,3,119,0,
+345,3,120,0,345,
+3,121,0,345,3,
+122,0,345,3,48,
+0,345,3,49,0,
+345,3,50,0,345,
+3,51,0,345,3,
+52,0,345,3,53,
+0,345,3,54,0,
+345,3,55,0,345,
+3,56,0,345,3,
+57,0,345,3,65,
+0,345,3,66,0,
+345,3,67,0,345,
+3,68,0,345,3,
+69,0,345,3,70,
+0,345,3,71,0,
+345,3,72,0,345,
+3,73,0,345,3,
+74,0,345,3,75,
+0,345,3,76,0,
+345,3,77,0,345,
+3,78,0,345,3,
+79,0,345,3,80,
+0,345,3,81,0,
+345,3,82,0,345,
+3,83,0,345,3,
+84,0,345,3,85,
+0,345,3,86,0,
+345,3,87,0,345,
+3,88,0,345,3,
+89,0,345,3,90,
+0,345,3,95,0,
+345,3,97,0,345,
+3,98,0,345,3,
+99,0,1366,12,1,
+21505,1367,5,63,3,
+109,0,345,3,110,
+0,345,3,111,0,
+345,3,112,0,345,
+3,113,0,345,3,
+114,0,345,3,115,
+0,345,3,116,0,
+1368,12,1,21540,1369,
+5,63,3,109,0,
+345,3,110,0,345,
+3,111,0,1370,12,
+1,21570,1371,5,63,
+3,109,0,345,3,
+110,0,345,3,111,
+0,345,3,112,0,
+345,3,113,0,345,
+3,114,0,1372,12,
+1,21603,1373,5,63,
 3,109,0,345,3,
 110,0,345,3,111,
 0,345,3,112,0,
@@ -18231,13 +18783,19 @@ public class yyLSLTokens : YyLexer {
 97,0,345,3,98,
 0,345,3,99,0,
 345,3,100,0,345,
-3,101,0,1337,12,
-1,20274,1338,5,63,
-3,109,0,345,3,
-110,0,345,3,111,
-0,345,3,112,0,
-345,3,113,0,345,
-3,114,0,345,3,
+3,101,0,345,3,
+102,0,345,3,103,
+0,345,3,104,0,
+345,3,105,0,345,
+3,106,0,345,3,
+107,0,345,3,108,
+0,345,1374,11,1,
+320,0,1375,4,22,
+86,0,69,0,67,
+0,84,0,79,0,
+82,0,95,0,84,
+0,89,0,80,0,
+69,0,1,-1,3,
 115,0,345,3,116,
 0,345,3,117,0,
 345,3,118,0,345,
@@ -18283,315 +18841,676 @@ public class yyLSLTokens : YyLexer {
 345,3,105,0,345,
 3,106,0,345,3,
 107,0,345,3,108,
-0,345,1339,11,1,
-229,0,1340,4,10,
-87,0,72,0,73,
-0,76,0,69,0,
-1,-1,3,102,0,
+0,345,1376,11,1,
+867,0,348,1,-1,
+3,112,0,345,3,
+113,0,345,3,114,
+0,345,3,115,0,
+345,3,116,0,345,
+3,117,0,345,3,
+118,0,345,3,119,
+0,345,3,120,0,
+345,3,121,0,345,
+3,122,0,345,3,
+48,0,345,3,49,
+0,345,3,50,0,
+345,3,51,0,345,
+3,52,0,345,3,
+53,0,345,3,54,
+0,345,3,55,0,
+345,3,56,0,345,
+3,57,0,345,3,
+65,0,345,3,66,
+0,345,3,67,0,
+345,3,68,0,345,
+3,69,0,345,3,
+70,0,345,3,71,
+0,345,3,72,0,
+345,3,73,0,345,
+3,74,0,345,3,
+75,0,345,3,76,
+0,345,3,77,0,
+345,3,78,0,345,
+3,79,0,345,3,
+80,0,345,3,81,
+0,345,3,82,0,
+345,3,83,0,345,
+3,84,0,345,3,
+85,0,345,3,86,
+0,345,3,87,0,
+345,3,88,0,345,
+3,89,0,345,3,
+90,0,345,3,95,
+0,345,3,97,0,
+345,3,98,0,345,
+3,99,0,345,3,
+100,0,345,3,101,
+0,345,3,102,0,
 345,3,103,0,345,
 3,104,0,345,3,
 105,0,345,3,106,
 0,345,3,107,0,
 345,3,108,0,345,
-1341,11,1,845,0,
-348,1,-1,1342,11,
-1,845,0,348,1,
--1,3,106,0,345,
+1377,11,1,867,0,
+348,1,-1,3,117,
+0,345,3,118,0,
+345,3,119,0,345,
+3,120,0,345,3,
+121,0,345,3,122,
+0,345,3,48,0,
+345,3,49,0,345,
+3,50,0,345,3,
+51,0,345,3,52,
+0,345,3,53,0,
+345,3,54,0,345,
+3,55,0,345,3,
+56,0,345,3,57,
+0,345,3,65,0,
+345,3,66,0,345,
+3,67,0,345,3,
+68,0,345,3,69,
+0,345,3,70,0,
+345,3,71,0,345,
+3,72,0,345,3,
+73,0,345,3,74,
+0,345,3,75,0,
+345,3,76,0,345,
+3,77,0,345,3,
+78,0,345,3,79,
+0,345,3,80,0,
+345,3,81,0,345,
+3,82,0,345,3,
+83,0,345,3,84,
+0,345,3,85,0,
+345,3,86,0,345,
+3,87,0,345,3,
+88,0,345,3,89,
+0,345,3,90,0,
+345,3,95,0,345,
+3,97,0,345,3,
+98,0,345,3,99,
+0,345,3,100,0,
+345,3,101,0,345,
+3,102,0,345,3,
+103,0,345,3,104,
+0,345,3,105,0,
+345,3,106,0,345,
 3,107,0,345,3,
-108,0,345,1343,11,
-1,845,0,348,1,
--1,3,105,0,345,
+108,0,345,1378,11,
+1,867,0,348,1,
+-1,3,100,0,345,
+3,101,0,345,3,
+102,0,345,3,103,
+0,345,3,104,0,
+345,3,105,0,345,
 3,106,0,345,3,
 107,0,345,3,108,
-0,345,1344,11,1,
-845,0,348,1,-1,
-3,120,0,343,3,
-121,0,343,3,122,
-0,343,3,123,0,
-1345,12,1,41003,1346,
-5,0,1347,11,1,
-51,0,1348,4,20,
-76,0,69,0,70,
-0,84,0,95,0,
-66,0,82,0,65,
-0,67,0,69,0,
-1,-1,3,124,0,
-1349,12,1,43906,1350,
-5,1,3,124,0,
-1351,12,1,44018,1352,
-5,0,1353,11,1,
-191,0,1354,4,26,
-83,0,84,0,82,
-0,79,0,75,0,
-69,0,95,0,83,
-0,84,0,82,0,
-79,0,75,0,69,
-0,1,-1,1355,11,
-1,165,0,1356,4,
-12,83,0,84,0,
+0,345,1379,11,1,
+867,0,348,1,-1,
+3,102,0,345,3,
+103,0,345,3,104,
+0,345,3,105,0,
+345,3,106,0,345,
+3,107,0,345,3,
+108,0,345,1380,11,
+1,867,0,348,1,
+-1,3,119,0,1381,
+12,1,22134,1382,5,
+63,3,109,0,345,
+3,110,0,345,3,
+111,0,345,3,112,
+0,345,3,113,0,
+345,3,114,0,345,
+3,115,0,345,3,
+116,0,345,3,117,
+0,345,3,118,0,
+345,3,119,0,345,
+3,120,0,345,3,
+121,0,345,3,122,
+0,345,3,48,0,
+345,3,49,0,345,
+3,50,0,345,3,
+51,0,345,3,52,
+0,345,3,53,0,
+345,3,54,0,345,
+3,55,0,345,3,
+56,0,345,3,57,
+0,345,3,65,0,
+345,3,66,0,345,
+3,67,0,345,3,
+68,0,345,3,69,
+0,345,3,70,0,
+345,3,71,0,345,
+3,72,0,345,3,
+73,0,345,3,74,
+0,345,3,75,0,
+345,3,76,0,345,
+3,77,0,345,3,
+78,0,345,3,79,
+0,345,3,80,0,
+345,3,81,0,345,
+3,82,0,345,3,
+83,0,345,3,84,
+0,345,3,85,0,
+345,3,86,0,345,
+3,87,0,345,3,
+88,0,345,3,89,
+0,345,3,90,0,
+345,3,95,0,345,
+3,97,0,345,3,
+98,0,345,3,99,
+0,345,3,100,0,
+345,3,101,0,345,
+3,102,0,345,3,
+103,0,345,3,104,
+0,1383,12,1,22184,
+1384,5,63,3,109,
+0,345,3,110,0,
+345,3,111,0,345,
+3,112,0,345,3,
+113,0,345,3,114,
+0,345,3,115,0,
+345,3,116,0,345,
+3,117,0,345,3,
+118,0,345,3,119,
+0,345,3,120,0,
+345,3,121,0,345,
+3,122,0,345,3,
+48,0,345,3,49,
+0,345,3,50,0,
+345,3,51,0,345,
+3,52,0,345,3,
+53,0,345,3,54,
+0,345,3,55,0,
+345,3,56,0,345,
+3,57,0,345,3,
+65,0,345,3,66,
+0,345,3,67,0,
+345,3,68,0,345,
+3,69,0,345,3,
+70,0,345,3,71,
+0,345,3,72,0,
+345,3,73,0,345,
+3,74,0,345,3,
+75,0,345,3,76,
+0,345,3,77,0,
+345,3,78,0,345,
+3,79,0,345,3,
+80,0,345,3,81,
+0,345,3,82,0,
+345,3,83,0,345,
+3,84,0,345,3,
+85,0,345,3,86,
+0,345,3,87,0,
+345,3,88,0,345,
+3,89,0,345,3,
+90,0,345,3,95,
+0,345,3,97,0,
+345,3,98,0,345,
+3,99,0,345,3,
+100,0,345,3,101,
+0,345,3,102,0,
+345,3,103,0,345,
+3,104,0,345,3,
+105,0,1385,12,1,
+22235,1386,5,63,3,
+109,0,345,3,110,
+0,345,3,111,0,
+345,3,112,0,345,
+3,113,0,345,3,
+114,0,345,3,115,
+0,345,3,116,0,
+345,3,117,0,345,
+3,118,0,345,3,
+119,0,345,3,120,
+0,345,3,121,0,
+345,3,122,0,345,
+3,48,0,345,3,
+49,0,345,3,50,
+0,345,3,51,0,
+345,3,52,0,345,
+3,53,0,345,3,
+54,0,345,3,55,
+0,345,3,56,0,
+345,3,57,0,345,
+3,65,0,345,3,
+66,0,345,3,67,
+0,345,3,68,0,
+345,3,69,0,345,
+3,70,0,345,3,
+71,0,345,3,72,
+0,345,3,73,0,
+345,3,74,0,345,
+3,75,0,345,3,
+76,0,345,3,77,
+0,345,3,78,0,
+345,3,79,0,345,
+3,80,0,345,3,
+81,0,345,3,82,
+0,345,3,83,0,
+345,3,84,0,345,
+3,85,0,345,3,
+86,0,345,3,87,
+0,345,3,88,0,
+345,3,89,0,345,
+3,90,0,345,3,
+95,0,345,3,97,
+0,345,3,98,0,
+345,3,99,0,345,
+3,100,0,345,3,
+101,0,345,3,102,
+0,345,3,103,0,
+345,3,104,0,345,
+3,105,0,345,3,
+106,0,345,3,107,
+0,345,3,108,0,
+1387,12,1,22289,1388,
+5,63,3,109,0,
+345,3,110,0,345,
+3,111,0,345,3,
+112,0,345,3,113,
+0,345,3,114,0,
+345,3,115,0,345,
+3,116,0,345,3,
+117,0,345,3,118,
+0,345,3,119,0,
+345,3,120,0,345,
+3,121,0,345,3,
+122,0,345,3,48,
+0,345,3,49,0,
+345,3,50,0,345,
+3,51,0,345,3,
+52,0,345,3,53,
+0,345,3,54,0,
+345,3,55,0,345,
+3,56,0,345,3,
+57,0,345,3,65,
+0,345,3,66,0,
+345,3,67,0,345,
+3,68,0,345,3,
+69,0,345,3,70,
+0,345,3,71,0,
+345,3,72,0,345,
+3,73,0,345,3,
+74,0,345,3,75,
+0,345,3,76,0,
+345,3,77,0,345,
+3,78,0,345,3,
+79,0,345,3,80,
+0,345,3,81,0,
+345,3,82,0,345,
+3,83,0,345,3,
+84,0,345,3,85,
+0,345,3,86,0,
+345,3,87,0,345,
+3,88,0,345,3,
+89,0,345,3,90,
+0,345,3,95,0,
+345,3,97,0,345,
+3,98,0,345,3,
+99,0,345,3,100,
+0,345,3,101,0,
+1389,12,1,22336,1390,
+5,63,3,109,0,
+345,3,110,0,345,
+3,111,0,345,3,
+112,0,345,3,113,
+0,345,3,114,0,
+345,3,115,0,345,
+3,116,0,345,3,
+117,0,345,3,118,
+0,345,3,119,0,
+345,3,120,0,345,
+3,121,0,345,3,
+122,0,345,3,48,
+0,345,3,49,0,
+345,3,50,0,345,
+3,51,0,345,3,
+52,0,345,3,53,
+0,345,3,54,0,
+345,3,55,0,345,
+3,56,0,345,3,
+57,0,345,3,65,
+0,345,3,66,0,
+345,3,67,0,345,
+3,68,0,345,3,
+69,0,345,3,70,
+0,345,3,71,0,
+345,3,72,0,345,
+3,73,0,345,3,
+74,0,345,3,75,
+0,345,3,76,0,
+345,3,77,0,345,
+3,78,0,345,3,
+79,0,345,3,80,
+0,345,3,81,0,
+345,3,82,0,345,
+3,83,0,345,3,
+84,0,345,3,85,
+0,345,3,86,0,
+345,3,87,0,345,
+3,88,0,345,3,
+89,0,345,3,90,
+0,345,3,95,0,
+345,3,97,0,345,
+3,98,0,345,3,
+99,0,345,3,100,
+0,345,3,101,0,
+345,3,102,0,345,
+3,103,0,345,3,
+104,0,345,3,105,
+0,345,3,106,0,
+345,3,107,0,345,
+3,108,0,345,1391,
+11,1,229,0,1392,
+4,10,87,0,72,
+0,73,0,76,0,
+69,0,1,-1,3,
+102,0,345,3,103,
+0,345,3,104,0,
+345,3,105,0,345,
+3,106,0,345,3,
+107,0,345,3,108,
+0,345,1393,11,1,
+867,0,348,1,-1,
+1394,11,1,867,0,
+348,1,-1,3,106,
+0,345,3,107,0,
+345,3,108,0,345,
+1395,11,1,867,0,
+348,1,-1,3,105,
+0,345,3,106,0,
+345,3,107,0,345,
+3,108,0,345,1396,
+11,1,867,0,348,
+1,-1,3,120,0,
+343,3,121,0,343,
+3,122,0,343,3,
+123,0,1397,12,1,
+43065,1398,5,0,1399,
+11,1,51,0,1400,
+4,20,76,0,69,
+0,70,0,84,0,
+95,0,66,0,82,
+0,65,0,67,0,
+69,0,1,-1,3,
+124,0,1401,12,1,
+45968,1402,5,1,3,
+124,0,1403,12,1,
+46080,1404,5,0,1405,
+11,1,191,0,1406,
+4,26,83,0,84,
+0,82,0,79,0,
+75,0,69,0,95,
+0,83,0,84,0,
 82,0,79,0,75,
 0,69,0,1,-1,
-3,125,0,1357,12,
-1,41368,1358,5,0,
-1359,11,1,56,0,
-1360,4,22,82,0,
-73,0,71,0,72,
-0,84,0,95,0,
-66,0,82,0,65,
-0,67,0,69,0,
-1,-1,3,126,0,
-1361,12,1,44147,1362,
-5,0,1363,11,1,
-175,0,1364,4,10,
-84,0,73,0,76,
-0,68,0,69,0,
-1,-1,0,165,1,
--1,1365,4,12,83,
-0,84,0,82,0,
-73,0,78,0,71,
-0,1366,12,1,45715,
-1367,5,119,3,1,
-0,1368,12,1,45716,
-1369,5,0,1370,11,
-1,946,0,165,1,
--1,3,9,0,1368,
-3,10,0,1371,12,
-1,45917,1372,5,0,
-1373,11,1,952,0,
-165,1,-1,3,13,
-0,1368,3,0,3,
-1368,3,96,33,1368,
-3,32,0,1368,3,
-33,0,1368,3,34,
-0,1374,12,1,46664,
-1375,5,0,1376,11,
-1,1010,0,165,1,
--1,3,35,0,1368,
-3,36,0,1368,3,
-37,0,1368,3,38,
-0,1368,3,40,0,
-1368,3,41,0,1368,
-3,42,0,1368,3,
-43,0,1368,3,44,
-0,1368,3,45,0,
-1368,3,46,0,1368,
-3,47,0,1368,3,
-3,9,1368,3,49,
-0,1368,3,50,0,
-1368,3,48,0,1368,
-3,52,0,1368,3,
-53,0,1368,3,51,
-0,1368,3,55,0,
-1368,3,56,0,1368,
-3,54,0,1368,3,
-59,0,1368,3,57,
-0,1368,3,61,0,
-1368,3,62,0,1368,
-3,60,0,1368,3,
-64,0,1368,3,65,
-0,1368,3,66,0,
-1368,3,67,0,1368,
-3,68,0,1368,3,
-69,0,1368,3,70,
-0,1368,3,71,0,
-1368,3,72,0,1368,
-3,73,0,1368,3,
-74,0,1368,3,75,
-0,1368,3,76,0,
-1368,3,77,0,1368,
-3,78,0,1368,3,
-79,0,1368,3,80,
-0,1368,3,81,0,
-1368,3,82,0,1368,
-3,83,0,1368,3,
-84,0,1368,3,85,
-0,1368,3,86,0,
-1368,3,87,0,1368,
-3,88,0,1368,3,
-89,0,1368,3,90,
-0,1368,3,91,0,
-1368,3,92,0,1377,
-12,1,46060,1378,5,
-4,3,110,0,1379,
-12,1,46089,1380,5,
-0,1381,11,1,957,
+1407,11,1,165,0,
+1408,4,12,83,0,
+84,0,82,0,79,
+0,75,0,69,0,
+1,-1,3,125,0,
+1409,12,1,43430,1410,
+5,0,1411,11,1,
+56,0,1412,4,22,
+82,0,73,0,71,
+0,72,0,84,0,
+95,0,66,0,82,
+0,65,0,67,0,
+69,0,1,-1,3,
+126,0,1413,12,1,
+46209,1414,5,0,1415,
+11,1,175,0,1416,
+4,10,84,0,73,
+0,76,0,68,0,
+69,0,1,-1,0,
+165,1,-1,1417,4,
+12,83,0,84,0,
+82,0,73,0,78,
+0,71,0,1418,12,
+1,47777,1419,5,119,
+3,1,0,1420,12,
+1,47778,1421,5,0,
+1422,11,1,968,0,
+165,1,-1,3,9,
+0,1420,3,10,0,
+1423,12,1,47979,1424,
+5,0,1425,11,1,
+974,0,165,1,-1,
+3,13,0,1420,3,
+0,3,1420,3,0,
+6,1420,3,32,0,
+1420,3,33,0,1420,
+3,34,0,1426,12,
+1,48726,1427,5,0,
+1428,11,1,1032,0,
+165,1,-1,3,35,
+0,1420,3,36,0,
+1420,3,37,0,1420,
+3,38,0,1420,3,
+40,0,1420,3,41,
+0,1420,3,42,0,
+1420,3,43,0,1420,
+3,44,0,1420,3,
+45,0,1420,3,46,
+0,1420,3,47,0,
+1420,3,3,9,1420,
+3,49,0,1420,3,
+50,0,1420,3,48,
+0,1420,3,52,0,
+1420,3,53,0,1420,
+3,51,0,1420,3,
+55,0,1420,3,56,
+0,1420,3,54,0,
+1420,3,59,0,1420,
+3,57,0,1420,3,
+61,0,1420,3,62,
+0,1420,3,60,0,
+1420,3,64,0,1420,
+3,65,0,1420,3,
+66,0,1420,3,67,
+0,1420,3,68,0,
+1420,3,69,0,1420,
+3,70,0,1420,3,
+71,0,1420,3,72,
+0,1420,3,73,0,
+1420,3,74,0,1420,
+3,75,0,1420,3,
+76,0,1420,3,77,
+0,1420,3,78,0,
+1420,3,79,0,1420,
+3,80,0,1420,3,
+81,0,1420,3,82,
+0,1420,3,83,0,
+1420,3,84,0,1420,
+3,85,0,1420,3,
+86,0,1420,3,87,
+0,1420,3,88,0,
+1420,3,89,0,1420,
+3,90,0,1420,3,
+91,0,1420,3,92,
+0,1429,12,1,48122,
+1430,5,4,3,110,
+0,1431,12,1,48151,
+1432,5,0,1433,11,
+1,979,0,165,1,
+-1,3,34,0,1434,
+12,1,48591,1435,5,
+0,1436,11,1,1003,
 0,165,1,-1,3,
-34,0,1382,12,1,
-46529,1383,5,0,1384,
-11,1,981,0,165,
-1,-1,3,92,0,
-1385,12,1,46405,1386,
-5,0,1387,11,1,
-993,0,165,1,-1,
-3,116,0,1388,12,
-1,46215,1389,5,0,
-1390,11,1,969,0,
-165,1,-1,1391,11,
-1,1005,0,165,1,
--1,3,93,0,1368,
-3,94,0,1368,3,
-95,0,1368,3,96,
-0,1368,3,97,0,
-1368,3,98,0,1368,
-3,99,0,1368,3,
-100,0,1368,3,101,
-0,1368,3,102,0,
-1368,3,103,0,1368,
-3,104,0,1368,3,
-105,0,1368,3,106,
-0,1368,3,107,0,
-1368,3,108,0,1368,
-3,109,0,1368,3,
-110,0,1368,3,111,
-0,1368,3,112,0,
-1368,3,113,0,1368,
-3,114,0,1368,3,
-115,0,1368,3,116,
-0,1368,3,117,0,
-1368,3,118,0,1368,
-3,119,0,1368,3,
-120,0,1368,3,121,
-0,1368,3,122,0,
-1368,3,123,0,1368,
-3,124,0,1368,3,
-125,0,1368,3,96,
-6,1368,3,126,0,
-1368,3,58,15,1368,
-3,59,15,1368,3,
-136,4,1368,3,160,
-0,1368,3,15,7,
-1368,3,170,0,1368,
-3,171,0,1368,3,
-172,0,1368,3,173,
-0,1368,3,178,0,
-1368,3,176,2,1368,
-3,187,0,1368,3,
-187,1,1368,3,192,
-0,1368,3,41,32,
-1368,3,197,1,1368,
-3,0,224,1368,3,
-40,32,1368,3,63,
-32,1368,0,165,1,
--1,1392,5,93,251,
-1393,10,251,1,19,
-573,1394,10,573,1,
-47,301,1395,10,301,
-1,93,1172,1396,10,
-1172,1,50,1041,1397,
-10,1041,1,80,1191,
-1398,10,1191,1,53,
-188,1399,10,188,1,
-37,602,1400,10,602,
-1,43,700,1401,10,
-700,1,51,613,1402,
-10,613,1,46,211,
-1403,10,211,1,16,
-215,1404,10,215,1,
-17,672,1405,10,672,
-1,68,901,1406,10,
-901,1,75,361,1407,
-10,361,1,35,223,
-1408,10,223,1,20,
-229,1409,10,229,1,
-6,199,1410,10,199,
-1,22,286,1411,10,
-286,1,21,265,1412,
-10,265,1,95,1292,
-1413,10,1292,1,88,
-481,1414,10,481,1,
-64,720,1415,10,720,
-1,49,357,1416,10,
-357,1,28,318,1417,
-10,318,1,25,709,
-1418,10,709,1,42,
-792,1419,10,792,1,
-69,1231,1420,10,1231,
-1,48,336,1421,10,
-336,1,41,850,1422,
-10,850,1,57,654,
-1423,10,654,1,91,
-233,1424,10,233,1,
-4,342,1425,10,342,
-1,23,493,1426,10,
-493,1,63,1246,1427,
-10,1246,1,84,324,
-1428,10,324,1,29,
-245,1429,10,245,1,
-5,316,1430,10,316,
-1,31,624,1431,10,
-624,1,52,889,1432,
-10,889,1,76,1114,
-1433,10,1114,1,83,
-1017,1434,10,1017,1,
-81,995,1435,10,995,
-1,77,186,1436,10,
-186,1,30,249,1437,
-10,249,1,7,847,
-1438,10,847,1,73,
-197,1439,10,197,1,
-10,353,1440,10,353,
-1,27,294,1441,10,
-294,1,94,239,1442,
-10,239,1,14,269,
-1443,10,269,1,24,
-731,1444,10,731,1,
-54,281,1445,10,281,
-1,9,1225,1446,10,
-1225,1,86,498,1447,
-10,498,1,62,1448,
-4,30,83,0,84,
-0,82,0,73,0,
-78,0,71,0,95,
-0,67,0,79,0,
-78,0,83,0,84,
-0,65,0,78,0,
-84,0,1449,10,1448,
-1,3,1340,1450,10,
-1340,1,45,348,1451,
-10,348,1,92,551,
-1452,10,551,1,66,
-1068,1453,10,1068,1,
-56,402,1454,10,402,
-1,58,1348,1455,10,
-1348,1,12,531,1456,
-10,531,1,44,312,
-1457,10,312,1,40,
-1154,1458,10,1154,1,
-82,591,1459,10,591,
-1,67,946,1460,10,
-946,1,78,1364,1461,
-10,1364,1,36,1356,
-1462,10,1356,1,34,
-787,1463,10,787,1,
-70,1305,1464,10,1305,
-1,87,865,1465,10,
-865,1,74,338,1466,
-10,338,1,26,425,
-1467,10,425,1,59,
-207,1468,10,207,1,
-33,306,1469,10,306,
-1,11,205,1470,10,
-205,1,38,519,1471,
-10,519,1,61,828,
-1472,10,828,1,72,
-1287,1473,10,1287,1,
-90,326,1474,10,326,
-1,15,969,1475,10,
-969,1,79,1354,1476,
-10,1354,1,39,332,
-1477,10,332,1,32,
-1275,1478,10,1275,1,
-89,375,1479,10,375,
-1,60,1323,1480,10,
-1323,1,55,1360,1481,
-10,1360,1,13,1214,
-1482,10,1214,1,85,
-235,1483,10,235,1,
-18,221,1484,10,221,
-1,8,775,1485,10,
-775,1,71,449,1486,
-10,449,1,65,1487,
-5,0,0};
+92,0,1437,12,1,
+48467,1438,5,0,1439,
+11,1,1015,0,165,
+1,-1,3,116,0,
+1440,12,1,48277,1441,
+5,0,1442,11,1,
+991,0,165,1,-1,
+1443,11,1,1027,0,
+165,1,-1,3,93,
+0,1420,3,94,0,
+1420,3,95,0,1420,
+3,96,0,1420,3,
+238,22,1420,3,98,
+0,1420,3,99,0,
+1420,3,100,0,1420,
+3,101,0,1420,3,
+97,0,1420,3,103,
+0,1420,3,104,0,
+1420,3,105,0,1420,
+3,106,0,1420,3,
+102,0,1420,3,108,
+0,1420,3,109,0,
+1420,3,110,0,1420,
+3,111,0,1420,3,
+112,0,1420,3,113,
+0,1420,3,114,0,
+1420,3,115,0,1420,
+3,116,0,1420,3,
+117,0,1420,3,118,
+0,1420,3,119,0,
+1420,3,120,0,1420,
+3,121,0,1420,3,
+122,0,1420,3,123,
+0,1420,3,124,0,
+1420,3,125,0,1420,
+3,96,6,1420,3,
+107,0,1420,3,126,
+0,1420,3,58,15,
+1420,3,59,15,1420,
+3,136,4,1420,3,
+160,0,1420,3,170,
+0,1420,3,171,0,
+1420,3,172,0,1420,
+3,173,0,1420,3,
+178,0,1420,3,176,
+2,1420,3,187,0,
+1420,3,187,1,1420,
+3,192,0,1420,3,
+41,32,1420,3,197,
+1,1420,3,0,224,
+1420,3,40,32,1420,
+3,63,32,1420,0,
+165,1,-1,1444,5,
+94,251,1445,10,251,
+1,19,573,1446,10,
+573,1,47,301,1447,
+10,301,1,94,1172,
+1448,10,1172,1,50,
+1041,1449,10,1041,1,
+80,1191,1450,10,1191,
+1,53,188,1451,10,
+188,1,37,602,1452,
+10,602,1,43,700,
+1453,10,700,1,51,
+613,1454,10,613,1,
+46,1331,1455,10,1331,
+1,92,211,1456,10,
+211,1,16,215,1457,
+10,215,1,17,672,
+1458,10,672,1,68,
+901,1459,10,901,1,
+75,361,1460,10,361,
+1,35,223,1461,10,
+223,1,20,229,1462,
+10,229,1,6,199,
+1463,10,199,1,22,
+286,1464,10,286,1,
+21,265,1465,10,265,
+1,96,1292,1466,10,
+1292,1,88,481,1467,
+10,481,1,64,720,
+1468,10,720,1,49,
+357,1469,10,357,1,
+28,318,1470,10,318,
+1,25,709,1471,10,
+709,1,42,792,1472,
+10,792,1,69,1231,
+1473,10,1231,1,48,
+336,1474,10,336,1,
+41,850,1475,10,850,
+1,57,654,1476,10,
+654,1,91,233,1477,
+10,233,1,4,342,
+1478,10,342,1,23,
+493,1479,10,493,1,
+63,1246,1480,10,1246,
+1,84,324,1481,10,
+324,1,29,245,1482,
+10,245,1,5,316,
+1483,10,316,1,31,
+624,1484,10,624,1,
+52,889,1485,10,889,
+1,76,1114,1486,10,
+1114,1,83,1017,1487,
+10,1017,1,81,995,
+1488,10,995,1,77,
+186,1489,10,186,1,
+30,249,1490,10,249,
+1,7,847,1491,10,
+847,1,73,197,1492,
+10,197,1,10,353,
+1493,10,353,1,27,
+294,1494,10,294,1,
+95,239,1495,10,239,
+1,14,269,1496,10,
+269,1,24,731,1497,
+10,731,1,54,281,
+1498,10,281,1,9,
+1225,1499,10,1225,1,
+86,498,1500,10,498,
+1,62,1501,4,30,
+83,0,84,0,82,
+0,73,0,78,0,
+71,0,95,0,67,
+0,79,0,78,0,
+83,0,84,0,65,
+0,78,0,84,0,
+1502,10,1501,1,3,
+1392,1503,10,1392,1,
+45,348,1504,10,348,
+1,93,551,1505,10,
+551,1,66,1068,1506,
+10,1068,1,56,402,
+1507,10,402,1,58,
+1400,1508,10,1400,1,
+12,531,1509,10,531,
+1,44,312,1510,10,
+312,1,40,1154,1511,
+10,1154,1,82,591,
+1512,10,591,1,67,
+946,1513,10,946,1,
+78,1416,1514,10,1416,
+1,36,1408,1515,10,
+1408,1,34,787,1516,
+10,787,1,70,1357,
+1517,10,1357,1,87,
+865,1518,10,865,1,
+74,338,1519,10,338,
+1,26,425,1520,10,
+425,1,59,207,1521,
+10,207,1,33,306,
+1522,10,306,1,11,
+205,1523,10,205,1,
+38,519,1524,10,519,
+1,61,828,1525,10,
+828,1,72,1287,1526,
+10,1287,1,90,326,
+1527,10,326,1,15,
+969,1528,10,969,1,
+79,1406,1529,10,1406,
+1,39,332,1530,10,
+332,1,32,1275,1531,
+10,1275,1,89,375,
+1532,10,375,1,60,
+1375,1533,10,1375,1,
+55,1412,1534,10,1412,
+1,13,1214,1535,10,
+1214,1,85,235,1536,
+10,235,1,18,221,
+1537,10,221,1,8,
+775,1538,10,775,1,
+71,449,1539,10,449,
+1,65,1540,5,0,0};
  new Tfactory(this,"MINUS",new TCreator(MINUS_factory));
  new Tfactory(this,"DEFAULT_STATE",new TCreator(DEFAULT_STATE_factory));
  new Tfactory(this,"INTEGER_CONSTANT",new TCreator(INTEGER_CONSTANT_factory));
@@ -18602,6 +19521,7 @@ public class yyLSLTokens : YyLexer {
  new Tfactory(this,"ELSE",new TCreator(ELSE_factory));
  new Tfactory(this,"INTEGER_TYPE",new TCreator(INTEGER_TYPE_factory));
  new Tfactory(this,"FOR",new TCreator(FOR_factory));
+ new Tfactory(this,"TRANSACTION_RESULT_EVENT",new TCreator(TRANSACTION_RESULT_EVENT_factory));
  new Tfactory(this,"LEFT_PAREN",new TCreator(LEFT_PAREN_factory));
  new Tfactory(this,"RIGHT_PAREN",new TCreator(RIGHT_PAREN_factory));
  new Tfactory(this,"HTTP_RESPONSE_EVENT",new TCreator(HTTP_RESPONSE_EVENT_factory));
@@ -18696,6 +19616,7 @@ public static object EXCLAMATION_factory(Lexer yyl) { return new EXCLAMATION(yyl
 public static object ELSE_factory(Lexer yyl) { return new ELSE(yyl);}
 public static object INTEGER_TYPE_factory(Lexer yyl) { return new INTEGER_TYPE(yyl);}
 public static object FOR_factory(Lexer yyl) { return new FOR(yyl);}
+public static object TRANSACTION_RESULT_EVENT_factory(Lexer yyl) { return new TRANSACTION_RESULT_EVENT(yyl);}
 public static object LEFT_PAREN_factory(Lexer yyl) { return new LEFT_PAREN(yyl);}
 public static object RIGHT_PAREN_factory(Lexer yyl) { return new RIGHT_PAREN(yyl);}
 public static object HTTP_RESPONSE_EVENT_factory(Lexer yyl) { return new HTTP_RESPONSE_EVENT(yyl);}
@@ -18782,35 +19703,35 @@ public static object CONTROL_EVENT_factory(Lexer yyl) { return new CONTROL_EVENT
 public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool reject) {
   switch(action) {
   case -1: break;
-   case 946: { ((LSLTokens)yym).str += yytext; }
+   case 1015: { ((LSLTokens)yym).str += "\\\\"; }
       break;
-   case 1010: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); }
+   case 991: { ((LSLTokens)yym).str += "    "; }
       break;
-   case 1015: { yym.yy_begin("COMMENT"); }
+   case 963: { yym.yy_begin("STRING"); ((LSLTokens)yym).str = "";}
       break;
-   case 1027: { yym.yy_begin("YYINITIAL"); }
+   case 1037: { yym.yy_begin("COMMENT"); }
       break;
-   case 1041: ;
+   case 1049: { yym.yy_begin("YYINITIAL"); }
       break;
-   case 1045: ;
+   case 1027: { ((LSLTokens)yym).str += '\\'; }
       break;
-   case 1054: ;   
+   case 1063: ;
       break;
-   case 1005: { ((LSLTokens)yym).str += '\\'; }
+   case 1076: ;   
       break;
-   case 1050: ;   
+   case 1032: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); }
       break;
-   case 941: { yym.yy_begin("STRING"); ((LSLTokens)yym).str = "";}
+   case 1067: ;
       break;
-   case 957: { ((LSLTokens)yym).str += "\\n"; }
+   case 1072: ;   
       break;
-   case 969: { ((LSLTokens)yym).str += "    "; }
+   case 1003: { ((LSLTokens)yym).str += "\\\""; }
       break;
-   case 981: { ((LSLTokens)yym).str += "\\\""; }
+   case 974: { ((LSLTokens)yym).str += "\\n"; }
       break;
-   case 952: { ((LSLTokens)yym).str += "\\n"; }
+   case 979: { ((LSLTokens)yym).str += "\\n"; }
       break;
-   case 993: { ((LSLTokens)yym).str += "\\\\"; }
+   case 968: { ((LSLTokens)yym).str += yytext; }
       break;
   }
   return null;
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index 44957bd..5fef83c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -1,6 +1,6 @@
 using System;using Tools;
 namespace OpenSim.Region.ScriptEngine.Shared.CodeTools {
-//%+LSLProgramRoot+96
+//%+LSLProgramRoot+97
 public class LSLProgramRoot : SYMBOL{
  public  LSLProgramRoot (Parser yyp, States  s ):base(((LSLSyntax
 )yyp)){ while (0< s . kids . Count ) kids . Add ( s . kids . Pop ());
@@ -11,9 +11,9 @@ public class LSLProgramRoot : SYMBOL{
 }
 
 public override string yyname { get { return "LSLProgramRoot"; }}
-public override int yynum { get { return 96; }}
+public override int yynum { get { return 97; }}
 public LSLProgramRoot(Parser yyp):base(yyp){}}
-//%+GlobalDefinitions+97
+//%+GlobalDefinitions+98
 public class GlobalDefinitions : SYMBOL{
  public  GlobalDefinitions (Parser yyp, GlobalVariableDeclaration  gvd ):base(((LSLSyntax
 )yyp)){ kids . Add ( gvd );
@@ -31,9 +31,9 @@ public class GlobalDefinitions : SYMBOL{
 }
 
 public override string yyname { get { return "GlobalDefinitions"; }}
-public override int yynum { get { return 97; }}
+public override int yynum { get { return 98; }}
 public GlobalDefinitions(Parser yyp):base(yyp){}}
-//%+GlobalVariableDeclaration+98
+//%+GlobalVariableDeclaration+99
 public class GlobalVariableDeclaration : SYMBOL{
  public  GlobalVariableDeclaration (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -43,9 +43,9 @@ public class GlobalVariableDeclaration : SYMBOL{
 }
 
 public override string yyname { get { return "GlobalVariableDeclaration"; }}
-public override int yynum { get { return 98; }}
+public override int yynum { get { return 99; }}
 public GlobalVariableDeclaration(Parser yyp):base(yyp){}}
-//%+GlobalFunctionDefinition+99
+//%+GlobalFunctionDefinition+100
 public class GlobalFunctionDefinition : SYMBOL{
  private  string  m_returnType ;
  private  string  m_name ;
@@ -65,9 +65,9 @@ public class GlobalFunctionDefinition : SYMBOL{
 }
 
 public override string yyname { get { return "GlobalFunctionDefinition"; }}
-public override int yynum { get { return 99; }}
+public override int yynum { get { return 100; }}
 public GlobalFunctionDefinition(Parser yyp):base(yyp){}}
-//%+States+100
+//%+States+101
 public class States : SYMBOL{
  public  States (Parser yyp, State  ds ):base(((LSLSyntax
 )yyp)){ kids . Add ( ds );
@@ -78,9 +78,9 @@ public class States : SYMBOL{
 }
 
 public override string yyname { get { return "States"; }}
-public override int yynum { get { return 100; }}
+public override int yynum { get { return 101; }}
 public States(Parser yyp):base(yyp){}}
-//%+State+101
+//%+State+102
 public class State : SYMBOL{
  private  string  m_name ;
  public  State (Parser yyp, string  name , StateBody  sb ):base(((LSLSyntax
@@ -94,9 +94,9 @@ public class State : SYMBOL{
 }
 
 public override string yyname { get { return "State"; }}
-public override int yynum { get { return 101; }}
+public override int yynum { get { return 102; }}
 public State(Parser yyp):base(yyp){}}
-//%+StateBody+102
+//%+StateBody+103
 public class StateBody : SYMBOL{
  public  StateBody (Parser yyp, StateBody  sb , StateEvent  se ):base(((LSLSyntax
 )yyp)){ while (0< sb . kids . Count ) kids . Add ( sb . kids . Pop ());
@@ -107,9 +107,9 @@ public class StateBody : SYMBOL{
 }
 
 public override string yyname { get { return "StateBody"; }}
-public override int yynum { get { return 102; }}
+public override int yynum { get { return 103; }}
 public StateBody(Parser yyp):base(yyp){}}
-//%+StateEvent+103
+//%+StateEvent+104
 public class StateEvent : SYMBOL{
  private  string  m_name ;
  public  StateEvent (Parser yyp, string  name , CompoundStatement  cs ):base(((LSLSyntax
@@ -128,65 +128,65 @@ public class StateEvent : SYMBOL{
 }
 
 public override string yyname { get { return "StateEvent"; }}
-public override int yynum { get { return 103; }}
+public override int yynum { get { return 104; }}
 public StateEvent(Parser yyp):base(yyp){}}
-//%+VoidArgStateEvent+104
+//%+VoidArgStateEvent+105
 public class VoidArgStateEvent : StateEvent{
  public  VoidArgStateEvent (Parser yyp, string  name , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , cs ){}
 
 public override string yyname { get { return "VoidArgStateEvent"; }}
-public override int yynum { get { return 104; }}
+public override int yynum { get { return 105; }}
 public VoidArgStateEvent(Parser yyp):base(yyp){}}
-//%+KeyArgStateEvent+105
+//%+KeyArgStateEvent+106
 public class KeyArgStateEvent : StateEvent{
  public  KeyArgStateEvent (Parser yyp, string  name , KeyArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , adl , cs ){}
 
 public override string yyname { get { return "KeyArgStateEvent"; }}
-public override int yynum { get { return 105; }}
+public override int yynum { get { return 106; }}
 public KeyArgStateEvent(Parser yyp):base(yyp){}}
-//%+IntArgStateEvent+106
+//%+IntArgStateEvent+107
 public class IntArgStateEvent : StateEvent{
  public  IntArgStateEvent (Parser yyp, string  name , IntArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , adl , cs ){}
 
 public override string yyname { get { return "IntArgStateEvent"; }}
-public override int yynum { get { return 106; }}
+public override int yynum { get { return 107; }}
 public IntArgStateEvent(Parser yyp):base(yyp){}}
-//%+VectorArgStateEvent+107
+//%+VectorArgStateEvent+108
 public class VectorArgStateEvent : StateEvent{
  public  VectorArgStateEvent (Parser yyp, string  name , VectorArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , adl , cs ){}
 
 public override string yyname { get { return "VectorArgStateEvent"; }}
-public override int yynum { get { return 107; }}
+public override int yynum { get { return 108; }}
 public VectorArgStateEvent(Parser yyp):base(yyp){}}
-//%+IntRotRotArgStateEvent+108
+//%+IntRotRotArgStateEvent+109
 public class IntRotRotArgStateEvent : StateEvent{
  public  IntRotRotArgStateEvent (Parser yyp, string  name , IntRotRotArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , adl , cs ){}
 
 public override string yyname { get { return "IntRotRotArgStateEvent"; }}
-public override int yynum { get { return 108; }}
+public override int yynum { get { return 109; }}
 public IntRotRotArgStateEvent(Parser yyp):base(yyp){}}
-//%+IntVecVecArgStateEvent+109
+//%+IntVecVecArgStateEvent+110
 public class IntVecVecArgStateEvent : StateEvent{
  public  IntVecVecArgStateEvent (Parser yyp, string  name , IntVecVecArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , adl , cs ){}
 
 public override string yyname { get { return "IntVecVecArgStateEvent"; }}
-public override int yynum { get { return 109; }}
+public override int yynum { get { return 110; }}
 public IntVecVecArgStateEvent(Parser yyp):base(yyp){}}
-//%+KeyIntIntArgStateEvent+110
+//%+KeyIntIntArgStateEvent+111
 public class KeyIntIntArgStateEvent : StateEvent{
  public  KeyIntIntArgStateEvent (Parser yyp, string  name , KeyIntIntArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , adl , cs ){}
 
 public override string yyname { get { return "KeyIntIntArgStateEvent"; }}
-public override int yynum { get { return 110; }}
+public override int yynum { get { return 111; }}
 public KeyIntIntArgStateEvent(Parser yyp):base(yyp){}}
-//%+ArgumentDeclarationList+111
+//%+ArgumentDeclarationList+112
 public class ArgumentDeclarationList : SYMBOL{
  public  ArgumentDeclarationList (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -206,57 +206,57 @@ public class ArgumentDeclarationList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentDeclarationList"; }}
-public override int yynum { get { return 111; }}
+public override int yynum { get { return 112; }}
 public ArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+KeyArgumentDeclarationList+112
+//%+KeyArgumentDeclarationList+113
 public class KeyArgumentDeclarationList : ArgumentDeclarationList{
  public  KeyArgumentDeclarationList (Parser yyp, KeyDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "KeyArgumentDeclarationList"; }}
-public override int yynum { get { return 112; }}
+public override int yynum { get { return 113; }}
 public KeyArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+IntArgumentDeclarationList+113
+//%+IntArgumentDeclarationList+114
 public class IntArgumentDeclarationList : ArgumentDeclarationList{
  public  IntArgumentDeclarationList (Parser yyp, IntDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "IntArgumentDeclarationList"; }}
-public override int yynum { get { return 113; }}
+public override int yynum { get { return 114; }}
 public IntArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+VectorArgumentDeclarationList+114
+//%+VectorArgumentDeclarationList+115
 public class VectorArgumentDeclarationList : ArgumentDeclarationList{
  public  VectorArgumentDeclarationList (Parser yyp, VecDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "VectorArgumentDeclarationList"; }}
-public override int yynum { get { return 114; }}
+public override int yynum { get { return 115; }}
 public VectorArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+IntRotRotArgumentDeclarationList+115
+//%+IntRotRotArgumentDeclarationList+116
 public class IntRotRotArgumentDeclarationList : ArgumentDeclarationList{
  public  IntRotRotArgumentDeclarationList (Parser yyp, Declaration  d1 , Declaration  d2 , Declaration  d3 ):base(((LSLSyntax
 )yyp), d1 , d2 , d3 ){}
 
 public override string yyname { get { return "IntRotRotArgumentDeclarationList"; }}
-public override int yynum { get { return 115; }}
+public override int yynum { get { return 116; }}
 public IntRotRotArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+IntVecVecArgumentDeclarationList+116
+//%+IntVecVecArgumentDeclarationList+117
 public class IntVecVecArgumentDeclarationList : ArgumentDeclarationList{
  public  IntVecVecArgumentDeclarationList (Parser yyp, Declaration  d1 , Declaration  d2 , Declaration  d3 ):base(((LSLSyntax
 )yyp), d1 , d2 , d3 ){}
 
 public override string yyname { get { return "IntVecVecArgumentDeclarationList"; }}
-public override int yynum { get { return 116; }}
+public override int yynum { get { return 117; }}
 public IntVecVecArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+KeyIntIntArgumentDeclarationList+117
+//%+KeyIntIntArgumentDeclarationList+118
 public class KeyIntIntArgumentDeclarationList : ArgumentDeclarationList{
  public  KeyIntIntArgumentDeclarationList (Parser yyp, Declaration  d1 , Declaration  d2 , Declaration  d3 ):base(((LSLSyntax
 )yyp), d1 , d2 , d3 ){}
 
 public override string yyname { get { return "KeyIntIntArgumentDeclarationList"; }}
-public override int yynum { get { return 117; }}
+public override int yynum { get { return 118; }}
 public KeyIntIntArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+Declaration+118
+//%+Declaration+119
 public class Declaration : SYMBOL{
  private  string  m_datatype ;
  private  string  m_id ;
@@ -276,41 +276,41 @@ public class Declaration : SYMBOL{
 }
 
 public override string yyname { get { return "Declaration"; }}
-public override int yynum { get { return 118; }}
+public override int yynum { get { return 119; }}
 public Declaration(Parser yyp):base(yyp){}}
-//%+KeyDeclaration+119
+//%+KeyDeclaration+120
 public class KeyDeclaration : Declaration{
  public  KeyDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "KeyDeclaration"; }}
-public override int yynum { get { return 119; }}
+public override int yynum { get { return 120; }}
 public KeyDeclaration(Parser yyp):base(yyp){}}
-//%+IntDeclaration+120
+//%+IntDeclaration+121
 public class IntDeclaration : Declaration{
  public  IntDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "IntDeclaration"; }}
-public override int yynum { get { return 120; }}
+public override int yynum { get { return 121; }}
 public IntDeclaration(Parser yyp):base(yyp){}}
-//%+VecDeclaration+121
+//%+VecDeclaration+122
 public class VecDeclaration : Declaration{
  public  VecDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "VecDeclaration"; }}
-public override int yynum { get { return 121; }}
+public override int yynum { get { return 122; }}
 public VecDeclaration(Parser yyp):base(yyp){}}
-//%+RotDeclaration+122
+//%+RotDeclaration+123
 public class RotDeclaration : Declaration{
  public  RotDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "RotDeclaration"; }}
-public override int yynum { get { return 122; }}
+public override int yynum { get { return 123; }}
 public RotDeclaration(Parser yyp):base(yyp){}}
-//%+Typename+123
+//%+Typename+124
 public class Typename : SYMBOL{
  public  string  yytext ;
  public  Typename (Parser yyp, string  text ):base(((LSLSyntax
@@ -318,9 +318,9 @@ public class Typename : SYMBOL{
 }
 
 public override string yyname { get { return "Typename"; }}
-public override int yynum { get { return 123; }}
+public override int yynum { get { return 124; }}
 public Typename(Parser yyp):base(yyp){}}
-//%+Event+124
+//%+Event+125
 public class Event : SYMBOL{
  public  string  yytext ;
  public  Event (Parser yyp, string  text ):base(((LSLSyntax
@@ -328,65 +328,65 @@ public class Event : SYMBOL{
 }
 
 public override string yyname { get { return "Event"; }}
-public override int yynum { get { return 124; }}
+public override int yynum { get { return 125; }}
 public Event(Parser yyp):base(yyp){}}
-//%+VoidArgEvent+125
+//%+VoidArgEvent+126
 public class VoidArgEvent : Event{
  public  VoidArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "VoidArgEvent"; }}
-public override int yynum { get { return 125; }}
+public override int yynum { get { return 126; }}
 public VoidArgEvent(Parser yyp):base(yyp){}}
-//%+KeyArgEvent+126
+//%+KeyArgEvent+127
 public class KeyArgEvent : Event{
  public  KeyArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "KeyArgEvent"; }}
-public override int yynum { get { return 126; }}
+public override int yynum { get { return 127; }}
 public KeyArgEvent(Parser yyp):base(yyp){}}
-//%+IntArgEvent+127
+//%+IntArgEvent+128
 public class IntArgEvent : Event{
  public  IntArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "IntArgEvent"; }}
-public override int yynum { get { return 127; }}
+public override int yynum { get { return 128; }}
 public IntArgEvent(Parser yyp):base(yyp){}}
-//%+VectorArgEvent+128
+//%+VectorArgEvent+129
 public class VectorArgEvent : Event{
  public  VectorArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "VectorArgEvent"; }}
-public override int yynum { get { return 128; }}
+public override int yynum { get { return 129; }}
 public VectorArgEvent(Parser yyp):base(yyp){}}
-//%+IntRotRotArgEvent+129
+//%+IntRotRotArgEvent+130
 public class IntRotRotArgEvent : Event{
  public  IntRotRotArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "IntRotRotArgEvent"; }}
-public override int yynum { get { return 129; }}
+public override int yynum { get { return 130; }}
 public IntRotRotArgEvent(Parser yyp):base(yyp){}}
-//%+IntVecVecArgEvent+130
+//%+IntVecVecArgEvent+131
 public class IntVecVecArgEvent : Event{
  public  IntVecVecArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "IntVecVecArgEvent"; }}
-public override int yynum { get { return 130; }}
+public override int yynum { get { return 131; }}
 public IntVecVecArgEvent(Parser yyp):base(yyp){}}
-//%+KeyIntIntArgEvent+131
+//%+KeyIntIntArgEvent+132
 public class KeyIntIntArgEvent : Event{
  public  KeyIntIntArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "KeyIntIntArgEvent"; }}
-public override int yynum { get { return 131; }}
+public override int yynum { get { return 132; }}
 public KeyIntIntArgEvent(Parser yyp):base(yyp){}}
-//%+CompoundStatement+132
+//%+CompoundStatement+133
 public class CompoundStatement : SYMBOL{
  public  CompoundStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -395,9 +395,9 @@ public class CompoundStatement : SYMBOL{
 }
 
 public override string yyname { get { return "CompoundStatement"; }}
-public override int yynum { get { return 132; }}
+public override int yynum { get { return 133; }}
 }
-//%+StatementList+133
+//%+StatementList+134
 public class StatementList : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if ( s . kids . Top  is  IfStatement || s . kids . Top  is  WhileStatement || s . kids . Top  is  DoWhileStatement || s . kids . Top  is  ForLoop ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -411,9 +411,9 @@ public class StatementList : SYMBOL{
 }
 
 public override string yyname { get { return "StatementList"; }}
-public override int yynum { get { return 133; }}
+public override int yynum { get { return 134; }}
 public StatementList(Parser yyp):base(yyp){}}
-//%+Statement+134
+//%+Statement+135
 public class Statement : SYMBOL{
  public  Statement (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -459,9 +459,9 @@ public class Statement : SYMBOL{
 }
 
 public override string yyname { get { return "Statement"; }}
-public override int yynum { get { return 134; }}
+public override int yynum { get { return 135; }}
 public Statement(Parser yyp):base(yyp){}}
-//%+EmptyStatement+135
+//%+EmptyStatement+136
 public class EmptyStatement : SYMBOL{
  public  EmptyStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -469,9 +469,9 @@ public class EmptyStatement : SYMBOL{
 }
 
 public override string yyname { get { return "EmptyStatement"; }}
-public override int yynum { get { return 135; }}
+public override int yynum { get { return 136; }}
 }
-//%+Assignment+136
+//%+Assignment+137
 public class Assignment : SYMBOL{
  protected  string  m_assignmentType ;
  public  Assignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
@@ -491,9 +491,9 @@ public class Assignment : SYMBOL{
 }
 
 public override string yyname { get { return "Assignment"; }}
-public override int yynum { get { return 136; }}
+public override int yynum { get { return 137; }}
 public Assignment(Parser yyp):base(yyp){}}
-//%+SimpleAssignment+137
+//%+SimpleAssignment+138
 public class SimpleAssignment : Assignment{
  public  SimpleAssignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
 )yyp)){ m_assignmentType = assignmentType ;
@@ -503,9 +503,9 @@ public class SimpleAssignment : Assignment{
 }
 
 public override string yyname { get { return "SimpleAssignment"; }}
-public override int yynum { get { return 137; }}
+public override int yynum { get { return 138; }}
 public SimpleAssignment(Parser yyp):base(yyp){}}
-//%+ReturnStatement+138
+//%+ReturnStatement+139
 public class ReturnStatement : SYMBOL{
  public  ReturnStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -515,9 +515,9 @@ public class ReturnStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ReturnStatement"; }}
-public override int yynum { get { return 138; }}
+public override int yynum { get { return 139; }}
 }
-//%+JumpLabel+139
+//%+JumpLabel+140
 public class JumpLabel : SYMBOL{
  private  string  m_labelName ;
  public  JumpLabel (Parser yyp, string  labelName ):base(((LSLSyntax
@@ -530,9 +530,9 @@ public class JumpLabel : SYMBOL{
 }
 
 public override string yyname { get { return "JumpLabel"; }}
-public override int yynum { get { return 139; }}
+public override int yynum { get { return 140; }}
 public JumpLabel(Parser yyp):base(yyp){}}
-//%+JumpStatement+140
+//%+JumpStatement+141
 public class JumpStatement : SYMBOL{
  private  string  m_targetName ;
  public  JumpStatement (Parser yyp, string  targetName ):base(((LSLSyntax
@@ -545,9 +545,9 @@ public class JumpStatement : SYMBOL{
 }
 
 public override string yyname { get { return "JumpStatement"; }}
-public override int yynum { get { return 140; }}
+public override int yynum { get { return 141; }}
 public JumpStatement(Parser yyp):base(yyp){}}
-//%+StateChange+141
+//%+StateChange+142
 public class StateChange : SYMBOL{
  private  string  m_newState ;
  public  StateChange (Parser yyp, string  newState ):base(((LSLSyntax
@@ -558,9 +558,9 @@ public class StateChange : SYMBOL{
 }
 
 public override string yyname { get { return "StateChange"; }}
-public override int yynum { get { return 141; }}
+public override int yynum { get { return 142; }}
 public StateChange(Parser yyp):base(yyp){}}
-//%+IfStatement+142
+//%+IfStatement+143
 public class IfStatement : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if (0< s . kids . Count && s . kids . Top  is  CompoundStatement ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -577,9 +577,9 @@ public class IfStatement : SYMBOL{
 }
 
 public override string yyname { get { return "IfStatement"; }}
-public override int yynum { get { return 142; }}
+public override int yynum { get { return 143; }}
 public IfStatement(Parser yyp):base(yyp){}}
-//%+WhileStatement+143
+//%+WhileStatement+144
 public class WhileStatement : SYMBOL{
  public  WhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
@@ -588,9 +588,9 @@ public class WhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "WhileStatement"; }}
-public override int yynum { get { return 143; }}
+public override int yynum { get { return 144; }}
 public WhileStatement(Parser yyp):base(yyp){}}
-//%+DoWhileStatement+144
+//%+DoWhileStatement+145
 public class DoWhileStatement : SYMBOL{
  public  DoWhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ if (0< st . kids . Count && st . kids . Top  is  CompoundStatement ) kids . Add ( st . kids . Pop ());
@@ -599,9 +599,9 @@ public class DoWhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "DoWhileStatement"; }}
-public override int yynum { get { return 144; }}
+public override int yynum { get { return 145; }}
 public DoWhileStatement(Parser yyp):base(yyp){}}
-//%+ForLoop+145
+//%+ForLoop+146
 public class ForLoop : SYMBOL{
  public  ForLoop (Parser yyp, ForLoopStatement  flsa , Expression  e , ForLoopStatement  flsb , Statement  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( flsa );
@@ -612,9 +612,9 @@ public class ForLoop : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoop"; }}
-public override int yynum { get { return 145; }}
+public override int yynum { get { return 146; }}
 public ForLoop(Parser yyp):base(yyp){}}
-//%+ForLoopStatement+146
+//%+ForLoopStatement+147
 public class ForLoopStatement : SYMBOL{
  public  ForLoopStatement (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ kids . Add ( e );
@@ -632,9 +632,9 @@ public class ForLoopStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoopStatement"; }}
-public override int yynum { get { return 146; }}
+public override int yynum { get { return 147; }}
 public ForLoopStatement(Parser yyp):base(yyp){}}
-//%+FunctionCall+147
+//%+FunctionCall+148
 public class FunctionCall : SYMBOL{
  private  string  m_id ;
  public  FunctionCall (Parser yyp, string  id , ArgumentList  al ):base(((LSLSyntax
@@ -648,9 +648,9 @@ public class FunctionCall : SYMBOL{
 }
 
 public override string yyname { get { return "FunctionCall"; }}
-public override int yynum { get { return 147; }}
+public override int yynum { get { return 148; }}
 public FunctionCall(Parser yyp):base(yyp){}}
-//%+ArgumentList+148
+//%+ArgumentList+149
 public class ArgumentList : SYMBOL{
  public  ArgumentList (Parser yyp, Argument  a ):base(((LSLSyntax
 )yyp)){ AddArgument ( a );
@@ -664,14 +664,14 @@ public class ArgumentList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentList"; }}
-public override int yynum { get { return 148; }}
+public override int yynum { get { return 149; }}
 public ArgumentList(Parser yyp):base(yyp){}}
-//%+Argument+149
+//%+Argument+150
 public class Argument : SYMBOL{
 public override string yyname { get { return "Argument"; }}
-public override int yynum { get { return 149; }}
+public override int yynum { get { return 150; }}
 public Argument(Parser yyp):base(yyp){}}
-//%+ExpressionArgument+150
+//%+ExpressionArgument+151
 public class ExpressionArgument : Argument{
  public  ExpressionArgument (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
@@ -679,9 +679,9 @@ public class ExpressionArgument : Argument{
 }
 
 public override string yyname { get { return "ExpressionArgument"; }}
-public override int yynum { get { return 150; }}
+public override int yynum { get { return 151; }}
 public ExpressionArgument(Parser yyp):base(yyp){}}
-//%+Constant+151
+//%+Constant+152
 public class Constant : SYMBOL{
  private  string  m_type ;
  private  string  m_val ;
@@ -703,9 +703,9 @@ public class Constant : SYMBOL{
 }
 
 public override string yyname { get { return "Constant"; }}
-public override int yynum { get { return 151; }}
+public override int yynum { get { return 152; }}
 public Constant(Parser yyp):base(yyp){}}
-//%+VectorConstant+152
+//%+VectorConstant+153
 public class VectorConstant : Constant{
  public  VectorConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ ):base(((LSLSyntax
 )yyp),"vector", null ){ kids . Add ( valX );
@@ -714,9 +714,9 @@ public class VectorConstant : Constant{
 }
 
 public override string yyname { get { return "VectorConstant"; }}
-public override int yynum { get { return 152; }}
+public override int yynum { get { return 153; }}
 public VectorConstant(Parser yyp):base(yyp){}}
-//%+RotationConstant+153
+//%+RotationConstant+154
 public class RotationConstant : Constant{
  public  RotationConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ , Expression  valS ):base(((LSLSyntax
 )yyp),"rotation", null ){ kids . Add ( valX );
@@ -726,36 +726,36 @@ public class RotationConstant : Constant{
 }
 
 public override string yyname { get { return "RotationConstant"; }}
-public override int yynum { get { return 153; }}
+public override int yynum { get { return 154; }}
 public RotationConstant(Parser yyp):base(yyp){}}
-//%+ListConstant+154
+//%+ListConstant+155
 public class ListConstant : Constant{
  public  ListConstant (Parser yyp, ArgumentList  al ):base(((LSLSyntax
 )yyp),"list", null ){ kids . Add ( al );
 }
 
 public override string yyname { get { return "ListConstant"; }}
-public override int yynum { get { return 154; }}
+public override int yynum { get { return 155; }}
 public ListConstant(Parser yyp):base(yyp){}}
-//%+Expression+155
+//%+Expression+156
 public class Expression : SYMBOL{
  protected  void  AddExpression ( Expression  e ){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
  else  kids . Add ( e );
 }
 
 public override string yyname { get { return "Expression"; }}
-public override int yynum { get { return 155; }}
+public override int yynum { get { return 156; }}
 public Expression(Parser yyp):base(yyp){}}
-//%+ConstantExpression+156
+//%+ConstantExpression+157
 public class ConstantExpression : Expression{
  public  ConstantExpression (Parser yyp, Constant  c ):base(((LSLSyntax
 )yyp)){ kids . Add ( c );
 }
 
 public override string yyname { get { return "ConstantExpression"; }}
-public override int yynum { get { return 156; }}
+public override int yynum { get { return 157; }}
 public ConstantExpression(Parser yyp):base(yyp){}}
-//%+IdentExpression+157
+//%+IdentExpression+158
 public class IdentExpression : Expression{
  protected  string  m_name ;
  public  IdentExpression (Parser yyp, string  name ):base(((LSLSyntax
@@ -768,9 +768,9 @@ public class IdentExpression : Expression{
 }
 
 public override string yyname { get { return "IdentExpression"; }}
-public override int yynum { get { return 157; }}
+public override int yynum { get { return 158; }}
 public IdentExpression(Parser yyp):base(yyp){}}
-//%+IdentDotExpression+158
+//%+IdentDotExpression+159
 public class IdentDotExpression : IdentExpression{
  private  string  m_member ;
  public  IdentDotExpression (Parser yyp, string  name , string  member ):base(((LSLSyntax
@@ -784,18 +784,18 @@ public class IdentDotExpression : IdentExpression{
 }
 
 public override string yyname { get { return "IdentDotExpression"; }}
-public override int yynum { get { return 158; }}
+public override int yynum { get { return 159; }}
 public IdentDotExpression(Parser yyp):base(yyp){}}
-//%+FunctionCallExpression+159
+//%+FunctionCallExpression+160
 public class FunctionCallExpression : Expression{
  public  FunctionCallExpression (Parser yyp, FunctionCall  fc ):base(((LSLSyntax
 )yyp)){ kids . Add ( fc );
 }
 
 public override string yyname { get { return "FunctionCallExpression"; }}
-public override int yynum { get { return 159; }}
+public override int yynum { get { return 160; }}
 public FunctionCallExpression(Parser yyp):base(yyp){}}
-//%+BinaryExpression+160
+//%+BinaryExpression+161
 public class BinaryExpression : Expression{
  private  string  m_expressionSymbol ;
  public  BinaryExpression (Parser yyp, Expression  lhs , Expression  rhs , string  expressionSymbol ):base(((LSLSyntax
@@ -810,9 +810,9 @@ public class BinaryExpression : Expression{
 }
 
 public override string yyname { get { return "BinaryExpression"; }}
-public override int yynum { get { return 160; }}
+public override int yynum { get { return 161; }}
 public BinaryExpression(Parser yyp):base(yyp){}}
-//%+UnaryExpression+161
+//%+UnaryExpression+162
 public class UnaryExpression : Expression{
  private  string  m_unarySymbol ;
  public  UnaryExpression (Parser yyp, string  unarySymbol , Expression  e ):base(((LSLSyntax
@@ -826,9 +826,9 @@ public class UnaryExpression : Expression{
 }
 
 public override string yyname { get { return "UnaryExpression"; }}
-public override int yynum { get { return 161; }}
+public override int yynum { get { return 162; }}
 public UnaryExpression(Parser yyp):base(yyp){}}
-//%+TypecastExpression+162
+//%+TypecastExpression+163
 public class TypecastExpression : Expression{
  private  string  m_typecastType ;
  public  TypecastExpression (Parser yyp, string  typecastType , SYMBOL  rhs ):base(((LSLSyntax
@@ -842,18 +842,18 @@ public class TypecastExpression : Expression{
 }
 
 public override string yyname { get { return "TypecastExpression"; }}
-public override int yynum { get { return 162; }}
+public override int yynum { get { return 163; }}
 public TypecastExpression(Parser yyp):base(yyp){}}
-//%+ParenthesisExpression+163
+//%+ParenthesisExpression+164
 public class ParenthesisExpression : Expression{
  public  ParenthesisExpression (Parser yyp, SYMBOL  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
 }
 
 public override string yyname { get { return "ParenthesisExpression"; }}
-public override int yynum { get { return 163; }}
+public override int yynum { get { return 164; }}
 public ParenthesisExpression(Parser yyp):base(yyp){}}
-//%+IncrementDecrementExpression+164
+//%+IncrementDecrementExpression+165
 public class IncrementDecrementExpression : Expression{
  private  string  m_name ;
  private  string  m_operation ;
@@ -881,7 +881,7 @@ public class IncrementDecrementExpression : Expression{
 }
 
 public override string yyname { get { return "IncrementDecrementExpression"; }}
-public override int yynum { get { return 164; }}
+public override int yynum { get { return 165; }}
 public IncrementDecrementExpression(Parser yyp):base(yyp){}}
 
 public class LSLProgramRoot_1 : LSLProgramRoot {
@@ -2234,6 +2234,11 @@ public class Event_8 : Event {
         ((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
         .yytext){}}
 
+public class Event_9 : Event {
+  public Event_9(Parser yyq):base(yyq,
+        ((TRANSACTION_RESULT_EVENT)(yyq.StackAt(0).m_value))
+        .yytext){}}
+
 public class VoidArgEvent_1 : VoidArgEvent {
   public VoidArgEvent_1(Parser yyq):base(yyq,
         ((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value))
@@ -2376,12 +2381,12 @@ public class ArgumentDeclarationList_3 : ArgumentDeclarationList {
 public class ArgumentList_3 : ArgumentList {
   public ArgumentList_3(Parser yyq):base(yyq){}}
 
-public class ArgumentDeclarationList_4 : ArgumentDeclarationList {
-  public ArgumentDeclarationList_4(Parser yyq):base(yyq){}}
-
 public class ArgumentList_4 : ArgumentList {
   public ArgumentList_4(Parser yyq):base(yyq){}}
 
+public class ArgumentDeclarationList_4 : ArgumentDeclarationList {
+  public ArgumentDeclarationList_4(Parser yyq):base(yyq){}}
+
 public class ArgumentDeclarationList_5 : ArgumentDeclarationList {
   public ArgumentDeclarationList_5(Parser yyq):base(yyq){}}
 public yyLSLSyntax
@@ -2394,10 +2399,10 @@ public yyLSLSyntax
 0,103,0,114,0,
 97,0,109,0,82,
 0,111,0,111,0,
-116,0,1,96,1,
-2,104,18,1,2841,
+116,0,1,97,1,
+2,104,18,1,2845,
 102,2,0,105,5,
-394,1,0,106,18,
+395,1,0,106,18,
 1,0,0,2,0,
 1,1,107,18,1,
 1,108,20,109,4,
@@ -2458,12 +2463,12 @@ public yyLSLSyntax
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,1,
-123,1,2,2,0,
+124,1,2,2,0,
 1,9,131,18,1,
 9,132,20,133,4,
 10,73,0,68,0,
 69,0,78,0,84,
-0,1,92,1,1,
+0,1,93,1,1,
 2,0,1,10,134,
 18,1,10,135,20,
 136,4,20,76,0,
@@ -2487,48 +2492,50 @@ public yyLSLSyntax
 105,0,111,0,110,
 0,76,0,105,0,
 115,0,116,0,1,
-111,1,2,2,0,
+112,1,2,2,0,
 1,21,142,18,1,
 21,143,20,144,4,
 10,67,0,79,0,
 77,0,77,0,65,
 0,1,14,1,1,
-2,0,1,2807,145,
-18,1,2807,146,20,
-147,4,18,83,0,
-69,0,77,0,73,
-0,67,0,79,0,
-76,0,79,0,78,
-0,1,11,1,1,
-2,0,1,1694,148,
-18,1,1694,149,20,
-150,4,32,70,0,
+2,0,1,1694,145,
+18,1,1694,146,20,
+147,4,32,70,0,
 111,0,114,0,76,
 0,111,0,111,0,
 112,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,146,1,2,2,
-0,1,1695,151,18,
+1,147,1,2,2,
+0,1,1695,148,18,
 1,1695,143,2,0,
+1,2811,149,18,1,
+2811,150,20,151,4,
+18,83,0,69,0,
+77,0,73,0,67,
+0,79,0,76,0,
+79,0,78,0,1,
+11,1,1,2,0,
 1,2645,152,18,1,
 2645,153,20,154,4,
-34,86,0,111,0,
-105,0,100,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,104,1,2,2,
-0,1,2646,155,18,
-1,2646,156,20,157,
-4,20,83,0,116,
+32,73,0,110,0,
+116,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,107,
+1,2,2,0,1,
+2646,155,18,1,2646,
+156,20,157,4,32,
+75,0,101,0,121,
+0,65,0,114,0,
+103,0,83,0,116,
 0,97,0,116,0,
 101,0,69,0,118,
 0,101,0,110,0,
-116,0,1,103,1,
+116,0,1,106,1,
 2,2,0,1,30,
 158,18,1,30,159,
 20,160,4,22,68,
@@ -2536,7 +2543,7 @@ public yyLSLSyntax
 108,0,97,0,114,
 0,97,0,116,0,
 105,0,111,0,110,
-0,1,118,1,2,
+0,1,119,1,2,
 2,0,1,31,161,
 18,1,31,162,20,
 163,4,22,82,0,
@@ -2554,728 +2561,753 @@ public yyLSLSyntax
 69,0,1,12,1,
 1,2,0,1,2650,
 167,18,1,2650,168,
-20,169,4,44,73,
-0,110,0,116,0,
-82,0,111,0,116,
-0,82,0,111,0,
+20,169,4,44,75,
+0,101,0,121,0,
+73,0,110,0,116,
+0,73,0,110,0,
 116,0,65,0,114,
 0,103,0,83,0,
 116,0,97,0,116,
 0,101,0,69,0,
 118,0,101,0,110,
-0,116,0,1,108,
+0,116,0,1,111,
 1,2,2,0,1,
-2819,170,18,1,2819,
-171,20,172,4,34,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,68,0,101,
+2651,170,18,1,2651,
+171,20,172,4,44,
+73,0,110,0,116,
+0,86,0,101,0,
+99,0,86,0,101,
+0,99,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+110,1,2,2,0,
+1,1114,173,18,1,
+1114,132,2,0,1,
+2654,174,18,1,2654,
+153,2,0,1,1152,
+175,18,1,1152,176,
+20,177,4,32,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,1,138,1,2,
+2,0,1,1117,178,
+18,1,1117,179,20,
+180,4,28,80,0,
+69,0,82,0,67,
+0,69,0,78,0,
+84,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,10,1,1,
+2,0,1,40,181,
+18,1,40,132,2,
+0,1,41,182,18,
+1,41,135,2,0,
+1,42,183,18,1,
+42,184,20,185,4,
+20,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,156,1,2,
+2,0,1,43,186,
+18,1,43,187,20,
+188,4,22,82,0,
+73,0,71,0,72,
+0,84,0,95,0,
+83,0,72,0,73,
+0,70,0,84,0,
+1,41,1,1,2,
+0,1,44,189,18,
+1,44,132,2,0,
+1,1159,190,18,1,
+1159,184,2,0,1,
+46,191,18,1,46,
+192,20,193,4,12,
+80,0,69,0,82,
+0,73,0,79,0,
+68,0,1,24,1,
+1,2,0,1,47,
+194,18,1,47,132,
+2,0,1,48,195,
+18,1,48,196,20,
+197,4,18,68,0,
+69,0,67,0,82,
+0,69,0,77,0,
+69,0,78,0,84,
+0,1,5,1,1,
+2,0,1,49,198,
+18,1,49,199,20,
+200,4,18,73,0,
+78,0,67,0,82,
+0,69,0,77,0,
+69,0,78,0,84,
+0,1,4,1,1,
+2,0,1,50,201,
+18,1,50,196,2,
+0,1,51,202,18,
+1,51,199,2,0,
+1,52,203,18,1,
+52,135,2,0,1,
+2281,204,18,1,2281,
+176,2,0,1,2841,
+205,18,1,2841,206,
+20,207,4,48,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,68,0,101,
 0,102,0,105,0,
 110,0,105,0,116,
 0,105,0,111,0,
-110,0,115,0,1,
-97,1,2,2,0,
-1,2652,173,18,1,
-2652,174,20,175,4,
-32,73,0,110,0,
-116,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,106,
-1,2,2,0,1,
-1114,176,18,1,1114,
-132,2,0,1,2654,
-177,18,1,2654,153,
-2,0,1,1152,178,
-18,1,1152,179,20,
-180,4,32,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-1,137,1,2,2,
-0,1,1117,181,18,
-1,1117,182,20,183,
-4,28,80,0,69,
-0,82,0,67,0,
-69,0,78,0,84,
-0,95,0,69,0,
-81,0,85,0,65,
-0,76,0,83,0,
-1,10,1,1,2,
-0,1,40,184,18,
-1,40,132,2,0,
-1,41,185,18,1,
-41,135,2,0,1,
-42,186,18,1,42,
-187,20,188,4,20,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,155,1,2,2,
-0,1,43,189,18,
-1,43,190,20,191,
-4,22,82,0,73,
-0,71,0,72,0,
-84,0,95,0,83,
-0,72,0,73,0,
-70,0,84,0,1,
-41,1,1,2,0,
-1,44,192,18,1,
-44,132,2,0,1,
-1159,193,18,1,1159,
-187,2,0,1,46,
-194,18,1,46,195,
-20,196,4,12,80,
-0,69,0,82,0,
-73,0,79,0,68,
-0,1,24,1,1,
-2,0,1,47,197,
-18,1,47,132,2,
-0,1,48,198,18,
-1,48,199,20,200,
-4,18,68,0,69,
-0,67,0,82,0,
-69,0,77,0,69,
-0,78,0,84,0,
-1,5,1,1,2,
-0,1,49,201,18,
-1,49,202,20,203,
-4,18,73,0,78,
-0,67,0,82,0,
-69,0,77,0,69,
-0,78,0,84,0,
-1,4,1,1,2,
-0,1,50,204,18,
-1,50,199,2,0,
-1,51,205,18,1,
-51,202,2,0,1,
-52,206,18,1,52,
-135,2,0,1,2281,
-207,18,1,2281,179,
-2,0,1,2839,208,
-18,1,2839,209,20,
-210,4,48,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,68,0,101,0,
-102,0,105,0,110,
-0,105,0,116,0,
-105,0,111,0,110,
-0,1,99,1,2,
-2,0,1,2840,211,
-18,1,2840,212,20,
-213,4,50,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-86,0,97,0,114,
-0,105,0,97,0,
-98,0,108,0,101,
+110,0,1,100,1,
+2,2,0,1,2842,
+208,18,1,2842,209,
+20,210,4,50,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,86,0,97,0,
+114,0,105,0,97,
+0,98,0,108,0,
+101,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,1,
+99,1,2,2,0,
+1,2755,211,18,1,
+2755,212,20,213,4,
+22,82,0,73,0,
+71,0,72,0,84,
+0,95,0,66,0,
+82,0,65,0,67,
+0,69,0,1,13,
+1,1,2,0,1,
+1730,214,18,1,1730,
+176,2,0,1,1731,
+215,18,1,1731,150,
+2,0,1,61,216,
+18,1,61,129,2,
+0,1,62,217,18,
+1,62,162,2,0,
+1,63,218,18,1,
+63,132,2,0,1,
+65,219,18,1,65,
+192,2,0,1,66,
+220,18,1,66,132,
+2,0,1,67,221,
+18,1,67,196,2,
+0,1,68,222,18,
+1,68,199,2,0,
+1,69,223,18,1,
+69,196,2,0,1,
+70,224,18,1,70,
+199,2,0,1,71,
+225,18,1,71,135,
+2,0,1,73,226,
+18,1,73,184,2,
+0,1,74,227,18,
+1,74,162,2,0,
+1,1189,228,18,1,
+1189,229,20,230,4,
+22,83,0,84,0,
+65,0,82,0,95,
+0,69,0,81,0,
+85,0,65,0,76,
+0,83,0,1,8,
+1,1,2,0,1,
+76,231,18,1,76,
+232,20,233,4,20,
+76,0,69,0,70,
+0,84,0,95,0,
+83,0,72,0,73,
+0,70,0,84,0,
+1,40,1,1,2,
+0,1,1153,234,18,
+1,1153,235,20,236,
+4,24,83,0,76,
+0,65,0,83,0,
+72,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,9,1,1,
+2,0,1,79,237,
+18,1,79,238,20,
+239,4,10,84,0,
+73,0,76,0,68,
+0,69,0,1,36,
+1,1,2,0,1,
+1195,240,18,1,1195,
+184,2,0,1,82,
+241,18,1,82,184,
+2,0,1,1123,242,
+18,1,1123,184,2,
+0,1,85,243,18,
+1,85,244,20,245,
+4,26,83,0,84,
+0,82,0,79,0,
+75,0,69,0,95,
+0,83,0,84,0,
+82,0,79,0,75,
+0,69,0,1,39,
+1,1,2,0,1,
+2547,246,18,1,2547,
+247,20,248,4,28,
+82,0,111,0,116,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,1,98,
+0,110,0,1,123,
 1,2,2,0,1,
-2841,104,1,2842,214,
-18,1,2842,215,23,
-216,4,6,69,0,
-79,0,70,0,1,
-2,1,6,2,0,
-1,1730,217,18,1,
-1730,179,2,0,1,
-1731,218,18,1,1731,
-146,2,0,1,61,
-219,18,1,61,129,
-2,0,1,62,220,
-18,1,62,162,2,
-0,1,63,221,18,
-1,63,132,2,0,
-1,65,222,18,1,
-65,195,2,0,1,
-66,223,18,1,66,
-132,2,0,1,67,
-224,18,1,67,199,
-2,0,1,68,225,
-18,1,68,202,2,
-0,1,69,226,18,
-1,69,199,2,0,
-1,70,227,18,1,
-70,202,2,0,1,
-71,228,18,1,71,
-135,2,0,1,73,
-229,18,1,73,187,
-2,0,1,74,230,
-18,1,74,162,2,
-0,1,1189,231,18,
-1,1189,232,20,233,
-4,22,83,0,84,
-0,65,0,82,0,
+89,249,18,1,89,
+250,20,251,4,10,
+77,0,73,0,78,
+0,85,0,83,0,
+1,19,1,1,2,
+0,1,2318,252,18,
+1,2318,150,2,0,
+1,93,253,18,1,
+93,184,2,0,1,
+2792,254,18,1,2792,
+184,2,0,1,97,
+255,18,1,97,256,
+20,257,4,14,65,
+0,77,0,80,0,
+95,0,65,0,77,
+0,80,0,1,38,
+1,1,2,0,1,
+102,258,18,1,102,
+259,20,260,4,22,
+69,0,88,0,67,
+0,76,0,65,0,
+77,0,65,0,84,
+0,73,0,79,0,
+78,0,1,37,1,
+1,2,0,1,1775,
+261,18,1,1775,162,
+2,0,1,107,262,
+18,1,107,184,2,
+0,1,2337,263,18,
+1,2337,162,2,0,
+1,1224,264,18,1,
+1224,176,2,0,1,
+1225,265,18,1,1225,
+266,20,267,4,24,
+77,0,73,0,78,
+0,85,0,83,0,
 95,0,69,0,81,
 0,85,0,65,0,
 76,0,83,0,1,
-8,1,1,2,0,
-1,76,234,18,1,
-76,235,20,236,4,
-20,76,0,69,0,
-70,0,84,0,95,
-0,83,0,72,0,
-73,0,70,0,84,
-0,1,40,1,1,
-2,0,1,1153,237,
-18,1,1153,238,20,
-239,4,24,83,0,
-76,0,65,0,83,
-0,72,0,95,0,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,9,1,
-1,2,0,1,79,
-240,18,1,79,241,
-20,242,4,10,84,
-0,73,0,76,0,
-68,0,69,0,1,
-36,1,1,2,0,
-1,1195,243,18,1,
-1195,187,2,0,1,
-82,244,18,1,82,
-187,2,0,1,1123,
-245,18,1,1123,187,
-2,0,1,85,246,
-18,1,85,247,20,
-248,4,26,83,0,
-84,0,82,0,79,
-0,75,0,69,0,
-95,0,83,0,84,
-0,82,0,79,0,
-75,0,69,0,1,
-39,1,1,2,0,
-1,2547,249,18,1,
-2547,250,20,251,4,
-64,73,0,110,0,
-116,0,82,0,111,
-0,116,0,82,0,
-111,0,116,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-1,115,1,2,2,
-0,1,89,252,18,
-1,89,253,20,254,
-4,10,77,0,73,
-0,78,0,85,0,
-83,0,1,19,1,
-1,2,0,1,2318,
-255,18,1,2318,146,
-2,0,1,2788,256,
-18,1,2788,187,2,
-0,1,93,257,18,
-1,93,187,2,0,
-1,97,258,18,1,
-97,259,20,260,4,
-14,65,0,77,0,
-80,0,95,0,65,
-0,77,0,80,0,
-1,38,1,1,2,
-0,1,102,261,18,
-1,102,262,20,263,
-4,22,69,0,88,
+7,1,1,2,0,
+1,112,268,18,1,
+112,269,20,270,4,
+28,71,0,82,0,
+69,0,65,0,84,
+0,69,0,82,0,
+95,0,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+32,1,1,2,0,
+1,1188,271,18,1,
+1188,176,2,0,1,
+1231,272,18,1,1231,
+184,2,0,1,118,
+273,18,1,118,184,
+2,0,1,1737,274,
+18,1,1737,184,2,
+0,1,124,275,18,
+1,124,276,20,277,
+4,22,76,0,69,
+0,83,0,83,0,
+95,0,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+31,1,1,2,0,
+1,2657,278,18,1,
+2657,279,20,280,4,
+20,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,104,1,2,
+2,0,1,2658,281,
+18,1,2658,282,20,
+283,4,26,68,0,
+69,0,70,0,65,
+0,85,0,76,0,
+84,0,95,0,83,
+0,84,0,65,0,
+84,0,69,0,1,
+47,1,1,2,0,
+1,2659,284,18,1,
+2659,165,2,0,1,
+130,285,18,1,130,
+184,2,0,1,2843,
+286,18,1,2843,206,
+2,0,1,1803,287,
+18,1,1803,288,20,
+289,4,18,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,135,1,2,
+2,0,1,1804,290,
+18,1,1804,291,20,
+292,4,4,68,0,
+79,0,1,44,1,
+1,2,0,1,2591,
+293,18,1,2591,140,
+2,0,1,2364,294,
+18,1,2364,288,2,
+0,1,137,295,18,
+1,137,296,20,297,
+4,36,69,0,88,
 0,67,0,76,0,
 65,0,77,0,65,
 0,84,0,73,0,
-79,0,78,0,1,
-37,1,1,2,0,
-1,1775,264,18,1,
-1775,162,2,0,1,
-107,265,18,1,107,
-187,2,0,1,2337,
-266,18,1,2337,162,
-2,0,1,1224,267,
-18,1,1224,179,2,
-0,1,1225,268,18,
-1,1225,269,20,270,
-4,24,77,0,73,
-0,78,0,85,0,
-83,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,7,1,1,
-2,0,1,112,271,
-18,1,112,272,20,
-273,4,28,71,0,
-82,0,69,0,65,
-0,84,0,69,0,
-82,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,32,1,1,
-2,0,1,1188,274,
-18,1,1188,179,2,
-0,1,1231,275,18,
-1,1231,187,2,0,
-1,118,276,18,1,
-118,187,2,0,1,
-1737,277,18,1,1737,
-187,2,0,1,2818,
-278,18,1,2818,146,
-2,0,1,124,279,
-18,1,124,280,20,
-281,4,22,76,0,
-69,0,83,0,83,
-0,95,0,69,0,
-81,0,85,0,65,
-0,76,0,83,0,
-1,31,1,1,2,
-0,1,2657,282,18,
-1,2657,165,2,0,
-1,130,283,18,1,
-130,187,2,0,1,
-1803,284,18,1,1803,
-285,20,286,4,18,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,134,
-1,2,2,0,1,
-1804,287,18,1,1804,
-288,20,289,4,4,
-68,0,79,0,1,
-44,1,1,2,0,
-1,2830,290,18,1,
-2830,291,20,292,4,
-12,83,0,116,0,
-97,0,116,0,101,
-0,115,0,1,100,
-1,2,2,0,1,
-2364,293,18,1,2364,
-285,2,0,1,137,
-294,18,1,137,295,
-20,296,4,36,69,
-0,88,0,67,0,
-76,0,65,0,77,
-0,65,0,84,0,
-73,0,79,0,78,
-0,95,0,69,0,
-81,0,85,0,65,
-0,76,0,83,0,
-1,30,1,1,2,
-0,1,2293,297,18,
-1,2293,146,2,0,
-1,1701,298,18,1,
-1701,187,2,0,1,
-1756,299,18,1,1756,
-146,2,0,1,2527,
-300,18,1,2527,132,
-2,0,1,143,301,
-18,1,143,187,2,
-0,1,2299,302,18,
-1,2299,187,2,0,
-1,1260,303,18,1,
-1260,179,2,0,1,
-1261,304,18,1,1261,
-305,20,306,4,22,
-80,0,76,0,85,
-0,83,0,95,0,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,6,1,
-1,2,0,1,2528,
-307,18,1,2528,308,
-20,309,4,28,86,
-0,101,0,99,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,1,121,1,
-2,2,0,1,151,
-310,18,1,151,311,
-20,312,4,26,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,95,0,69,0,
-81,0,85,0,65,
-0,76,0,83,0,
-1,29,1,1,2,
-0,1,1267,313,18,
-1,1267,187,2,0,
-1,2765,314,18,1,
-2765,132,2,0,1,
-157,315,18,1,157,
-187,2,0,1,1773,
-316,18,1,1773,149,
-2,0,1,1832,317,
-18,1,1832,285,2,
-0,1,1833,318,18,
-1,1833,319,20,320,
-4,10,87,0,72,
-0,73,0,76,0,
-69,0,1,45,1,
-1,2,0,1,1834,
-321,18,1,1834,135,
-2,0,1,166,322,
-18,1,166,323,20,
-324,4,20,76,0,
-69,0,70,0,84,
-0,95,0,65,0,
-78,0,71,0,76,
-0,69,0,1,25,
+79,0,78,0,95,
+0,69,0,81,0,
+85,0,65,0,76,
+0,83,0,1,30,
 1,1,2,0,1,
-1840,325,18,1,1840,
-187,2,0,1,2779,
-326,18,1,2779,327,
-20,328,4,34,67,
-0,111,0,109,0,
-112,0,111,0,117,
-0,110,0,100,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,132,
+2293,298,18,1,2293,
+150,2,0,1,2834,
+299,18,1,2834,300,
+20,301,4,12,83,
+0,116,0,97,0,
+116,0,101,0,115,
+0,1,101,1,2,
+2,0,1,1701,302,
+18,1,1701,184,2,
+0,1,1756,303,18,
+1,1756,150,2,0,
+1,2527,304,18,1,
+2527,114,2,0,1,
+143,305,18,1,143,
+184,2,0,1,2299,
+306,18,1,2299,184,
+2,0,1,1260,307,
+18,1,1260,176,2,
+0,1,1261,308,18,
+1,1261,309,20,310,
+4,22,80,0,76,
+0,85,0,83,0,
+95,0,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+6,1,1,2,0,
+1,2528,311,18,1,
+2528,132,2,0,1,
+2844,312,18,1,2844,
+209,2,0,1,2845,
+104,1,151,313,18,
+1,151,314,20,315,
+4,26,69,0,81,
+0,85,0,65,0,
+76,0,83,0,95,
+0,69,0,81,0,
+85,0,65,0,76,
+0,83,0,1,29,
+1,1,2,0,1,
+1267,316,18,1,1267,
+184,2,0,1,157,
+317,18,1,157,184,
+2,0,1,2767,318,
+18,1,2767,319,20,
+320,4,10,83,0,
+116,0,97,0,116,
+0,101,0,1,102,
 1,2,2,0,1,
-172,329,18,1,172,
-187,2,0,1,2335,
-330,18,1,2335,149,
-2,0,1,1296,331,
-18,1,1296,179,2,
-0,1,1297,332,18,
-1,1297,333,20,334,
+1773,321,18,1,1773,
+146,2,0,1,1832,
+322,18,1,1832,288,
+2,0,1,1833,323,
+18,1,1833,324,20,
+325,4,10,87,0,
+72,0,73,0,76,
+0,69,0,1,45,
+1,1,2,0,1,
+1834,326,18,1,1834,
+135,2,0,1,166,
+327,18,1,166,328,
+20,329,4,20,76,
+0,69,0,70,0,
+84,0,95,0,65,
+0,78,0,71,0,
+76,0,69,0,1,
+25,1,1,2,0,
+1,1840,330,18,1,
+1840,184,2,0,1,
+2779,331,18,1,2779,
+140,2,0,1,172,
+332,18,1,172,184,
+2,0,1,2785,333,
+18,1,2785,159,2,
+0,1,2786,334,18,
+1,2786,335,20,336,
 4,12,69,0,81,
 0,85,0,65,0,
 76,0,83,0,1,
 15,1,1,2,0,
-1,2413,335,18,1,
-2413,336,20,337,4,
-26,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,76,
-0,105,0,115,0,
-116,0,1,133,1,
-2,2,0,1,1859,
-338,18,1,1859,162,
-2,0,1,1860,339,
-18,1,1860,146,2,
-0,1,188,340,18,
-1,188,187,2,0,
-1,182,341,18,1,
-182,342,20,343,4,
-22,82,0,73,0,
-71,0,72,0,84,
-0,95,0,65,0,
-78,0,71,0,76,
-0,69,0,1,26,
-1,1,2,0,1,
-199,344,18,1,199,
-345,20,346,4,10,
-67,0,65,0,82,
-0,69,0,84,0,
-1,35,1,1,2,
-0,1,1871,347,18,
-1,1871,179,2,0,
-1,1872,348,18,1,
-1872,162,2,0,1,
-1873,349,18,1,1873,
-146,2,0,1,1875,
-350,18,1,1875,319,
-2,0,1,205,351,
-18,1,205,187,2,
-0,1,2581,352,18,
-1,2581,135,2,0,
-1,1882,353,18,1,
-1882,187,2,0,1,
-2227,354,18,1,2227,
-285,2,0,1,2590,
-355,18,1,2590,140,
-2,0,1,217,356,
-18,1,217,357,20,
-358,4,12,83,0,
+1,2335,337,18,1,
+2335,146,2,0,1,
+1296,338,18,1,1296,
+176,2,0,1,1297,
+339,18,1,1297,335,
+2,0,1,2413,340,
+18,1,2413,341,20,
+342,4,26,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,76,0,105,0,
+115,0,116,0,1,
+134,1,2,2,0,
+1,1859,343,18,1,
+1859,162,2,0,1,
+1860,344,18,1,1860,
+150,2,0,1,188,
+345,18,1,188,184,
+2,0,1,182,346,
+18,1,182,347,20,
+348,4,22,82,0,
+73,0,71,0,72,
+0,84,0,95,0,
+65,0,78,0,71,
+0,76,0,69,0,
+1,26,1,1,2,
+0,1,199,349,18,
+1,199,350,20,351,
+4,10,67,0,65,
+0,82,0,69,0,
+84,0,1,35,1,
+1,2,0,1,1871,
+352,18,1,1871,176,
+2,0,1,1872,353,
+18,1,1872,162,2,
+0,1,1873,354,18,
+1,1873,150,2,0,
+1,1875,355,18,1,
+1875,324,2,0,1,
+205,356,18,1,205,
+184,2,0,1,2581,
+357,18,1,2581,358,
+20,359,4,10,69,
+0,118,0,101,0,
+110,0,116,0,1,
+125,1,2,2,0,
+1,2515,360,18,1,
+2515,143,2,0,1,
+1882,361,18,1,1882,
+184,2,0,1,2227,
+362,18,1,2227,288,
+2,0,1,217,363,
+18,1,217,364,20,
+365,4,12,83,0,
 84,0,82,0,79,
 0,75,0,69,0,
 1,34,1,1,2,
-0,1,1332,359,18,
-1,1332,179,2,0,
-1,1335,360,18,1,
-1335,182,2,0,1,
-223,361,18,1,223,
-187,2,0,1,1341,
-362,18,1,1341,187,
-2,0,1,1901,363,
-18,1,1901,162,2,
-0,1,1303,364,18,
-1,1303,187,2,0,
-1,2837,365,18,1,
-2837,209,2,0,1,
-2838,366,18,1,2838,
-212,2,0,1,2462,
-367,18,1,2462,285,
-2,0,1,236,368,
-18,1,236,369,20,
-370,4,6,65,0,
+0,1,1332,366,18,
+1,1332,176,2,0,
+1,1335,367,18,1,
+1335,179,2,0,1,
+223,368,18,1,223,
+184,2,0,1,2846,
+369,18,1,2846,370,
+23,371,4,6,69,
+0,79,0,70,0,
+1,2,1,6,2,
+0,1,1341,372,18,
+1,1341,184,2,0,
+1,1901,373,18,1,
+1901,162,2,0,1,
+1303,374,18,1,1303,
+184,2,0,1,2462,
+375,18,1,2462,288,
+2,0,1,236,376,
+18,1,236,377,20,
+378,4,6,65,0,
 77,0,80,0,1,
 33,1,1,2,0,
-1,2466,371,18,1,
-2466,327,2,0,1,
-2467,372,18,1,2467,
-159,2,0,1,2468,
-373,18,1,2468,374,
-20,375,4,10,83,
-0,84,0,65,0,
-84,0,69,0,1,
-48,1,1,2,0,
-1,2469,376,18,1,
-2469,132,2,0,1,
-242,377,18,1,242,
-187,2,0,1,2471,
-378,18,1,2471,379,
-20,380,4,26,67,
-0,79,0,78,0,
-84,0,82,0,79,
-0,76,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,65,1,1,2,
-0,1,2472,381,18,
-1,2472,382,20,383,
-4,30,65,0,84,
-0,95,0,84,0,
-65,0,82,0,71,
-0,69,0,84,0,
+1,2466,379,18,1,
+2466,380,20,381,4,
+34,67,0,111,0,
+109,0,112,0,111,
+0,117,0,110,0,
+100,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,133,1,2,2,
+0,1,2467,382,18,
+1,2467,159,2,0,
+1,2468,383,18,1,
+2468,384,20,385,4,
+10,83,0,84,0,
+65,0,84,0,69,
+0,1,48,1,1,
+2,0,1,2469,386,
+18,1,2469,132,2,
+0,1,242,387,18,
+1,242,184,2,0,
+1,2471,388,18,1,
+2471,389,20,390,4,
+26,67,0,79,0,
+78,0,84,0,82,
+0,79,0,76,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,59,1,
-1,2,0,1,2473,
-384,18,1,2473,385,
-20,386,4,38,65,
+84,0,1,65,1,
+1,2,0,1,2472,
+391,18,1,2472,392,
+20,393,4,30,65,
 0,84,0,95,0,
-82,0,79,0,84,
-0,95,0,84,0,
-65,0,82,0,71,
-0,69,0,84,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,58,1,
-1,2,0,1,2474,
-387,18,1,2474,388,
-20,389,4,52,76,
-0,65,0,78,0,
-68,0,95,0,67,
-0,79,0,76,0,
-76,0,73,0,83,
-0,73,0,79,0,
-78,0,95,0,83,
-0,84,0,65,0,
-82,0,84,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,71,1,1,
-2,0,1,2475,390,
-18,1,2475,391,20,
-392,4,48,76,0,
-65,0,78,0,68,
-0,95,0,67,0,
-79,0,76,0,76,
-0,73,0,83,0,
-73,0,79,0,78,
-0,95,0,69,0,
+84,0,65,0,82,
+0,71,0,69,0,
+84,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+59,1,1,2,0,
+1,2473,394,18,1,
+2473,395,20,396,4,
+38,65,0,84,0,
+95,0,82,0,79,
+0,84,0,95,0,
+84,0,65,0,82,
+0,71,0,69,0,
+84,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+58,1,1,2,0,
+1,2474,397,18,1,
+2474,398,20,399,4,
+52,76,0,65,0,
 78,0,68,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,70,1,1,
-2,0,1,2476,393,
-18,1,2476,394,20,
-395,4,40,76,0,
-65,0,78,0,68,
-0,95,0,67,0,
-79,0,76,0,76,
-0,73,0,83,0,
-73,0,79,0,78,
+0,67,0,79,0,
+76,0,76,0,73,
+0,83,0,73,0,
+79,0,78,0,95,
+0,83,0,84,0,
+65,0,82,0,84,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,69,
+0,84,0,1,71,
 1,1,2,0,1,
-2477,396,18,1,2477,
-397,20,398,4,34,
-84,0,79,0,85,
-0,67,0,72,0,
-95,0,83,0,84,
-0,65,0,82,0,
-84,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-89,1,1,2,0,
-1,2478,399,18,1,
-2478,400,20,401,4,
-30,84,0,79,0,
-85,0,67,0,72,
+2475,400,18,1,2475,
+401,20,402,4,48,
+76,0,65,0,78,
+0,68,0,95,0,
+67,0,79,0,76,
+0,76,0,73,0,
+83,0,73,0,79,
+0,78,0,95,0,
+69,0,78,0,68,
 0,95,0,69,0,
-78,0,68,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,90,1,1,
-2,0,1,2479,402,
-18,1,2479,403,20,
-404,4,22,84,0,
-79,0,85,0,67,
-0,72,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,88,1,1,2,
-0,1,2480,405,18,
-1,2480,406,20,407,
-4,24,83,0,69,
-0,78,0,83,0,
-79,0,82,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,84,1,1,
-2,0,1,2481,408,
-18,1,2481,409,20,
-410,4,52,82,0,
-85,0,78,0,95,
-0,84,0,73,0,
-77,0,69,0,95,
-0,80,0,69,0,
-82,0,77,0,73,
-0,83,0,83,0,
-73,0,79,0,78,
-0,83,0,95,0,
+86,0,69,0,78,
+0,84,0,1,70,
+1,1,2,0,1,
+2476,403,18,1,2476,
+404,20,405,4,40,
+76,0,65,0,78,
+0,68,0,95,0,
+67,0,79,0,76,
+0,76,0,73,0,
+83,0,73,0,79,
+0,78,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,83,1,1,2,
-0,1,2482,411,18,
-1,2482,412,20,413,
-4,24,79,0,78,
-0,95,0,82,0,
-69,0,90,0,95,
+1,69,1,1,2,
+0,1,2477,406,18,
+1,2477,407,20,408,
+4,34,84,0,79,
+0,85,0,67,0,
+72,0,95,0,83,
+0,84,0,65,0,
+82,0,84,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,81,1,1,
-2,0,1,2483,414,
-18,1,2483,415,20,
-416,4,42,67,0,
-79,0,76,0,76,
-0,73,0,83,0,
-73,0,79,0,78,
-0,95,0,83,0,
-84,0,65,0,82,
-0,84,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,64,1,1,2,
-0,1,256,417,18,
-1,256,418,20,419,
-4,14,80,0,69,
-0,82,0,67,0,
-69,0,78,0,84,
-0,1,22,1,1,
-2,0,1,1371,420,
-18,1,1371,238,2,
-0,1,2486,421,18,
-1,2486,422,20,423,
-4,26,67,0,72,
-0,65,0,78,0,
-71,0,69,0,68,
+0,1,89,1,1,
+2,0,1,2478,409,
+18,1,2478,410,20,
+411,4,30,84,0,
+79,0,85,0,67,
+0,72,0,95,0,
+69,0,78,0,68,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,61,
+0,84,0,1,90,
 1,1,2,0,1,
-2487,424,18,1,2487,
-425,20,426,4,32,
-79,0,66,0,74,
-0,69,0,67,0,
-84,0,95,0,82,
-0,69,0,90,0,
+2479,412,18,1,2479,
+413,20,414,4,22,
+84,0,79,0,85,
+0,67,0,72,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,80,1,
-1,2,0,1,1931,
-427,18,1,1931,285,
-2,0,1,1932,428,
-18,1,1932,429,20,
-430,4,4,73,0,
-70,0,1,42,1,
-1,2,0,1,262,
-431,18,1,262,187,
-2,0,1,1377,432,
-18,1,1377,187,2,
-0,1,2492,433,18,
-1,2492,434,20,435,
-4,30,78,0,79,
-0,95,0,83,0,
-69,0,78,0,83,
-0,79,0,82,0,
+84,0,1,88,1,
+1,2,0,1,2480,
+415,18,1,2480,416,
+20,417,4,24,83,
+0,69,0,78,0,
+83,0,79,0,82,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,84,
+1,1,2,0,1,
+2481,418,18,1,2481,
+419,20,420,4,52,
+82,0,85,0,78,
+0,95,0,84,0,
+73,0,77,0,69,
+0,95,0,80,0,
+69,0,82,0,77,
+0,73,0,83,0,
+83,0,73,0,79,
+0,78,0,83,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,77,1,
-1,2,0,1,1876,
-436,18,1,1876,135,
-2,0,1,2494,437,
-18,1,2494,438,20,
-439,4,32,77,0,
-79,0,86,0,73,
-0,78,0,71,0,
-95,0,69,0,78,
+84,0,1,83,1,
+1,2,0,1,2482,
+421,18,1,2482,422,
+20,423,4,24,79,
+0,78,0,95,0,
+82,0,69,0,90,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,81,
+1,1,2,0,1,
+2483,424,18,1,2483,
+425,20,426,4,42,
+67,0,79,0,76,
+0,76,0,73,0,
+83,0,73,0,79,
+0,78,0,95,0,
+83,0,84,0,65,
+0,82,0,84,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,64,1,
+1,2,0,1,256,
+427,18,1,256,428,
+20,429,4,14,80,
+0,69,0,82,0,
+67,0,69,0,78,
+0,84,0,1,22,
+1,1,2,0,1,
+1371,430,18,1,1371,
+235,2,0,1,2486,
+431,18,1,2486,432,
+20,433,4,26,67,
+0,72,0,65,0,
+78,0,71,0,69,
 0,68,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,75,1,1,2,
-0,1,2495,440,18,
-1,2495,441,20,442,
-4,32,83,0,84,
-0,65,0,84,0,
-69,0,95,0,69,
-0,88,0,73,0,
-84,0,95,0,69,
+1,61,1,1,2,
+0,1,2487,434,18,
+1,2487,435,20,436,
+4,32,79,0,66,
+0,74,0,69,0,
+67,0,84,0,95,
+0,82,0,69,0,
+90,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-86,1,1,2,0,
-1,1939,443,18,1,
-1939,187,2,0,1,
-2497,444,18,1,2497,
-445,20,446,4,36,
-72,0,84,0,84,
-0,80,0,95,0,
-82,0,69,0,81,
-0,85,0,69,0,
-83,0,84,0,95,
+80,1,1,2,0,
+1,1931,437,18,1,
+1931,288,2,0,1,
+1932,438,18,1,1932,
+439,20,440,4,4,
+73,0,70,0,1,
+42,1,1,2,0,
+1,262,441,18,1,
+262,184,2,0,1,
+1377,442,18,1,1377,
+184,2,0,1,2492,
+443,18,1,2492,444,
+20,445,4,30,78,
+0,79,0,95,0,
+83,0,69,0,78,
+0,83,0,79,0,
+82,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+77,1,1,2,0,
+1,1876,446,18,1,
+1876,135,2,0,1,
+2494,447,18,1,2494,
+448,20,449,4,32,
+77,0,79,0,86,
+0,73,0,78,0,
+71,0,95,0,69,
+0,78,0,68,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,75,1,
+1,2,0,1,2495,
+450,18,1,2495,451,
+20,452,4,32,83,
+0,84,0,65,0,
+84,0,69,0,95,
+0,69,0,88,0,
+73,0,84,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,91,1,1,
-2,0,1,827,447,
-18,1,827,187,2,
-0,1,2499,448,18,
-1,2499,449,20,450,
+0,1,86,1,1,
+2,0,1,1939,453,
+18,1,1939,184,2,
+0,1,2497,454,18,
+1,2497,455,20,456,
+4,48,84,0,82,
+0,65,0,78,0,
+83,0,65,0,67,
+0,84,0,73,0,
+79,0,78,0,95,
+0,82,0,69,0,
+83,0,85,0,76,
+0,84,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,92,1,1,2,
+0,1,827,457,18,
+1,827,184,2,0,
+1,2499,458,18,1,
+2499,459,20,460,4,
+34,82,0,69,0,
+77,0,79,0,84,
+0,69,0,95,0,
+68,0,65,0,84,
+0,65,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,82,1,1,2,
+0,1,2500,461,18,
+1,2500,462,20,463,
 4,22,77,0,79,
 0,78,0,69,0,
 89,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
 74,1,1,2,0,
-1,2500,451,18,1,
-2500,452,20,453,4,
+1,2501,464,18,1,
+2501,465,20,466,4,
 24,76,0,73,0,
 83,0,84,0,69,
 0,78,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
 1,73,1,1,2,
-0,1,2501,454,18,
-1,2501,455,20,456,
+0,1,2502,467,18,
+1,2502,468,20,469,
 4,36,76,0,73,
 0,78,0,75,0,
 95,0,77,0,69,
@@ -3285,8 +3317,8 @@ public yyLSLSyntax
 86,0,69,0,78,
 0,84,0,1,72,
 1,1,2,0,1,
-2502,457,18,1,2502,
-458,20,459,4,38,
+2503,470,18,1,2503,
+471,20,472,4,38,
 72,0,84,0,84,
 0,80,0,95,0,
 82,0,69,0,83,
@@ -3296,293 +3328,266 @@ public yyLSLSyntax
 86,0,69,0,78,
 0,84,0,1,68,
 1,1,2,0,1,
-2503,460,18,1,2503,
-461,20,462,4,22,
+2504,473,18,1,2504,
+474,20,475,4,22,
 69,0,77,0,65,
 0,73,0,76,0,
 95,0,69,0,86,
 0,69,0,78,0,
 84,0,1,67,1,
-1,2,0,1,2504,
-463,18,1,2504,464,
-20,465,4,32,68,
-0,65,0,84,0,
-65,0,83,0,69,
-0,82,0,86,0,
-69,0,82,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,66,1,1,
-2,0,1,277,466,
-18,1,277,467,20,
-468,4,10,83,0,
-76,0,65,0,83,
-0,72,0,1,21,
-1,1,2,0,1,
-2506,469,18,1,2506,
-135,2,0,1,2507,
-470,18,1,2507,117,
-2,0,1,2508,471,
-18,1,2508,132,2,
-0,1,2509,472,18,
-1,2509,473,20,474,
-4,28,75,0,101,
-0,121,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-1,119,1,2,2,
-0,1,2510,475,18,
-1,2510,143,2,0,
-1,283,476,18,1,
-283,187,2,0,1,
-2512,477,18,1,2512,
-132,2,0,1,2513,
-478,18,1,2513,479,
-20,480,4,28,73,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,1,120,1,
-2,2,0,1,2514,
-481,18,1,2514,143,
-2,0,1,1958,482,
-18,1,1958,162,2,
-0,1,2516,483,18,
-1,2516,479,2,0,
-1,2517,484,18,1,
-2517,485,20,486,4,
-64,75,0,101,0,
+1,2,0,1,277,
+476,18,1,277,477,
+20,478,4,10,83,
+0,76,0,65,0,
+83,0,72,0,1,
+21,1,1,2,0,
+1,2506,479,18,1,
+2506,480,20,481,4,
+34,75,0,101,0,
 121,0,73,0,110,
 0,116,0,73,0,
 110,0,116,0,65,
 0,114,0,103,0,
-117,0,109,0,101,
+69,0,118,0,101,
 0,110,0,116,0,
+1,132,1,2,2,
+0,1,2507,482,18,
+1,2507,135,2,0,
+1,2508,483,18,1,
+2508,117,2,0,1,
+2509,484,18,1,2509,
+132,2,0,1,2510,
+485,18,1,2510,486,
+20,487,4,28,75,
+0,101,0,121,0,
 68,0,101,0,99,
 0,108,0,97,0,
 114,0,97,0,116,
 0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-1,117,1,2,2,
-0,1,2518,487,18,
-1,2518,162,2,0,
-1,1406,488,18,1,
-1406,179,2,0,1,
-1407,489,18,1,1407,
-232,2,0,1,2522,
-490,18,1,2522,135,
-2,0,1,2524,491,
-18,1,2524,479,2,
-0,1,2525,492,18,
-1,2525,143,2,0,
-1,2526,493,18,1,
-2526,114,2,0,1,
-299,494,18,1,299,
-495,20,496,4,8,
-83,0,84,0,65,
-0,82,0,1,20,
-1,1,2,0,1,
-1370,497,18,1,1370,
-179,2,0,1,2529,
-498,18,1,2529,143,
-2,0,1,2531,499,
-18,1,2531,308,2,
-0,1,2532,500,18,
-1,2532,501,20,502,
-4,64,73,0,110,
+110,0,1,120,1,
+2,2,0,1,283,
+488,18,1,283,184,
+2,0,1,2512,489,
+18,1,2512,126,2,
+0,1,2513,490,18,
+1,2513,132,2,0,
+1,2514,491,18,1,
+2514,492,20,493,4,
+28,73,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,1,
+121,1,2,2,0,
+1,1958,494,18,1,
+1958,162,2,0,1,
+2517,495,18,1,2517,
+492,2,0,1,2518,
+496,18,1,2518,497,
+20,498,4,64,75,
+0,101,0,121,0,
+73,0,110,0,116,
+0,73,0,110,0,
+116,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,1,118,
+1,2,2,0,1,
+2519,499,18,1,2519,
+162,2,0,1,1406,
+500,18,1,1406,176,
+2,0,1,1407,501,
+18,1,1407,229,2,
+0,1,2522,502,18,
+1,2522,503,20,504,
+4,34,73,0,110,
 0,116,0,86,0,
 101,0,99,0,86,
 0,101,0,99,0,
 65,0,114,0,103,
-0,117,0,109,0,
+0,69,0,118,0,
 101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,1,116,1,2,
-2,0,1,305,503,
-18,1,305,187,2,
-0,1,2535,504,18,
-1,2535,327,2,0,
-1,2458,505,18,1,
-2458,285,2,0,1,
-2459,506,18,1,2459,
-507,20,508,4,22,
-82,0,73,0,71,
-0,72,0,84,0,
-95,0,66,0,82,
-0,65,0,67,0,
-69,0,1,13,1,
-1,2,0,1,2539,
-509,18,1,2539,479,
-2,0,1,2540,510,
-18,1,2540,143,2,
-0,1,2541,511,18,
-1,2541,111,2,0,
-1,2542,512,18,1,
-2542,132,2,0,1,
-2464,513,18,1,2464,
-507,2,0,1,2544,
-514,18,1,2544,143,
-2,0,1,1989,515,
-18,1,1989,285,2,
-0,1,1990,516,18,
-1,1990,517,20,518,
-4,8,69,0,76,
-0,83,0,69,0,
-1,43,1,1,2,
-0,1,2548,519,18,
-1,2548,162,2,0,
-1,2470,520,18,1,
-2470,165,2,0,1,
-322,521,18,1,322,
-253,2,0,1,2551,
-522,18,1,2551,523,
-20,524,4,28,86,
+0,1,131,1,2,
+2,0,1,2523,505,
+18,1,2523,135,2,
+0,1,2525,506,18,
+1,2525,492,2,0,
+1,2526,507,18,1,
+2526,143,2,0,1,
+299,508,18,1,299,
+509,20,510,4,8,
+83,0,84,0,65,
+0,82,0,1,20,
+1,1,2,0,1,
+1370,511,18,1,1370,
+176,2,0,1,2529,
+512,18,1,2529,513,
+20,514,4,28,86,
 0,101,0,99,0,
-116,0,111,0,114,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,1,128,1,
-2,2,0,1,1933,
-525,18,1,1933,135,
-2,0,1,883,526,
-18,1,883,187,2,
-0,1,2555,527,18,
-1,2555,528,20,529,
-4,58,86,0,101,
-0,99,0,116,0,
-111,0,114,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
 68,0,101,0,99,
 0,108,0,97,0,
 114,0,97,0,116,
 0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-1,114,1,2,2,
-0,1,328,530,18,
-1,328,187,2,0,
-1,1443,531,18,1,
-1443,269,2,0,1,
-2558,532,18,1,2558,
-327,2,0,1,2559,
-533,18,1,2559,534,
-20,535,4,22,73,
+110,0,1,122,1,
+2,2,0,1,2530,
+515,18,1,2530,143,
+2,0,1,2532,516,
+18,1,2532,513,2,
+0,1,305,517,18,
+1,305,184,2,0,
+1,2534,518,18,1,
+2534,162,2,0,1,
+2822,519,18,1,2822,
+150,2,0,1,2458,
+520,18,1,2458,288,
+2,0,1,2459,521,
+18,1,2459,212,2,
+0,1,2538,522,18,
+1,2538,135,2,0,
+1,2540,523,18,1,
+2540,492,2,0,1,
+2541,524,18,1,2541,
+143,2,0,1,2542,
+525,18,1,2542,111,
+2,0,1,2464,526,
+18,1,2464,212,2,
+0,1,2544,527,18,
+1,2544,247,2,0,
+1,2545,528,18,1,
+2545,143,2,0,1,
+1989,529,18,1,1989,
+288,2,0,1,1990,
+530,18,1,1990,531,
+20,532,4,8,69,
+0,76,0,83,0,
+69,0,1,43,1,
+1,2,0,1,2548,
+533,18,1,2548,534,
+20,535,4,64,73,
 0,110,0,116,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,127,1,2,
-2,0,1,2560,536,
-18,1,2560,135,2,
-0,1,2562,537,18,
-1,2562,479,2,0,
-1,1449,538,18,1,
-1449,187,2,0,1,
-2485,539,18,1,2485,
-540,20,541,4,30,
-67,0,79,0,76,
-0,76,0,73,0,
-83,0,73,0,79,
-0,78,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,62,1,1,2,
-0,1,2566,542,18,
-1,2566,327,2,0,
-1,2488,543,18,1,
-2488,544,20,545,4,
-24,65,0,84,0,
-84,0,65,0,67,
-0,72,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,60,1,1,2,
-0,1,2489,546,18,
-1,2489,547,20,548,
-4,22,84,0,73,
-0,77,0,69,0,
-82,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-87,1,1,2,0,
-1,2490,549,18,1,
-2490,550,20,551,4,
-38,78,0,79,0,
-84,0,95,0,65,
+82,0,111,0,116,
+0,82,0,111,0,
+116,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,1,116,
+1,2,2,0,1,
+2470,536,18,1,2470,
+165,2,0,1,322,
+537,18,1,322,250,
+2,0,1,2551,538,
+18,1,2551,380,2,
+0,1,1933,539,18,
+1,1933,135,2,0,
+1,2553,540,18,1,
+2553,135,2,0,1,
+883,541,18,1,883,
+184,2,0,1,2555,
+542,18,1,2555,513,
+2,0,1,328,543,
+18,1,328,184,2,
+0,1,1443,544,18,
+1,1443,266,2,0,
+1,2559,545,18,1,
+2559,380,2,0,1,
+2560,546,18,1,2560,
+547,20,548,4,22,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,1,128,1,
+2,2,0,1,2561,
+549,18,1,2561,135,
+2,0,1,1449,550,
+18,1,1449,184,2,
+0,1,2485,551,18,
+1,2485,552,20,553,
+4,30,67,0,79,
+0,76,0,76,0,
+73,0,83,0,73,
+0,79,0,78,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,62,1,
+1,2,0,1,2565,
+554,18,1,2565,162,
+2,0,1,2488,555,
+18,1,2488,556,20,
+557,4,24,65,0,
+84,0,84,0,65,
+0,67,0,72,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,60,1,
+1,2,0,1,2489,
+558,18,1,2489,559,
+20,560,4,22,84,
+0,73,0,77,0,
+69,0,82,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,87,1,1,
+2,0,1,2490,561,
+18,1,2490,562,20,
+563,4,38,78,0,
+79,0,84,0,95,
+0,65,0,84,0,
+95,0,84,0,65,
+0,82,0,71,0,
+69,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,79,1,1,
+2,0,1,2491,564,
+18,1,2491,565,20,
+566,4,46,78,0,
+79,0,84,0,95,
+0,65,0,84,0,
+95,0,82,0,79,
 0,84,0,95,0,
 84,0,65,0,82,
 0,71,0,69,0,
 84,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-79,1,1,2,0,
-1,2491,552,18,1,
-2491,553,20,554,4,
-46,78,0,79,0,
-84,0,95,0,65,
-0,84,0,95,0,
-82,0,79,0,84,
-0,95,0,84,0,
-65,0,82,0,71,
-0,69,0,84,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,78,1,
-1,2,0,1,2571,
-555,18,1,2571,556,
-20,557,4,52,75,
-0,101,0,121,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,1,112,1,2,
-2,0,1,2493,558,
-18,1,2493,559,20,
-560,4,36,77,0,
-79,0,86,0,73,
-0,78,0,71,0,
-95,0,83,0,84,
-0,65,0,82,0,
-84,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-76,1,1,2,0,
-1,1413,561,18,1,
-1413,187,2,0,1,
-346,562,18,1,346,
-563,20,564,4,8,
-80,0,76,0,85,
-0,83,0,1,18,
-1,1,2,0,1,
-2575,565,18,1,2575,
-566,20,567,4,24,
-86,0,111,0,105,
-0,100,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
-125,1,2,2,0,
-1,2496,568,18,1,
-2496,569,20,570,4,
+78,1,1,2,0,
+1,2571,567,18,1,
+2571,486,2,0,1,
+2493,568,18,1,2493,
+569,20,570,4,36,
+77,0,79,0,86,
+0,73,0,78,0,
+71,0,95,0,83,
+0,84,0,65,0,
+82,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,76,1,1,
+2,0,1,1413,571,
+18,1,1413,184,2,
+0,1,346,572,18,
+1,346,573,20,574,
+4,8,80,0,76,
+0,85,0,83,0,
+1,18,1,1,2,
+0,1,2575,575,18,
+1,2575,380,2,0,
+1,2496,576,18,1,
+2496,577,20,578,4,
 34,83,0,84,0,
 65,0,84,0,69,
 0,95,0,69,0,
@@ -3591,420 +3596,253 @@ public yyLSLSyntax
 69,0,86,0,69,
 0,78,0,84,0,
 1,85,1,1,2,
-0,1,2577,571,18,
-1,2577,162,2,0,
-1,2021,572,18,1,
-2021,285,2,0,1,
-2022,573,18,1,2022,
-374,2,0,1,352,
-574,18,1,352,187,
-2,0,1,2024,575,
+0,1,2577,579,18,
+1,2577,135,2,0,
+1,2021,580,18,1,
+2021,288,2,0,1,
+2022,581,18,1,2022,
+384,2,0,1,352,
+582,18,1,352,184,
+2,0,1,2024,583,
 18,1,2024,132,2,
-0,1,2025,576,18,
-1,2025,577,20,578,
+0,1,2025,584,18,
+1,2025,585,20,586,
 4,8,74,0,85,
 0,77,0,80,0,
 1,49,1,1,2,
-0,1,2026,579,18,
+0,1,2026,587,18,
 1,2026,132,2,0,
-1,2027,580,18,1,
-2027,581,20,582,4,
+1,2027,588,18,1,
+2027,589,20,590,4,
 4,65,0,84,0,
 1,23,1,1,2,
-0,1,2028,583,18,
+0,1,2028,591,18,
 1,2028,132,2,0,
-1,2029,584,18,1,
-2029,327,2,0,1,
-2030,585,18,1,2030,
-586,20,587,4,14,
+1,2029,592,18,1,
+2029,380,2,0,1,
+2030,593,18,1,2030,
+594,20,595,4,14,
 70,0,111,0,114,
 0,76,0,111,0,
 111,0,112,0,1,
-145,1,2,2,0,
-1,2031,588,18,1,
-2031,589,20,590,4,
+146,1,2,2,0,
+1,2031,596,18,1,
+2031,597,20,598,4,
 32,68,0,111,0,
 87,0,104,0,105,
 0,108,0,101,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,1,144,
+0,116,0,1,145,
 1,2,2,0,1,
-2032,591,18,1,2032,
-592,20,593,4,28,
+2032,599,18,1,2032,
+600,20,601,4,28,
 87,0,104,0,105,
 0,108,0,101,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,1,143,
+0,116,0,1,144,
 1,2,2,0,1,
-2033,594,18,1,2033,
-595,20,596,4,22,
+2033,602,18,1,2033,
+603,20,604,4,22,
 73,0,102,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,142,1,
+116,0,1,143,1,
 2,2,0,1,2034,
-597,18,1,2034,598,
-20,599,4,22,83,
+605,18,1,2034,606,
+20,607,4,22,83,
 0,116,0,97,0,
 116,0,101,0,67,
 0,104,0,97,0,
 110,0,103,0,101,
-0,1,141,1,2,
-2,0,1,1478,600,
-18,1,1478,179,2,
-0,1,1479,601,18,
-1,1479,305,2,0,
-1,2037,602,18,1,
-2037,146,2,0,1,
-2038,603,18,1,2038,
-604,20,605,4,18,
+0,1,142,1,2,
+2,0,1,1478,608,
+18,1,1478,176,2,
+0,1,1479,609,18,
+1,1479,309,2,0,
+1,2037,610,18,1,
+2037,150,2,0,1,
+2038,611,18,1,2038,
+612,20,613,4,18,
 74,0,117,0,109,
 0,112,0,76,0,
 97,0,98,0,101,
-0,108,0,1,139,
+0,108,0,1,140,
 1,2,2,0,1,
-2039,606,18,1,2039,
-146,2,0,1,2040,
-607,18,1,2040,608,
-20,609,4,30,82,
+2039,614,18,1,2039,
+150,2,0,1,2040,
+615,18,1,2040,616,
+20,617,4,30,82,
 0,101,0,116,0,
 117,0,114,0,110,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
-138,1,2,2,0,
-1,2041,610,18,1,
-2041,146,2,0,1,
-1485,611,18,1,1485,
-187,2,0,1,372,
-612,18,1,372,199,
-2,0,1,373,613,
+139,1,2,2,0,
+1,2041,618,18,1,
+2041,150,2,0,1,
+1485,619,18,1,1485,
+184,2,0,1,372,
+620,18,1,372,196,
+2,0,1,373,621,
 18,1,373,132,2,
-0,1,374,614,18,
-1,374,195,2,0,
-1,375,615,18,1,
+0,1,374,622,18,
+1,374,192,2,0,
+1,375,623,18,1,
 375,132,2,0,1,
-376,616,18,1,376,
-202,2,0,1,377,
-617,18,1,377,132,
-2,0,1,378,618,
-18,1,378,195,2,
-0,1,379,619,18,
+376,624,18,1,376,
+199,2,0,1,377,
+625,18,1,377,132,
+2,0,1,378,626,
+18,1,378,192,2,
+0,1,379,627,18,
 1,379,132,2,0,
-1,380,620,18,1,
-380,621,20,622,4,
+1,380,628,18,1,
+380,629,20,630,4,
 16,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
-116,0,1,151,1,
+116,0,1,152,1,
 2,2,0,1,381,
-623,18,1,381,323,
-2,0,1,371,624,
-18,1,371,625,20,
-626,4,24,70,0,
+631,18,1,381,328,
+2,0,1,371,632,
+18,1,371,633,20,
+634,4,24,70,0,
 117,0,110,0,99,
 0,116,0,105,0,
 111,0,110,0,67,
 0,97,0,108,0,
-108,0,1,147,1,
+108,0,1,148,1,
 2,2,0,1,942,
-627,18,1,942,187,
-2,0,1,2533,628,
-18,1,2533,162,2,
-0,1,387,629,18,
-1,387,187,2,0,
-1,2536,630,18,1,
-2536,631,20,632,4,
-34,73,0,110,0,
-116,0,82,0,111,
-0,116,0,82,0,
-111,0,116,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,129,1,2,2,
-0,1,2537,633,18,
-1,2537,135,2,0,
-1,2543,634,18,1,
-2543,635,20,636,4,
-28,82,0,111,0,
+635,18,1,942,184,
+2,0,1,2533,636,
+18,1,2533,637,20,
+638,4,64,73,0,
+110,0,116,0,86,
+0,101,0,99,0,
+86,0,101,0,99,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
 116,0,68,0,101,
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
-111,0,110,0,1,
-122,1,2,2,0,
-1,2546,637,18,1,
-2546,635,2,0,1,
-1514,638,18,1,1514,
-179,2,0,1,1515,
-639,18,1,1515,333,
-2,0,1,2074,640,
-18,1,2074,179,2,
-0,1,2075,641,18,
-1,2075,162,2,0,
-1,2552,642,18,1,
-2552,135,2,0,1,
-406,643,18,1,406,
-143,2,0,1,1521,
-644,18,1,1521,187,
-2,0,1,2556,645,
-18,1,2556,162,2,
-0,1,2639,646,18,
-1,2639,647,20,648,
-4,44,75,0,101,
-0,121,0,73,0,
-110,0,116,0,73,
-0,110,0,116,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,1,117,1,
+2,2,0,1,387,
+639,18,1,387,184,
+2,0,1,2536,640,
+18,1,2536,380,2,
+0,1,2537,641,18,
+1,2537,642,20,643,
+4,34,73,0,110,
+0,116,0,82,0,
+111,0,116,0,82,
+0,111,0,116,0,
 65,0,114,0,103,
-0,83,0,116,0,
-97,0,116,0,101,
 0,69,0,118,0,
 101,0,110,0,116,
-0,1,110,1,2,
-2,0,1,412,649,
-18,1,412,187,2,
-0,1,2641,650,18,
-1,2641,168,2,0,
-1,2484,651,18,1,
-2484,652,20,653,4,
-38,67,0,79,0,
-76,0,76,0,73,
-0,83,0,73,0,
-79,0,78,0,95,
-0,69,0,78,0,
-68,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-63,1,1,2,0,
-1,2643,654,18,1,
-2643,174,2,0,1,
-2644,655,18,1,2644,
-656,20,657,4,32,
-75,0,101,0,121,
+0,1,130,1,2,
+2,0,1,2543,644,
+18,1,2543,132,2,
+0,1,2823,645,18,
+1,2823,646,20,647,
+4,34,71,0,108,
+0,111,0,98,0,
+97,0,108,0,68,
+0,101,0,102,0,
+105,0,110,0,105,
+0,116,0,105,0,
+111,0,110,0,115,
+0,1,98,1,2,
+2,0,1,1514,648,
+18,1,1514,176,2,
+0,1,1515,649,18,
+1,1515,335,2,0,
+1,2549,650,18,1,
+2549,162,2,0,1,
+2074,651,18,1,2074,
+176,2,0,1,2075,
+652,18,1,2075,162,
+2,0,1,2552,653,
+18,1,2552,654,20,
+655,4,28,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,129,1,2,
+2,0,1,406,656,
+18,1,406,143,2,
+0,1,1521,657,18,
+1,1521,184,2,0,
+1,2556,658,18,1,
+2556,659,20,660,4,
+58,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,1,
+115,1,2,2,0,
+1,2557,661,18,1,
+2557,162,2,0,1,
+412,662,18,1,412,
+184,2,0,1,2641,
+663,18,1,2641,168,
+2,0,1,2484,664,
+18,1,2484,665,20,
+666,4,38,67,0,
+79,0,76,0,76,
+0,73,0,83,0,
+73,0,79,0,78,
+0,95,0,69,0,
+78,0,68,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,63,1,1,
+2,0,1,2643,667,
+18,1,2643,668,20,
+669,4,44,73,0,
+110,0,116,0,82,
+0,111,0,116,0,
+82,0,111,0,116,
 0,65,0,114,0,
 103,0,83,0,116,
 0,97,0,116,0,
 101,0,69,0,118,
 0,101,0,110,0,
-116,0,1,105,1,
-2,2,0,1,2023,
-658,18,1,2023,659,
-20,660,4,26,68,
-0,69,0,70,0,
-65,0,85,0,76,
-0,84,0,95,0,
-83,0,84,0,65,
-0,84,0,69,0,
-1,47,1,1,2,
-0,1,2564,661,18,
-1,2564,162,2,0,
-1,2647,662,18,1,
-2647,507,2,0,1,
-2648,663,18,1,2648,
-647,2,0,1,2567,
-664,18,1,2567,665,
-20,666,4,22,75,
-0,101,0,121,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,126,1,2,
-2,0,1,1442,667,
-18,1,1442,179,2,
-0,1,2651,668,18,
-1,2651,669,20,670,
-4,38,86,0,101,
-0,99,0,116,0,
-111,0,114,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,107,1,2,2,
-0,1,2570,671,18,
-1,2570,473,2,0,
-1,2653,672,18,1,
-2653,656,2,0,1,
-2572,673,18,1,2572,
-162,2,0,1,2655,
-674,18,1,2655,156,
-2,0,1,2574,675,
-18,1,2574,327,2,
-0,1,2035,676,18,
-1,2035,146,2,0,
-1,2036,677,18,1,
-2036,678,20,679,4,
-26,74,0,117,0,
-109,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,140,1,
-2,2,0,1,431,
-680,18,1,431,143,
-2,0,1,2579,681,
-18,1,2579,327,2,
-0,1,2105,682,18,
-1,2105,285,2,0,
-1,2106,683,18,1,
-2106,517,2,0,1,
-1550,684,18,1,1550,
-179,2,0,1,437,
-685,18,1,437,187,
-2,0,1,2044,686,
-18,1,2044,687,20,
-688,4,28,69,0,
-109,0,112,0,116,
-0,121,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,135,1,2,
-2,0,1,2045,689,
-18,1,2045,146,2,
-0,1,1555,690,18,
-1,1555,187,2,0,
-1,2511,691,18,1,
-2511,126,2,0,1,
-1001,692,18,1,1001,
-625,2,0,1,1002,
-693,18,1,1002,621,
-2,0,1,447,694,
-18,1,447,342,2,
-0,1,2594,695,18,
-1,2594,327,2,0,
-1,2596,696,18,1,
-2596,697,20,698,4,
-18,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,1,
-102,1,2,2,0,
-1,2520,699,18,1,
-2520,327,2,0,1,
-1010,700,18,1,1010,
-179,2,0,1,1011,
-701,18,1,1011,162,
-2,0,1,1012,702,
-18,1,1012,187,2,
-0,1,1013,703,18,
-1,1013,162,2,0,
-1,459,704,18,1,
-459,705,20,706,4,
-24,76,0,69,0,
-70,0,84,0,95,
-0,66,0,82,0,
-65,0,67,0,75,
-0,69,0,84,0,
-1,27,1,1,2,
-0,1,1574,707,18,
-1,1574,146,2,0,
-1,461,708,18,1,
-461,709,20,710,4,
-24,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-1,148,1,2,2,
-0,1,462,711,18,
-1,462,143,2,0,
-1,464,712,18,1,
-464,713,20,714,4,
-16,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,1,149,1,
-2,2,0,1,2136,
-715,18,1,2136,285,
-2,0,1,1585,716,
-18,1,1585,717,20,
-718,4,12,82,0,
-69,0,84,0,85,
-0,82,0,78,0,
-1,50,1,1,2,
-0,1,2700,719,18,
-1,2700,697,2,0,
-1,476,720,18,1,
-476,721,20,722,4,
-30,83,0,84,0,
-82,0,73,0,78,
-0,71,0,95,0,
-67,0,79,0,78,
-0,83,0,84,0,
-65,0,78,0,84,
-0,1,3,1,1,
-2,0,1,477,723,
-18,1,477,724,20,
-725,4,28,70,0,
-76,0,79,0,65,
-0,84,0,95,0,
-67,0,79,0,78,
-0,83,0,84,0,
-65,0,78,0,84,
-0,1,95,1,1,
-2,0,1,478,726,
-18,1,478,727,20,
-728,4,40,72,0,
-69,0,88,0,95,
-0,73,0,78,0,
-84,0,69,0,71,
-0,69,0,82,0,
-95,0,67,0,79,
-0,78,0,83,0,
-84,0,65,0,78,
-0,84,0,1,94,
-1,1,2,0,1,
-479,729,18,1,479,
-730,20,731,4,32,
-73,0,78,0,84,
-0,69,0,71,0,
-69,0,82,0,95,
-0,67,0,79,0,
-78,0,83,0,84,
-0,65,0,78,0,
-84,0,1,93,1,
-1,2,0,1,480,
-732,18,1,480,733,
-20,734,4,26,82,
-0,73,0,71,0,
-72,0,84,0,95,
-0,66,0,82,0,
-65,0,67,0,75,
-0,69,0,84,0,
-1,28,1,1,2,
-0,1,481,735,18,
-1,481,713,2,0,
-1,2550,736,18,1,
-2550,327,2,0,1,
-2554,737,18,1,2554,
-308,2,0,1,1048,
-738,18,1,1048,187,
-2,0,1,2640,739,
-18,1,2640,740,20,
-741,4,44,73,0,
-110,0,116,0,86,
+116,0,1,109,1,
+2,2,0,1,2644,
+670,18,1,2644,671,
+20,672,4,38,86,
 0,101,0,99,0,
-86,0,101,0,99,
+116,0,111,0,114,
 0,65,0,114,0,
 103,0,83,0,116,
 0,97,0,116,0,
 101,0,69,0,118,
 0,101,0,110,0,
-116,0,1,109,1,
-2,2,0,1,2642,
-742,18,1,2642,669,
-2,0,1,2563,743,
-18,1,2563,744,20,
-745,4,52,73,0,
+116,0,1,108,1,
+2,2,0,1,2023,
+673,18,1,2023,282,
+2,0,1,2564,674,
+18,1,2564,675,20,
+676,4,52,73,0,
 110,0,116,0,65,
 0,114,0,103,0,
 117,0,109,0,101,
@@ -4015,159 +3853,351 @@ public yyLSLSyntax
 0,105,0,111,0,
 110,0,76,0,105,
 0,115,0,116,0,
-1,113,1,2,2,
-0,1,2042,746,18,
-1,2042,747,20,748,
-4,20,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,1,136,1,
-2,2,0,1,2043,
-749,18,1,2043,146,
-2,0,1,2568,750,
-18,1,2568,135,2,
-0,1,2649,751,18,
-1,2649,740,2,0,
-1,1620,752,18,1,
-1620,179,2,0,1,
-1621,753,18,1,1621,
-159,2,0,1,1622,
-754,18,1,1622,333,
-2,0,1,509,755,
-18,1,509,143,2,
-0,1,2498,756,18,
-1,2498,757,20,758,
-4,34,82,0,69,
-0,77,0,79,0,
-84,0,69,0,95,
-0,68,0,65,0,
-84,0,65,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,82,1,1,
-2,0,1,2576,759,
-18,1,2576,135,2,
-0,1,2656,760,18,
-1,2656,659,2,0,
-1,1628,761,18,1,
-1628,187,2,0,1,
-515,762,18,1,515,
-187,2,0,1,2580,
-763,18,1,2580,764,
-20,765,4,10,69,
-0,118,0,101,0,
-110,0,116,0,1,
-124,1,2,2,0,
-1,2505,766,18,1,
-2505,767,20,768,4,
-34,75,0,101,0,
-121,0,73,0,110,
-0,116,0,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,131,1,2,2,
-0,1,2751,769,18,
-1,2751,507,2,0,
-1,525,770,18,1,
-525,342,2,0,1,
-2197,771,18,1,2197,
-179,2,0,1,2198,
-772,18,1,2198,162,
-2,0,1,1591,773,
-18,1,1591,187,2,
-0,1,2592,774,18,
-1,2592,162,2,0,
-1,2760,775,18,1,
-2760,291,2,0,1,
-2521,776,18,1,2521,
-777,20,778,4,34,
-73,0,110,0,116,
-0,86,0,101,0,
-99,0,86,0,101,
-0,99,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
-130,1,2,2,0,
-1,2763,779,18,1,
-2763,780,20,781,4,
-10,83,0,116,0,
+1,114,1,2,2,
+0,1,2647,677,18,
+1,2647,678,20,679,
+4,34,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,83,0,116,0,
 97,0,116,0,101,
-0,1,101,1,2,
-2,0,1,2764,782,
-18,1,2764,780,2,
-0,1,1094,783,18,
-1,1094,709,2,0,
-1,2766,784,18,1,
-2766,135,2,0,1,
-1096,785,18,1,1096,
-162,2,0,1,1657,
-786,18,1,1657,146,
-2,0,1,1658,787,
-18,1,1658,788,20,
-789,4,6,70,0,
-79,0,82,0,1,
-46,1,1,2,0,
-1,1659,790,18,1,
-1659,135,2,0,1,
-2775,791,18,1,2775,
-140,2,0,1,2777,
-792,18,1,2777,162,
-2,0,1,1665,793,
-18,1,1665,187,2,
-0,1,2781,794,18,
-1,2781,159,2,0,
-1,2782,795,18,1,
-2782,333,2,0,1,
-1113,796,18,1,1113,
-195,2,0,797,5,
-0,798,5,379,1,
-2,799,19,216,1,
-2,800,5,6,1,
-2764,801,17,802,15,
-803,4,14,37,0,
-83,0,116,0,97,
-0,116,0,101,0,
-115,0,1,-1,1,
-5,804,20,805,4,
-16,83,0,116,0,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,105,1,2,
+2,0,1,2648,680,
+18,1,2648,279,2,
+0,1,2567,681,18,
+1,2567,380,2,0,
+1,1442,682,18,1,
+1442,176,2,0,1,
+2569,683,18,1,2569,
+135,2,0,1,2652,
+684,18,1,2652,668,
+2,0,1,2653,685,
+18,1,2653,671,2,
+0,1,2572,686,18,
+1,2572,687,20,688,
+4,52,75,0,101,
+0,121,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,1,
+113,1,2,2,0,
+1,2573,689,18,1,
+2573,162,2,0,1,
+2656,690,18,1,2656,
+678,2,0,1,2035,
+691,18,1,2035,150,
+2,0,1,2036,692,
+18,1,2036,693,20,
+694,4,26,74,0,
+117,0,109,0,112,
+0,83,0,116,0,
 97,0,116,0,101,
-0,115,0,95,0,
-49,0,1,176,1,
-3,1,2,1,1,
-806,22,1,11,1,
-2751,807,17,808,15,
-809,4,12,37,0,
+0,109,0,101,0,
+110,0,116,0,1,
+141,1,2,2,0,
+1,431,695,18,1,
+431,143,2,0,1,
+2578,696,18,1,2578,
+162,2,0,1,2105,
+697,18,1,2105,288,
+2,0,1,2106,698,
+18,1,2106,531,2,
+0,1,1550,699,18,
+1,1550,176,2,0,
+1,437,700,18,1,
+437,184,2,0,1,
+2044,701,18,1,2044,
+702,20,703,4,28,
+69,0,109,0,112,
+0,116,0,121,0,
 83,0,116,0,97,
 0,116,0,101,0,
-1,-1,1,5,810,
-20,811,4,14,83,
-0,116,0,97,0,
-116,0,101,0,95,
-0,49,0,1,178,
-1,3,1,5,1,
-4,812,22,1,13,
-1,2763,813,17,814,
-15,803,1,-1,1,
-5,815,20,816,4,
-16,83,0,116,0,
-97,0,116,0,101,
-0,115,0,95,0,
-50,0,1,177,1,
-3,1,3,1,2,
-817,22,1,12,1,
-2830,818,17,819,15,
-820,4,30,37,0,
+109,0,101,0,110,
+0,116,0,1,136,
+1,2,2,0,1,
+2045,704,18,1,2045,
+150,2,0,1,1555,
+705,18,1,1555,184,
+2,0,1,2511,706,
+18,1,2511,143,2,
+0,1,1001,707,18,
+1,1001,633,2,0,
+1,1002,708,18,1,
+1002,629,2,0,1,
+447,709,18,1,447,
+347,2,0,1,2593,
+710,18,1,2593,162,
+2,0,1,2595,711,
+18,1,2595,380,2,
+0,1,2597,712,18,
+1,2597,713,20,714,
+4,18,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+1,103,1,2,2,
+0,1,1010,715,18,
+1,1010,176,2,0,
+1,1011,716,18,1,
+1011,162,2,0,1,
+1012,717,18,1,1012,
+184,2,0,1,1013,
+718,18,1,1013,162,
+2,0,1,459,719,
+18,1,459,720,20,
+721,4,24,76,0,
+69,0,70,0,84,
+0,95,0,66,0,
+82,0,65,0,67,
+0,75,0,69,0,
+84,0,1,27,1,
+1,2,0,1,1574,
+722,18,1,1574,150,
+2,0,1,461,723,
+18,1,461,724,20,
+725,4,24,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,76,
+0,105,0,115,0,
+116,0,1,149,1,
+2,2,0,1,462,
+726,18,1,462,143,
+2,0,1,464,727,
+18,1,464,728,20,
+729,4,16,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,1,
+150,1,2,2,0,
+1,2136,730,18,1,
+2136,288,2,0,1,
+1585,731,18,1,1585,
+732,20,733,4,12,
+82,0,69,0,84,
+0,85,0,82,0,
+78,0,1,50,1,
+1,2,0,1,2703,
+734,18,1,2703,713,
+2,0,1,476,735,
+18,1,476,736,20,
+737,4,30,83,0,
+84,0,82,0,73,
+0,78,0,71,0,
+95,0,67,0,79,
+0,78,0,83,0,
+84,0,65,0,78,
+0,84,0,1,3,
+1,1,2,0,1,
+477,738,18,1,477,
+739,20,740,4,28,
+70,0,76,0,79,
+0,65,0,84,0,
+95,0,67,0,79,
+0,78,0,83,0,
+84,0,65,0,78,
+0,84,0,1,96,
+1,1,2,0,1,
+478,741,18,1,478,
+742,20,743,4,40,
+72,0,69,0,88,
+0,95,0,73,0,
+78,0,84,0,69,
+0,71,0,69,0,
+82,0,95,0,67,
+0,79,0,78,0,
+83,0,84,0,65,
+0,78,0,84,0,
+1,95,1,1,2,
+0,1,479,744,18,
+1,479,745,20,746,
+4,32,73,0,78,
+0,84,0,69,0,
+71,0,69,0,82,
+0,95,0,67,0,
+79,0,78,0,83,
+0,84,0,65,0,
+78,0,84,0,1,
+94,1,1,2,0,
+1,480,747,18,1,
+480,748,20,749,4,
+26,82,0,73,0,
+71,0,72,0,84,
+0,95,0,66,0,
+82,0,65,0,67,
+0,75,0,69,0,
+84,0,1,28,1,
+1,2,0,1,481,
+750,18,1,481,728,
+2,0,1,1048,751,
+18,1,1048,184,2,
+0,1,2642,752,18,
+1,2642,171,2,0,
+1,2563,753,18,1,
+2563,492,2,0,1,
+2042,754,18,1,2042,
+755,20,756,4,20,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+1,137,1,2,2,
+0,1,2043,757,18,
+1,2043,150,2,0,
+1,2568,758,18,1,
+2568,759,20,760,4,
+22,75,0,101,0,
+121,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,1,127,
+1,2,2,0,1,
+2649,761,18,1,2649,
+212,2,0,1,1620,
+762,18,1,1620,176,
+2,0,1,1621,763,
+18,1,1621,159,2,
+0,1,1622,764,18,
+1,1622,335,2,0,
+1,509,765,18,1,
+509,143,2,0,1,
+2498,766,18,1,2498,
+767,20,768,4,36,
+72,0,84,0,84,
+0,80,0,95,0,
+82,0,69,0,81,
+0,85,0,69,0,
+83,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,91,1,1,
+2,0,1,2655,769,
+18,1,2655,156,2,
+0,1,2576,770,18,
+1,2576,771,20,772,
+4,24,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,126,1,2,
+2,0,1,1628,773,
+18,1,1628,184,2,
+0,1,515,774,18,
+1,515,184,2,0,
+1,2580,775,18,1,
+2580,380,2,0,1,
+2505,776,18,1,2505,
+777,20,778,4,32,
+68,0,65,0,84,
+0,65,0,83,0,
+69,0,82,0,86,
+0,69,0,82,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,66,1,
+1,2,0,1,2582,
+779,18,1,2582,135,
+2,0,1,525,780,
+18,1,525,347,2,
+0,1,2197,781,18,
+1,2197,176,2,0,
+1,2198,782,18,1,
+2198,162,2,0,1,
+1591,783,18,1,1591,
+184,2,0,1,2521,
+784,18,1,2521,380,
+2,0,1,2764,785,
+18,1,2764,300,2,
+0,1,1094,786,18,
+1,1094,724,2,0,
+1,1096,787,18,1,
+1096,162,2,0,1,
+2768,788,18,1,2768,
+319,2,0,1,2769,
+789,18,1,2769,132,
+2,0,1,2770,790,
+18,1,2770,135,2,
+0,1,1657,791,18,
+1,1657,150,2,0,
+1,1658,792,18,1,
+1658,793,20,794,4,
+6,70,0,79,0,
+82,0,1,46,1,
+1,2,0,1,1659,
+795,18,1,1659,135,
+2,0,1,1665,796,
+18,1,1665,184,2,
+0,1,2781,797,18,
+1,2781,162,2,0,
+1,2783,798,18,1,
+2783,380,2,0,1,
+1113,799,18,1,1113,
+192,2,0,800,5,
+0,801,5,381,1,
+2,802,19,371,1,
+2,803,5,6,1,
+2764,804,17,805,15,
+806,4,30,37,0,
 76,0,83,0,76,
 0,80,0,114,0,
 111,0,103,0,114,
 0,97,0,109,0,
 82,0,111,0,111,
 0,116,0,1,-1,
-1,5,821,20,822,
+1,5,807,20,808,
+4,32,76,0,83,
+0,76,0,80,0,
+114,0,111,0,103,
+0,114,0,97,0,
+109,0,82,0,111,
+0,111,0,116,0,
+95,0,50,0,1,
+168,1,3,1,2,
+1,1,809,22,1,
+2,1,2768,810,17,
+811,15,812,4,14,
+37,0,83,0,116,
+0,97,0,116,0,
+101,0,115,0,1,
+-1,1,5,813,20,
+814,4,16,83,0,
+116,0,97,0,116,
+0,101,0,115,0,
+95,0,49,0,1,
+177,1,3,1,2,
+1,1,815,22,1,
+11,1,2755,816,17,
+817,15,818,4,12,
+37,0,83,0,116,
+0,97,0,116,0,
+101,0,1,-1,1,
+5,819,20,820,4,
+14,83,0,116,0,
+97,0,116,0,101,
+0,95,0,49,0,
+1,179,1,3,1,
+5,1,4,821,22,
+1,13,1,2767,822,
+17,823,15,812,1,
+-1,1,5,824,20,
+825,4,16,83,0,
+116,0,97,0,116,
+0,101,0,115,0,
+95,0,50,0,1,
+178,1,3,1,3,
+1,2,826,22,1,
+12,1,2834,827,17,
+828,15,806,1,-1,
+1,5,829,20,830,
 4,32,76,0,83,
 0,76,0,80,0,
 114,0,111,0,103,
@@ -4175,233 +4205,221 @@ public yyLSLSyntax
 109,0,82,0,111,
 0,111,0,116,0,
 95,0,49,0,1,
-166,1,3,1,3,
-1,2,823,22,1,
-1,1,2647,824,17,
-825,15,809,1,-1,
-1,5,826,20,827,
+167,1,3,1,3,
+1,2,831,22,1,
+1,1,2649,832,17,
+833,15,818,1,-1,
+1,5,834,20,835,
 4,14,83,0,116,
 0,97,0,116,0,
 101,0,95,0,50,
-0,1,179,1,3,
-1,6,1,5,828,
-22,1,14,1,2760,
-829,17,830,15,820,
-1,-1,1,5,831,
-20,832,4,32,76,
-0,83,0,76,0,
-80,0,114,0,111,
-0,103,0,114,0,
-97,0,109,0,82,
-0,111,0,111,0,
-116,0,95,0,50,
-0,1,167,1,3,
-1,2,1,1,833,
-22,1,2,1,3,
-834,19,722,1,3,
-835,5,95,1,256,
-836,16,0,720,1,
-1261,837,16,0,720,
-1,509,838,16,0,
-720,1,1515,839,16,
-0,720,1,2021,840,
-17,841,15,842,4,
+0,1,180,1,3,
+1,6,1,5,836,
+22,1,14,1,3,
+837,19,737,1,3,
+838,5,95,1,256,
+839,16,0,735,1,
+1261,840,16,0,735,
+1,509,841,16,0,
+735,1,1515,842,16,
+0,735,1,2021,843,
+17,844,15,845,4,
 24,37,0,73,0,
 102,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,843,
-20,844,4,26,73,
+1,-1,1,5,846,
+20,847,4,26,73,
 0,102,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-1,240,1,3,1,
-8,1,7,845,22,
-1,76,1,1775,846,
-16,0,720,1,2029,
-847,17,848,15,849,
+1,241,1,3,1,
+8,1,7,848,22,
+1,76,1,1775,849,
+16,0,735,1,2029,
+850,17,851,15,852,
 4,20,37,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,1,-1,1,
-5,850,20,851,4,
+5,853,20,854,4,
 24,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
 0,49,0,51,0,
-1,234,1,3,1,
-2,1,1,852,22,
-1,70,1,2030,853,
-17,854,15,849,1,
--1,1,5,855,20,
-856,4,24,83,0,
+1,235,1,3,1,
+2,1,1,855,22,
+1,70,1,2030,856,
+17,857,15,852,1,
+-1,1,5,858,20,
+859,4,24,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-50,0,1,233,1,
+50,0,1,234,1,
 3,1,2,1,1,
-857,22,1,69,1,
-2031,858,17,859,15,
-849,1,-1,1,5,
-860,20,861,4,24,
+860,22,1,69,1,
+2031,861,17,862,15,
+852,1,-1,1,5,
+863,20,864,4,24,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
 49,0,49,0,1,
-232,1,3,1,2,
-1,1,862,22,1,
-68,1,2032,863,17,
-864,15,849,1,-1,
-1,5,865,20,866,
+233,1,3,1,2,
+1,1,865,22,1,
+68,1,2032,866,17,
+867,15,852,1,-1,
+1,5,868,20,869,
 4,24,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,48,
-0,1,231,1,3,
-1,2,1,1,867,
+0,1,232,1,3,
+1,2,1,1,870,
 22,1,67,1,2033,
-868,17,869,15,849,
-1,-1,1,5,870,
-20,871,4,22,83,
+871,17,872,15,852,
+1,-1,1,5,873,
+20,874,4,22,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,57,
-0,1,230,1,3,
-1,2,1,1,872,
+0,1,231,1,3,
+1,2,1,1,875,
 22,1,66,1,277,
-873,16,0,720,1,
-2035,874,17,875,15,
-849,1,-1,1,5,
-876,20,877,4,22,
+876,16,0,735,1,
+2035,877,17,878,15,
+852,1,-1,1,5,
+879,20,880,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-56,0,1,229,1,
+56,0,1,230,1,
 3,1,3,1,2,
-878,22,1,65,1,
-2037,879,17,880,15,
-849,1,-1,1,5,
-881,20,882,4,22,
+881,22,1,65,1,
+2037,882,17,883,15,
+852,1,-1,1,5,
+884,20,885,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-55,0,1,228,1,
+55,0,1,229,1,
 3,1,3,1,2,
-883,22,1,64,1,
-2039,884,17,885,15,
-849,1,-1,1,5,
-886,20,887,4,22,
+886,22,1,64,1,
+2039,887,17,888,15,
+852,1,-1,1,5,
+889,20,890,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-54,0,1,227,1,
+54,0,1,228,1,
 3,1,3,1,2,
-888,22,1,63,1,
-32,889,16,0,720,
-1,2041,890,17,891,
-15,849,1,-1,1,
-5,892,20,893,4,
+891,22,1,63,1,
+32,892,16,0,735,
+1,2041,893,17,894,
+15,852,1,-1,1,
+5,895,20,896,4,
 22,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,53,0,1,226,
+0,53,0,1,227,
 1,3,1,3,1,
-2,894,22,1,62,
-1,2293,895,16,0,
-720,1,2043,896,17,
-897,15,849,1,-1,
-1,5,898,20,899,
+2,897,22,1,62,
+1,2293,898,16,0,
+735,1,2043,899,17,
+900,15,852,1,-1,
+1,5,901,20,902,
 4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,51,0,1,
-224,1,3,1,3,
-1,2,900,22,1,
-60,1,2045,901,17,
-902,15,849,1,-1,
-1,5,903,20,904,
+225,1,3,1,3,
+1,2,903,22,1,
+60,1,2045,904,17,
+905,15,852,1,-1,
+1,5,906,20,907,
 4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-222,1,3,1,3,
-1,2,905,22,1,
-58,1,41,906,16,
-0,720,1,1297,907,
-16,0,720,1,43,
-908,16,0,720,1,
-1803,909,17,910,15,
-911,4,16,37,0,
+223,1,3,1,3,
+1,2,908,22,1,
+58,1,41,909,16,
+0,735,1,1297,910,
+16,0,735,1,43,
+911,16,0,735,1,
+1803,912,17,913,15,
+914,4,16,37,0,
 70,0,111,0,114,
 0,76,0,111,0,
 111,0,112,0,1,
--1,1,5,912,20,
-913,4,18,70,0,
+-1,1,5,915,20,
+916,4,18,70,0,
 111,0,114,0,76,
 0,111,0,111,0,
 112,0,95,0,49,
-0,1,247,1,3,
-1,10,1,9,914,
+0,1,248,1,3,
+1,10,1,9,917,
 22,1,83,1,1804,
-915,16,0,720,1,
-299,916,16,0,720,
-1,52,917,16,0,
-720,1,2318,918,16,
-0,720,1,62,919,
-16,0,720,1,2075,
-920,16,0,720,1,
-1574,921,17,922,15,
-849,1,-1,1,5,
-923,20,924,4,22,
+918,16,0,735,1,
+299,919,16,0,735,
+1,52,920,16,0,
+735,1,2318,921,16,
+0,735,1,62,922,
+16,0,735,1,2075,
+923,16,0,735,1,
+1574,924,17,925,15,
+852,1,-1,1,5,
+926,20,927,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-52,0,1,225,1,
+52,0,1,226,1,
 3,1,3,1,2,
-925,22,1,61,1,
-71,926,16,0,720,
-1,76,927,16,0,
-720,1,1834,928,16,
-0,720,1,2337,929,
-16,0,720,1,79,
-930,16,0,720,1,
-1335,931,16,0,720,
-1,322,932,16,0,
-720,1,85,933,16,
-0,720,1,89,934,
-16,0,720,1,346,
-935,16,0,720,1,
-2105,936,17,937,15,
-842,1,-1,1,5,
-938,20,939,4,26,
+928,22,1,61,1,
+71,929,16,0,735,
+1,76,930,16,0,
+735,1,1834,931,16,
+0,735,1,2337,932,
+16,0,735,1,79,
+933,16,0,735,1,
+1335,934,16,0,735,
+1,322,935,16,0,
+735,1,85,936,16,
+0,735,1,89,937,
+16,0,735,1,346,
+938,16,0,735,1,
+2105,939,17,940,15,
+845,1,-1,1,5,
+941,20,942,4,26,
 73,0,102,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,51,
-0,1,241,1,3,
-1,6,1,5,940,
+0,1,242,1,3,
+1,6,1,5,943,
 22,1,77,1,2106,
-941,16,0,720,1,
-97,942,16,0,720,
-1,1860,943,17,944,
-15,945,4,34,37,
+944,16,0,735,1,
+97,945,16,0,735,
+1,1860,946,17,947,
+15,948,4,34,37,
 0,68,0,111,0,
 87,0,104,0,105,
 0,108,0,101,0,
@@ -4409,7 +4427,7 @@ public yyLSLSyntax
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,1,-1,
-1,5,946,20,947,
+1,5,949,20,950,
 4,36,68,0,111,
 0,87,0,104,0,
 105,0,108,0,101,
@@ -4417,26 +4435,26 @@ public yyLSLSyntax
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,245,
+0,49,0,1,246,
 1,3,1,8,1,
-7,948,22,1,81,
-1,2364,949,17,950,
-15,911,1,-1,1,
-5,951,20,952,4,
+7,951,22,1,81,
+1,2364,952,17,953,
+15,914,1,-1,1,
+5,954,20,955,4,
 18,70,0,111,0,
 114,0,76,0,111,
 0,111,0,112,0,
 95,0,50,0,1,
-248,1,3,1,9,
-1,8,953,22,1,
-84,1,102,954,16,
-0,720,1,2782,955,
-16,0,720,1,112,
-956,16,0,720,1,
-1117,957,16,0,720,
-1,1873,958,17,959,
-15,945,1,-1,1,
-5,960,20,961,4,
+249,1,3,1,9,
+1,8,956,22,1,
+84,1,102,957,16,
+0,735,1,112,958,
+16,0,735,1,1117,
+959,16,0,735,1,
+2786,960,16,0,735,
+1,1873,961,17,962,
+15,948,1,-1,1,
+5,963,20,964,4,
 36,68,0,111,0,
 87,0,104,0,105,
 0,108,0,101,0,
@@ -4444,39 +4462,39 @@ public yyLSLSyntax
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-50,0,1,246,1,
+50,0,1,247,1,
 3,1,8,1,7,
-962,22,1,82,1,
-1876,963,16,0,720,
-1,124,964,16,0,
-720,1,2136,965,17,
-966,15,842,1,-1,
-1,5,967,20,968,
+965,22,1,82,1,
+1876,966,16,0,735,
+1,124,967,16,0,
+735,1,2136,968,17,
+969,15,845,1,-1,
+1,5,970,20,971,
 4,26,73,0,102,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,52,0,1,242,
+0,52,0,1,243,
 1,3,1,8,1,
-7,969,22,1,78,
-1,381,970,16,0,
-720,1,525,971,16,
-0,720,1,137,972,
-16,0,720,1,1901,
-973,16,0,720,1,
-1153,974,16,0,720,
-1,151,975,16,0,
-720,1,1407,976,16,
-0,720,1,1659,977,
-16,0,720,1,2413,
-978,16,0,720,1,
-406,979,16,0,720,
-1,1371,980,16,0,
-720,1,166,981,16,
-0,720,1,1622,982,
-16,0,720,1,1931,
-983,17,984,15,985,
+7,972,22,1,78,
+1,381,973,16,0,
+735,1,525,974,16,
+0,735,1,137,975,
+16,0,735,1,1901,
+976,16,0,735,1,
+1153,977,16,0,735,
+1,151,978,16,0,
+735,1,1407,979,16,
+0,735,1,1659,980,
+16,0,735,1,2413,
+981,16,0,735,1,
+406,982,16,0,735,
+1,1371,983,16,0,
+735,1,166,984,16,
+0,735,1,1622,985,
+16,0,735,1,1931,
+986,17,987,15,988,
 4,30,37,0,87,
 0,104,0,105,0,
 108,0,101,0,83,
@@ -4484,46 +4502,46 @@ public yyLSLSyntax
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,1,-1,1,
-5,986,20,987,4,
+5,989,20,990,4,
 32,87,0,104,0,
 105,0,108,0,101,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,243,
+0,49,0,1,244,
 1,3,1,6,1,
-5,988,22,1,79,
-1,1933,989,16,0,
-720,1,431,990,16,
-0,720,1,1585,991,
-16,0,720,1,182,
-992,16,0,720,1,
-1189,993,16,0,720,
-1,1443,994,16,0,
-720,1,1695,995,16,
-0,720,1,2198,996,
-16,0,720,1,447,
-997,16,0,720,1,
-2458,998,17,999,15,
-1000,4,28,37,0,
+5,991,22,1,79,
+1,1933,992,16,0,
+735,1,431,993,16,
+0,735,1,1585,994,
+16,0,735,1,182,
+995,16,0,735,1,
+1189,996,16,0,735,
+1,1443,997,16,0,
+735,1,1695,998,16,
+0,735,1,2198,999,
+16,0,735,1,447,
+1000,16,0,735,1,
+2458,1001,17,1002,15,
+1003,4,28,37,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,76,0,
 105,0,115,0,116,
 0,1,-1,1,5,
-1001,20,1002,4,30,
+1004,20,1005,4,30,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,76,0,
 105,0,115,0,116,
 0,95,0,50,0,
-1,220,1,3,1,
-3,1,2,1003,22,
-1,56,1,2459,1004,
-17,1005,15,1006,4,
+1,221,1,3,1,
+3,1,2,1006,22,
+1,56,1,2459,1007,
+17,1008,15,1009,4,
 36,37,0,67,0,
 111,0,109,0,112,
 0,111,0,117,0,
@@ -4532,7 +4550,7 @@ public yyLSLSyntax
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,1,-1,1,
-5,1007,20,1008,4,
+5,1010,20,1011,4,
 38,67,0,111,0,
 109,0,112,0,111,
 0,117,0,110,0,
@@ -4541,34 +4559,34 @@ public yyLSLSyntax
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,50,0,1,
-218,1,3,1,4,
-1,3,1009,22,1,
-54,1,1958,1010,16,
-0,720,1,2462,1011,
-17,1012,15,1000,1,
--1,1,5,1013,20,
-1014,4,30,83,0,
+219,1,3,1,4,
+1,3,1012,22,1,
+54,1,1958,1013,16,
+0,735,1,2462,1014,
+17,1015,15,1003,1,
+-1,1,5,1016,20,
+1017,4,30,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,76,0,105,0,
 115,0,116,0,95,
-0,49,0,1,219,
+0,49,0,1,220,
 1,3,1,2,1,
-1,1015,22,1,55,
-1,1657,1016,17,1017,
-15,849,1,-1,1,
-5,1018,20,1019,4,
+1,1018,22,1,55,
+1,1657,1019,17,1020,
+15,852,1,-1,1,
+5,1021,20,1022,4,
 22,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,1,223,
+0,50,0,1,224,
 1,3,1,3,1,
-2,1020,22,1,59,
-1,2464,1021,17,1022,
-15,1006,1,-1,1,
-5,1023,20,1024,4,
+2,1023,22,1,59,
+1,2464,1024,17,1025,
+15,1009,1,-1,1,
+5,1026,20,1027,4,
 38,67,0,111,0,
 109,0,112,0,111,
 0,117,0,110,0,
@@ -4577,280 +4595,280 @@ public yyLSLSyntax
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-217,1,3,1,3,
-1,2,1025,22,1,
-53,1,199,1026,16,
-0,720,1,459,1027,
-16,0,720,1,462,
-1028,16,0,720,1,
-217,1029,16,0,720,
-1,2227,1030,17,1031,
-15,985,1,-1,1,
-5,1032,20,1033,4,
+218,1,3,1,3,
+1,2,1028,22,1,
+53,1,199,1029,16,
+0,735,1,459,1030,
+16,0,735,1,462,
+1031,16,0,735,1,
+217,1032,16,0,735,
+1,2227,1033,17,1034,
+15,988,1,-1,1,
+5,1035,20,1036,4,
 32,87,0,104,0,
 105,0,108,0,101,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,1,244,
+0,50,0,1,245,
 1,3,1,6,1,
-5,1034,22,1,80,
-1,1225,1035,16,0,
-720,1,1479,1036,16,
-0,720,1,1731,1037,
-16,0,720,1,1989,
-1038,17,1039,15,842,
-1,-1,1,5,1040,
-20,1041,4,26,73,
+5,1037,22,1,80,
+1,1225,1038,16,0,
+735,1,1479,1039,16,
+0,735,1,1731,1040,
+16,0,735,1,1989,
+1041,17,1042,15,845,
+1,-1,1,5,1043,
+20,1044,4,26,73,
 0,102,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,239,1,3,1,
-6,1,5,1042,22,
-1,75,1,1990,1043,
-16,0,720,1,236,
-1044,16,0,720,1,
-1756,1045,16,0,720,
-1,4,1046,19,203,
-1,4,1047,5,100,
-1,256,1048,16,0,
-616,1,1261,1049,16,
-0,616,1,509,1050,
-16,0,616,1,1515,
-1051,16,0,616,1,
-2021,840,1,1775,1052,
-16,0,616,1,2029,
-847,1,2030,853,1,
-2031,858,1,2032,863,
-1,2033,868,1,277,
-1053,16,0,616,1,
-2035,874,1,2037,879,
-1,2039,884,1,32,
-1054,16,0,616,1,
-2041,890,1,2293,1055,
-16,0,616,1,2043,
-896,1,2045,901,1,
-40,1056,16,0,205,
-1,41,1057,16,0,
-616,1,1297,1058,16,
-0,616,1,43,1059,
-16,0,616,1,44,
-1060,16,0,205,1,
-1803,909,1,1804,1061,
-16,0,616,1,299,
-1062,16,0,616,1,
-47,1063,16,0,201,
-1,52,1064,16,0,
-616,1,2318,1065,16,
-0,616,1,63,1066,
-16,0,227,1,66,
-1067,16,0,225,1,
-2075,1068,16,0,616,
-1,1574,921,1,71,
-1069,16,0,616,1,
-76,1070,16,0,616,
-1,1834,1071,16,0,
-616,1,2337,1072,16,
-0,616,1,79,1073,
-16,0,616,1,1335,
-1074,16,0,616,1,
-322,1075,16,0,616,
-1,85,1076,16,0,
-616,1,89,1077,16,
-0,616,1,346,1078,
-16,0,616,1,97,
-1079,16,0,616,1,
-2106,1080,16,0,616,
-1,102,1081,16,0,
-616,1,1860,943,1,
-2364,949,1,2782,1082,
-16,0,616,1,1114,
-1083,16,0,201,1,
-112,1084,16,0,616,
-1,1117,1085,16,0,
-616,1,1873,958,1,
-1876,1086,16,0,616,
-1,124,1087,16,0,
-616,1,2136,965,1,
-381,1088,16,0,616,
-1,525,1089,16,0,
-616,1,137,1090,16,
-0,616,1,1901,1091,
-16,0,616,1,1153,
-1092,16,0,616,1,
-151,1093,16,0,616,
-1,1407,1094,16,0,
-616,1,1659,1095,16,
-0,616,1,2413,1096,
-16,0,616,1,406,
-1097,16,0,616,1,
-1371,1098,16,0,616,
-1,2105,936,1,166,
-1099,16,0,616,1,
-1622,1100,16,0,616,
-1,1931,983,1,1933,
-1101,16,0,616,1,
-431,1102,16,0,616,
-1,1585,1103,16,0,
-616,1,182,1104,16,
-0,616,1,1189,1105,
-16,0,616,1,1443,
-1106,16,0,616,1,
-1695,1107,16,0,616,
-1,2198,1108,16,0,
-616,1,447,1109,16,
-0,616,1,2458,998,
-1,2459,1004,1,1958,
-1110,16,0,616,1,
-2462,1011,1,1657,1016,
-1,2464,1021,1,199,
-1111,16,0,616,1,
-459,1112,16,0,616,
-1,462,1113,16,0,
-616,1,217,1114,16,
-0,616,1,2227,1030,
-1,1225,1115,16,0,
-616,1,1479,1116,16,
-0,616,1,1731,1117,
-16,0,616,1,1989,
-1038,1,1990,1118,16,
-0,616,1,236,1119,
-16,0,616,1,1756,
-1120,16,0,616,1,
-5,1121,19,200,1,
-5,1122,5,100,1,
-256,1123,16,0,612,
-1,1261,1124,16,0,
-612,1,509,1125,16,
-0,612,1,1515,1126,
-16,0,612,1,2021,
-840,1,1775,1127,16,
-0,612,1,2029,847,
-1,2030,853,1,2031,
-858,1,2032,863,1,
-2033,868,1,277,1128,
-16,0,612,1,2035,
-874,1,2037,879,1,
-2039,884,1,32,1129,
-16,0,612,1,2041,
-890,1,2293,1130,16,
-0,612,1,2043,896,
-1,2045,901,1,40,
-1131,16,0,204,1,
-41,1132,16,0,612,
-1,1297,1133,16,0,
-612,1,43,1134,16,
-0,612,1,44,1135,
-16,0,204,1,1803,
-909,1,1804,1136,16,
-0,612,1,299,1137,
-16,0,612,1,47,
-1138,16,0,198,1,
-52,1139,16,0,612,
-1,2318,1140,16,0,
-612,1,63,1141,16,
-0,226,1,66,1142,
-16,0,224,1,2075,
-1143,16,0,612,1,
-1574,921,1,71,1144,
-16,0,612,1,76,
-1145,16,0,612,1,
-1834,1146,16,0,612,
-1,2337,1147,16,0,
-612,1,79,1148,16,
-0,612,1,1335,1149,
-16,0,612,1,322,
-1150,16,0,612,1,
-85,1151,16,0,612,
-1,89,1152,16,0,
-612,1,346,1153,16,
-0,612,1,97,1154,
-16,0,612,1,2106,
-1155,16,0,612,1,
-102,1156,16,0,612,
-1,1860,943,1,2364,
-949,1,2782,1157,16,
-0,612,1,1114,1158,
+1,240,1,3,1,
+6,1,5,1045,22,
+1,75,1,1990,1046,
+16,0,735,1,236,
+1047,16,0,735,1,
+1756,1048,16,0,735,
+1,4,1049,19,200,
+1,4,1050,5,100,
+1,256,1051,16,0,
+624,1,1261,1052,16,
+0,624,1,509,1053,
+16,0,624,1,1515,
+1054,16,0,624,1,
+2021,843,1,1775,1055,
+16,0,624,1,2029,
+850,1,2030,856,1,
+2031,861,1,2032,866,
+1,2033,871,1,277,
+1056,16,0,624,1,
+2035,877,1,2037,882,
+1,2039,887,1,32,
+1057,16,0,624,1,
+2041,893,1,2293,1058,
+16,0,624,1,2043,
+899,1,2045,904,1,
+40,1059,16,0,202,
+1,41,1060,16,0,
+624,1,1297,1061,16,
+0,624,1,43,1062,
+16,0,624,1,44,
+1063,16,0,202,1,
+1803,912,1,1804,1064,
+16,0,624,1,299,
+1065,16,0,624,1,
+47,1066,16,0,198,
+1,52,1067,16,0,
+624,1,2318,1068,16,
+0,624,1,63,1069,
+16,0,224,1,66,
+1070,16,0,222,1,
+2075,1071,16,0,624,
+1,1574,924,1,71,
+1072,16,0,624,1,
+76,1073,16,0,624,
+1,1834,1074,16,0,
+624,1,2337,1075,16,
+0,624,1,79,1076,
+16,0,624,1,1335,
+1077,16,0,624,1,
+322,1078,16,0,624,
+1,85,1079,16,0,
+624,1,89,1080,16,
+0,624,1,346,1081,
+16,0,624,1,97,
+1082,16,0,624,1,
+2106,1083,16,0,624,
+1,102,1084,16,0,
+624,1,1860,946,1,
+2364,952,1,1114,1085,
 16,0,198,1,112,
-1159,16,0,612,1,
-1117,1160,16,0,612,
-1,1873,958,1,1876,
-1161,16,0,612,1,
-124,1162,16,0,612,
-1,2136,965,1,381,
-1163,16,0,612,1,
-525,1164,16,0,612,
-1,137,1165,16,0,
-612,1,1901,1166,16,
-0,612,1,1153,1167,
-16,0,612,1,151,
-1168,16,0,612,1,
-1407,1169,16,0,612,
-1,1659,1170,16,0,
-612,1,2413,1171,16,
-0,612,1,406,1172,
-16,0,612,1,1371,
-1173,16,0,612,1,
-2105,936,1,166,1174,
-16,0,612,1,1622,
-1175,16,0,612,1,
-1931,983,1,1933,1176,
-16,0,612,1,431,
-1177,16,0,612,1,
-1585,1178,16,0,612,
-1,182,1179,16,0,
-612,1,1189,1180,16,
-0,612,1,1443,1181,
-16,0,612,1,1695,
-1182,16,0,612,1,
-2198,1183,16,0,612,
-1,447,1184,16,0,
-612,1,2458,998,1,
-2459,1004,1,1958,1185,
-16,0,612,1,2462,
-1011,1,1657,1016,1,
-2464,1021,1,199,1186,
-16,0,612,1,459,
-1187,16,0,612,1,
-462,1188,16,0,612,
-1,217,1189,16,0,
-612,1,2227,1030,1,
-1225,1190,16,0,612,
-1,1479,1191,16,0,
-612,1,1731,1192,16,
-0,612,1,1989,1038,
-1,1990,1193,16,0,
-612,1,236,1194,16,
-0,612,1,1756,1195,
-16,0,612,1,6,
-1196,19,306,1,6,
-1197,5,2,1,1114,
-1198,16,0,304,1,
-40,1199,16,0,601,
-1,7,1200,19,270,
-1,7,1201,5,2,
-1,1114,1202,16,0,
-268,1,40,1203,16,
-0,531,1,8,1204,
-19,233,1,8,1205,
-5,2,1,1114,1206,
-16,0,231,1,40,
-1207,16,0,489,1,
-9,1208,19,239,1,
-9,1209,5,2,1,
-1114,1210,16,0,237,
-1,40,1211,16,0,
-420,1,10,1212,19,
-183,1,10,1213,5,
-2,1,1114,1214,16,
-0,181,1,40,1215,
-16,0,360,1,11,
-1216,19,147,1,11,
-1217,5,146,1,1260,
-1218,17,1219,15,1220,
+1086,16,0,624,1,
+1117,1087,16,0,624,
+1,2786,1088,16,0,
+624,1,1873,961,1,
+1876,1089,16,0,624,
+1,124,1090,16,0,
+624,1,2136,968,1,
+381,1091,16,0,624,
+1,525,1092,16,0,
+624,1,137,1093,16,
+0,624,1,1901,1094,
+16,0,624,1,1153,
+1095,16,0,624,1,
+151,1096,16,0,624,
+1,1407,1097,16,0,
+624,1,1659,1098,16,
+0,624,1,2413,1099,
+16,0,624,1,406,
+1100,16,0,624,1,
+1371,1101,16,0,624,
+1,2105,939,1,166,
+1102,16,0,624,1,
+1622,1103,16,0,624,
+1,1931,986,1,1933,
+1104,16,0,624,1,
+431,1105,16,0,624,
+1,1585,1106,16,0,
+624,1,182,1107,16,
+0,624,1,1189,1108,
+16,0,624,1,1443,
+1109,16,0,624,1,
+1695,1110,16,0,624,
+1,2198,1111,16,0,
+624,1,447,1112,16,
+0,624,1,2458,1001,
+1,2459,1007,1,1958,
+1113,16,0,624,1,
+2462,1014,1,1657,1019,
+1,2464,1024,1,199,
+1114,16,0,624,1,
+459,1115,16,0,624,
+1,462,1116,16,0,
+624,1,217,1117,16,
+0,624,1,2227,1033,
+1,1225,1118,16,0,
+624,1,1479,1119,16,
+0,624,1,1731,1120,
+16,0,624,1,1989,
+1041,1,1990,1121,16,
+0,624,1,236,1122,
+16,0,624,1,1756,
+1123,16,0,624,1,
+5,1124,19,197,1,
+5,1125,5,100,1,
+256,1126,16,0,620,
+1,1261,1127,16,0,
+620,1,509,1128,16,
+0,620,1,1515,1129,
+16,0,620,1,2021,
+843,1,1775,1130,16,
+0,620,1,2029,850,
+1,2030,856,1,2031,
+861,1,2032,866,1,
+2033,871,1,277,1131,
+16,0,620,1,2035,
+877,1,2037,882,1,
+2039,887,1,32,1132,
+16,0,620,1,2041,
+893,1,2293,1133,16,
+0,620,1,2043,899,
+1,2045,904,1,40,
+1134,16,0,201,1,
+41,1135,16,0,620,
+1,1297,1136,16,0,
+620,1,43,1137,16,
+0,620,1,44,1138,
+16,0,201,1,1803,
+912,1,1804,1139,16,
+0,620,1,299,1140,
+16,0,620,1,47,
+1141,16,0,195,1,
+52,1142,16,0,620,
+1,2318,1143,16,0,
+620,1,63,1144,16,
+0,223,1,66,1145,
+16,0,221,1,2075,
+1146,16,0,620,1,
+1574,924,1,71,1147,
+16,0,620,1,76,
+1148,16,0,620,1,
+1834,1149,16,0,620,
+1,2337,1150,16,0,
+620,1,79,1151,16,
+0,620,1,1335,1152,
+16,0,620,1,322,
+1153,16,0,620,1,
+85,1154,16,0,620,
+1,89,1155,16,0,
+620,1,346,1156,16,
+0,620,1,97,1157,
+16,0,620,1,2106,
+1158,16,0,620,1,
+102,1159,16,0,620,
+1,1860,946,1,2364,
+952,1,1114,1160,16,
+0,195,1,112,1161,
+16,0,620,1,1117,
+1162,16,0,620,1,
+2786,1163,16,0,620,
+1,1873,961,1,1876,
+1164,16,0,620,1,
+124,1165,16,0,620,
+1,2136,968,1,381,
+1166,16,0,620,1,
+525,1167,16,0,620,
+1,137,1168,16,0,
+620,1,1901,1169,16,
+0,620,1,1153,1170,
+16,0,620,1,151,
+1171,16,0,620,1,
+1407,1172,16,0,620,
+1,1659,1173,16,0,
+620,1,2413,1174,16,
+0,620,1,406,1175,
+16,0,620,1,1371,
+1176,16,0,620,1,
+2105,939,1,166,1177,
+16,0,620,1,1622,
+1178,16,0,620,1,
+1931,986,1,1933,1179,
+16,0,620,1,431,
+1180,16,0,620,1,
+1585,1181,16,0,620,
+1,182,1182,16,0,
+620,1,1189,1183,16,
+0,620,1,1443,1184,
+16,0,620,1,1695,
+1185,16,0,620,1,
+2198,1186,16,0,620,
+1,447,1187,16,0,
+620,1,2458,1001,1,
+2459,1007,1,1958,1188,
+16,0,620,1,2462,
+1014,1,1657,1019,1,
+2464,1024,1,199,1189,
+16,0,620,1,459,
+1190,16,0,620,1,
+462,1191,16,0,620,
+1,217,1192,16,0,
+620,1,2227,1033,1,
+1225,1193,16,0,620,
+1,1479,1194,16,0,
+620,1,1731,1195,16,
+0,620,1,1989,1041,
+1,1990,1196,16,0,
+620,1,236,1197,16,
+0,620,1,1756,1198,
+16,0,620,1,6,
+1199,19,310,1,6,
+1200,5,2,1,1114,
+1201,16,0,308,1,
+40,1202,16,0,609,
+1,7,1203,19,267,
+1,7,1204,5,2,
+1,1114,1205,16,0,
+265,1,40,1206,16,
+0,544,1,8,1207,
+19,230,1,8,1208,
+5,2,1,1114,1209,
+16,0,228,1,40,
+1210,16,0,501,1,
+9,1211,19,236,1,
+9,1212,5,2,1,
+1114,1213,16,0,234,
+1,40,1214,16,0,
+430,1,10,1215,19,
+180,1,10,1216,5,
+2,1,1114,1217,16,
+0,178,1,40,1218,
+16,0,367,1,11,
+1219,19,151,1,11,
+1220,5,146,1,1260,
+1221,17,1222,15,1223,
 4,34,37,0,83,
 0,105,0,109,0,
 112,0,108,0,101,
@@ -4859,7 +4877,7 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-1221,20,1222,4,38,
+1224,20,1225,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -4867,11 +4885,11 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,50,
-0,49,0,1,275,
+0,49,0,1,276,
 1,3,1,6,1,
-5,1223,22,1,111,
-1,1011,1224,17,1225,
-15,1226,4,44,37,
+5,1226,22,1,111,
+1,1011,1227,17,1228,
+15,1229,4,44,37,
 0,80,0,97,0,
 114,0,101,0,110,
 0,116,0,104,0,
@@ -4881,7 +4899,7 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,1,-1,
-1,5,1227,20,1228,
+1,5,1230,20,1231,
 4,46,80,0,97,
 0,114,0,101,0,
 110,0,116,0,104,
@@ -4891,12 +4909,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,50,0,1,322,
+0,50,0,1,323,
 1,3,1,4,1,
-3,1229,22,1,158,
-1,1514,1230,17,1231,
-15,1220,1,-1,1,
-5,1232,20,1233,4,
+3,1232,22,1,158,
+1,1514,1233,17,1234,
+15,1223,1,-1,1,
+5,1235,20,1236,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -4905,26 +4923,26 @@ public yyLSLSyntax
 109,0,101,0,110,
 0,116,0,95,0,
 49,0,52,0,1,
-268,1,3,1,4,
-1,3,1234,22,1,
-104,1,9,1235,17,
-1236,15,1237,4,24,
+269,1,3,1,4,
+1,3,1237,22,1,
+104,1,9,1238,17,
+1239,15,1240,4,24,
 37,0,68,0,101,
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
 111,0,110,0,1,
--1,1,5,1238,20,
-1239,4,26,68,0,
+-1,1,5,1241,20,
+1242,4,26,68,0,
 101,0,99,0,108,
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
 95,0,49,0,1,
-212,1,3,1,3,
-1,2,1240,22,1,
-48,1,262,1241,17,
-1242,15,1243,4,34,
+213,1,3,1,3,
+1,2,1243,22,1,
+48,1,262,1244,17,
+1245,15,1246,4,34,
 37,0,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -4932,8 +4950,8 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
--1,1,5,1244,20,
-1245,4,36,66,0,
+-1,1,5,1247,20,
+1248,4,36,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
@@ -4941,11 +4959,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,53,0,1,
-304,1,3,1,4,
-1,3,1246,22,1,
-140,1,1267,1247,17,
-1248,15,1220,1,-1,
-1,5,1249,20,1250,
+305,1,3,1,4,
+1,3,1249,22,1,
+140,1,1267,1250,17,
+1251,15,1223,1,-1,
+1,5,1252,20,1253,
 4,36,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -4953,13 +4971,13 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,56,0,1,262,
+0,56,0,1,263,
 1,3,1,6,1,
-5,1251,22,1,98,
-1,2021,840,1,1521,
-1252,17,1253,15,1220,
-1,-1,1,5,1254,
-20,1255,4,36,83,
+5,1254,22,1,98,
+1,2021,843,1,1521,
+1255,17,1256,15,1223,
+1,-1,1,5,1257,
+20,1258,4,36,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -4967,26 +4985,26 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,255,1,3,1,
-4,1,3,1256,22,
-1,91,1,2024,1257,
-17,1258,15,1259,4,
+1,256,1,3,1,
+4,1,3,1259,22,
+1,91,1,2024,1260,
+17,1261,15,1262,4,
 24,37,0,83,0,
 116,0,97,0,116,
 0,101,0,67,0,
 104,0,97,0,110,
 0,103,0,101,0,
-1,-1,1,5,1260,
-20,1261,4,26,83,
+1,-1,1,5,1263,
+20,1264,4,26,83,
 0,116,0,97,0,
 116,0,101,0,67,
 0,104,0,97,0,
 110,0,103,0,101,
 0,95,0,49,0,
-1,237,1,3,1,
-3,1,2,1262,22,
-1,73,1,1775,1263,
-17,1264,15,1265,4,
+1,238,1,3,1,
+3,1,2,1265,22,
+1,73,1,1775,1266,
+17,1267,15,1268,4,
 30,37,0,69,0,
 109,0,112,0,116,
 0,121,0,83,0,
@@ -4994,34 +5012,34 @@ public yyLSLSyntax
 0,101,0,109,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-1266,20,1267,4,32,
+1269,20,1270,4,32,
 69,0,109,0,112,
 0,116,0,121,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,1,221,1,
+49,0,1,222,1,
 3,1,1,1,0,
-1268,22,1,57,1,
-19,1269,17,1236,1,
-2,1240,1,2028,1270,
-17,1271,15,1272,4,
+1271,22,1,57,1,
+19,1272,17,1239,1,
+2,1243,1,2028,1273,
+17,1274,15,1275,4,
 20,37,0,74,0,
 117,0,109,0,112,
 0,76,0,97,0,
 98,0,101,0,108,
 0,1,-1,1,5,
-1273,20,1274,4,22,
+1276,20,1277,4,22,
 74,0,117,0,109,
 0,112,0,76,0,
 97,0,98,0,101,
 0,108,0,95,0,
-49,0,1,235,1,
+49,0,1,236,1,
 3,1,3,1,2,
-1275,22,1,71,1,
-2029,847,1,2281,1276,
-17,1277,15,1278,4,
+1278,22,1,71,1,
+2029,850,1,2281,1279,
+17,1280,15,1281,4,
 34,37,0,70,0,
 111,0,114,0,76,
 0,111,0,111,0,
@@ -5029,8 +5047,8 @@ public yyLSLSyntax
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,1279,
-20,1280,4,36,70,
+1,-1,1,5,1282,
+20,1283,4,36,70,
 0,111,0,114,0,
 76,0,111,0,111,
 0,112,0,83,0,
@@ -5038,125 +5056,95 @@ public yyLSLSyntax
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-1,250,1,3,1,
-2,1,1,1281,22,
-1,86,1,2031,858,
-1,2032,863,1,2033,
-868,1,2034,1282,16,
-0,676,1,2788,1283,
-16,0,145,1,2036,
-1284,16,0,602,1,
-2037,879,1,2038,1285,
-16,0,606,1,2039,
-884,1,32,1286,17,
-1264,1,0,1268,1,
-2041,890,1,2042,1287,
-16,0,749,1,2043,
-896,1,2044,1288,16,
-0,689,1,2045,901,
-1,2299,1289,16,0,
-255,1,1296,1290,17,
-1291,15,1220,1,-1,
-1,5,1292,20,1293,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,48,0,
-1,274,1,3,1,
-6,1,5,1294,22,
-1,110,1,283,1295,
-17,1296,15,1243,1,
--1,1,5,1297,20,
-1298,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,52,0,1,
-303,1,3,1,4,
-1,3,1299,22,1,
-139,1,40,1300,17,
-1301,15,1302,4,32,
-37,0,73,0,100,
+1,251,1,3,1,
+2,1,1,1284,22,
+1,86,1,2031,861,
+1,2785,1285,16,0,
+519,1,2033,871,1,
+2034,1286,16,0,691,
+1,2035,877,1,2036,
+1287,16,0,610,1,
+2037,882,1,2038,1288,
+16,0,614,1,2792,
+1289,16,0,149,1,
+32,1290,17,1267,1,
+0,1271,1,2032,866,
+1,2042,1291,16,0,
+757,1,2043,899,1,
+2044,1292,16,0,704,
+1,2045,904,1,2299,
+1293,16,0,252,1,
+1296,1294,17,1295,15,
+1223,1,-1,1,5,
+1296,20,1297,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
 0,101,0,110,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,-1,1,
-5,1303,20,1304,4,
-34,73,0,100,0,
-101,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-1,289,1,3,1,
-2,1,1,1305,22,
-1,125,1,44,1306,
-17,1301,1,1,1305,
-1,1803,909,1,47,
-1307,17,1308,15,1309,
-4,38,37,0,73,
-0,100,0,101,0,
-110,0,116,0,68,
-0,111,0,116,0,
+116,0,95,0,50,
+0,48,0,1,275,
+1,3,1,6,1,
+5,1298,22,1,110,
+1,283,1299,17,1300,
+15,1246,1,-1,1,
+5,1301,20,1302,4,
+36,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+52,0,1,304,1,
+3,1,4,1,3,
+1303,22,1,139,1,
+40,1304,17,1305,15,
+1306,4,32,37,0,
+73,0,100,0,101,
+0,110,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,-1,1,5,1310,
-20,1311,4,40,73,
+1,-1,1,5,1307,
+20,1308,4,34,73,
 0,100,0,101,0,
-110,0,116,0,68,
-0,111,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,1,
-290,1,3,1,4,
-1,3,1312,22,1,
-126,1,48,1313,17,
-1314,15,1315,4,58,
-37,0,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,1,290,
+1,3,1,2,1,
+1,1309,22,1,125,
+1,44,1310,17,1305,
+1,1,1309,1,1803,
+912,1,47,1311,17,
+1312,15,1313,4,38,
+37,0,73,0,100,
+0,101,0,110,0,
+116,0,68,0,111,
 0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,1,-1,
-1,5,1316,20,1317,
-4,60,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
+1,5,1314,20,1315,
+4,40,73,0,100,
+0,101,0,110,0,
+116,0,68,0,111,
 0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-52,0,1,294,1,
-3,1,5,1,4,
-1318,22,1,130,1,
-49,1319,17,1320,15,
-1315,1,-1,1,5,
-1321,20,1322,4,60,
+49,0,1,291,1,
+3,1,4,1,3,
+1316,22,1,126,1,
+48,1317,17,1318,15,
+1319,4,58,37,0,
 73,0,110,0,99,
 0,114,0,101,0,
 109,0,101,0,110,
@@ -5168,13 +5156,26 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,51,0,
-1,293,1,3,1,
-5,1,4,1323,22,
-1,129,1,50,1324,
-17,1325,15,1315,1,
--1,1,5,1326,20,
-1327,4,60,73,0,
+0,1,-1,1,5,
+1320,20,1321,4,60,
+73,0,110,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,52,0,
+1,295,1,3,1,
+5,1,4,1322,22,
+1,130,1,49,1323,
+17,1324,15,1319,1,
+-1,1,5,1325,20,
+1326,4,60,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -5186,12 +5187,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,50,0,1,292,
-1,3,1,3,1,
-2,1328,22,1,128,
-1,51,1329,17,1330,
-15,1315,1,-1,1,
-5,1331,20,1332,4,
+0,51,0,1,294,
+1,3,1,5,1,
+4,1327,22,1,129,
+1,50,1328,17,1329,
+15,1319,1,-1,1,
+5,1330,20,1331,4,
 60,73,0,110,0,
 99,0,114,0,101,
 0,109,0,101,0,
@@ -5203,67 +5204,71 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,49,
-0,1,291,1,3,
-1,3,1,2,1333,
-22,1,127,1,305,
-1334,17,1335,15,1243,
-1,-1,1,5,1336,
-20,1337,4,36,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,51,0,
-1,302,1,3,1,
-4,1,3,1338,22,
-1,138,1,525,1339,
-17,1340,15,1341,4,
-34,37,0,82,0,
-111,0,116,0,97,
-0,116,0,105,0,
-111,0,110,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
+110,0,95,0,50,
+0,1,293,1,3,
+1,3,1,2,1332,
+22,1,128,1,51,
+1333,17,1334,15,1319,
+1,-1,1,5,1335,
+20,1336,4,60,73,
+0,110,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,114,0,
+101,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,1342,
-20,1343,4,36,82,
-0,111,0,116,0,
-97,0,116,0,105,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
 0,111,0,110,0,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,95,0,49,0,
-1,287,1,3,1,
-10,1,9,1344,22,
-1,123,1,63,1345,
-17,1346,15,1347,4,
-38,37,0,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
-115,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
--1,1,5,1348,20,
-1349,4,40,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
-115,0,116,0,69,
+95,0,49,0,1,
+292,1,3,1,3,
+1,2,1337,22,1,
+127,1,305,1338,17,
+1339,15,1246,1,-1,
+1,5,1340,20,1341,
+4,36,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,50,0,1,324,
-1,3,1,5,1,
-4,1350,22,1,160,
-1,66,1351,17,1352,
-15,1347,1,-1,1,
-5,1353,20,1354,4,
+0,51,0,1,303,
+1,3,1,4,1,
+3,1342,22,1,138,
+1,525,1343,17,1344,
+15,1345,4,34,37,
+0,82,0,111,0,
+116,0,97,0,116,
+0,105,0,111,0,
+110,0,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,1,-1,
+1,5,1346,20,1347,
+4,36,82,0,111,
+0,116,0,97,0,
+116,0,105,0,111,
+0,110,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,95,
+0,49,0,1,288,
+1,3,1,10,1,
+9,1348,22,1,123,
+1,63,1349,17,1350,
+15,1351,4,38,37,
+0,84,0,121,0,
+112,0,101,0,99,
+0,97,0,115,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1352,20,1353,4,
 40,84,0,121,0,
 112,0,101,0,99,
 0,97,0,115,0,
@@ -5271,13 +5276,13 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,51,
+110,0,95,0,50,
 0,1,325,1,3,
-1,7,1,6,1355,
-22,1,161,1,67,
-1356,17,1357,15,1347,
-1,-1,1,5,1358,
-20,1359,4,40,84,
+1,5,1,4,1354,
+22,1,160,1,66,
+1355,17,1356,15,1351,
+1,-1,1,5,1357,
+20,1358,4,40,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -5285,12 +5290,12 @@ public yyLSLSyntax
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,55,0,1,
-329,1,3,1,8,
-1,7,1360,22,1,
-165,1,68,1361,17,
-1362,15,1347,1,-1,
-1,5,1363,20,1364,
+95,0,51,0,1,
+326,1,3,1,7,
+1,6,1359,22,1,
+161,1,67,1360,17,
+1361,15,1351,1,-1,
+1,5,1362,20,1363,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -5299,12 +5304,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-53,0,1,327,1,
+55,0,1,330,1,
 3,1,8,1,7,
-1365,22,1,163,1,
-69,1366,17,1367,15,
-1347,1,-1,1,5,
-1368,20,1369,4,40,
+1364,22,1,165,1,
+68,1365,17,1366,15,
+1351,1,-1,1,5,
+1367,20,1368,4,40,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -5312,13 +5317,13 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,54,0,
+0,95,0,53,0,
 1,328,1,3,1,
-6,1,5,1370,22,
-1,164,1,70,1371,
-17,1372,15,1347,1,
--1,1,5,1373,20,
-1374,4,40,84,0,
+8,1,7,1369,22,
+1,163,1,69,1370,
+17,1371,15,1351,1,
+-1,1,5,1372,20,
+1373,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -5326,12 +5331,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,52,0,1,326,
+0,54,0,1,329,
 1,3,1,6,1,
-5,1375,22,1,162,
-1,74,1376,17,1377,
-15,1347,1,-1,1,
-5,1378,20,1379,4,
+5,1374,22,1,164,
+1,70,1375,17,1376,
+15,1351,1,-1,1,
+5,1377,20,1378,4,
 40,84,0,121,0,
 112,0,101,0,99,
 0,97,0,115,0,
@@ -5339,191 +5344,251 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,57,
-0,1,331,1,3,
-1,7,1,6,1380,
-22,1,167,1,1013,
-1381,17,1382,15,1226,
-1,-1,1,5,1383,
-20,1384,4,46,80,
-0,97,0,114,0,
-101,0,110,0,116,
-0,104,0,101,0,
-115,0,105,0,115,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-1,321,1,3,1,
-4,1,3,1385,22,
-1,157,1,1332,1386,
-17,1387,15,1220,1,
--1,1,5,1388,20,
-1389,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,57,
-0,1,273,1,3,
-1,6,1,5,1390,
-22,1,109,1,2337,
-1391,17,1264,1,0,
-1268,1,1585,1392,17,
-1393,15,1394,4,32,
-37,0,82,0,101,
-0,116,0,117,0,
-114,0,110,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1395,20,1396,4,
-34,82,0,101,0,
-116,0,117,0,114,
-0,110,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,280,1,3,1,
-2,1,1,1397,22,
-1,116,1,2023,1398,
-17,1399,15,1259,1,
--1,1,5,1400,20,
-1401,4,26,83,0,
-116,0,97,0,116,
-0,101,0,67,0,
-104,0,97,0,110,
-0,103,0,101,0,
-95,0,50,0,1,
-238,1,3,1,3,
-1,2,1402,22,1,
-74,1,2136,965,1,
-82,1403,17,1404,15,
-1405,4,32,37,0,
-85,0,110,0,97,
-0,114,0,121,0,
+110,0,95,0,52,
+0,1,327,1,3,
+1,6,1,5,1379,
+22,1,162,1,74,
+1380,17,1381,15,1351,
+1,-1,1,5,1382,
+20,1383,4,40,84,
+0,121,0,112,0,
+101,0,99,0,97,
+0,115,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,-1,1,5,1406,
-20,1407,4,34,85,
-0,110,0,97,0,
-114,0,121,0,69,
+95,0,57,0,1,
+332,1,3,1,7,
+1,6,1384,22,1,
+167,1,1013,1385,17,
+1386,15,1229,1,-1,
+1,5,1387,20,1388,
+4,46,80,0,97,
+0,114,0,101,0,
+110,0,116,0,104,
+0,101,0,115,0,
+105,0,115,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,51,0,1,320,
-1,3,1,3,1,
-2,1408,22,1,156,
-1,2026,1409,17,1410,
-15,1411,4,28,37,
-0,74,0,117,0,
-109,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1412,20,1413,4,
-30,74,0,117,0,
-109,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,236,1,3,
-1,3,1,2,1414,
-22,1,72,1,1591,
-1415,17,1416,15,1394,
-1,-1,1,5,1417,
-20,1418,4,34,82,
-0,101,0,116,0,
-117,0,114,0,110,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,279,
-1,3,1,3,1,
-2,1419,22,1,115,
-1,1341,1420,17,1421,
-15,1220,1,-1,1,
-5,1422,20,1423,4,
-36,83,0,105,0,
+0,49,0,1,322,
+1,3,1,4,1,
+3,1389,22,1,157,
+1,1332,1390,17,1391,
+15,1223,1,-1,1,
+5,1392,20,1393,4,
+38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
 115,0,115,0,105,
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-54,0,1,260,1,
-3,1,4,1,3,
-1424,22,1,96,1,
-2030,853,1,328,1425,
-17,1426,15,1243,1,
--1,1,5,1427,20,
-1428,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,50,0,1,
-301,1,3,1,4,
-1,3,1429,22,1,
-137,1,1303,1430,17,
-1431,15,1220,1,-1,
-1,5,1432,20,1433,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
+49,0,57,0,1,
+274,1,3,1,6,
+1,5,1394,22,1,
+109,1,2337,1395,17,
+1267,1,0,1271,1,
+1585,1396,17,1397,15,
+1398,4,32,37,0,
+82,0,101,0,116,
+0,117,0,114,0,
+110,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,-1,1,5,1399,
+20,1400,4,34,82,
+0,101,0,116,0,
+117,0,114,0,110,
+0,83,0,116,0,
+97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,55,0,1,261,
-1,3,1,6,1,
-5,1434,22,1,97,
-1,2035,874,1,93,
-1435,17,1436,15,1405,
-1,-1,1,5,1437,
-20,1438,4,34,85,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
+0,50,0,1,281,
+1,3,1,2,1,
+1,1401,22,1,116,
+1,2023,1402,17,1403,
+15,1262,1,-1,1,
+5,1404,20,1405,4,
+26,83,0,116,0,
+97,0,116,0,101,
+0,67,0,104,0,
+97,0,110,0,103,
+0,101,0,95,0,
+50,0,1,239,1,
+3,1,3,1,2,
+1406,22,1,74,1,
+2136,968,1,82,1407,
+17,1408,15,1409,4,
+32,37,0,85,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,-1,
+1,5,1410,20,1411,
+4,34,85,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,51,
+0,1,321,1,3,
+1,3,1,2,1412,
+22,1,156,1,2026,
+1413,17,1414,15,1415,
+4,28,37,0,74,
+0,117,0,109,0,
+112,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,-1,1,5,1416,
+20,1417,4,30,74,
+0,117,0,109,0,
+112,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+237,1,3,1,3,
+1,2,1418,22,1,
+72,1,1591,1419,17,
+1420,15,1398,1,-1,
+1,5,1421,20,1422,
+4,34,82,0,101,
+0,116,0,117,0,
+114,0,110,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,280,1,3,
+1,3,1,2,1423,
+22,1,115,1,1341,
+1424,17,1425,15,1223,
+1,-1,1,5,1426,
+20,1427,4,36,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,54,0,
+1,261,1,3,1,
+4,1,3,1428,22,
+1,96,1,2030,856,
+1,328,1429,17,1430,
+15,1246,1,-1,1,
+5,1431,20,1432,4,
+36,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+50,0,1,302,1,
+3,1,4,1,3,
+1433,22,1,137,1,
+1303,1434,17,1435,15,
+1223,1,-1,1,5,
+1436,20,1437,4,36,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
 0,115,0,105,0,
-111,0,110,0,95,
-0,50,0,1,319,
-1,3,1,3,1,
-2,1439,22,1,155,
-1,1550,1440,17,1441,
-15,1220,1,-1,1,
-5,1442,20,1443,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,51,0,1,
-267,1,3,1,4,
-1,3,1444,22,1,
-103,1,2040,1445,16,
-0,610,1,2106,1446,
-17,1264,1,0,1268,
-1,1555,1447,16,0,
-707,1,827,1448,17,
-1449,15,1243,1,-1,
-1,5,1450,20,1451,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,55,
+0,1,262,1,3,
+1,6,1,5,1438,
+22,1,97,1,1096,
+1439,17,1440,15,1441,
+4,26,37,0,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+67,0,97,0,108,
+0,108,0,1,-1,
+1,5,1442,20,1443,
+4,28,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,67,0,
+97,0,108,0,108,
+0,95,0,49,0,
+1,333,1,3,1,
+5,1,4,1444,22,
+1,168,1,93,1445,
+17,1446,15,1409,1,
+-1,1,5,1447,20,
+1448,4,34,85,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+50,0,1,320,1,
+3,1,3,1,2,
+1449,22,1,155,1,
+1550,1450,17,1451,15,
+1223,1,-1,1,5,
+1452,20,1453,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,51,0,1,268,
+1,3,1,4,1,
+3,1454,22,1,103,
+1,2039,887,1,2040,
+1455,16,0,618,1,
+2041,893,1,1555,1456,
+16,0,722,1,827,
+1457,17,1458,15,1246,
+1,-1,1,5,1459,
+20,1460,4,38,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+53,0,1,315,1,
+3,1,4,1,3,
+1461,22,1,150,1,
+1859,1462,16,0,344,
+1,1860,946,1,1804,
+1463,17,1267,1,0,
+1271,1,107,1464,17,
+1465,15,1409,1,-1,
+1,5,1466,20,1467,
+4,34,85,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,319,1,3,
+1,3,1,2,1468,
+22,1,154,1,1114,
+1469,17,1312,1,3,
+1316,1,1048,1470,17,
+1471,15,1246,1,-1,
+1,5,1472,20,1473,
 4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -5531,31 +5596,27 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,53,0,
-1,314,1,3,1,
-4,1,3,1452,22,
-1,150,1,1859,1453,
-16,0,339,1,1860,
-943,1,1804,1454,17,
-1264,1,0,1268,1,
-107,1455,17,1456,15,
-1405,1,-1,1,5,
-1457,20,1458,4,34,
-85,0,110,0,97,
+0,49,0,56,0,
+1,318,1,3,1,
+4,1,3,1474,22,
+1,153,1,352,1475,
+17,1476,15,1246,1,
+-1,1,5,1477,20,
+1478,4,36,66,0,
+105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,49,0,1,
-318,1,3,1,3,
-1,2,1459,22,1,
-154,1,2781,1460,16,
-0,278,1,1114,1461,
-17,1308,1,3,1312,
-1,1048,1462,17,1463,
-15,1243,1,-1,1,
-5,1464,20,1465,4,
+301,1,3,1,4,
+1,3,1479,22,1,
+136,1,1872,1480,16,
+0,354,1,1873,961,
+1,118,1481,17,1482,
+15,1246,1,-1,1,
+5,1483,20,1484,4,
 38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5563,126 +5624,63 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,56,0,1,
-317,1,3,1,4,
-1,3,1466,22,1,
-153,1,352,1467,17,
-1468,15,1243,1,-1,
-1,5,1469,20,1470,
-4,36,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,1,300,
-1,3,1,4,1,
-3,1471,22,1,136,
-1,1872,1472,16,0,
-349,1,1873,958,1,
-118,1473,17,1474,15,
-1243,1,-1,1,5,
-1475,20,1476,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
+49,0,52,0,1,
+314,1,3,1,4,
+1,3,1485,22,1,
+149,1,1123,1486,17,
+1487,15,1223,1,-1,
+1,5,1488,20,1489,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,50,0,
+1,267,1,3,1,
+6,1,5,1490,22,
+1,102,1,371,1491,
+17,1492,15,1493,4,
+46,37,0,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,49,
-0,52,0,1,313,
-1,3,1,4,1,
-3,1477,22,1,149,
-1,1123,1478,17,1479,
-15,1220,1,-1,1,
-5,1480,20,1481,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,50,0,1,
-266,1,3,1,6,
-1,5,1482,22,1,
-102,1,371,1483,17,
-1484,15,1485,4,46,
-37,0,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,67,0,
-97,0,108,0,108,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1486,20,1487,4,48,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,67,0,97,0,
-108,0,108,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,1,299,
-1,3,1,2,1,
-1,1488,22,1,135,
-1,1377,1489,17,1490,
-15,1220,1,-1,1,
-5,1491,20,1492,4,
-36,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-53,0,1,259,1,
-3,1,4,1,3,
-1493,22,1,95,1,
-375,1494,17,1495,15,
-1315,1,-1,1,5,
-1496,20,1497,4,60,
-73,0,110,0,99,
+110,0,1,-1,1,
+5,1494,20,1495,4,
+48,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,67,0,97,
+0,108,0,108,0,
+69,0,120,0,112,
 0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+300,1,3,1,2,
+1,1,1496,22,1,
+135,1,1377,1497,17,
+1498,15,1223,1,-1,
+1,5,1499,20,1500,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
 0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,56,0,
-1,298,1,3,1,
-5,1,4,1498,22,
-1,134,1,377,1499,
-17,1500,15,1315,1,
--1,1,5,1501,20,
-1502,4,60,73,0,
-110,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,114,0,101,
+105,0,103,0,110,
 0,109,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,53,0,1,295,
-1,3,1,3,1,
-2,1503,22,1,131,
-1,379,1504,17,1505,
-15,1315,1,-1,1,
-5,1506,20,1507,4,
+110,0,116,0,95,
+0,53,0,1,260,
+1,3,1,4,1,
+3,1501,22,1,95,
+1,375,1502,17,1503,
+15,1319,1,-1,1,
+5,1504,20,1505,4,
 60,73,0,110,0,
 99,0,114,0,101,
 0,109,0,101,0,
@@ -5694,64 +5692,30 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,55,
-0,1,297,1,3,
-1,5,1,4,1508,
-22,1,133,1,380,
-1509,17,1510,15,1511,
-4,38,37,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,-1,1,5,1512,
-20,1513,4,40,67,
-0,111,0,110,0,
-115,0,116,0,97,
+110,0,95,0,56,
+0,1,299,1,3,
+1,5,1,4,1506,
+22,1,134,1,377,
+1507,17,1508,15,1319,
+1,-1,1,5,1509,
+20,1510,4,60,73,
+0,110,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,114,0,
+101,0,109,0,101,
 0,110,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,1,
-288,1,3,1,2,
-1,1,1514,22,1,
-124,1,883,1515,17,
-1516,15,1243,1,-1,
-1,5,1517,20,1518,
-4,38,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,54,0,
-1,315,1,3,1,
-4,1,3,1519,22,
-1,151,1,1628,1520,
-17,1521,15,1522,4,
-22,37,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,1523,20,1524,
-4,24,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,253,1,3,
-1,4,1,3,1525,
-22,1,89,1,2075,
-1526,17,1264,1,0,
-1268,1,373,1527,17,
-1528,15,1315,1,-1,
-1,5,1529,20,1530,
+95,0,53,0,1,
+296,1,3,1,3,
+1,2,1511,22,1,
+131,1,379,1512,17,
+1513,15,1319,1,-1,
+1,5,1514,20,1515,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -5764,25 +5728,81 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-54,0,1,296,1,
-3,1,3,1,2,
-1531,22,1,132,1,
-130,1532,17,1533,15,
-1243,1,-1,1,5,
-1534,20,1535,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,51,0,1,312,
-1,3,1,4,1,
-3,1536,22,1,148,
-1,143,1537,17,1538,
-15,1243,1,-1,1,
-5,1539,20,1540,4,
+55,0,1,298,1,
+3,1,5,1,4,
+1516,22,1,133,1,
+380,1517,17,1518,15,
+1519,4,38,37,0,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+1520,20,1521,4,40,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,289,1,3,1,
+2,1,1,1522,22,
+1,124,1,883,1523,
+17,1524,15,1246,1,
+-1,1,5,1525,20,
+1526,4,38,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,54,
+0,1,316,1,3,
+1,4,1,3,1527,
+22,1,151,1,1628,
+1528,17,1529,15,1530,
+4,22,37,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,1,
+-1,1,5,1531,20,
+1532,4,24,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,1,254,1,
+3,1,4,1,3,
+1533,22,1,89,1,
+2075,1534,17,1267,1,
+0,1271,1,373,1535,
+17,1536,15,1319,1,
+-1,1,5,1537,20,
+1538,4,60,73,0,
+110,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,54,0,1,297,
+1,3,1,3,1,
+2,1539,22,1,132,
+1,130,1540,17,1541,
+15,1246,1,-1,1,
+5,1542,20,1543,4,
 38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5790,43 +5810,27 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,50,0,1,
-311,1,3,1,4,
-1,3,1541,22,1,
-147,1,1901,1542,17,
-1264,1,0,1268,1,
-1152,1543,17,1544,15,
-1220,1,-1,1,5,
-1545,20,1546,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
+49,0,51,0,1,
+313,1,3,1,4,
+1,3,1544,22,1,
+148,1,143,1545,17,
+1546,15,1246,1,-1,
+1,5,1547,20,1548,
+4,38,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
 0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,50,
-0,52,0,1,278,
-1,3,1,6,1,
-5,1547,22,1,114,
-1,1406,1548,17,1549,
-15,1220,1,-1,1,
-5,1550,20,1551,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,55,0,1,
-271,1,3,1,4,
-1,3,1552,22,1,
-107,1,1659,1553,16,
-0,297,1,2413,1554,
-17,1264,1,0,1268,
-1,1159,1555,17,1556,
-15,1220,1,-1,1,
-5,1557,20,1558,4,
+111,0,110,0,95,
+0,49,0,50,0,
+1,312,1,3,1,
+4,1,3,1549,22,
+1,147,1,1901,1550,
+17,1267,1,0,1271,
+1,1152,1551,17,1552,
+15,1223,1,-1,1,
+5,1553,20,1554,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -5834,38 +5838,12 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,49,0,1,
-265,1,3,1,6,
-1,5,1559,22,1,
-101,1,157,1560,17,
-1561,15,1243,1,-1,
-1,5,1562,20,1563,
-4,38,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,49,0,
-1,310,1,3,1,
-4,1,3,1564,22,
-1,146,1,1413,1565,
-17,1566,15,1220,1,
--1,1,5,1567,20,
-1568,4,36,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,52,0,1,
-258,1,3,1,4,
-1,3,1569,22,1,
-94,1,1370,1570,17,
-1571,15,1220,1,-1,
-1,5,1572,20,1573,
+50,0,52,0,1,
+279,1,3,1,6,
+1,5,1555,22,1,
+114,1,1406,1556,17,
+1557,15,1223,1,-1,
+1,5,1558,20,1559,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5873,79 +5851,165 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,56,0,
+0,49,0,55,0,
 1,272,1,3,1,
-4,1,3,1574,22,
-1,108,1,1478,1575,
-17,1576,15,1220,1,
--1,1,5,1577,20,
-1578,4,38,83,0,
+4,1,3,1560,22,
+1,107,1,1659,1561,
+16,0,298,1,2413,
+1562,17,1267,1,0,
+1271,1,1159,1563,17,
+1564,15,1223,1,-1,
+1,5,1565,20,1566,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,49,0,
+1,266,1,3,1,
+6,1,5,1567,22,
+1,101,1,157,1568,
+17,1569,15,1246,1,
+-1,1,5,1570,20,
+1571,4,38,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,49,
+0,1,311,1,3,
+1,4,1,3,1572,
+22,1,146,1,1413,
+1573,17,1574,15,1223,
+1,-1,1,5,1575,
+20,1576,4,36,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,52,0,
+1,259,1,3,1,
+4,1,3,1577,22,
+1,94,1,1370,1578,
+17,1579,15,1223,1,
+-1,1,5,1580,20,
+1581,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,53,
-0,1,269,1,3,
-1,4,1,3,1579,
-22,1,105,1,1620,
-1580,17,1581,15,1522,
-1,-1,1,5,1582,
-20,1583,4,24,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,1,254,
-1,3,1,2,1,
-1,1584,22,1,90,
-1,1621,1585,16,0,
-786,1,1574,921,1,
-172,1586,17,1587,15,
-1243,1,-1,1,5,
-1588,20,1589,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,48,0,1,309,
-1,3,1,4,1,
-3,1590,22,1,145,
-1,1931,983,1,1665,
-1591,17,1592,15,1278,
-1,-1,1,5,1593,
-20,1594,4,36,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
+95,0,49,0,56,
+0,1,273,1,3,
+1,4,1,3,1582,
+22,1,108,1,1478,
+1583,17,1584,15,1223,
+1,-1,1,5,1585,
+20,1586,4,38,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,249,1,3,1,
-2,1,1,1595,22,
-1,85,1,2364,949,
-1,2105,936,1,1188,
-1596,17,1597,15,1220,
-1,-1,1,5,1598,
-20,1599,4,38,83,
+53,0,1,270,1,
+3,1,4,1,3,
+1587,22,1,105,1,
+2106,1588,17,1267,1,
+0,1271,1,1620,1589,
+17,1590,15,1530,1,
+-1,1,5,1591,20,
+1592,4,24,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+50,0,1,255,1,
+3,1,2,1,1,
+1593,22,1,90,1,
+1621,1594,16,0,791,
+1,1574,924,1,172,
+1595,17,1596,15,1246,
+1,-1,1,5,1597,
+20,1598,4,38,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+48,0,1,310,1,
+3,1,4,1,3,
+1599,22,1,145,1,
+1931,986,1,1665,1600,
+17,1601,15,1281,1,
+-1,1,5,1602,20,
+1603,4,36,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+250,1,3,1,2,
+1,1,1604,22,1,
+85,1,2364,952,1,
+2105,939,1,1188,1605,
+17,1606,15,1223,1,
+-1,1,5,1607,20,
+1608,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,51,
+0,1,278,1,3,
+1,6,1,5,1609,
+22,1,113,1,1442,
+1610,17,1611,15,1223,
+1,-1,1,5,1612,
+20,1613,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
 115,0,105,0,103,
 0,110,0,109,0,
 101,0,110,0,116,
-0,95,0,50,0,
-51,0,1,277,1,
-3,1,6,1,5,
-1600,22,1,113,1,
-1442,1601,17,1602,15,
-1220,1,-1,1,5,
-1603,20,1604,4,38,
+0,95,0,49,0,
+54,0,1,271,1,
+3,1,4,1,3,
+1614,22,1,106,1,
+1694,1615,16,0,215,
+1,942,1616,17,1617,
+15,1246,1,-1,1,
+5,1618,20,1619,4,
+38,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,55,0,1,
+317,1,3,1,4,
+1,3,1620,22,1,
+152,1,2198,1621,17,
+1267,1,0,1271,1,
+1195,1622,17,1623,15,
+1223,1,-1,1,5,
+1624,20,1625,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -5953,88 +6017,100 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,54,0,1,270,
-1,3,1,4,1,
-3,1605,22,1,106,
-1,1694,1606,16,0,
-218,1,942,1607,17,
-1608,15,1243,1,-1,
-1,5,1609,20,1610,
-4,38,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,55,0,
-1,316,1,3,1,
-4,1,3,1611,22,
-1,152,1,2198,1612,
-17,1264,1,0,1268,
-1,1195,1613,17,1614,
-15,1220,1,-1,1,
-5,1615,20,1616,4,
-38,83,0,105,0,
+0,48,0,1,265,
+1,3,1,6,1,
+5,1626,22,1,100,
+1,1449,1627,17,1628,
+15,1223,1,-1,1,
+5,1629,20,1630,4,
+36,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
 115,0,115,0,105,
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,48,0,1,
-264,1,3,1,6,
-1,5,1617,22,1,
-100,1,1449,1618,17,
-1619,15,1220,1,-1,
-1,5,1620,20,1621,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,51,0,1,257,
-1,3,1,4,1,
-3,1622,22,1,93,
-1,1701,1623,17,1624,
-15,1278,1,-1,1,
-5,1625,20,1626,4,
-36,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-51,0,1,251,1,
+51,0,1,258,1,
 3,1,4,1,3,
-1627,22,1,87,1,
-447,1628,17,1629,15,
-1630,4,30,37,0,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,1,-1,
-1,5,1631,20,1632,
-4,32,86,0,101,
-0,99,0,116,0,
-111,0,114,0,67,
+1631,22,1,93,1,
+1701,1632,17,1633,15,
+1281,1,-1,1,5,
+1634,20,1635,4,36,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,51,
+0,1,252,1,3,
+1,4,1,3,1636,
+22,1,87,1,447,
+1637,17,1638,15,1639,
+4,30,37,0,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,-1,1,
+5,1640,20,1641,4,
+32,86,0,101,0,
+99,0,116,0,111,
+0,114,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,95,
+0,49,0,1,287,
+1,3,1,8,1,
+7,1642,22,1,122,
+1,2458,1001,1,2459,
+1007,1,1958,1643,17,
+1267,1,0,1271,1,
+188,1644,17,1645,15,
+1246,1,-1,1,5,
+1646,20,1647,4,36,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,57,
+0,1,309,1,3,
+1,4,1,3,1648,
+22,1,144,1,2462,
+1014,1,1657,1019,1,
+2464,1024,1,205,1649,
+17,1650,15,1246,1,
+-1,1,5,1651,20,
+1652,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
 0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-95,0,49,0,1,
-286,1,3,1,8,
-1,7,1633,22,1,
-122,1,2458,998,1,
-2459,1004,1,1958,1634,
-17,1264,1,0,1268,
-1,188,1635,17,1636,
-15,1243,1,-1,1,
-5,1637,20,1638,4,
+95,0,56,0,1,
+308,1,3,1,4,
+1,3,1653,22,1,
+143,1,2227,1033,1,
+1224,1654,17,1655,15,
+1223,1,-1,1,5,
+1656,20,1657,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,50,
+0,50,0,1,277,
+1,3,1,6,1,
+5,1658,22,1,112,
+1,223,1659,17,1660,
+15,1246,1,-1,1,
+5,1661,20,1662,4,
 36,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -6042,89 +6118,87 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-57,0,1,308,1,
+55,0,1,307,1,
 3,1,4,1,3,
-1639,22,1,144,1,
-2462,1011,1,1657,1016,
-1,2464,1021,1,205,
-1640,17,1641,15,1243,
-1,-1,1,5,1642,
-20,1643,4,36,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,56,0,
-1,307,1,3,1,
-4,1,3,1644,22,
-1,143,1,2227,1030,
-1,1224,1645,17,1646,
-15,1220,1,-1,1,
-5,1647,20,1648,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
+1663,22,1,142,1,
+1730,1664,17,1665,15,
+1281,1,-1,1,5,
+1666,20,1667,4,36,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,52,
+0,1,253,1,3,
+1,4,1,3,1668,
+22,1,88,1,476,
+1669,17,1670,15,1671,
+4,18,37,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,-1,1,5,1672,
+20,1673,4,20,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+95,0,52,0,1,
+285,1,3,1,2,
+1,1,1674,22,1,
+120,1,477,1675,17,
+1676,15,1671,1,-1,
+1,5,1677,20,1678,
+4,20,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
 0,116,0,95,0,
-50,0,50,0,1,
-276,1,3,1,6,
-1,5,1649,22,1,
-112,1,223,1650,17,
-1651,15,1243,1,-1,
-1,5,1652,20,1653,
-4,36,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
+51,0,1,284,1,
+3,1,2,1,1,
+1679,22,1,119,1,
+1231,1680,17,1681,15,
+1223,1,-1,1,5,
+1682,20,1683,4,36,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
 0,115,0,105,0,
-111,0,110,0,95,
-0,55,0,1,306,
-1,3,1,4,1,
-3,1654,22,1,142,
-1,1730,1655,17,1656,
-15,1278,1,-1,1,
-5,1657,20,1658,4,
-36,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-52,0,1,252,1,
-3,1,4,1,3,
-1659,22,1,88,1,
-476,1660,17,1661,15,
-1662,4,18,37,0,
-67,0,111,0,110,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,57,
+0,1,264,1,3,
+1,6,1,5,1684,
+22,1,99,1,479,
+1685,17,1686,15,1671,
+1,-1,1,5,1687,
+20,1688,4,20,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+95,0,49,0,1,
+282,1,3,1,2,
+1,1,1689,22,1,
+117,1,480,1690,17,
+1691,15,1692,4,26,
+37,0,76,0,105,
 0,115,0,116,0,
-97,0,110,0,116,
-0,1,-1,1,5,
-1663,20,1664,4,20,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,95,0,52,0,
-1,284,1,3,1,
-2,1,1,1665,22,
-1,120,1,477,1666,
-17,1667,15,1662,1,
--1,1,5,1668,20,
-1669,4,20,67,0,
+0,1,-1,1,5,
+1693,20,1694,4,28,
+76,0,105,0,115,
+0,116,0,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,95,
-0,51,0,1,283,
-1,3,1,2,1,
-1,1670,22,1,119,
-1,1231,1671,17,1672,
-15,1220,1,-1,1,
-5,1673,20,1674,4,
+0,49,0,1,286,
+1,3,1,4,1,
+3,1695,22,1,121,
+1,1485,1696,17,1697,
+15,1223,1,-1,1,
+5,1698,20,1699,4,
 36,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -6132,71 +6206,15 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-57,0,1,263,1,
-3,1,6,1,5,
-1675,22,1,99,1,
-479,1676,17,1677,15,
-1662,1,-1,1,5,
-1678,20,1679,4,20,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,95,0,49,0,
-1,281,1,3,1,
-2,1,1,1680,22,
-1,117,1,480,1681,
-17,1682,15,1683,4,
-26,37,0,76,0,
-105,0,115,0,116,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,-1,1,
-5,1684,20,1685,4,
-28,76,0,105,0,
-115,0,116,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-95,0,49,0,1,
-285,1,3,1,4,
-1,3,1686,22,1,
-121,1,1485,1687,17,
-1688,15,1220,1,-1,
-1,5,1689,20,1690,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,1,256,
-1,3,1,4,1,
-3,1691,22,1,92,
-1,1737,1692,16,0,
-299,1,1989,1038,1,
-1990,1693,17,1264,1,
-0,1268,1,1096,1694,
-17,1695,15,1696,4,
-26,37,0,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,67,
-0,97,0,108,0,
-108,0,1,-1,1,
-5,1697,20,1698,4,
-28,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,67,0,97,
-0,108,0,108,0,
-95,0,49,0,1,
-332,1,3,1,5,
-1,4,1699,22,1,
-168,1,242,1700,17,
-1701,15,1243,1,-1,
-1,5,1702,20,1703,
+50,0,1,257,1,
+3,1,4,1,3,
+1700,22,1,92,1,
+1737,1701,16,0,303,
+1,1989,1041,1,1990,
+1702,17,1267,1,0,
+1271,1,242,1703,17,
+1704,15,1246,1,-1,
+1,5,1705,20,1706,
 4,36,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -6204,22 +6222,22 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,54,0,1,305,
+0,54,0,1,306,
 1,3,1,4,1,
-3,1704,22,1,141,
-1,478,1705,17,1706,
-15,1662,1,-1,1,
-5,1707,20,1708,4,
+3,1707,22,1,141,
+1,478,1708,17,1709,
+15,1671,1,-1,1,
+5,1710,20,1711,4,
 20,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
 116,0,95,0,50,
-0,1,282,1,3,
-1,2,1,1,1709,
+0,1,283,1,3,
+1,2,1,1,1712,
 22,1,118,1,1001,
-1710,17,1711,15,1347,
-1,-1,1,5,1712,
-20,1713,4,40,84,
+1713,17,1714,15,1351,
+1,-1,1,5,1715,
+20,1716,4,40,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -6228,11 +6246,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,56,0,1,
-330,1,3,1,5,
-1,4,1714,22,1,
-166,1,1002,1715,17,
-1716,15,1347,1,-1,
-1,5,1717,20,1718,
+331,1,3,1,5,
+1,4,1717,22,1,
+166,1,1002,1718,17,
+1719,15,1351,1,-1,
+1,5,1720,20,1721,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -6241,153 +6259,58 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,1,323,1,
+49,0,1,324,1,
 3,1,5,1,4,
-1719,22,1,159,1,
-12,1720,19,166,1,
-12,1721,5,50,1,
-1901,1722,16,0,164,
-1,2075,1723,16,0,
-164,1,1860,943,1,
-1803,909,1,1804,1724,
-16,0,164,1,2518,
-1725,16,0,164,1,
-2413,1726,16,0,164,
-1,2198,1727,16,0,
-164,1,1873,958,1,
-1657,1016,1,2136,965,
-1,2032,863,1,1989,
-1038,1,1990,1728,16,
-0,164,1,31,1729,
-16,0,164,1,32,
-1730,16,0,164,1,
-2105,936,1,2106,1731,
-16,0,164,1,2656,
-1732,16,0,282,1,
-2548,1733,16,0,164,
-1,2227,1030,1,2337,
-1734,16,0,164,1,
-2556,1735,16,0,164,
-1,2777,1736,16,0,
-164,1,2564,1737,16,
-0,164,1,2021,840,
-1,2458,998,1,2459,
-1004,1,2462,1011,1,
-2572,1738,16,0,164,
-1,2464,1021,1,2029,
-847,1,2030,853,1,
-2031,858,1,2577,1739,
-16,0,164,1,2469,
-1740,16,0,520,1,
-2035,874,1,2364,949,
-1,2039,884,1,1931,
-983,1,2041,890,1,
-2043,896,1,2045,901,
-1,2592,1741,16,0,
-164,1,1775,1742,16,
-0,164,1,2033,868,
-1,2037,879,1,1574,
-921,1,1958,1743,16,
-0,164,1,2533,1744,
+1722,22,1,159,1,
+12,1723,19,166,1,
+12,1724,5,50,1,
+1901,1725,16,0,164,
+1,2075,1726,16,0,
+164,1,1860,946,1,
+1803,912,1,1804,1727,
+16,0,164,1,2519,
+1728,16,0,164,1,
+2549,1729,16,0,164,
+1,2413,1730,16,0,
+164,1,2198,1731,16,
+0,164,1,1873,961,
+1,1657,1019,1,2534,
+1732,16,0,164,1,
+1990,1733,16,0,164,
+1,31,1734,16,0,
+164,1,32,1735,16,
+0,164,1,2105,939,
+1,2106,1736,16,0,
+164,1,2573,1737,16,
+0,164,1,2658,1738,
+16,0,284,1,2578,
+1739,16,0,164,1,
+2227,1033,1,2337,1740,
+16,0,164,1,2557,
+1741,16,0,164,1,
+2781,1742,16,0,164,
+1,2565,1743,16,0,
+164,1,2021,843,1,
+2458,1001,1,2459,1007,
+1,2462,1014,1,2136,
+968,1,2464,1024,1,
+2029,850,1,2030,856,
+1,2031,861,1,2032,
+866,1,2469,1744,16,
+0,536,1,2035,877,
+1,2364,952,1,2039,
+887,1,1931,986,1,
+2041,893,1,2043,899,
+1,2045,904,1,2593,
+1745,16,0,164,1,
+1775,1746,16,0,164,
+1,1989,1041,1,2033,
+871,1,2037,882,1,
+1574,924,1,1958,1747,
 16,0,164,1,13,
-1745,19,508,1,13,
-1746,5,55,1,2643,
-1747,17,1748,15,1749,
-4,20,37,0,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,1,-1,1,
-5,1750,20,1751,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,56,0,1,187,
-1,3,1,3,1,
-2,1752,22,1,22,
-1,2644,1753,17,1754,
-15,1749,1,-1,1,
-5,1755,20,1756,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,54,0,1,185,
-1,3,1,3,1,
-2,1757,22,1,20,
-1,1860,943,1,1803,
-909,1,2520,1758,17,
-1759,15,1760,4,46,
-37,0,75,0,101,
-0,121,0,73,0,
-110,0,116,0,73,
-0,110,0,116,0,
-65,0,114,0,103,
-0,83,0,116,0,
-97,0,116,0,101,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-1761,20,1762,4,48,
-75,0,101,0,121,
-0,73,0,110,0,
-116,0,73,0,110,
-0,116,0,65,0,
-114,0,103,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,1,203,
-1,3,1,6,1,
-5,1763,22,1,38,
-1,2413,1764,16,0,
-506,1,1873,958,1,
-1657,1016,1,2639,1765,
-17,1766,15,1749,1,
--1,1,5,1767,20,
-1768,4,24,83,0,
-116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,95,0,49,0,
-54,0,1,195,1,
-3,1,3,1,2,
-1769,22,1,30,1,
-2640,1770,17,1771,15,
-1749,1,-1,1,5,
-1772,20,1773,4,24,
-83,0,116,0,97,
-0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,95,0,
-49,0,52,0,1,
-193,1,3,1,3,
-1,2,1774,22,1,
-28,1,2641,1775,17,
-1776,15,1749,1,-1,
-1,5,1777,20,1778,
-4,24,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,49,0,50,
-0,1,191,1,3,
-1,3,1,2,1779,
-22,1,26,1,2642,
-1780,17,1781,15,1749,
-1,-1,1,5,1782,
-20,1783,4,24,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,49,
-0,48,0,1,189,
-1,3,1,3,1,
-2,1784,22,1,24,
-1,1989,1038,1,2535,
-1785,17,1786,15,1787,
+1748,19,213,1,13,
+1749,5,55,1,2536,
+1750,17,1751,15,1752,
 4,46,37,0,73,
 0,110,0,116,0,
 86,0,101,0,99,
@@ -6398,7 +6321,7 @@ public yyLSLSyntax
 0,101,0,69,0,
 118,0,101,0,110,
 0,116,0,1,-1,
-1,5,1788,20,1789,
+1,5,1753,20,1754,
 4,48,73,0,110,
 0,116,0,86,0,
 101,0,99,0,86,
@@ -6409,181 +6332,228 @@ public yyLSLSyntax
 0,69,0,118,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,202,1,3,1,
-6,1,5,1790,22,
-1,37,1,2645,1791,
-17,1792,15,1749,1,
--1,1,5,1793,20,
-1794,4,22,83,0,
+1,203,1,3,1,
+6,1,5,1755,22,
+1,37,1,2643,1756,
+17,1757,15,1758,4,
+20,37,0,83,0,
 116,0,97,0,116,
 0,101,0,66,0,
 111,0,100,0,121,
-0,95,0,52,0,
-1,183,1,3,1,
-3,1,2,1795,22,
-1,18,1,2646,1796,
-17,1797,15,1749,1,
--1,1,5,1798,20,
-1799,4,22,83,0,
+0,1,-1,1,5,
+1759,20,1760,4,24,
+83,0,116,0,97,
+0,116,0,101,0,
+66,0,111,0,100,
+0,121,0,95,0,
+49,0,50,0,1,
+192,1,3,1,3,
+1,2,1761,22,1,
+26,1,2647,1762,17,
+1763,15,1758,1,-1,
+1,5,1764,20,1765,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,52,0,1,
+184,1,3,1,3,
+1,2,1766,22,1,
+18,1,1860,946,1,
+1803,912,1,2521,1767,
+17,1768,15,1769,4,
+46,37,0,75,0,
+101,0,121,0,73,
+0,110,0,116,0,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1770,20,1771,4,
+48,75,0,101,0,
+121,0,73,0,110,
+0,116,0,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+204,1,3,1,6,
+1,5,1772,22,1,
+38,1,2413,1773,16,
+0,521,1,2657,1774,
+17,1775,15,1758,1,
+-1,1,5,1776,20,
+1777,4,22,83,0,
 116,0,97,0,116,
 0,101,0,66,0,
 111,0,100,0,121,
-0,95,0,50,0,
+0,95,0,49,0,
 1,181,1,3,1,
-3,1,2,1800,22,
-1,16,1,2037,879,
-1,32,1801,16,0,
-513,1,2649,1802,17,
-1803,15,1749,1,-1,
-1,5,1804,20,1805,
-4,24,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,49,0,51,
-0,1,192,1,3,
-1,2,1,1,1806,
-22,1,27,1,2650,
-1807,17,1808,15,1749,
-1,-1,1,5,1809,
-20,1810,4,24,83,
+2,1,1,1778,22,
+1,15,1,1873,961,
+1,1657,1019,1,2641,
+1779,17,1780,15,1758,
+1,-1,1,5,1781,
+20,1782,4,24,83,
 0,116,0,97,0,
 116,0,101,0,66,
 0,111,0,100,0,
 121,0,95,0,49,
-0,49,0,1,190,
-1,3,1,2,1,
-1,1811,22,1,25,
-1,2651,1812,17,1813,
-15,1749,1,-1,1,
-5,1814,20,1815,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,57,0,1,188,
-1,3,1,2,1,
-1,1816,22,1,23,
-1,2652,1817,17,1818,
-15,1749,1,-1,1,
-5,1819,20,1820,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,55,0,1,186,
-1,3,1,2,1,
-1,1821,22,1,21,
-1,2653,1822,17,1823,
-15,1749,1,-1,1,
-5,1824,20,1825,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,53,0,1,184,
-1,3,1,2,1,
-1,1826,22,1,19,
-1,2654,1827,17,1828,
-15,1749,1,-1,1,
-5,1829,20,1830,4,
-22,83,0,116,0,
+0,54,0,1,196,
+1,3,1,3,1,
+2,1783,22,1,30,
+1,2642,1784,17,1785,
+15,1758,1,-1,1,
+5,1786,20,1787,4,
+24,83,0,116,0,
 97,0,116,0,101,
 0,66,0,111,0,
 100,0,121,0,95,
-0,51,0,1,182,
-1,3,1,2,1,
-1,1831,22,1,17,
-1,2655,1832,17,1833,
-15,1749,1,-1,1,
-5,1834,20,1835,4,
-22,83,0,116,0,
+0,49,0,52,0,
+1,194,1,3,1,
+3,1,2,1788,22,
+1,28,1,1989,1041,
+1,2644,1789,17,1790,
+15,1758,1,-1,1,
+5,1791,20,1792,4,
+24,83,0,116,0,
 97,0,116,0,101,
 0,66,0,111,0,
 100,0,121,0,95,
-0,49,0,1,180,
-1,3,1,2,1,
-1,1836,22,1,15,
-1,2574,1837,17,1838,
-15,1839,4,34,37,
-0,75,0,101,0,
-121,0,65,0,114,
-0,103,0,83,0,
+0,49,0,48,0,
+1,190,1,3,1,
+3,1,2,1793,22,
+1,24,1,2645,1794,
+17,1795,15,1758,1,
+-1,1,5,1796,20,
+1797,4,22,83,0,
 116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,-1,
-1,5,1840,20,1841,
-4,36,75,0,101,
-0,121,0,65,0,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,56,0,
+1,188,1,3,1,
+3,1,2,1798,22,
+1,22,1,2646,1799,
+17,1800,15,1758,1,
+-1,1,5,1801,20,
+1802,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,54,0,
+1,186,1,3,1,
+3,1,2,1803,22,
+1,20,1,2037,882,
+1,32,1804,16,0,
+526,1,2567,1805,17,
+1806,15,1807,4,34,
+37,0,73,0,110,
+0,116,0,65,0,
 114,0,103,0,83,
 0,116,0,97,0,
 116,0,101,0,69,
 0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,1,198,
-1,3,1,6,1,
-5,1842,22,1,33,
-1,2550,1843,17,1844,
-15,1845,4,46,37,
-0,73,0,110,0,
-116,0,82,0,111,
-0,116,0,82,0,
-111,0,116,0,65,
+110,0,116,0,1,
+-1,1,5,1808,20,
+1809,4,36,73,0,
+110,0,116,0,65,
 0,114,0,103,0,
 83,0,116,0,97,
 0,116,0,101,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,-1,1,5,1846,
-20,1847,4,48,73,
-0,110,0,116,0,
-82,0,111,0,116,
-0,82,0,111,0,
-116,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,1,201,1,
-3,1,6,1,5,
-1848,22,1,36,1,
-2227,1030,1,1574,921,
-1,2558,1849,17,1850,
-15,1851,4,40,37,
-0,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
-114,0,103,0,83,
+95,0,49,0,1,
+200,1,3,1,6,
+1,5,1810,22,1,
+34,1,2650,1811,17,
+1812,15,1758,1,-1,
+1,5,1813,20,1814,
+4,24,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,49,0,53,
+0,1,195,1,3,
+1,2,1,1,1815,
+22,1,29,1,2651,
+1816,17,1817,15,1758,
+1,-1,1,5,1818,
+20,1819,4,24,83,
 0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1852,20,
-1853,4,42,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
-65,0,114,0,103,
-0,83,0,116,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,49,
+0,51,0,1,193,
+1,3,1,2,1,
+1,1820,22,1,27,
+1,2652,1821,17,1822,
+15,1758,1,-1,1,
+5,1823,20,1824,4,
+24,83,0,116,0,
 97,0,116,0,101,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,200,1,3,1,
-6,1,5,1854,22,
-1,35,1,2566,1855,
-17,1856,15,1857,4,
-34,37,0,73,0,
-110,0,116,0,65,
+0,66,0,111,0,
+100,0,121,0,95,
+0,49,0,49,0,
+1,191,1,3,1,
+2,1,1,1825,22,
+1,25,1,2653,1826,
+17,1827,15,1758,1,
+-1,1,5,1828,20,
+1829,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,57,0,
+1,189,1,3,1,
+2,1,1,1830,22,
+1,23,1,2654,1831,
+17,1832,15,1758,1,
+-1,1,5,1833,20,
+1834,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,55,0,
+1,187,1,3,1,
+2,1,1,1835,22,
+1,21,1,2655,1836,
+17,1837,15,1758,1,
+-1,1,5,1838,20,
+1839,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,53,0,
+1,185,1,3,1,
+2,1,1,1840,22,
+1,19,1,2656,1841,
+17,1842,15,1758,1,
+-1,1,5,1843,20,
+1844,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,51,0,
+1,183,1,3,1,
+2,1,1,1845,22,
+1,17,1,2575,1846,
+17,1847,15,1848,4,
+34,37,0,75,0,
+101,0,121,0,65,
 0,114,0,103,0,
 83,0,116,0,97,
 0,116,0,101,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,-1,1,5,1858,
-20,1859,4,36,73,
-0,110,0,116,0,
+1,-1,1,5,1849,
+20,1850,4,36,75,
+0,101,0,121,0,
 65,0,114,0,103,
 0,83,0,116,0,
 97,0,116,0,101,
@@ -6591,137 +6561,166 @@ public yyLSLSyntax
 101,0,110,0,116,
 0,95,0,49,0,
 1,199,1,3,1,
-6,1,5,1860,22,
-1,34,1,2458,998,
-1,2459,1004,1,2462,
-1011,1,2136,965,1,
-2464,1021,1,2029,847,
-1,2030,853,1,2031,
-858,1,2032,863,1,
-2033,868,1,2579,1861,
-17,1862,15,1863,4,
-36,37,0,86,0,
-111,0,105,0,100,
+6,1,5,1851,22,
+1,33,1,2551,1852,
+17,1853,15,1854,4,
+46,37,0,73,0,
+110,0,116,0,82,
+0,111,0,116,0,
+82,0,111,0,116,
 0,65,0,114,0,
 103,0,83,0,116,
 0,97,0,116,0,
 101,0,69,0,118,
 0,101,0,110,0,
 116,0,1,-1,1,
-5,1864,20,1865,4,
-38,86,0,111,0,
-105,0,100,0,65,
+5,1855,20,1856,4,
+48,73,0,110,0,
+116,0,82,0,111,
+0,116,0,82,0,
+111,0,116,0,65,
 0,114,0,103,0,
 83,0,116,0,97,
 0,116,0,101,0,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-197,1,3,1,5,
-1,4,1866,22,1,
-32,1,2035,874,1,
-2364,949,1,2039,884,
-1,1931,983,1,2041,
-890,1,2021,840,1,
-2043,896,1,2045,901,
-1,2700,1867,16,0,
-769,1,2594,1868,17,
-1869,15,1870,4,22,
-37,0,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1871,20,1872,4,
-24,83,0,116,0,
+202,1,3,1,6,
+1,5,1857,22,1,
+36,1,2580,1858,17,
+1859,15,1860,4,36,
+37,0,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,83,0,116,0,
 97,0,116,0,101,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,196,1,3,1,
-6,1,5,1873,22,
-1,31,1,2596,1874,
-16,0,662,1,2648,
-1875,17,1876,15,1749,
-1,-1,1,5,1877,
-20,1878,4,24,83,
+0,1,-1,1,5,
+1861,20,1862,4,38,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,83,
 0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,49,
-0,53,0,1,194,
-1,3,1,2,1,
-1,1879,22,1,29,
-1,2105,936,1,14,
-1880,19,144,1,14,
-1881,5,115,1,2512,
-1882,17,1883,15,1884,
-4,30,37,0,73,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,1,-1,1,
-5,1885,20,1886,4,
-32,73,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,95,
-0,49,0,1,214,
-1,3,1,3,1,
-2,1887,22,1,50,
-1,2513,1888,16,0,
-481,1,1260,1218,1,
-1011,1224,1,1514,1230,
-1,9,1235,1,10,
-1889,17,1890,15,1891,
-4,48,37,0,65,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,49,0,1,198,
+1,3,1,5,1,
+4,1863,22,1,32,
+1,2227,1033,1,1574,
+924,1,2559,1864,17,
+1865,15,1866,4,40,
+37,0,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
 0,114,0,103,0,
-117,0,109,0,101,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
 0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-1,-1,1,5,140,
-1,0,1,0,1892,
-22,1,39,1,262,
-1241,1,1267,1247,1,
-2524,1893,16,0,492,
-1,1521,1252,1,1773,
-1894,16,0,151,1,
-2527,1895,17,1896,15,
-1897,4,30,37,0,
-86,0,101,0,99,
+1,-1,1,5,1867,
+20,1868,4,42,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,65,0,114,0,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,201,1,3,
+1,6,1,5,1869,
+22,1,35,1,2021,
+843,1,2458,1001,1,
+2459,1007,1,2462,1014,
+1,2136,968,1,2464,
+1024,1,2029,850,1,
+2030,856,1,2031,861,
+1,2032,866,1,2033,
+871,1,2035,877,1,
+2364,952,1,2039,887,
+1,1931,986,1,2041,
+893,1,2043,899,1,
+2045,904,1,2703,1870,
+16,0,211,1,2595,
+1871,17,1872,15,1873,
+4,22,37,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,1874,20,
+1875,4,24,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,197,1,
+3,1,6,1,5,
+1876,22,1,31,1,
+2597,1877,16,0,761,
+1,2648,1878,17,1879,
+15,1758,1,-1,1,
+5,1880,20,1881,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,50,0,1,182,
+1,3,1,3,1,
+2,1882,22,1,16,
+1,2105,939,1,14,
+1883,19,144,1,14,
+1884,5,115,1,2510,
+1885,16,0,706,1,
+2513,1886,17,1887,15,
+1888,4,30,37,0,
+73,0,110,0,116,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
 0,110,0,1,-1,
-1,5,1898,20,1899,
-4,32,86,0,101,
-0,99,0,68,0,
+1,5,1889,20,1890,
+4,32,73,0,110,
+0,116,0,68,0,
 101,0,99,0,108,
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
 95,0,49,0,1,
 215,1,3,1,3,
-1,2,1900,22,1,
-51,1,2528,1901,16,
-0,498,1,19,1269,
-1,20,1902,16,0,
-142,1,2281,1276,1,
-525,1339,1,2539,1903,
-16,0,510,1,30,
-1904,17,1905,15,1891,
-1,-1,1,5,1906,
-20,1907,4,50,65,
+1,2,1891,22,1,
+50,1,2514,1892,16,
+0,360,1,1260,1221,
+1,1011,1227,1,1514,
+1233,1,9,1238,1,
+10,1893,17,1894,15,
+1895,4,48,37,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,1,-1,1,5,
+140,1,0,1,0,
+1896,22,1,39,1,
+262,1244,1,1267,1250,
+1,2525,1897,16,0,
+507,1,1773,1898,16,
+0,148,1,2779,1899,
+16,0,142,1,19,
+1272,1,20,1900,16,
+0,142,1,2281,1279,
+1,525,1343,1,30,
+1901,17,1902,15,1895,
+1,-1,1,5,1903,
+20,1904,4,50,65,
 0,114,0,103,0,
 117,0,109,0,101,
 0,110,0,116,0,
@@ -6732,18 +6731,18 @@ public yyLSLSyntax
 110,0,76,0,105,
 0,115,0,116,0,
 95,0,50,0,1,
-205,1,3,1,4,
-1,3,1908,22,1,
-41,1,1002,1715,1,
-2542,1909,17,1910,15,
-1911,4,30,37,0,
+206,1,3,1,4,
+1,3,1905,22,1,
+41,1,283,1299,1,
+2543,1906,17,1907,15,
+1908,4,30,37,0,
 82,0,111,0,116,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
 0,110,0,1,-1,
-1,5,1912,20,1913,
+1,5,1909,20,1910,
 4,32,82,0,111,
 0,116,0,68,0,
 101,0,99,0,108,
@@ -6751,21 +6750,21 @@ public yyLSLSyntax
 97,0,116,0,105,
 0,111,0,110,0,
 95,0,49,0,1,
-216,1,3,1,3,
-1,2,1914,22,1,
-52,1,2543,1915,16,
-0,514,1,40,1300,
-1,41,1916,17,1917,
-15,1918,4,26,37,
+217,1,3,1,3,
+1,2,1911,22,1,
+52,1,2544,1912,16,
+0,528,1,40,1304,
+1,41,1913,17,1914,
+15,1915,4,26,37,
 0,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
 116,0,76,0,105,
 0,115,0,116,0,
-1,-1,1,5,709,
-1,0,1,0,1919,
+1,-1,1,5,724,
+1,0,1,0,1916,
 22,1,169,1,42,
-1920,17,1921,15,1922,
+1917,17,1918,15,1919,
 4,38,37,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
@@ -6774,8 +6773,8 @@ public yyLSLSyntax
 0,114,0,103,0,
 117,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,1923,
-20,1924,4,40,69,
+1,-1,1,5,1920,
+20,1921,4,40,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
@@ -6784,317 +6783,336 @@ public yyLSLSyntax
 117,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-335,1,3,1,2,
-1,1,1925,22,1,
-172,1,44,1306,1,
-47,1307,1,48,1313,
-1,49,1319,1,50,
-1324,1,51,1329,1,
-283,1295,1,305,1334,
-1,63,1345,1,66,
-1351,1,67,1356,1,
-1478,1575,1,69,1366,
-1,70,1371,1,2581,
-1926,17,1927,15,1891,
-1,-1,1,5,140,
-1,0,1,0,1892,
-1,68,1361,1,74,
-1376,1,1013,1381,1,
-2335,1928,16,0,151,
-1,1332,1386,1,1048,
-1462,1,2590,1929,16,
-0,142,1,82,1403,
-1,1296,1290,1,1341,
-1420,1,328,1425,1,
-1303,1430,1,1096,1694,
-1,93,1435,1,1550,
-1440,1,352,1467,1,
-2775,1930,16,0,142,
-1,107,1455,1,1114,
-1461,1,1370,1570,1,
-118,1473,1,1123,1478,
-1,371,1483,1,1377,
-1489,1,375,1494,1,
-377,1499,1,827,1448,
-1,380,1509,1,883,
-1515,1,373,1527,1,
-130,1532,1,379,1504,
-1,143,1537,1,1152,
-1543,1,387,1931,16,
-0,643,1,1406,1548,
-1,1159,1555,1,157,
-1560,1,1413,1565,1,
-1665,1591,1,412,1932,
-16,0,680,1,1094,
-1933,16,0,711,1,
-172,1586,1,2766,1934,
-17,1935,15,1891,1,
--1,1,5,140,1,
-0,1,0,1892,1,
-1188,1596,1,437,1936,
-16,0,755,1,1442,
-1601,1,1694,1937,16,
-0,151,1,942,1607,
-1,1195,1613,1,1449,
-1618,1,1701,1623,1,
-447,1628,1,188,1635,
-1,205,1640,1,2467,
-1938,17,1939,15,1891,
-1,-1,1,5,1940,
-20,1941,4,50,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
+336,1,3,1,2,
+1,1,1922,22,1,
+172,1,44,1310,1,
+47,1311,1,48,1317,
+1,49,1323,1,50,
+1328,1,51,1333,1,
+305,1338,1,63,1349,
+1,1521,1255,1,66,
+1355,1,67,1360,1,
+1478,1583,1,69,1370,
+1,70,1375,1,68,
+1365,1,74,1380,1,
+1013,1385,1,2335,1923,
+16,0,148,1,1332,
+1390,1,1048,1470,1,
+2591,1924,16,0,142,
+1,82,1407,1,1296,
+1294,1,1341,1424,1,
+328,1429,1,1303,1434,
+1,1096,1439,1,93,
+1445,1,1550,1450,1,
+2770,1925,17,1926,15,
+1895,1,-1,1,5,
+140,1,0,1,0,
+1896,1,2528,1927,17,
+1928,15,1929,4,30,
+37,0,86,0,101,
+0,99,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+1,-1,1,5,1930,
+20,1931,4,32,86,
+0,101,0,99,0,
 68,0,101,0,99,
 0,108,0,97,0,
 114,0,97,0,116,
 0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-95,0,49,0,1,
-204,1,3,1,2,
-1,1,1942,22,1,
-40,1,461,1943,16,
-0,711,1,464,1944,
-17,1945,15,1918,1,
--1,1,5,1946,20,
-1947,4,28,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,76,
-0,105,0,115,0,
-116,0,95,0,50,
-0,1,334,1,3,
-1,4,1,3,1948,
-22,1,171,1,1224,
-1645,1,223,1650,1,
-1730,1655,1,476,1660,
-1,477,1666,1,1231,
-1671,1,479,1676,1,
-480,1681,1,1485,1687,
-1,459,1949,17,1950,
-15,1918,1,-1,1,
-5,709,1,0,1,
-0,1919,1,242,1700,
-1,478,1705,1,481,
-1951,17,1952,15,1918,
-1,-1,1,5,1953,
-20,1954,4,28,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
+110,0,95,0,49,
+0,1,216,1,3,
+1,3,1,2,1932,
+22,1,51,1,2529,
+1933,16,0,515,1,
+352,1475,1,107,1464,
+1,1114,1469,1,2540,
+1934,16,0,524,1,
+1370,1578,1,118,1481,
+1,1123,1486,1,371,
+1491,1,1377,1497,1,
+375,1502,1,377,1507,
+1,827,1457,1,380,
+1517,1,883,1523,1,
+373,1535,1,130,1540,
+1,379,1512,1,143,
+1545,1,1152,1551,1,
+387,1935,16,0,656,
+1,1406,1556,1,2582,
+1936,17,1937,15,1895,
+1,-1,1,5,140,
+1,0,1,0,1896,
+1,1159,1563,1,157,
+1568,1,1413,1573,1,
+1665,1600,1,412,1938,
+16,0,695,1,1094,
+1939,16,0,726,1,
+172,1595,1,1188,1605,
+1,437,1940,16,0,
+765,1,1442,1610,1,
+1694,1941,16,0,148,
+1,942,1616,1,1195,
+1622,1,1449,1627,1,
+1701,1632,1,447,1637,
+1,188,1644,1,205,
+1649,1,2467,1942,17,
+1943,15,1895,1,-1,
+1,5,1944,20,1945,
+4,50,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
 76,0,105,0,115,
 0,116,0,95,0,
-49,0,1,333,1,
+49,0,1,205,1,
 3,1,2,1,1,
-1955,22,1,170,1,
-1001,1710,1,2508,1956,
-17,1957,15,1958,4,
-30,37,0,75,0,
-101,0,121,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1959,20,1960,4,32,
-75,0,101,0,121,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,95,0,
-49,0,1,213,1,
-3,1,3,1,2,
-1961,22,1,49,1,
-2509,1962,16,0,475,
-1,15,1963,19,334,
-1,15,1964,5,6,
-1,1114,1965,16,0,
-332,1,1621,1966,16,
-0,754,1,2781,1967,
-16,0,795,1,40,
-1968,16,0,639,1,
-19,1269,1,9,1235,
-1,16,1969,19,136,
-1,16,1970,5,146,
-1,2765,1971,16,0,
-784,1,256,1972,16,
-0,206,1,1261,1973,
-16,0,206,1,509,
-1974,16,0,206,1,
-9,1975,16,0,134,
-1,2521,1976,16,0,
-490,1,2021,840,1,
-1775,1977,16,0,206,
-1,2029,847,1,2030,
-853,1,2031,858,1,
-2032,863,1,2033,868,
-1,277,1978,16,0,
-206,1,2035,874,1,
-2037,879,1,2039,884,
-1,32,1979,16,0,
-206,1,2041,890,1,
-2293,1980,16,0,206,
-1,2043,896,1,2045,
-901,1,40,1981,16,
-0,185,1,41,1982,
-16,0,206,1,1297,
-1983,16,0,206,1,
-43,1984,16,0,206,
-1,44,1985,16,0,
-185,1,1803,909,1,
-1804,1986,16,0,206,
-1,299,1987,16,0,
-206,1,2480,1988,17,
-1989,15,1990,4,24,
-37,0,73,0,110,
-0,116,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1991,20,
-1992,4,26,73,0,
+1946,22,1,40,1,
+461,1947,16,0,726,
+1,464,1948,17,1949,
+15,1915,1,-1,1,
+5,1950,20,1951,4,
+28,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+95,0,50,0,1,
+335,1,3,1,4,
+1,3,1952,22,1,
+171,1,1224,1654,1,
+223,1659,1,1730,1664,
+1,476,1669,1,477,
+1675,1,1231,1680,1,
+479,1685,1,480,1690,
+1,1485,1696,1,459,
+1953,17,1954,15,1915,
+1,-1,1,5,724,
+1,0,1,0,1916,
+1,242,1703,1,478,
+1708,1,481,1955,17,
+1956,15,1915,1,-1,
+1,5,1957,20,1958,
+4,28,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,76,0,
+105,0,115,0,116,
+0,95,0,49,0,
+1,334,1,3,1,
+2,1,1,1959,22,
+1,170,1,1001,1713,
+1,1002,1718,1,2509,
+1960,17,1961,15,1962,
+4,30,37,0,75,
+0,101,0,121,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1963,20,1964,4,
+32,75,0,101,0,
+121,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,95,
+0,49,0,1,214,
+1,3,1,3,1,
+2,1965,22,1,49,
+1,15,1966,19,336,
+1,15,1967,5,6,
+1,2785,1968,16,0,
+334,1,1114,1969,16,
+0,339,1,1621,1970,
+16,0,764,1,40,
+1971,16,0,649,1,
+19,1272,1,9,1238,
+1,16,1972,19,136,
+1,16,1973,5,147,
+1,256,1974,16,0,
+203,1,1261,1975,16,
+0,203,1,509,1976,
+16,0,203,1,2769,
+1977,16,0,790,1,
+9,1978,16,0,134,
+1,2522,1979,16,0,
+505,1,2021,843,1,
+1775,1980,16,0,203,
+1,2029,850,1,2030,
+856,1,2031,861,1,
+2032,866,1,2786,1981,
+16,0,203,1,277,
+1982,16,0,203,1,
+2537,1983,16,0,522,
+1,2037,882,1,2039,
+887,1,32,1984,16,
+0,203,1,2041,893,
+1,2293,1985,16,0,
+203,1,2043,899,1,
+2045,904,1,40,1986,
+16,0,182,1,41,
+1987,16,0,203,1,
+1297,1988,16,0,203,
+1,43,1989,16,0,
+203,1,44,1990,16,
+0,182,1,1803,912,
+1,1804,1991,16,0,
+203,1,299,1992,16,
+0,203,1,2480,1993,
+17,1994,15,1995,4,
+24,37,0,73,0,
 110,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,55,0,1,
-367,1,3,1,2,
-1,1,1993,22,1,
-204,1,52,1994,16,
-0,206,1,2484,1995,
-17,1996,15,1990,1,
--1,1,5,1997,20,
-1998,4,26,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
+1,-1,1,5,1996,
+20,1997,4,26,73,
 0,110,0,116,0,
-95,0,51,0,1,
-363,1,3,1,2,
-1,1,1999,22,1,
-200,1,2567,2000,16,
-0,750,1,1515,2001,
-16,0,206,1,2318,
-2002,16,0,206,1,
-2491,2003,17,2004,15,
-2005,4,26,37,0,
-86,0,111,0,105,
-0,100,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,2006,20,
-2007,4,28,86,0,
-111,0,105,0,100,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,55,0,
+1,369,1,3,1,
+2,1,1,1998,22,
+1,205,1,2560,1999,
+16,0,549,1,52,
+2000,16,0,203,1,
+2484,2001,17,2002,15,
+1995,1,-1,1,5,
+2003,20,2004,4,26,
+73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,54,
-0,1,356,1,3,
-1,2,1,1,2008,
-22,1,193,1,62,
-2009,16,0,228,1,
-63,2010,16,0,185,
-1,2495,2011,17,2012,
-15,2005,1,-1,1,
-5,2013,20,2014,4,
-28,86,0,111,0,
+116,0,95,0,51,
+0,1,365,1,3,
+1,2,1,1,2005,
+22,1,201,1,1515,
+2006,16,0,203,1,
+2318,2007,16,0,203,
+1,2491,2008,17,2009,
+15,2010,4,26,37,
+0,86,0,111,0,
 105,0,100,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,50,0,1,
-352,1,3,1,2,
-1,1,2015,22,1,
-189,1,2575,2016,16,
-0,759,1,2075,2017,
-16,0,206,1,1574,
-921,1,1479,2018,16,
-0,206,1,2580,2019,
-16,0,352,1,71,
-2020,16,0,206,1,
-1658,2021,16,0,790,
-1,1833,2022,16,0,
-321,1,1834,2023,16,
-0,206,1,2337,2024,
-16,0,206,1,79,
-2025,16,0,206,1,
-1335,2026,16,0,206,
-1,322,2027,16,0,
-206,1,76,2028,16,
-0,206,1,85,2029,
-16,0,206,1,89,
-2030,16,0,206,1,
-346,2031,16,0,206,
-1,97,2032,16,0,
-206,1,2106,2033,16,
-0,206,1,102,2034,
-16,0,206,1,1860,
-943,1,2458,998,1,
-2364,949,1,2536,2035,
-16,0,633,1,2782,
-2036,16,0,206,1,
-1990,2037,16,0,206,
-1,112,2038,16,0,
-206,1,1117,2039,16,
-0,206,1,1873,958,
-1,1875,2040,16,0,
-436,1,1876,2041,16,
-0,206,1,2551,2042,
-16,0,642,1,124,
-2043,16,0,206,1,
-2478,2044,17,2045,15,
-1990,1,-1,1,5,
-2046,20,2047,4,26,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,57,
-0,1,369,1,3,
-1,2,1,1,2048,
-22,1,206,1,2136,
-965,1,2559,2049,16,
-0,536,1,525,2050,
-16,0,206,1,137,
-2051,16,0,206,1,
-381,2052,16,0,206,
-1,1901,2053,16,0,
-206,1,1153,2054,16,
-0,206,1,151,2055,
-16,0,206,1,1407,
-2056,16,0,206,1,
-1659,2057,16,0,206,
-1,2413,2058,16,0,
-206,1,406,2059,16,
-0,206,1,1371,2060,
-16,0,206,1,2105,
-936,1,166,2061,16,
-0,206,1,1622,2062,
-16,0,206,1,1931,
-983,1,1932,2063,16,
-0,525,1,1933,2064,
-16,0,206,1,431,
-2065,16,0,206,1,
-1585,2066,16,0,206,
-1,182,2067,16,0,
-206,1,1189,2068,16,
-0,206,1,1443,2069,
-16,0,206,1,1695,
-2070,16,0,206,1,
-2198,2071,16,0,206,
-1,447,2072,16,0,
-206,1,199,2073,16,
-0,206,1,2459,1004,
-1,1958,2074,16,0,
-206,1,2462,1011,1,
-1657,1016,1,2464,1021,
-1,459,2075,16,0,
-206,1,462,2076,16,
-0,206,1,2471,2077,
-17,2078,15,2079,4,
+1,-1,1,5,2011,
+20,2012,4,28,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+54,0,1,358,1,
+3,1,2,1,1,
+2013,22,1,194,1,
+62,2014,16,0,225,
+1,63,2015,16,0,
+182,1,2495,2016,17,
+2017,15,2010,1,-1,
+1,5,2018,20,2019,
+4,28,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,354,1,3,1,
+2,1,1,2020,22,
+1,190,1,2576,2021,
+16,0,579,1,2075,
+2022,16,0,203,1,
+1574,924,1,1479,2023,
+16,0,203,1,71,
+2024,16,0,203,1,
+1658,2025,16,0,795,
+1,1833,2026,16,0,
+326,1,1834,2027,16,
+0,203,1,2337,2028,
+16,0,203,1,79,
+2029,16,0,203,1,
+1335,2030,16,0,203,
+1,322,2031,16,0,
+203,1,76,2032,16,
+0,203,1,85,2033,
+16,0,203,1,89,
+2034,16,0,203,1,
+2033,871,1,2035,877,
+1,346,2035,16,0,
+203,1,97,2036,16,
+0,203,1,2106,2037,
+16,0,203,1,102,
+2038,16,0,203,1,
+1860,946,1,2458,1001,
+1,2364,952,1,1990,
+2039,16,0,203,1,
+112,2040,16,0,203,
+1,1117,2041,16,0,
+203,1,1873,961,1,
+1875,2042,16,0,446,
+1,1876,2043,16,0,
+203,1,2552,2044,16,
+0,540,1,124,2045,
+16,0,203,1,2478,
+2046,17,2047,15,1995,
+1,-1,1,5,2048,
+20,2049,4,26,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,57,0,
+1,371,1,3,1,
+2,1,1,2050,22,
+1,207,1,2136,968,
+1,381,2051,16,0,
+203,1,525,2052,16,
+0,203,1,137,2053,
+16,0,203,1,2568,
+2054,16,0,683,1,
+1901,2055,16,0,203,
+1,1153,2056,16,0,
+203,1,151,2057,16,
+0,203,1,1407,2058,
+16,0,203,1,2581,
+2059,16,0,779,1,
+2413,2060,16,0,203,
+1,406,2061,16,0,
+203,1,1371,2062,16,
+0,203,1,2105,939,
+1,166,2063,16,0,
+203,1,1622,2064,16,
+0,203,1,1931,986,
+1,1932,2065,16,0,
+539,1,1933,2066,16,
+0,203,1,431,2067,
+16,0,203,1,1585,
+2068,16,0,203,1,
+182,2069,16,0,203,
+1,1189,2070,16,0,
+203,1,1443,2071,16,
+0,203,1,1695,2072,
+16,0,203,1,2198,
+2073,16,0,203,1,
+447,2074,16,0,203,
+1,199,2075,16,0,
+203,1,2459,1007,1,
+1958,2076,16,0,203,
+1,2462,1014,1,1657,
+1019,1,2464,1024,1,
+1659,2077,16,0,203,
+1,459,2078,16,0,
+203,1,462,2079,16,
+0,203,1,2471,2080,
+17,2081,15,2082,4,
 36,37,0,75,0,
 101,0,121,0,73,
 0,110,0,116,0,
@@ -7103,7 +7121,7 @@ public yyLSLSyntax
 103,0,69,0,118,
 0,101,0,110,0,
 116,0,1,-1,1,
-5,2080,20,2081,4,
+5,2083,20,2084,4,
 38,75,0,101,0,
 121,0,73,0,110,
 0,116,0,73,0,
@@ -7112,10 +7130,10 @@ public yyLSLSyntax
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-376,1,3,1,2,
-1,1,2082,22,1,
-213,1,2472,2083,17,
-2084,15,2085,4,36,
+378,1,3,1,2,
+1,1,2085,22,1,
+214,1,2472,2086,17,
+2087,15,2088,4,36,
 37,0,73,0,110,
 0,116,0,86,0,
 101,0,99,0,86,
@@ -7124,7 +7142,7 @@ public yyLSLSyntax
 0,69,0,118,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-2086,20,2087,4,38,
+2089,20,2090,4,38,
 73,0,110,0,116,
 0,86,0,101,0,
 99,0,86,0,101,
@@ -7132,11 +7150,11 @@ public yyLSLSyntax
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,1,375,
+0,49,0,1,377,
 1,3,1,2,1,
-1,2088,22,1,212,
-1,2473,2089,17,2090,
-15,2091,4,36,37,
+1,2091,22,1,213,
+1,2473,2092,17,2093,
+15,2094,4,36,37,
 0,73,0,110,0,
 116,0,82,0,111,
 0,116,0,82,0,
@@ -7144,8 +7162,8 @@ public yyLSLSyntax
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,-1,1,5,2092,
-20,2093,4,38,73,
+1,-1,1,5,2095,
+20,2096,4,38,73,
 0,110,0,116,0,
 82,0,111,0,116,
 0,82,0,111,0,
@@ -7153,18 +7171,18 @@ public yyLSLSyntax
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-49,0,1,374,1,
+49,0,1,376,1,
 3,1,2,1,1,
-2094,22,1,211,1,
-2474,2095,17,2096,15,
-2097,4,30,37,0,
+2097,22,1,212,1,
+2474,2098,17,2099,15,
+2100,4,30,37,0,
 86,0,101,0,99,
 0,116,0,111,0,
 114,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,1,-1,
-1,5,2098,20,2099,
+1,5,2101,20,2102,
 4,32,86,0,101,
 0,99,0,116,0,
 111,0,114,0,65,
@@ -7172,11 +7190,11 @@ public yyLSLSyntax
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,51,0,1,
-373,1,3,1,2,
-1,1,2100,22,1,
-210,1,2475,2101,17,
-2102,15,2097,1,-1,
-1,5,2103,20,2104,
+375,1,3,1,2,
+1,1,2103,22,1,
+211,1,2475,2104,17,
+2105,15,2100,1,-1,
+1,5,2106,20,2107,
 4,32,86,0,101,
 0,99,0,116,0,
 111,0,114,0,65,
@@ -7184,11 +7202,11 @@ public yyLSLSyntax
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,50,0,1,
-372,1,3,1,2,
-1,1,2105,22,1,
-209,1,2476,2106,17,
-2107,15,2097,1,-1,
-1,5,2108,20,2109,
+374,1,3,1,2,
+1,1,2108,22,1,
+210,1,2476,2109,17,
+2110,15,2100,1,-1,
+1,5,2111,20,2112,
 4,32,86,0,101,
 0,99,0,116,0,
 111,0,114,0,65,
@@ -7196,380 +7214,352 @@ public yyLSLSyntax
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-371,1,3,1,2,
-1,1,2110,22,1,
-208,1,2477,2111,17,
-2112,15,1990,1,-1,
-1,5,2113,20,2114,
+373,1,3,1,2,
+1,1,2113,22,1,
+209,1,2477,2114,17,
+2115,15,1995,1,-1,
+1,5,2116,20,2117,
 4,28,73,0,110,
 0,116,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
 0,49,0,48,0,
-1,370,1,3,1,
-2,1,1,2115,22,
-1,207,1,2227,1030,
-1,2479,2116,17,2117,
-15,1990,1,-1,1,
-5,2118,20,2119,4,
+1,372,1,3,1,
+2,1,1,2118,22,
+1,208,1,2227,1033,
+1,2479,2119,17,2120,
+15,1995,1,-1,1,
+5,2121,20,2122,4,
 26,73,0,110,0,
 116,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-56,0,1,368,1,
+56,0,1,370,1,
 3,1,2,1,1,
-2120,22,1,205,1,
-1225,2121,16,0,206,
-1,2481,2122,17,2123,
-15,1990,1,-1,1,
-5,2124,20,2125,4,
+2123,22,1,206,1,
+1225,2124,16,0,203,
+1,2481,2125,17,2126,
+15,1995,1,-1,1,
+5,2127,20,2128,4,
 26,73,0,110,0,
 116,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-54,0,1,366,1,
+54,0,1,368,1,
 3,1,2,1,1,
-2126,22,1,203,1,
-2482,2127,17,2128,15,
-1990,1,-1,1,5,
-2129,20,2130,4,26,
+2129,22,1,204,1,
+2482,2130,17,2131,15,
+1995,1,-1,1,5,
+2132,20,2133,4,26,
 73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
 116,0,95,0,53,
-0,1,365,1,3,
-1,2,1,1,2131,
-22,1,202,1,2483,
-2132,17,2133,15,1990,
-1,-1,1,5,2134,
-20,2135,4,26,73,
+0,1,367,1,3,
+1,2,1,1,2134,
+22,1,203,1,2483,
+2135,17,2136,15,1995,
+1,-1,1,5,2137,
+20,2138,4,26,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
 0,95,0,52,0,
-1,364,1,3,1,
-2,1,1,2136,22,
-1,201,1,1731,2137,
-16,0,206,1,2485,
-2138,17,2139,15,1990,
-1,-1,1,5,2140,
-20,2141,4,26,73,
+1,366,1,3,1,
+2,1,1,2139,22,
+1,202,1,1731,2140,
+16,0,203,1,2485,
+2141,17,2142,15,1995,
+1,-1,1,5,2143,
+20,2144,4,26,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
 0,95,0,50,0,
-1,362,1,3,1,
-2,1,1,2142,22,
-1,199,1,2486,2143,
-17,2144,15,1990,1,
--1,1,5,2145,20,
-2146,4,26,73,0,
+1,364,1,3,1,
+2,1,1,2145,22,
+1,200,1,2486,2146,
+17,2147,15,1995,1,
+-1,1,5,2148,20,
+2149,4,26,73,0,
 110,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-361,1,3,1,2,
-1,1,2147,22,1,
-198,1,2487,2148,17,
-2149,15,2150,4,24,
+363,1,3,1,2,
+1,1,2150,22,1,
+199,1,2487,2151,17,
+2152,15,2153,4,24,
 37,0,75,0,101,
 0,121,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,1,
--1,1,5,2151,20,
-2152,4,26,75,0,
+-1,1,5,2154,20,
+2155,4,26,75,0,
 101,0,121,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,50,0,1,
-360,1,3,1,2,
-1,1,2153,22,1,
-197,1,2488,2154,17,
-2155,15,2150,1,-1,
-1,5,2156,20,2157,
+362,1,3,1,2,
+1,1,2156,22,1,
+198,1,2488,2157,17,
+2158,15,2153,1,-1,
+1,5,2159,20,2160,
 4,26,75,0,101,
 0,121,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,1,359,
+0,49,0,1,361,
 1,3,1,2,1,
-1,2158,22,1,196,
-1,2489,2159,17,2160,
-15,2005,1,-1,1,
-5,2161,20,2162,4,
+1,2161,22,1,197,
+1,2489,2162,17,2163,
+15,2010,1,-1,1,
+5,2164,20,2165,4,
 28,86,0,111,0,
 105,0,100,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,56,0,1,
-358,1,3,1,2,
-1,1,2163,22,1,
-195,1,2490,2164,17,
-2165,15,2005,1,-1,
-1,5,2166,20,2167,
+360,1,3,1,2,
+1,1,2166,22,1,
+196,1,2490,2167,17,
+2168,15,2010,1,-1,
+1,5,2169,20,2170,
 4,28,86,0,111,
 0,105,0,100,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
 0,95,0,55,0,
-1,357,1,3,1,
-2,1,1,2168,22,
-1,194,1,1989,1038,
-1,2492,2169,17,2170,
-15,2005,1,-1,1,
-5,2171,20,2172,4,
+1,359,1,3,1,
+2,1,1,2171,22,
+1,195,1,1989,1041,
+1,2492,2172,17,2173,
+15,2010,1,-1,1,
+5,2174,20,2175,4,
 28,86,0,111,0,
 105,0,100,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,53,0,1,
-355,1,3,1,2,
-1,1,2173,22,1,
-192,1,2493,2174,17,
-2175,15,2005,1,-1,
-1,5,2176,20,2177,
+357,1,3,1,2,
+1,1,2176,22,1,
+193,1,2493,2177,17,
+2178,15,2010,1,-1,
+1,5,2179,20,2180,
 4,28,86,0,111,
 0,105,0,100,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
 0,95,0,52,0,
-1,354,1,3,1,
-2,1,1,2178,22,
-1,191,1,2494,2179,
-17,2180,15,2005,1,
--1,1,5,2181,20,
-2182,4,28,86,0,
+1,356,1,3,1,
+2,1,1,2181,22,
+1,192,1,2494,2182,
+17,2183,15,2010,1,
+-1,1,5,2184,20,
+2185,4,28,86,0,
 111,0,105,0,100,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
 116,0,95,0,51,
-0,1,353,1,3,
-1,2,1,1,2183,
-22,1,190,1,236,
-2184,16,0,206,1,
-2496,2185,17,2186,15,
-2005,1,-1,1,5,
-2187,20,2188,4,28,
+0,1,355,1,3,
+1,2,1,1,2186,
+22,1,191,1,236,
+2187,16,0,203,1,
+2496,2188,17,2189,15,
+2010,1,-1,1,5,
+2190,20,2191,4,28,
 86,0,111,0,105,
 0,100,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,1,351,
+0,49,0,1,353,
 1,3,1,2,1,
-1,2189,22,1,188,
-1,2497,2190,17,2191,
-15,2192,4,12,37,
+1,2192,22,1,189,
+1,2497,2193,17,2194,
+15,2195,4,12,37,
 0,69,0,118,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-2193,20,2194,4,14,
+2196,20,2197,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,56,0,1,
-350,1,3,1,2,
-1,1,2195,22,1,
-187,1,2498,2196,17,
-2197,15,2192,1,-1,
-1,5,2198,20,2199,
+95,0,57,0,1,
+352,1,3,1,2,
+1,1,2198,22,1,
+188,1,2498,2199,17,
+2200,15,2195,1,-1,
+1,5,2201,20,2202,
 4,14,69,0,118,
 0,101,0,110,0,
-116,0,95,0,55,
-0,1,349,1,3,
-1,2,1,1,2200,
-22,1,186,1,2499,
-2201,17,2202,15,2192,
-1,-1,1,5,2203,
-20,2204,4,14,69,
+116,0,95,0,56,
+0,1,351,1,3,
+1,2,1,1,2203,
+22,1,187,1,2499,
+2204,17,2205,15,2195,
+1,-1,1,5,2206,
+20,2207,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,54,0,1,348,
+0,55,0,1,350,
 1,3,1,2,1,
-1,2205,22,1,185,
-1,2500,2206,17,2207,
-15,2192,1,-1,1,
-5,2208,20,2209,4,
+1,2208,22,1,186,
+1,2500,2209,17,2210,
+15,2195,1,-1,1,
+5,2211,20,2212,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,53,0,
-1,347,1,3,1,
-2,1,1,2210,22,
-1,184,1,2501,2211,
-17,2212,15,2192,1,
--1,1,5,2213,20,
-2214,4,14,69,0,
+0,95,0,54,0,
+1,349,1,3,1,
+2,1,1,2213,22,
+1,185,1,2501,2214,
+17,2215,15,2195,1,
+-1,1,5,2216,20,
+2217,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-52,0,1,346,1,
+53,0,1,348,1,
 3,1,2,1,1,
-2215,22,1,183,1,
-2502,2216,17,2217,15,
-2192,1,-1,1,5,
-2218,20,2219,4,14,
+2218,22,1,184,1,
+2502,2219,17,2220,15,
+2195,1,-1,1,5,
+2221,20,2222,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,51,0,1,
-345,1,3,1,2,
-1,1,2220,22,1,
-182,1,2503,2221,17,
-2222,15,2192,1,-1,
-1,5,2223,20,2224,
+95,0,52,0,1,
+347,1,3,1,2,
+1,1,2223,22,1,
+183,1,2503,2224,17,
+2225,15,2195,1,-1,
+1,5,2226,20,2227,
 4,14,69,0,118,
 0,101,0,110,0,
-116,0,95,0,50,
-0,1,344,1,3,
-1,2,1,1,2225,
-22,1,181,1,2504,
-2226,17,2227,15,2192,
-1,-1,1,5,2228,
-20,2229,4,14,69,
+116,0,95,0,51,
+0,1,346,1,3,
+1,2,1,1,2228,
+22,1,182,1,2504,
+2229,17,2230,15,2195,
+1,-1,1,5,2231,
+20,2232,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,1,343,
+0,50,0,1,345,
 1,3,1,2,1,
-1,2230,22,1,180,
-1,2505,2231,16,0,
-469,1,217,2232,16,
-0,206,1,1756,2233,
-16,0,206,1,17,
-2234,19,163,1,17,
-2235,5,134,1,1,
-2236,17,2237,15,2238,
-4,18,37,0,84,
-0,121,0,112,0,
-101,0,110,0,97,
-0,109,0,101,0,
-1,-1,1,5,2239,
-20,2240,4,20,84,
+1,2233,22,1,181,
+1,2505,2234,17,2235,
+15,2195,1,-1,1,
+5,2236,20,2237,4,
+14,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,344,1,3,1,
+2,1,1,2238,22,
+1,180,1,2506,2239,
+16,0,482,1,217,
+2240,16,0,203,1,
+1756,2241,16,0,203,
+1,17,2242,19,163,
+1,17,2243,5,134,
+1,1,2244,17,2245,
+15,2246,4,18,37,
+0,84,0,121,0,
+112,0,101,0,110,
+0,97,0,109,0,
+101,0,1,-1,1,
+5,2247,20,2248,4,
+20,84,0,121,0,
+112,0,101,0,110,
+0,97,0,109,0,
+101,0,95,0,55,
+0,1,343,1,3,
+1,2,1,1,2249,
+22,1,179,1,2,
+2250,17,2251,15,2246,
+1,-1,1,5,2252,
+20,2253,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
-95,0,55,0,1,
+95,0,54,0,1,
 342,1,3,1,2,
-1,1,2241,22,1,
-179,1,2,2242,17,
-2243,15,2238,1,-1,
-1,5,2244,20,2245,
+1,1,2254,22,1,
+178,1,3,2255,17,
+2256,15,2246,1,-1,
+1,5,2257,20,2258,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-54,0,1,341,1,
+53,0,1,341,1,
 3,1,2,1,1,
-2246,22,1,178,1,
-3,2247,17,2248,15,
-2238,1,-1,1,5,
-2249,20,2250,4,20,
+2259,22,1,177,1,
+4,2260,17,2261,15,
+2246,1,-1,1,5,
+2262,20,2263,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
-0,95,0,53,0,
+0,95,0,52,0,
 1,340,1,3,1,
-2,1,1,2251,22,
-1,177,1,4,2252,
-17,2253,15,2238,1,
--1,1,5,2254,20,
-2255,4,20,84,0,
+2,1,1,2264,22,
+1,176,1,5,2265,
+17,2266,15,2246,1,
+-1,1,5,2267,20,
+2268,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,52,0,1,339,
+0,51,0,1,339,
 1,3,1,2,1,
-1,2256,22,1,176,
-1,5,2257,17,2258,
-15,2238,1,-1,1,
-5,2259,20,2260,4,
+1,2269,22,1,175,
+1,6,2270,17,2271,
+15,2246,1,-1,1,
+5,2272,20,2273,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
-101,0,95,0,51,
+101,0,95,0,50,
 0,1,338,1,3,
-1,2,1,1,2261,
-22,1,175,1,6,
-2262,17,2263,15,2238,
-1,-1,1,5,2264,
-20,2265,4,20,84,
+1,2,1,1,2274,
+22,1,174,1,7,
+2275,17,2276,15,2246,
+1,-1,1,5,2277,
+20,2278,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
-95,0,50,0,1,
+95,0,49,0,1,
 337,1,3,1,2,
-1,1,2266,22,1,
-174,1,7,2267,17,
-2268,15,2238,1,-1,
-1,5,2269,20,2270,
-4,20,84,0,121,
-0,112,0,101,0,
-110,0,97,0,109,
-0,101,0,95,0,
-49,0,1,336,1,
-3,1,2,1,1,
-2271,22,1,173,1,
-1514,1230,1,9,1235,
-1,10,1889,1,262,
-1241,1,1267,1247,1,
-2775,2272,16,0,792,
-1,1521,1252,1,1773,
-2273,16,0,264,1,
-2527,1895,1,19,1269,
-1,20,2274,16,0,
-161,1,2531,2275,17,
-2276,15,2277,4,66,
-37,0,73,0,110,
-0,116,0,86,0,
-101,0,99,0,86,
-0,101,0,99,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,1,-1,1,5,
-2278,20,2279,4,68,
-73,0,110,0,116,
-0,86,0,101,0,
-99,0,86,0,101,
-0,99,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,95,
-0,49,0,1,210,
-1,3,1,6,1,
-5,2280,22,1,46,
-1,2281,1276,1,525,
-1339,1,30,1904,1,
-1002,1715,1,283,1295,
-1,2546,2281,17,2282,
-15,2283,4,66,37,
+1,1,2279,22,1,
+173,1,2518,2280,16,
+0,499,1,9,1238,
+1,10,1893,1,262,
+1244,1,1267,1250,1,
+1521,1255,1,1773,2281,
+16,0,261,1,2528,
+1927,1,19,1272,1,
+20,2282,16,0,161,
+1,2532,2283,17,2284,
+15,2285,4,66,37,
 0,73,0,110,0,
-116,0,82,0,111,
-0,116,0,82,0,
-111,0,116,0,65,
+116,0,86,0,101,
+0,99,0,86,0,
+101,0,99,0,65,
 0,114,0,103,0,
 117,0,109,0,101,
 0,110,0,116,0,
@@ -7579,12 +7569,12 @@ public yyLSLSyntax
 0,105,0,111,0,
 110,0,76,0,105,
 0,115,0,116,0,
-1,-1,1,5,2284,
-20,2285,4,68,73,
+1,-1,1,5,2286,
+20,2287,4,68,73,
 0,110,0,116,0,
-82,0,111,0,116,
-0,82,0,111,0,
-116,0,65,0,114,
+86,0,101,0,99,
+0,86,0,101,0,
+99,0,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
 0,116,0,68,0,
@@ -7594,34 +7584,54 @@ public yyLSLSyntax
 0,111,0,110,0,
 76,0,105,0,115,
 0,116,0,95,0,
-49,0,1,209,1,
+49,0,1,211,1,
 3,1,6,1,5,
-2286,22,1,45,1,
-2547,2287,16,0,519,
-1,1010,2288,16,0,
-701,1,40,1300,1,
-41,1916,1,42,1920,
-1,44,1306,1,2555,
-2289,16,0,645,1,
-1260,1218,1,47,1307,
-1,48,1313,1,49,
-1319,1,50,1324,1,
-51,1329,1,2562,2290,
-17,2291,15,2292,4,
-54,37,0,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-1,-1,1,5,2293,
-20,2294,4,56,73,
-0,110,0,116,0,
+2288,22,1,46,1,
+2533,2289,16,0,518,
+1,30,1901,1,283,
+1299,1,2543,1906,1,
+2547,2290,17,2291,15,
+2292,4,66,37,0,
+73,0,110,0,116,
+0,82,0,111,0,
+116,0,82,0,111,
+0,116,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,1,
+-1,1,5,2293,20,
+2294,4,68,73,0,
+110,0,116,0,82,
+0,111,0,116,0,
+82,0,111,0,116,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,95,0,49,
+0,1,210,1,3,
+1,6,1,5,2295,
+22,1,45,1,2548,
+2296,16,0,650,1,
+1010,2297,16,0,716,
+1,40,1304,1,41,
+1913,1,42,1917,1,
+44,1310,1,2555,2298,
+17,2299,15,2300,4,
+60,37,0,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -7631,16 +7641,30 @@ public yyLSLSyntax
 116,0,105,0,111,
 0,110,0,76,0,
 105,0,115,0,116,
-0,95,0,49,0,
-1,207,1,3,1,
-2,1,1,2295,22,
-1,43,1,2563,2296,
-16,0,661,1,305,
-1334,1,2576,2297,16,
-0,571,1,2570,2298,
-17,2299,15,2300,4,
-54,37,0,75,0,
-101,0,121,0,65,
+0,1,-1,1,5,
+2301,20,2302,4,62,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,95,0,
+49,0,1,209,1,
+3,1,2,1,1,
+2303,22,1,44,1,
+1260,1221,1,47,1311,
+1,48,1317,1,49,
+1323,1,50,1328,1,
+51,1333,1,2563,2304,
+17,2305,15,2306,4,
+54,37,0,73,0,
+110,0,116,0,65,
 0,114,0,103,0,
 117,0,109,0,101,
 0,110,0,116,0,
@@ -7650,9 +7674,9 @@ public yyLSLSyntax
 0,105,0,111,0,
 110,0,76,0,105,
 0,115,0,116,0,
-1,-1,1,5,2301,
-20,2302,4,56,75,
-0,101,0,121,0,
+1,-1,1,5,2307,
+20,2308,4,56,73,
+0,110,0,116,0,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -7663,23 +7687,26 @@ public yyLSLSyntax
 0,110,0,76,0,
 105,0,115,0,116,
 0,95,0,49,0,
-1,206,1,3,1,
-2,1,1,2303,22,
-1,42,1,61,2304,
-16,0,220,1,63,
-1345,1,66,1351,1,
-67,1356,1,68,1361,
-1,69,1366,1,70,
-1371,1,2581,1926,1,
-73,2305,16,0,230,
-1,74,1376,1,1013,
-1381,1,2335,2306,16,
-0,266,1,1332,1386,
-1,1048,1462,1,2590,
-2307,16,0,774,1,
-82,1403,1,1840,2308,
-16,0,338,1,2516,
-2309,17,2310,15,2311,
+1,208,1,3,1,
+2,1,1,2309,22,
+1,43,1,305,1338,
+1,1514,1233,1,525,
+1343,1,61,2310,16,
+0,217,1,2572,2311,
+16,0,689,1,63,
+1349,1,66,1355,1,
+67,1360,1,68,1365,
+1,69,1370,1,70,
+1375,1,2582,1936,1,
+73,2312,16,0,227,
+1,827,1457,1,1013,
+1385,1,2335,2313,16,
+0,263,1,1332,1390,
+1,74,1380,1,2591,
+2314,16,0,710,1,
+82,1407,1,2513,1886,
+1,1341,1424,1,2517,
+2315,17,2316,15,2317,
 4,66,37,0,75,
 0,101,0,121,0,
 73,0,110,0,116,
@@ -7694,7 +7721,7 @@ public yyLSLSyntax
 0,111,0,110,0,
 76,0,105,0,115,
 0,116,0,1,-1,
-1,5,2312,20,2313,
+1,5,2318,20,2319,
 4,68,75,0,101,
 0,121,0,73,0,
 110,0,116,0,73,
@@ -7709,63 +7736,55 @@ public yyLSLSyntax
 0,110,0,76,0,
 105,0,115,0,116,
 0,95,0,49,0,
-1,211,1,3,1,
-6,1,5,2314,22,
-1,47,1,2517,2315,
-16,0,487,1,328,
-1425,1,1303,1430,1,
-1096,1694,1,93,1435,
-1,1550,1440,1,827,
-1448,1,2532,2316,16,
-0,628,1,1011,1224,
-1,107,1455,1,1114,
-1461,1,2542,1909,1,
-1871,2317,16,0,348,
-1,1370,1570,1,1478,
-1575,1,118,1473,1,
-1123,1478,1,371,1483,
-1,1377,1489,1,375,
-1494,1,1882,2318,16,
-0,363,1,377,1499,
-1,352,1467,1,379,
-1504,1,1341,1420,1,
-130,1532,1,2074,2319,
-16,0,641,1,373,
-1527,1,1012,2320,16,
-0,703,1,380,1509,
-1,143,1537,1,1152,
-1543,1,1406,1548,1,
-1159,1555,1,157,1560,
-1,1413,1565,1,883,
-1515,1,2512,1882,1,
-1296,1290,1,172,1586,
-1,1665,1591,1,2766,
-1934,1,1939,2321,16,
-0,482,1,1188,1596,
-1,1442,1601,1,188,
-1635,1,942,1607,1,
-1195,1613,1,1449,1618,
-1,1701,1623,1,447,
-1628,1,1094,2322,16,
-0,785,1,205,1640,
-1,2554,2323,17,2324,
-15,2325,4,60,37,
-0,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,1,
--1,1,5,2326,20,
-2327,4,62,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
+1,212,1,3,1,
+6,1,5,2320,22,
+1,47,1,328,1429,
+1,1303,1434,1,1096,
+1439,1,93,1445,1,
+1550,1450,1,2281,1279,
+1,2770,1925,1,352,
+1475,1,2779,2321,16,
+0,797,1,107,1464,
+1,1114,1469,1,1048,
+1470,1,1871,2322,16,
+0,353,1,1370,1578,
+1,1478,1583,1,118,
+1481,1,1123,1486,1,
+371,1491,1,1377,1497,
+1,375,1502,1,1882,
+2323,16,0,373,1,
+377,1507,1,2556,2324,
+16,0,661,1,379,
+1512,1,380,1517,1,
+130,1540,1,2074,2325,
+16,0,652,1,373,
+1535,1,2564,2326,16,
+0,554,1,1011,1227,
+1,1012,2327,16,0,
+718,1,1840,2328,16,
+0,343,1,143,1545,
+1,1152,1551,1,2577,
+2329,16,0,696,1,
+1406,1556,1,1159,1563,
+1,157,1568,1,1413,
+1573,1,883,1523,1,
+1094,2330,16,0,787,
+1,1296,1294,1,172,
+1595,1,1665,1600,1,
+1939,2331,16,0,494,
+1,1188,1605,1,1442,
+1610,1,188,1644,1,
+942,1616,1,1195,1622,
+1,1449,1627,1,1701,
+1632,1,447,1637,1,
+205,1649,1,2467,1942,
+1,464,1948,1,2197,
+2332,16,0,782,1,
+1224,1654,1,223,1659,
+1,1730,1664,1,2571,
+2333,17,2334,15,2335,
+4,54,37,0,75,
+0,101,0,121,0,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -7775,2175 +7794,2120 @@ public yyLSLSyntax
 116,0,105,0,111,
 0,110,0,76,0,
 105,0,115,0,116,
-0,95,0,49,0,
-1,208,1,3,1,
-2,1,1,2328,22,
-1,44,1,2467,1938,
-1,464,1944,1,2197,
-2329,16,0,772,1,
-1224,1645,1,223,1650,
-1,1730,1655,1,2571,
-2330,16,0,673,1,
-477,1666,1,1231,1671,
-1,479,1676,1,480,
-1681,1,1485,1687,1,
-459,1949,1,476,1660,
-1,242,1700,1,478,
-1705,1,481,1951,1,
-1001,1710,1,2508,1956,
-1,18,2331,19,564,
-1,18,2332,5,84,
-1,1011,1224,1,1012,
-2333,16,0,562,1,
-1013,1381,1,262,1241,
-1,1267,2334,16,0,
-562,1,515,2335,16,
-0,562,1,1521,2336,
-16,0,562,1,525,
-1339,1,2788,2337,16,
-0,562,1,283,1295,
-1,2299,2338,16,0,
-562,1,42,2339,16,
-0,562,1,40,1300,
-1,44,1306,1,47,
-1307,1,1303,2340,16,
-0,562,1,1555,2341,
-16,0,562,1,50,
-1324,1,48,1313,1,
-49,1319,1,51,1329,
-1,63,1345,1,305,
-1334,1,66,1351,1,
-67,1356,1,68,1361,
-1,69,1366,1,70,
-1371,1,73,2342,16,
-0,562,1,74,1376,
-1,328,1425,1,1048,
-2343,16,0,562,1,
-82,2344,16,0,562,
-1,1840,2345,16,0,
-562,1,1591,2346,16,
-0,562,1,1341,2347,
-16,0,562,1,1096,
-1694,1,93,1435,1,
-352,1467,1,107,2348,
-16,0,562,1,1114,
-1461,1,118,2349,16,
-0,562,1,1123,2350,
-16,0,562,1,371,
-1483,1,1628,2351,16,
-0,562,1,375,1494,
-1,1882,2352,16,0,
-562,1,377,1499,1,
-379,1504,1,380,1509,
-1,883,2353,16,0,
-562,1,373,1527,1,
-130,2354,16,0,562,
-1,143,2355,16,0,
-562,1,387,2356,16,
-0,562,1,1159,2357,
-16,0,562,1,157,
-2358,16,0,562,1,
-1413,2359,16,0,562,
-1,1665,2360,16,0,
-562,1,412,2361,16,
-0,562,1,1377,2362,
-16,0,562,1,172,
-2363,16,0,562,1,
-1939,2364,16,0,562,
-1,437,2365,16,0,
-562,1,188,2366,16,
-0,562,1,942,2367,
-16,0,562,1,1195,
-2368,16,0,562,1,
-1449,2369,16,0,562,
-1,1701,2370,16,0,
-562,1,447,1628,1,
-205,2371,16,0,562,
-1,827,2372,16,0,
-562,1,223,2373,16,
-0,562,1,476,1660,
-1,477,1666,1,1231,
-2374,16,0,562,1,
-479,1676,1,480,1681,
-1,1485,2375,16,0,
-562,1,1737,2376,16,
-0,562,1,242,2377,
-16,0,562,1,478,
-1705,1,1001,1710,1,
-1002,1715,1,19,2378,
-19,254,1,19,2379,
-5,176,1,256,2380,
-16,0,252,1,1261,
-2381,16,0,252,1,
-1011,1224,1,1012,2382,
-16,0,521,1,2458,
-998,1,262,1241,1,
-1267,2383,16,0,521,
-1,2021,840,1,1521,
-2384,16,0,521,1,
-1775,2385,16,0,252,
-1,2029,847,1,2030,
-853,1,2031,858,1,
-2032,863,1,2033,868,
-1,277,2386,16,0,
-252,1,2788,2387,16,
-0,521,1,2037,879,
-1,2039,884,1,32,
-2388,16,0,252,1,
-2464,1021,1,2293,2389,
-16,0,252,1,2043,
-896,1,2045,901,1,
-2299,2390,16,0,521,
-1,41,2391,16,0,
-252,1,42,2392,16,
-0,521,1,40,1300,
-1,44,1306,1,43,
-2393,16,0,252,1,
-1804,2394,16,0,252,
-1,48,1313,1,49,
-1319,1,47,1307,1,
-51,1329,1,52,2395,
-16,0,252,1,50,
-1324,1,305,1334,1,
-1096,1694,1,1515,2396,
-16,0,252,1,2318,
-2397,16,0,252,1,
-283,1295,1,63,1345,
-1,66,1351,1,67,
-1356,1,68,1361,1,
-69,1366,1,70,1371,
-1,71,2398,16,0,
-252,1,73,2399,16,
-0,521,1,74,1376,
-1,1013,1381,1,76,
-2400,16,0,252,1,
-1834,2401,16,0,252,
-1,2337,2402,16,0,
-252,1,79,2403,16,
-0,252,1,1335,2404,
-16,0,252,1,299,
-2405,16,0,252,1,
-82,2406,16,0,521,
-1,1840,2407,16,0,
-521,1,1297,2408,16,
-0,252,1,85,2409,
-16,0,252,1,1341,
-2410,16,0,521,1,
-89,2411,16,0,252,
-1,1303,2412,16,0,
-521,1,2035,874,1,
-93,1435,1,322,2413,
-16,0,252,1,97,
-2414,16,0,252,1,
-2041,890,1,1555,2415,
-16,0,521,1,827,
-2416,16,0,521,1,
-102,2417,16,0,252,
-1,1860,943,1,1803,
-909,1,2364,949,1,
-107,2418,16,0,521,
-1,509,2419,16,0,
-252,1,1114,1461,1,
-112,2420,16,0,252,
-1,1117,2421,16,0,
-252,1,352,1467,1,
-1873,958,1,118,2422,
-16,0,521,1,1123,
-2423,16,0,521,1,
-371,1483,1,515,2424,
-16,0,521,1,1377,
-2425,16,0,521,1,
-124,2426,16,0,252,
-1,1882,2427,16,0,
-521,1,377,1499,1,
-379,1504,1,380,1509,
-1,130,2428,16,0,
-521,1,346,2429,16,
-0,252,1,2075,2430,
-16,0,252,1,373,
-1527,1,387,2431,16,
-0,521,1,137,2432,
-16,0,252,1,143,
-2433,16,0,521,1,
-1901,2434,16,0,252,
-1,1048,2435,16,0,
-521,1,1153,2436,16,
-0,252,1,375,1494,
-1,151,2437,16,0,
-252,1,1407,2438,16,
-0,252,1,1659,2439,
-16,0,252,1,2413,
-2440,16,0,252,1,
-1159,2441,16,0,521,
-1,381,2442,16,0,
-252,1,157,2443,16,
-0,521,1,1413,2444,
-16,0,521,1,883,
-2445,16,0,521,1,
-1371,2446,16,0,252,
-1,328,1425,1,2105,
-936,1,2106,2447,16,
-0,252,1,166,2448,
-16,0,252,1,525,
-2449,16,0,252,1,
-1622,2450,16,0,252,
-1,406,2451,16,0,
-252,1,1574,921,1,
-172,2452,16,0,521,
-1,1931,983,1,412,
-2453,16,0,521,1,
-1933,2454,16,0,252,
-1,1876,2455,16,0,
-252,1,431,2456,16,
-0,252,1,1585,2457,
-16,0,252,1,182,
-2458,16,0,252,1,
-1628,2459,16,0,521,
-1,1189,2460,16,0,
-252,1,437,2461,16,
-0,521,1,1591,2462,
-16,0,521,1,188,
-2463,16,0,521,1,
-1695,2464,16,0,252,
-1,2198,2465,16,0,
-252,1,1195,2466,16,
-0,521,1,1449,2467,
-16,0,521,1,1701,
-2468,16,0,521,1,
-447,2469,16,0,252,
-1,2782,2470,16,0,
-252,1,199,2471,16,
-0,252,1,2459,1004,
-1,1958,2472,16,0,
-252,1,2462,1011,1,
-1657,1016,1,205,2473,
-16,0,521,1,459,
-2474,16,0,252,1,
-462,2475,16,0,252,
-1,1665,2476,16,0,
-521,1,217,2477,16,
-0,252,1,2227,1030,
-1,942,2478,16,0,
-521,1,1225,2479,16,
-0,252,1,223,2480,
-16,0,521,1,1479,
-2481,16,0,252,1,
-1731,2482,16,0,252,
-1,477,1666,1,1231,
-2483,16,0,521,1,
-479,1676,1,480,1681,
-1,1485,2484,16,0,
-521,1,1737,2485,16,
-0,521,1,1989,1038,
-1,1990,2486,16,0,
-252,1,1443,2487,16,
-0,252,1,236,2488,
-16,0,252,1,2136,
-965,1,476,1660,1,
-242,2489,16,0,521,
-1,478,1705,1,1939,
-2490,16,0,521,1,
-1001,1710,1,1002,1715,
-1,1756,2491,16,0,
-252,1,20,2492,19,
-496,1,20,2493,5,
-84,1,1011,1224,1,
-1012,2494,16,0,494,
-1,1013,1381,1,262,
-1241,1,1267,2495,16,
-0,494,1,515,2496,
-16,0,494,1,1521,
-2497,16,0,494,1,
-525,1339,1,2788,2498,
-16,0,494,1,283,
-1295,1,2299,2499,16,
-0,494,1,42,2500,
-16,0,494,1,40,
-1300,1,44,1306,1,
-47,1307,1,1303,2501,
-16,0,494,1,1555,
-2502,16,0,494,1,
-50,1324,1,48,1313,
-1,49,1319,1,51,
-1329,1,63,1345,1,
-305,1334,1,66,1351,
-1,67,1356,1,68,
-1361,1,69,1366,1,
-70,1371,1,73,2503,
-16,0,494,1,74,
-1376,1,328,2504,16,
-0,494,1,1048,2505,
-16,0,494,1,82,
-2506,16,0,494,1,
-1840,2507,16,0,494,
-1,1591,2508,16,0,
-494,1,1341,2509,16,
-0,494,1,1096,1694,
-1,93,1435,1,352,
-2510,16,0,494,1,
-107,2511,16,0,494,
-1,1114,1461,1,118,
-2512,16,0,494,1,
-1123,2513,16,0,494,
-1,371,1483,1,1628,
-2514,16,0,494,1,
-375,1494,1,1882,2515,
-16,0,494,1,377,
-1499,1,379,1504,1,
-380,1509,1,883,2516,
-16,0,494,1,373,
-1527,1,130,2517,16,
-0,494,1,143,2518,
-16,0,494,1,387,
-2519,16,0,494,1,
-1159,2520,16,0,494,
-1,157,2521,16,0,
-494,1,1413,2522,16,
-0,494,1,1665,2523,
-16,0,494,1,412,
-2524,16,0,494,1,
-1377,2525,16,0,494,
-1,172,2526,16,0,
-494,1,1939,2527,16,
-0,494,1,437,2528,
-16,0,494,1,188,
-2529,16,0,494,1,
-942,2530,16,0,494,
-1,1195,2531,16,0,
-494,1,1449,2532,16,
-0,494,1,1701,2533,
-16,0,494,1,447,
-1628,1,205,2534,16,
-0,494,1,827,2535,
-16,0,494,1,223,
-2536,16,0,494,1,
-476,1660,1,477,1666,
-1,1231,2537,16,0,
-494,1,479,1676,1,
-480,1681,1,1485,2538,
-16,0,494,1,1737,
-2539,16,0,494,1,
-242,2540,16,0,494,
-1,478,1705,1,1001,
-1710,1,1002,1715,1,
-21,2541,19,468,1,
-21,2542,5,84,1,
-1011,1224,1,1012,2543,
-16,0,466,1,1013,
-1381,1,262,1241,1,
-1267,2544,16,0,466,
-1,515,2545,16,0,
-466,1,1521,2546,16,
-0,466,1,525,1339,
-1,2788,2547,16,0,
-466,1,283,1295,1,
-2299,2548,16,0,466,
-1,42,2549,16,0,
-466,1,40,1300,1,
-44,1306,1,47,1307,
-1,1303,2550,16,0,
-466,1,1555,2551,16,
-0,466,1,50,1324,
-1,48,1313,1,49,
-1319,1,51,1329,1,
-63,1345,1,305,1334,
-1,66,1351,1,67,
-1356,1,68,1361,1,
-69,1366,1,70,1371,
-1,73,2552,16,0,
-466,1,74,1376,1,
-328,2553,16,0,466,
-1,1048,2554,16,0,
-466,1,82,2555,16,
-0,466,1,1840,2556,
-16,0,466,1,1591,
-2557,16,0,466,1,
-1341,2558,16,0,466,
-1,1096,1694,1,93,
-1435,1,352,2559,16,
-0,466,1,107,2560,
-16,0,466,1,1114,
-1461,1,118,2561,16,
-0,466,1,1123,2562,
-16,0,466,1,371,
-1483,1,1628,2563,16,
-0,466,1,375,1494,
-1,1882,2564,16,0,
-466,1,377,1499,1,
-379,1504,1,380,1509,
-1,883,2565,16,0,
-466,1,373,1527,1,
-130,2566,16,0,466,
-1,143,2567,16,0,
-466,1,387,2568,16,
-0,466,1,1159,2569,
-16,0,466,1,157,
-2570,16,0,466,1,
-1413,2571,16,0,466,
-1,1665,2572,16,0,
-466,1,412,2573,16,
-0,466,1,1377,2574,
-16,0,466,1,172,
-2575,16,0,466,1,
-1939,2576,16,0,466,
-1,437,2577,16,0,
-466,1,188,2578,16,
-0,466,1,942,2579,
-16,0,466,1,1195,
-2580,16,0,466,1,
-1449,2581,16,0,466,
-1,1701,2582,16,0,
-466,1,447,1628,1,
-205,2583,16,0,466,
-1,827,2584,16,0,
-466,1,223,2585,16,
-0,466,1,476,1660,
-1,477,1666,1,1231,
-2586,16,0,466,1,
-479,1676,1,480,1681,
-1,1485,2587,16,0,
-466,1,1737,2588,16,
-0,466,1,242,2589,
-16,0,466,1,478,
-1705,1,1001,1710,1,
-1002,1715,1,22,2590,
-19,419,1,22,2591,
-5,84,1,1011,1224,
-1,1012,2592,16,0,
-417,1,1013,1381,1,
-262,1241,1,1267,2593,
-16,0,417,1,515,
-2594,16,0,417,1,
-1521,2595,16,0,417,
-1,525,1339,1,2788,
-2596,16,0,417,1,
-283,1295,1,2299,2597,
-16,0,417,1,42,
-2598,16,0,417,1,
-40,1300,1,44,1306,
-1,47,1307,1,1303,
-2599,16,0,417,1,
-1555,2600,16,0,417,
-1,50,1324,1,48,
-1313,1,49,1319,1,
-51,1329,1,63,1345,
-1,305,1334,1,66,
-1351,1,67,1356,1,
-68,1361,1,69,1366,
-1,70,1371,1,73,
-2601,16,0,417,1,
-74,1376,1,328,2602,
-16,0,417,1,1048,
-2603,16,0,417,1,
-82,2604,16,0,417,
-1,1840,2605,16,0,
-417,1,1591,2606,16,
-0,417,1,1341,2607,
-16,0,417,1,1096,
-1694,1,93,1435,1,
-352,2608,16,0,417,
-1,107,2609,16,0,
-417,1,1114,1461,1,
-118,2610,16,0,417,
-1,1123,2611,16,0,
-417,1,371,1483,1,
-1628,2612,16,0,417,
-1,375,1494,1,1882,
-2613,16,0,417,1,
-377,1499,1,379,1504,
-1,380,1509,1,883,
-2614,16,0,417,1,
-373,1527,1,130,2615,
-16,0,417,1,143,
-2616,16,0,417,1,
-387,2617,16,0,417,
-1,1159,2618,16,0,
-417,1,157,2619,16,
-0,417,1,1413,2620,
-16,0,417,1,1665,
-2621,16,0,417,1,
-412,2622,16,0,417,
-1,1377,2623,16,0,
-417,1,172,2624,16,
-0,417,1,1939,2625,
-16,0,417,1,437,
-2626,16,0,417,1,
-188,2627,16,0,417,
-1,942,2628,16,0,
-417,1,1195,2629,16,
-0,417,1,1449,2630,
-16,0,417,1,1701,
-2631,16,0,417,1,
-447,1628,1,205,2632,
-16,0,417,1,827,
-2633,16,0,417,1,
-223,2634,16,0,417,
-1,476,1660,1,477,
-1666,1,1231,2635,16,
-0,417,1,479,1676,
-1,480,1681,1,1485,
-2636,16,0,417,1,
-1737,2637,16,0,417,
-1,242,2638,16,0,
-417,1,478,1705,1,
-1001,1710,1,1002,1715,
-1,23,2639,19,582,
-1,23,2640,5,38,
-1,1901,2641,16,0,
-580,1,2075,2642,16,
-0,580,1,1860,943,
-1,1803,909,1,1804,
-2643,16,0,580,1,
-2413,2644,16,0,580,
-1,2198,2645,16,0,
-580,1,1873,958,1,
-1657,1016,1,1989,1038,
-1,1990,2646,16,0,
-580,1,1775,2647,16,
-0,580,1,32,2648,
-16,0,580,1,2105,
-936,1,2106,2649,16,
-0,580,1,2364,949,
-1,2227,1030,1,2337,
-2650,16,0,580,1,
-2021,840,1,2458,998,
-1,2459,1004,1,2462,
-1011,1,2136,965,1,
-2464,1021,1,2029,847,
-1,2030,853,1,2031,
-858,1,2032,863,1,
-2033,868,1,2035,874,
-1,2037,879,1,2039,
-884,1,1931,983,1,
-2041,890,1,2043,896,
-1,2045,901,1,1574,
-921,1,1958,2651,16,
-0,580,1,24,2652,
-19,196,1,24,2653,
-5,5,1,44,2654,
-16,0,194,1,377,
-2655,16,0,618,1,
-40,2656,16,0,796,
-1,63,2657,16,0,
-222,1,373,2658,16,
-0,614,1,25,2659,
-19,324,1,25,2660,
-5,177,1,256,2661,
-16,0,623,1,1261,
-2662,16,0,623,1,
-1011,1224,1,1012,2663,
-16,0,322,1,2458,
-998,1,262,1241,1,
-1267,2664,16,0,322,
-1,2021,840,1,1521,
-2665,16,0,322,1,
-1775,2666,16,0,623,
-1,2029,847,1,2030,
-853,1,2031,858,1,
-2032,863,1,2033,868,
-1,277,2667,16,0,
-623,1,2788,2668,16,
-0,322,1,2037,879,
-1,2039,884,1,32,
-2669,16,0,623,1,
-2464,1021,1,2293,2670,
-16,0,623,1,2043,
-896,1,2045,901,1,
-2299,2671,16,0,322,
-1,41,2672,16,0,
-623,1,42,2673,16,
-0,322,1,40,1300,
-1,44,1306,1,43,
-2674,16,0,623,1,
-1804,2675,16,0,623,
-1,48,1313,1,49,
-1319,1,47,1307,1,
-51,1329,1,52,2676,
-16,0,623,1,50,
-1324,1,305,1334,1,
-1096,1694,1,1515,2677,
-16,0,623,1,2318,
-2678,16,0,623,1,
-62,2679,16,0,623,
-1,63,1345,1,66,
-1351,1,67,1356,1,
-68,1361,1,69,1366,
-1,70,1371,1,71,
-2680,16,0,623,1,
-283,1295,1,73,2681,
-16,0,322,1,74,
-1376,1,1013,1381,1,
-76,2682,16,0,623,
-1,1834,2683,16,0,
-623,1,2337,2684,16,
-0,623,1,79,2685,
-16,0,623,1,1335,
-2686,16,0,623,1,
-299,2687,16,0,623,
-1,82,2688,16,0,
-322,1,1840,2689,16,
-0,322,1,1297,2690,
-16,0,623,1,85,
-2691,16,0,623,1,
-1341,2692,16,0,322,
-1,89,2693,16,0,
-623,1,1303,2694,16,
-0,322,1,2035,874,
-1,93,1435,1,322,
-2695,16,0,623,1,
-97,2696,16,0,623,
-1,2041,890,1,1555,
-2697,16,0,322,1,
-827,2698,16,0,322,
-1,102,2699,16,0,
-623,1,1860,943,1,
-1803,909,1,2364,949,
-1,107,2700,16,0,
-322,1,509,2701,16,
-0,623,1,1114,1461,
-1,112,2702,16,0,
-623,1,1117,2703,16,
-0,623,1,352,1467,
-1,1873,958,1,118,
-1473,1,1123,2704,16,
-0,322,1,371,1483,
-1,515,2705,16,0,
-322,1,1377,2706,16,
-0,322,1,124,2707,
-16,0,623,1,1882,
-2708,16,0,322,1,
-377,1499,1,379,1504,
-1,380,1509,1,130,
-1532,1,346,2709,16,
-0,623,1,2075,2710,
-16,0,623,1,373,
-1527,1,387,2711,16,
-0,322,1,137,2712,
-16,0,623,1,143,
-2713,16,0,322,1,
-1901,2714,16,0,623,
-1,1048,1462,1,1153,
-2715,16,0,623,1,
-375,1494,1,151,2716,
-16,0,623,1,1407,
-2717,16,0,623,1,
-1659,2718,16,0,623,
-1,2413,2719,16,0,
-623,1,1159,2720,16,
-0,322,1,381,2721,
-16,0,623,1,157,
-2722,16,0,322,1,
-1413,2723,16,0,322,
-1,883,2724,16,0,
-322,1,1371,2725,16,
-0,623,1,328,1425,
-1,2105,936,1,2106,
-2726,16,0,623,1,
-166,2727,16,0,623,
-1,525,2728,16,0,
-623,1,1622,2729,16,
-0,623,1,406,2730,
-16,0,623,1,1574,
-921,1,172,1586,1,
-1931,983,1,412,2731,
-16,0,322,1,1933,
-2732,16,0,623,1,
-1876,2733,16,0,623,
-1,431,2734,16,0,
-623,1,1585,2735,16,
-0,623,1,182,2736,
-16,0,623,1,1628,
-2737,16,0,322,1,
-1189,2738,16,0,623,
-1,437,2739,16,0,
-322,1,1591,2740,16,
-0,322,1,188,1635,
-1,1695,2741,16,0,
-623,1,2198,2742,16,
-0,623,1,1195,2743,
-16,0,322,1,1449,
-2744,16,0,322,1,
-1701,2745,16,0,322,
-1,447,2746,16,0,
-623,1,2782,2747,16,
-0,623,1,199,2748,
-16,0,623,1,2459,
-1004,1,1958,2749,16,
-0,623,1,2462,1011,
-1,1657,1016,1,205,
-2750,16,0,322,1,
-459,2751,16,0,623,
-1,462,2752,16,0,
-623,1,1665,2753,16,
-0,322,1,217,2754,
-16,0,623,1,2227,
-1030,1,942,1607,1,
-1225,2755,16,0,623,
-1,223,2756,16,0,
-322,1,1479,2757,16,
-0,623,1,1731,2758,
-16,0,623,1,477,
-1666,1,1231,2759,16,
-0,322,1,479,1676,
-1,480,1681,1,1485,
-2760,16,0,322,1,
-1737,2761,16,0,322,
-1,1989,1038,1,1990,
-2762,16,0,623,1,
-1443,2763,16,0,623,
-1,236,2764,16,0,
-623,1,2136,965,1,
-476,1660,1,242,2765,
-16,0,322,1,478,
-1705,1,1939,2766,16,
-0,322,1,1001,1710,
-1,1002,1715,1,1756,
-2767,16,0,623,1,
-26,2768,19,343,1,
-26,2769,5,84,1,
-1011,1224,1,1012,2770,
-16,0,341,1,1013,
-1381,1,262,1241,1,
-1267,2771,16,0,341,
-1,515,2772,16,0,
-770,1,1521,2773,16,
-0,341,1,525,1339,
-1,2788,2774,16,0,
-341,1,283,1295,1,
-2299,2775,16,0,341,
-1,42,2776,16,0,
-341,1,40,1300,1,
-44,1306,1,47,1307,
-1,1303,2777,16,0,
-341,1,1555,2778,16,
-0,341,1,50,1324,
-1,48,1313,1,49,
-1319,1,51,1329,1,
-63,1345,1,305,1334,
-1,66,1351,1,67,
-1356,1,68,1361,1,
-69,1366,1,70,1371,
-1,73,2779,16,0,
-341,1,74,1376,1,
-328,1425,1,1048,1462,
-1,82,2780,16,0,
-341,1,1840,2781,16,
-0,341,1,1591,2782,
-16,0,341,1,1341,
-2783,16,0,341,1,
-1096,1694,1,93,1435,
-1,352,1467,1,107,
-2784,16,0,341,1,
-1114,1461,1,118,1473,
-1,1123,2785,16,0,
-341,1,371,1483,1,
-1628,2786,16,0,341,
-1,375,1494,1,1882,
-2787,16,0,341,1,
-377,1499,1,379,1504,
-1,380,1509,1,883,
-2788,16,0,341,1,
-373,1527,1,130,1532,
-1,143,2789,16,0,
-341,1,387,2790,16,
-0,341,1,1159,2791,
-16,0,341,1,157,
-2792,16,0,341,1,
-1413,2793,16,0,341,
-1,1665,2794,16,0,
-341,1,412,2795,16,
-0,341,1,1377,2796,
-16,0,341,1,172,
-1586,1,1939,2797,16,
-0,341,1,437,2798,
-16,0,694,1,188,
-1635,1,942,1607,1,
-1195,2799,16,0,341,
-1,1449,2800,16,0,
-341,1,1701,2801,16,
-0,341,1,447,1628,
-1,205,2802,16,0,
-341,1,827,2803,16,
-0,341,1,223,2804,
-16,0,341,1,476,
-1660,1,477,1666,1,
-1231,2805,16,0,341,
-1,479,1676,1,480,
-1681,1,1485,2806,16,
-0,341,1,1737,2807,
-16,0,341,1,242,
-2808,16,0,341,1,
-478,1705,1,1001,1710,
-1,1002,1715,1,27,
-2809,19,706,1,27,
-2810,5,95,1,256,
-2811,16,0,704,1,
-1261,2812,16,0,704,
-1,509,2813,16,0,
-704,1,1515,2814,16,
-0,704,1,2021,840,
-1,1775,2815,16,0,
-704,1,2029,847,1,
-2030,853,1,2031,858,
-1,2032,863,1,2033,
-868,1,277,2816,16,
-0,704,1,2035,874,
-1,2037,879,1,2039,
-884,1,32,2817,16,
-0,704,1,2041,890,
-1,2293,2818,16,0,
-704,1,2043,896,1,
-2045,901,1,41,2819,
-16,0,704,1,1297,
-2820,16,0,704,1,
-43,2821,16,0,704,
-1,1803,909,1,1804,
-2822,16,0,704,1,
-299,2823,16,0,704,
-1,52,2824,16,0,
-704,1,2318,2825,16,
-0,704,1,62,2826,
-16,0,704,1,2075,
-2827,16,0,704,1,
-1574,921,1,71,2828,
-16,0,704,1,76,
-2829,16,0,704,1,
-1834,2830,16,0,704,
-1,2337,2831,16,0,
-704,1,79,2832,16,
-0,704,1,1335,2833,
-16,0,704,1,322,
-2834,16,0,704,1,
-85,2835,16,0,704,
-1,89,2836,16,0,
-704,1,346,2837,16,
-0,704,1,2105,936,
-1,2106,2838,16,0,
-704,1,97,2839,16,
-0,704,1,1860,943,
-1,2364,949,1,102,
-2840,16,0,704,1,
-2782,2841,16,0,704,
-1,112,2842,16,0,
-704,1,1117,2843,16,
-0,704,1,1873,958,
-1,1876,2844,16,0,
-704,1,124,2845,16,
-0,704,1,2136,965,
-1,381,2846,16,0,
-704,1,525,2847,16,
-0,704,1,137,2848,
-16,0,704,1,1901,
-2849,16,0,704,1,
-1153,2850,16,0,704,
-1,151,2851,16,0,
-704,1,1407,2852,16,
-0,704,1,1659,2853,
-16,0,704,1,2413,
-2854,16,0,704,1,
-406,2855,16,0,704,
-1,1371,2856,16,0,
-704,1,166,2857,16,
-0,704,1,1622,2858,
-16,0,704,1,1931,
-983,1,1933,2859,16,
-0,704,1,431,2860,
-16,0,704,1,1585,
-2861,16,0,704,1,
-182,2862,16,0,704,
-1,1189,2863,16,0,
-704,1,1443,2864,16,
-0,704,1,1695,2865,
-16,0,704,1,2198,
-2866,16,0,704,1,
-447,2867,16,0,704,
-1,2458,998,1,2459,
-1004,1,1958,2868,16,
-0,704,1,2462,1011,
-1,1657,1016,1,2464,
-1021,1,199,2869,16,
-0,704,1,459,2870,
-16,0,704,1,462,
-2871,16,0,704,1,
-217,2872,16,0,704,
-1,2227,1030,1,1225,
-2873,16,0,704,1,
-1479,2874,16,0,704,
-1,1731,2875,16,0,
-704,1,1989,1038,1,
-1990,2876,16,0,704,
-1,236,2877,16,0,
-704,1,1756,2878,16,
-0,704,1,28,2879,
-19,734,1,28,2880,
-5,60,1,328,1425,
-1,223,1650,1,1096,
-1694,1,118,1473,1,
-883,1515,1,525,1339,
-1,1001,1710,1,130,
-1532,1,459,1949,1,
-1114,1461,1,352,1467,
-1,447,1628,1,464,
-1944,1,1011,1224,1,
-1013,1381,1,242,1700,
-1,143,1537,1,40,
-1300,1,41,1916,1,
-42,1920,1,479,1676,
-1,44,1306,1,481,
-1951,1,373,1527,1,
-47,1307,1,157,1560,
-1,49,1319,1,50,
-1324,1,48,1313,1,
-379,1504,1,380,1509,
-1,51,1329,1,476,
-1660,1,371,1483,1,
-478,1705,1,1048,1462,
-1,375,1494,1,172,
-1586,1,262,1241,1,
-283,1295,1,63,1345,
-1,67,1356,1,68,
-1361,1,69,1366,1,
-66,1351,1,461,2881,
-16,0,732,1,74,
-1376,1,377,1499,1,
-1002,1715,1,70,1371,
-1,188,1635,1,82,
-1403,1,305,1334,1,
-477,1666,1,827,1448,
-1,93,1435,1,480,
-1681,1,205,1640,1,
-942,1607,1,107,1455,
-1,29,2882,19,312,
-1,29,2883,5,84,
-1,1011,1224,1,1012,
-2884,16,0,310,1,
-1013,1381,1,262,1241,
-1,1267,2885,16,0,
-310,1,515,2886,16,
-0,310,1,1521,2887,
-16,0,310,1,525,
-1339,1,2788,2888,16,
-0,310,1,283,1295,
-1,2299,2889,16,0,
-310,1,42,2890,16,
-0,310,1,40,1300,
-1,44,1306,1,47,
-1307,1,1303,2891,16,
-0,310,1,1555,2892,
-16,0,310,1,50,
-1324,1,48,1313,1,
-49,1319,1,51,1329,
-1,63,1345,1,305,
-1334,1,66,1351,1,
-67,1356,1,68,1361,
-1,69,1366,1,70,
-1371,1,73,2893,16,
-0,310,1,74,1376,
-1,328,1425,1,1048,
-1462,1,82,2894,16,
-0,310,1,1840,2895,
-16,0,310,1,1591,
-2896,16,0,310,1,
-1341,2897,16,0,310,
-1,1096,1694,1,93,
-1435,1,352,1467,1,
-107,2898,16,0,310,
-1,1114,1461,1,118,
-1473,1,1123,2899,16,
-0,310,1,371,1483,
-1,1628,2900,16,0,
-310,1,375,1494,1,
-1882,2901,16,0,310,
-1,377,1499,1,379,
-1504,1,380,1509,1,
-883,2902,16,0,310,
-1,373,1527,1,130,
-1532,1,143,1537,1,
-387,2903,16,0,310,
-1,1159,2904,16,0,
-310,1,157,1560,1,
-1413,2905,16,0,310,
-1,1665,2906,16,0,
-310,1,412,2907,16,
-0,310,1,1377,2908,
-16,0,310,1,172,
-1586,1,1939,2909,16,
-0,310,1,437,2910,
-16,0,310,1,188,
-1635,1,942,1607,1,
-1195,2911,16,0,310,
-1,1449,2912,16,0,
-310,1,1701,2913,16,
-0,310,1,447,1628,
-1,205,2914,16,0,
-310,1,827,2915,16,
-0,310,1,223,2916,
-16,0,310,1,476,
-1660,1,477,1666,1,
-1231,2917,16,0,310,
-1,479,1676,1,480,
-1681,1,1485,2918,16,
-0,310,1,1737,2919,
-16,0,310,1,242,
-2920,16,0,310,1,
-478,1705,1,1001,1710,
-1,1002,1715,1,30,
-2921,19,296,1,30,
-2922,5,84,1,1011,
-1224,1,1012,2923,16,
-0,294,1,1013,1381,
-1,262,1241,1,1267,
-2924,16,0,294,1,
-515,2925,16,0,294,
-1,1521,2926,16,0,
-294,1,525,1339,1,
-2788,2927,16,0,294,
-1,283,1295,1,2299,
-2928,16,0,294,1,
-42,2929,16,0,294,
-1,40,1300,1,44,
-1306,1,47,1307,1,
-1303,2930,16,0,294,
-1,1555,2931,16,0,
-294,1,50,1324,1,
-48,1313,1,49,1319,
-1,51,1329,1,63,
-1345,1,305,1334,1,
-66,1351,1,67,1356,
-1,68,1361,1,69,
-1366,1,70,1371,1,
-73,2932,16,0,294,
-1,74,1376,1,328,
-1425,1,1048,1462,1,
-82,2933,16,0,294,
-1,1840,2934,16,0,
-294,1,1591,2935,16,
-0,294,1,1341,2936,
-16,0,294,1,1096,
-1694,1,93,1435,1,
-352,1467,1,107,2937,
-16,0,294,1,1114,
-1461,1,118,1473,1,
-1123,2938,16,0,294,
-1,371,1483,1,1628,
-2939,16,0,294,1,
-375,1494,1,1882,2940,
-16,0,294,1,377,
-1499,1,379,1504,1,
-380,1509,1,883,2941,
-16,0,294,1,373,
-1527,1,130,1532,1,
-143,1537,1,387,2942,
-16,0,294,1,1159,
-2943,16,0,294,1,
-157,1560,1,1413,2944,
-16,0,294,1,1665,
-2945,16,0,294,1,
-412,2946,16,0,294,
-1,1377,2947,16,0,
-294,1,172,1586,1,
-1939,2948,16,0,294,
-1,437,2949,16,0,
-294,1,188,1635,1,
-942,1607,1,1195,2950,
-16,0,294,1,1449,
-2951,16,0,294,1,
-1701,2952,16,0,294,
-1,447,1628,1,205,
-2953,16,0,294,1,
-827,2954,16,0,294,
-1,223,2955,16,0,
-294,1,476,1660,1,
-477,1666,1,1231,2956,
-16,0,294,1,479,
-1676,1,480,1681,1,
-1485,2957,16,0,294,
-1,1737,2958,16,0,
-294,1,242,2959,16,
-0,294,1,478,1705,
-1,1001,1710,1,1002,
-1715,1,31,2960,19,
-281,1,31,2961,5,
-84,1,1011,1224,1,
-1012,2962,16,0,279,
-1,1013,1381,1,262,
-1241,1,1267,2963,16,
-0,279,1,515,2964,
-16,0,279,1,1521,
-2965,16,0,279,1,
-525,1339,1,2788,2966,
-16,0,279,1,283,
-1295,1,2299,2967,16,
-0,279,1,42,2968,
-16,0,279,1,40,
-1300,1,44,1306,1,
-47,1307,1,1303,2969,
-16,0,279,1,1555,
-2970,16,0,279,1,
-50,1324,1,48,1313,
-1,49,1319,1,51,
-1329,1,63,1345,1,
-305,1334,1,66,1351,
-1,67,1356,1,68,
-1361,1,69,1366,1,
-70,1371,1,73,2971,
-16,0,279,1,74,
-1376,1,328,1425,1,
-1048,1462,1,82,2972,
-16,0,279,1,1840,
-2973,16,0,279,1,
-1591,2974,16,0,279,
-1,1341,2975,16,0,
-279,1,1096,1694,1,
-93,1435,1,352,1467,
-1,107,2976,16,0,
-279,1,1114,1461,1,
-118,1473,1,1123,2977,
-16,0,279,1,371,
-1483,1,1628,2978,16,
-0,279,1,375,1494,
-1,1882,2979,16,0,
-279,1,377,1499,1,
-379,1504,1,380,1509,
-1,883,2980,16,0,
-279,1,373,1527,1,
-130,1532,1,143,2981,
-16,0,279,1,387,
-2982,16,0,279,1,
-1159,2983,16,0,279,
-1,157,2984,16,0,
-279,1,1413,2985,16,
-0,279,1,1665,2986,
-16,0,279,1,412,
-2987,16,0,279,1,
-1377,2988,16,0,279,
-1,172,1586,1,1939,
-2989,16,0,279,1,
-437,2990,16,0,279,
-1,188,1635,1,942,
-1607,1,1195,2991,16,
-0,279,1,1449,2992,
-16,0,279,1,1701,
-2993,16,0,279,1,
-447,1628,1,205,2994,
-16,0,279,1,827,
-2995,16,0,279,1,
-223,2996,16,0,279,
-1,476,1660,1,477,
-1666,1,1231,2997,16,
-0,279,1,479,1676,
-1,480,1681,1,1485,
-2998,16,0,279,1,
-1737,2999,16,0,279,
-1,242,3000,16,0,
-279,1,478,1705,1,
-1001,1710,1,1002,1715,
-1,32,3001,19,273,
-1,32,3002,5,84,
-1,1011,1224,1,1012,
-3003,16,0,271,1,
-1013,1381,1,262,1241,
-1,1267,3004,16,0,
-271,1,515,3005,16,
-0,271,1,1521,3006,
-16,0,271,1,525,
-1339,1,2788,3007,16,
-0,271,1,283,1295,
-1,2299,3008,16,0,
-271,1,42,3009,16,
-0,271,1,40,1300,
-1,44,1306,1,47,
-1307,1,1303,3010,16,
-0,271,1,1555,3011,
-16,0,271,1,50,
-1324,1,48,1313,1,
-49,1319,1,51,1329,
-1,63,1345,1,305,
-1334,1,66,1351,1,
-67,1356,1,68,1361,
-1,69,1366,1,70,
-1371,1,73,3012,16,
-0,271,1,74,1376,
-1,328,1425,1,1048,
-1462,1,82,3013,16,
-0,271,1,1840,3014,
-16,0,271,1,1591,
-3015,16,0,271,1,
-1341,3016,16,0,271,
-1,1096,1694,1,93,
-1435,1,352,1467,1,
-107,3017,16,0,271,
-1,1114,1461,1,118,
-1473,1,1123,3018,16,
-0,271,1,371,1483,
-1,1628,3019,16,0,
-271,1,375,1494,1,
-1882,3020,16,0,271,
-1,377,1499,1,379,
-1504,1,380,1509,1,
-883,3021,16,0,271,
-1,373,1527,1,130,
-1532,1,143,3022,16,
-0,271,1,387,3023,
-16,0,271,1,1159,
-3024,16,0,271,1,
-157,3025,16,0,271,
-1,1413,3026,16,0,
-271,1,1665,3027,16,
-0,271,1,412,3028,
-16,0,271,1,1377,
-3029,16,0,271,1,
-172,1586,1,1939,3030,
-16,0,271,1,437,
-3031,16,0,271,1,
-188,1635,1,942,1607,
-1,1195,3032,16,0,
-271,1,1449,3033,16,
-0,271,1,1701,3034,
-16,0,271,1,447,
-1628,1,205,3035,16,
-0,271,1,827,3036,
-16,0,271,1,223,
-3037,16,0,271,1,
-476,1660,1,477,1666,
-1,1231,3038,16,0,
-271,1,479,1676,1,
-480,1681,1,1485,3039,
-16,0,271,1,1737,
-3040,16,0,271,1,
-242,3041,16,0,271,
-1,478,1705,1,1001,
-1710,1,1002,1715,1,
-33,3042,19,370,1,
-33,3043,5,84,1,
-1011,1224,1,1012,3044,
-16,0,368,1,1013,
-1381,1,262,1241,1,
-1267,3045,16,0,368,
-1,515,3046,16,0,
-368,1,1521,3047,16,
-0,368,1,525,1339,
-1,2788,3048,16,0,
-368,1,283,1295,1,
-2299,3049,16,0,368,
-1,42,3050,16,0,
-368,1,40,1300,1,
-44,1306,1,47,1307,
-1,1303,3051,16,0,
-368,1,1555,3052,16,
-0,368,1,50,1324,
-1,48,1313,1,49,
-1319,1,51,1329,1,
-63,1345,1,305,1334,
-1,66,1351,1,67,
-1356,1,68,1361,1,
-69,1366,1,70,1371,
-1,73,3053,16,0,
-368,1,74,1376,1,
-328,1425,1,1048,1462,
-1,82,3054,16,0,
-368,1,1840,3055,16,
-0,368,1,1591,3056,
-16,0,368,1,1341,
-3057,16,0,368,1,
-1096,1694,1,93,1435,
-1,352,1467,1,107,
-3058,16,0,368,1,
-1114,1461,1,118,1473,
-1,1123,3059,16,0,
-368,1,371,1483,1,
-1628,3060,16,0,368,
-1,375,1494,1,1882,
-3061,16,0,368,1,
-377,1499,1,379,1504,
-1,380,1509,1,883,
-3062,16,0,368,1,
-373,1527,1,130,1532,
-1,143,1537,1,387,
-3063,16,0,368,1,
-1159,3064,16,0,368,
-1,157,1560,1,1413,
-3065,16,0,368,1,
-1665,3066,16,0,368,
-1,412,3067,16,0,
-368,1,1377,3068,16,
-0,368,1,172,1586,
-1,1939,3069,16,0,
-368,1,437,3070,16,
-0,368,1,188,1635,
-1,942,1607,1,1195,
-3071,16,0,368,1,
-1449,3072,16,0,368,
-1,1701,3073,16,0,
-368,1,447,1628,1,
-205,3074,16,0,368,
-1,827,3075,16,0,
-368,1,223,3076,16,
-0,368,1,476,1660,
-1,477,1666,1,1231,
-3077,16,0,368,1,
-479,1676,1,480,1681,
-1,1485,3078,16,0,
-368,1,1737,3079,16,
-0,368,1,242,1700,
-1,478,1705,1,1001,
-1710,1,1002,1715,1,
-34,3080,19,358,1,
-34,3081,5,84,1,
-1011,1224,1,1012,3082,
-16,0,356,1,1013,
-1381,1,262,1241,1,
-1267,3083,16,0,356,
-1,515,3084,16,0,
-356,1,1521,3085,16,
-0,356,1,525,1339,
-1,2788,3086,16,0,
-356,1,283,1295,1,
-2299,3087,16,0,356,
-1,42,3088,16,0,
-356,1,40,1300,1,
-44,1306,1,47,1307,
-1,1303,3089,16,0,
-356,1,1555,3090,16,
-0,356,1,50,1324,
-1,48,1313,1,49,
-1319,1,51,1329,1,
-63,1345,1,305,1334,
-1,66,1351,1,67,
-1356,1,68,1361,1,
-69,1366,1,70,1371,
-1,73,3091,16,0,
-356,1,74,1376,1,
-328,1425,1,1048,1462,
-1,82,3092,16,0,
-356,1,1840,3093,16,
-0,356,1,1591,3094,
-16,0,356,1,1341,
-3095,16,0,356,1,
-1096,1694,1,93,1435,
-1,352,1467,1,107,
-3096,16,0,356,1,
-1114,1461,1,118,1473,
-1,1123,3097,16,0,
-356,1,371,1483,1,
-1628,3098,16,0,356,
-1,375,1494,1,1882,
-3099,16,0,356,1,
-377,1499,1,379,1504,
-1,380,1509,1,883,
-3100,16,0,356,1,
-373,1527,1,130,1532,
-1,143,1537,1,387,
-3101,16,0,356,1,
-1159,3102,16,0,356,
-1,157,1560,1,1413,
-3103,16,0,356,1,
-1665,3104,16,0,356,
-1,412,3105,16,0,
-356,1,1377,3106,16,
-0,356,1,172,1586,
-1,1939,3107,16,0,
-356,1,437,3108,16,
-0,356,1,188,1635,
-1,942,1607,1,1195,
-3109,16,0,356,1,
-1449,3110,16,0,356,
-1,1701,3111,16,0,
-356,1,447,1628,1,
-205,1640,1,827,3112,
-16,0,356,1,223,
-1650,1,476,1660,1,
-477,1666,1,1231,3113,
-16,0,356,1,479,
-1676,1,480,1681,1,
-1485,3114,16,0,356,
-1,1737,3115,16,0,
-356,1,242,1700,1,
-478,1705,1,1001,1710,
-1,1002,1715,1,35,
-3116,19,346,1,35,
-3117,5,84,1,1011,
-1224,1,1012,3118,16,
-0,344,1,1013,1381,
-1,262,1241,1,1267,
-3119,16,0,344,1,
-515,3120,16,0,344,
-1,1521,3121,16,0,
-344,1,525,1339,1,
-2788,3122,16,0,344,
-1,283,1295,1,2299,
-3123,16,0,344,1,
-42,3124,16,0,344,
-1,40,1300,1,44,
-1306,1,47,1307,1,
-1303,3125,16,0,344,
-1,1555,3126,16,0,
-344,1,50,1324,1,
-48,1313,1,49,1319,
-1,51,1329,1,63,
-1345,1,305,1334,1,
-66,1351,1,67,1356,
-1,68,1361,1,69,
-1366,1,70,1371,1,
-73,3127,16,0,344,
-1,74,1376,1,328,
-1425,1,1048,1462,1,
-82,3128,16,0,344,
-1,1840,3129,16,0,
-344,1,1591,3130,16,
-0,344,1,1341,3131,
-16,0,344,1,1096,
-1694,1,93,1435,1,
-352,1467,1,107,3132,
-16,0,344,1,1114,
-1461,1,118,1473,1,
-1123,3133,16,0,344,
-1,371,1483,1,1628,
-3134,16,0,344,1,
-375,1494,1,1882,3135,
-16,0,344,1,377,
-1499,1,379,1504,1,
-380,1509,1,883,3136,
-16,0,344,1,373,
-1527,1,130,1532,1,
-143,1537,1,387,3137,
-16,0,344,1,1159,
-3138,16,0,344,1,
-157,1560,1,1413,3139,
-16,0,344,1,1665,
-3140,16,0,344,1,
-412,3141,16,0,344,
-1,1377,3142,16,0,
-344,1,172,1586,1,
-1939,3143,16,0,344,
-1,437,3144,16,0,
-344,1,188,1635,1,
-942,1607,1,1195,3145,
-16,0,344,1,1449,
-3146,16,0,344,1,
-1701,3147,16,0,344,
-1,447,1628,1,205,
-1640,1,827,3148,16,
-0,344,1,223,3149,
-16,0,344,1,476,
-1660,1,477,1666,1,
-1231,3150,16,0,344,
-1,479,1676,1,480,
-1681,1,1485,3151,16,
-0,344,1,1737,3152,
-16,0,344,1,242,
-1700,1,478,1705,1,
-1001,1710,1,1002,1715,
-1,36,3153,19,242,
-1,36,3154,5,94,
-1,256,3155,16,0,
-240,1,1261,3156,16,
-0,240,1,509,3157,
-16,0,240,1,1515,
-3158,16,0,240,1,
-2021,840,1,1775,3159,
-16,0,240,1,2029,
-847,1,2030,853,1,
-2031,858,1,2032,863,
-1,2033,868,1,277,
-3160,16,0,240,1,
-2035,874,1,2037,879,
-1,2039,884,1,32,
-3161,16,0,240,1,
-2041,890,1,2293,3162,
-16,0,240,1,2043,
-896,1,2045,901,1,
-41,3163,16,0,240,
-1,1297,3164,16,0,
-240,1,43,3165,16,
-0,240,1,1803,909,
-1,1804,3166,16,0,
-240,1,299,3167,16,
-0,240,1,52,3168,
-16,0,240,1,2318,
-3169,16,0,240,1,
-2075,3170,16,0,240,
-1,1574,921,1,71,
-3171,16,0,240,1,
-76,3172,16,0,240,
-1,1834,3173,16,0,
-240,1,2337,3174,16,
-0,240,1,79,3175,
-16,0,240,1,1335,
-3176,16,0,240,1,
-322,3177,16,0,240,
-1,85,3178,16,0,
-240,1,89,3179,16,
-0,240,1,346,3180,
-16,0,240,1,2105,
-936,1,2106,3181,16,
-0,240,1,97,3182,
-16,0,240,1,1860,
-943,1,2364,949,1,
-102,3183,16,0,240,
-1,2782,3184,16,0,
-240,1,112,3185,16,
-0,240,1,1117,3186,
-16,0,240,1,1873,
-958,1,1876,3187,16,
-0,240,1,124,3188,
-16,0,240,1,2136,
-965,1,381,3189,16,
-0,240,1,525,3190,
-16,0,240,1,137,
-3191,16,0,240,1,
-1901,3192,16,0,240,
-1,1153,3193,16,0,
-240,1,151,3194,16,
-0,240,1,1407,3195,
-16,0,240,1,1659,
-3196,16,0,240,1,
-2413,3197,16,0,240,
-1,406,3198,16,0,
-240,1,1371,3199,16,
-0,240,1,166,3200,
-16,0,240,1,1622,
-3201,16,0,240,1,
-1931,983,1,1933,3202,
-16,0,240,1,431,
-3203,16,0,240,1,
-1585,3204,16,0,240,
-1,182,3205,16,0,
-240,1,1189,3206,16,
-0,240,1,1443,3207,
-16,0,240,1,1695,
-3208,16,0,240,1,
-2198,3209,16,0,240,
-1,447,3210,16,0,
-240,1,2458,998,1,
-2459,1004,1,1958,3211,
-16,0,240,1,2462,
-1011,1,1657,1016,1,
-2464,1021,1,199,3212,
-16,0,240,1,459,
-3213,16,0,240,1,
-462,3214,16,0,240,
-1,217,3215,16,0,
-240,1,2227,1030,1,
-1225,3216,16,0,240,
-1,1479,3217,16,0,
-240,1,1731,3218,16,
-0,240,1,1989,1038,
-1,1990,3219,16,0,
-240,1,236,3220,16,
-0,240,1,1756,3221,
-16,0,240,1,37,
-3222,19,263,1,37,
-3223,5,94,1,256,
-3224,16,0,261,1,
-1261,3225,16,0,261,
-1,509,3226,16,0,
-261,1,1515,3227,16,
-0,261,1,2021,840,
-1,1775,3228,16,0,
-261,1,2029,847,1,
-2030,853,1,2031,858,
-1,2032,863,1,2033,
-868,1,277,3229,16,
-0,261,1,2035,874,
-1,2037,879,1,2039,
-884,1,32,3230,16,
-0,261,1,2041,890,
-1,2293,3231,16,0,
-261,1,2043,896,1,
-2045,901,1,41,3232,
-16,0,261,1,1297,
-3233,16,0,261,1,
-43,3234,16,0,261,
-1,1803,909,1,1804,
-3235,16,0,261,1,
-299,3236,16,0,261,
-1,52,3237,16,0,
-261,1,2318,3238,16,
-0,261,1,2075,3239,
-16,0,261,1,1574,
-921,1,71,3240,16,
-0,261,1,76,3241,
-16,0,261,1,1834,
-3242,16,0,261,1,
-2337,3243,16,0,261,
-1,79,3244,16,0,
-261,1,1335,3245,16,
-0,261,1,322,3246,
-16,0,261,1,85,
-3247,16,0,261,1,
-89,3248,16,0,261,
-1,346,3249,16,0,
-261,1,2105,936,1,
-2106,3250,16,0,261,
-1,97,3251,16,0,
-261,1,1860,943,1,
-2364,949,1,102,3252,
-16,0,261,1,2782,
-3253,16,0,261,1,
-112,3254,16,0,261,
-1,1117,3255,16,0,
-261,1,1873,958,1,
-1876,3256,16,0,261,
-1,124,3257,16,0,
-261,1,2136,965,1,
-381,3258,16,0,261,
-1,525,3259,16,0,
-261,1,137,3260,16,
-0,261,1,1901,3261,
-16,0,261,1,1153,
-3262,16,0,261,1,
-151,3263,16,0,261,
-1,1407,3264,16,0,
-261,1,1659,3265,16,
-0,261,1,2413,3266,
-16,0,261,1,406,
-3267,16,0,261,1,
-1371,3268,16,0,261,
-1,166,3269,16,0,
-261,1,1622,3270,16,
-0,261,1,1931,983,
-1,1933,3271,16,0,
-261,1,431,3272,16,
-0,261,1,1585,3273,
-16,0,261,1,182,
-3274,16,0,261,1,
-1189,3275,16,0,261,
-1,1443,3276,16,0,
-261,1,1695,3277,16,
-0,261,1,2198,3278,
-16,0,261,1,447,
-3279,16,0,261,1,
-2458,998,1,2459,1004,
-1,1958,3280,16,0,
-261,1,2462,1011,1,
-1657,1016,1,2464,1021,
-1,199,3281,16,0,
-261,1,459,3282,16,
-0,261,1,462,3283,
-16,0,261,1,217,
-3284,16,0,261,1,
-2227,1030,1,1225,3285,
-16,0,261,1,1479,
-3286,16,0,261,1,
-1731,3287,16,0,261,
-1,1989,1038,1,1990,
-3288,16,0,261,1,
-236,3289,16,0,261,
-1,1756,3290,16,0,
-261,1,38,3291,19,
-260,1,38,3292,5,
-84,1,1011,1224,1,
-1012,3293,16,0,258,
-1,1013,1381,1,262,
-1241,1,1267,3294,16,
-0,258,1,515,3295,
-16,0,258,1,1521,
-3296,16,0,258,1,
-525,1339,1,2788,3297,
-16,0,258,1,283,
-1295,1,2299,3298,16,
-0,258,1,42,3299,
-16,0,258,1,40,
-1300,1,44,1306,1,
-47,1307,1,1303,3300,
-16,0,258,1,1555,
-3301,16,0,258,1,
-50,1324,1,48,1313,
-1,49,1319,1,51,
-1329,1,63,1345,1,
-305,1334,1,66,1351,
-1,67,1356,1,68,
-1361,1,69,1366,1,
-70,1371,1,73,3302,
-16,0,258,1,74,
-1376,1,328,1425,1,
-1048,1462,1,82,3303,
-16,0,258,1,1840,
-3304,16,0,258,1,
-1591,3305,16,0,258,
-1,1341,3306,16,0,
-258,1,1096,1694,1,
-93,1435,1,352,1467,
-1,107,3307,16,0,
-258,1,1114,1461,1,
-118,1473,1,1123,3308,
-16,0,258,1,371,
-1483,1,1628,3309,16,
-0,258,1,375,1494,
-1,1882,3310,16,0,
-258,1,377,1499,1,
-379,1504,1,380,1509,
-1,883,1515,1,373,
-1527,1,130,1532,1,
-143,1537,1,387,3311,
-16,0,258,1,1159,
-3312,16,0,258,1,
-157,1560,1,1413,3313,
-16,0,258,1,1665,
-3314,16,0,258,1,
-412,3315,16,0,258,
-1,1377,3316,16,0,
-258,1,172,1586,1,
-1939,3317,16,0,258,
-1,437,3318,16,0,
-258,1,188,1635,1,
-942,1607,1,1195,3319,
-16,0,258,1,1449,
-3320,16,0,258,1,
-1701,3321,16,0,258,
-1,447,1628,1,205,
-1640,1,827,1448,1,
-223,1650,1,476,1660,
-1,477,1666,1,1231,
-3322,16,0,258,1,
-479,1676,1,480,1681,
-1,1485,3323,16,0,
-258,1,1737,3324,16,
-0,258,1,242,1700,
-1,478,1705,1,1001,
-1710,1,1002,1715,1,
-39,3325,19,248,1,
-39,3326,5,84,1,
-1011,1224,1,1012,3327,
-16,0,246,1,1013,
-1381,1,262,1241,1,
-1267,3328,16,0,246,
-1,515,3329,16,0,
-246,1,1521,3330,16,
-0,246,1,525,1339,
-1,2788,3331,16,0,
-246,1,283,1295,1,
-2299,3332,16,0,246,
-1,42,3333,16,0,
-246,1,40,1300,1,
-44,1306,1,47,1307,
-1,1303,3334,16,0,
-246,1,1555,3335,16,
-0,246,1,50,1324,
-1,48,1313,1,49,
-1319,1,51,1329,1,
-63,1345,1,305,1334,
-1,66,1351,1,67,
-1356,1,68,1361,1,
-69,1366,1,70,1371,
-1,73,3336,16,0,
-246,1,74,1376,1,
-328,1425,1,1048,1462,
-1,82,3337,16,0,
-246,1,1840,3338,16,
-0,246,1,1591,3339,
-16,0,246,1,1341,
-3340,16,0,246,1,
-1096,1694,1,93,1435,
-1,352,1467,1,107,
-3341,16,0,246,1,
-1114,1461,1,118,1473,
-1,1123,3342,16,0,
-246,1,371,1483,1,
-1628,3343,16,0,246,
-1,375,1494,1,1882,
-3344,16,0,246,1,
-377,1499,1,379,1504,
-1,380,1509,1,883,
-1515,1,373,1527,1,
-130,1532,1,143,1537,
-1,387,3345,16,0,
-246,1,1159,3346,16,
-0,246,1,157,1560,
-1,1413,3347,16,0,
-246,1,1665,3348,16,
-0,246,1,412,3349,
-16,0,246,1,1377,
-3350,16,0,246,1,
-172,1586,1,1939,3351,
-16,0,246,1,437,
-3352,16,0,246,1,
-188,1635,1,942,1607,
-1,1195,3353,16,0,
-246,1,1449,3354,16,
-0,246,1,1701,3355,
-16,0,246,1,447,
-1628,1,205,1640,1,
-827,1448,1,223,1650,
-1,476,1660,1,477,
-1666,1,1231,3356,16,
-0,246,1,479,1676,
-1,480,1681,1,1485,
-3357,16,0,246,1,
-1737,3358,16,0,246,
-1,242,1700,1,478,
-1705,1,1001,1710,1,
-1002,1715,1,40,3359,
-19,236,1,40,3360,
-5,84,1,1011,1224,
-1,1012,3361,16,0,
-234,1,1013,1381,1,
-262,1241,1,1267,3362,
-16,0,234,1,515,
-3363,16,0,234,1,
-1521,3364,16,0,234,
-1,525,1339,1,2788,
-3365,16,0,234,1,
-283,1295,1,2299,3366,
-16,0,234,1,42,
-3367,16,0,234,1,
-40,1300,1,44,1306,
-1,47,1307,1,1303,
-3368,16,0,234,1,
-1555,3369,16,0,234,
-1,50,1324,1,48,
-1313,1,49,1319,1,
-51,1329,1,63,1345,
-1,305,1334,1,66,
-1351,1,67,1356,1,
-68,1361,1,69,1366,
-1,70,1371,1,73,
-3370,16,0,234,1,
-74,1376,1,328,1425,
-1,1048,1462,1,82,
-3371,16,0,234,1,
-1840,3372,16,0,234,
-1,1591,3373,16,0,
-234,1,1341,3374,16,
-0,234,1,1096,1694,
-1,93,1435,1,352,
-1467,1,107,3375,16,
-0,234,1,1114,1461,
-1,118,3376,16,0,
-234,1,1123,3377,16,
-0,234,1,371,1483,
-1,1628,3378,16,0,
-234,1,375,1494,1,
-1882,3379,16,0,234,
-1,377,1499,1,379,
-1504,1,380,1509,1,
-883,3380,16,0,234,
-1,373,1527,1,130,
-3381,16,0,234,1,
-143,3382,16,0,234,
-1,387,3383,16,0,
-234,1,1159,3384,16,
-0,234,1,157,3385,
-16,0,234,1,1413,
-3386,16,0,234,1,
-1665,3387,16,0,234,
-1,412,3388,16,0,
-234,1,1377,3389,16,
-0,234,1,172,3390,
-16,0,234,1,1939,
-3391,16,0,234,1,
-437,3392,16,0,234,
-1,188,3393,16,0,
-234,1,942,1607,1,
-1195,3394,16,0,234,
-1,1449,3395,16,0,
-234,1,1701,3396,16,
-0,234,1,447,1628,
-1,205,3397,16,0,
-234,1,827,3398,16,
-0,234,1,223,3399,
-16,0,234,1,476,
-1660,1,477,1666,1,
-1231,3400,16,0,234,
-1,479,1676,1,480,
-1681,1,1485,3401,16,
-0,234,1,1737,3402,
-16,0,234,1,242,
-3403,16,0,234,1,
-478,1705,1,1001,1710,
-1,1002,1715,1,41,
-3404,19,191,1,41,
-3405,5,84,1,1011,
-1224,1,1012,3406,16,
-0,189,1,1013,1381,
-1,262,1241,1,1267,
-3407,16,0,189,1,
-515,3408,16,0,189,
-1,1521,3409,16,0,
-189,1,525,1339,1,
-2788,3410,16,0,189,
-1,283,1295,1,2299,
-3411,16,0,189,1,
-42,3412,16,0,189,
-1,40,1300,1,44,
-1306,1,47,1307,1,
-1303,3413,16,0,189,
-1,1555,3414,16,0,
-189,1,50,1324,1,
-48,1313,1,49,1319,
-1,51,1329,1,63,
-1345,1,305,1334,1,
-66,1351,1,67,1356,
-1,68,1361,1,69,
-1366,1,70,1371,1,
-73,3415,16,0,189,
-1,74,1376,1,328,
-1425,1,1048,1462,1,
-82,3416,16,0,189,
-1,1840,3417,16,0,
-189,1,1591,3418,16,
-0,189,1,1341,3419,
-16,0,189,1,1096,
-1694,1,93,1435,1,
-352,1467,1,107,3420,
-16,0,189,1,1114,
-1461,1,118,3421,16,
-0,189,1,1123,3422,
-16,0,189,1,371,
-1483,1,1628,3423,16,
-0,189,1,375,1494,
-1,1882,3424,16,0,
-189,1,377,1499,1,
-379,1504,1,380,1509,
-1,883,3425,16,0,
-189,1,373,1527,1,
-130,3426,16,0,189,
-1,143,3427,16,0,
-189,1,387,3428,16,
-0,189,1,1159,3429,
-16,0,189,1,157,
-3430,16,0,189,1,
-1413,3431,16,0,189,
-1,1665,3432,16,0,
-189,1,412,3433,16,
-0,189,1,1377,3434,
-16,0,189,1,172,
-3435,16,0,189,1,
-1939,3436,16,0,189,
-1,437,3437,16,0,
-189,1,188,3438,16,
-0,189,1,942,1607,
-1,1195,3439,16,0,
-189,1,1449,3440,16,
-0,189,1,1701,3441,
-16,0,189,1,447,
-1628,1,205,3442,16,
-0,189,1,827,3443,
-16,0,189,1,223,
-3444,16,0,189,1,
-476,1660,1,477,1666,
-1,1231,3445,16,0,
-189,1,479,1676,1,
-480,1681,1,1485,3446,
-16,0,189,1,1737,
-3447,16,0,189,1,
-242,3448,16,0,189,
-1,478,1705,1,1001,
-1710,1,1002,1715,1,
-42,3449,19,430,1,
-42,3450,5,38,1,
-1901,3451,16,0,428,
-1,2075,3452,16,0,
-428,1,1860,943,1,
-1803,909,1,1804,3453,
-16,0,428,1,2413,
-3454,16,0,428,1,
-2198,3455,16,0,428,
-1,1873,958,1,1657,
-1016,1,1989,1038,1,
-1990,3456,16,0,428,
-1,1775,3457,16,0,
-428,1,32,3458,16,
-0,428,1,2105,936,
-1,2106,3459,16,0,
-428,1,2364,949,1,
-2227,1030,1,2337,3460,
-16,0,428,1,2021,
-840,1,2458,998,1,
-2459,1004,1,2462,1011,
-1,2136,965,1,2464,
-1021,1,2029,847,1,
-2030,853,1,2031,858,
-1,2032,863,1,2033,
-868,1,2035,874,1,
-2037,879,1,2039,884,
-1,1931,983,1,2041,
-890,1,2043,896,1,
-2045,901,1,1574,921,
-1,1958,3461,16,0,
-428,1,43,3462,19,
-518,1,43,3463,5,
-25,1,2035,874,1,
-2037,879,1,2039,884,
-1,2041,890,1,2227,
-1030,1,2043,896,1,
-1657,1016,1,1860,943,
-1,2136,965,1,2021,
-840,1,2459,1004,1,
-1574,921,1,2105,3464,
-16,0,683,1,1931,
-983,1,1873,958,1,
-2031,858,1,1803,909,
-1,1989,3465,16,0,
-516,1,2464,1021,1,
-2029,847,1,2030,853,
-1,2364,949,1,2032,
-863,1,2033,868,1,
-2045,901,1,44,3466,
-19,289,1,44,3467,
-5,38,1,1901,3468,
-16,0,287,1,2075,
-3469,16,0,287,1,
-1860,943,1,1803,909,
-1,1804,3470,16,0,
-287,1,2413,3471,16,
-0,287,1,2198,3472,
-16,0,287,1,1873,
-958,1,1657,1016,1,
-1989,1038,1,1990,3473,
-16,0,287,1,1775,
-3474,16,0,287,1,
-32,3475,16,0,287,
-1,2105,936,1,2106,
-3476,16,0,287,1,
-2364,949,1,2227,1030,
-1,2337,3477,16,0,
-287,1,2021,840,1,
-2458,998,1,2459,1004,
-1,2462,1011,1,2136,
-965,1,2464,1021,1,
-2029,847,1,2030,853,
-1,2031,858,1,2032,
-863,1,2033,868,1,
-2035,874,1,2037,879,
-1,2039,884,1,1931,
-983,1,2041,890,1,
-2043,896,1,2045,901,
-1,1574,921,1,1958,
-3478,16,0,287,1,
-45,3479,19,320,1,
-45,3480,5,39,1,
-1901,3481,16,0,350,
-1,2075,3482,16,0,
-350,1,1860,943,1,
-1803,909,1,1804,3483,
-16,0,350,1,2413,
-3484,16,0,350,1,
-2198,3485,16,0,350,
-1,1873,958,1,1657,
-1016,1,1989,1038,1,
-1990,3486,16,0,350,
-1,1775,3487,16,0,
-350,1,32,3488,16,
-0,350,1,2105,936,
-1,2106,3489,16,0,
-350,1,2364,949,1,
-2227,1030,1,2337,3490,
-16,0,350,1,2021,
-840,1,2458,998,1,
-2459,1004,1,2462,1011,
-1,2136,965,1,2464,
-1021,1,2029,847,1,
-2030,853,1,2031,858,
-1,2032,863,1,2033,
-868,1,2035,874,1,
-2037,879,1,2039,884,
-1,1931,983,1,2041,
-890,1,2043,896,1,
-2045,901,1,1832,3491,
-16,0,318,1,1574,
-921,1,1958,3492,16,
-0,350,1,46,3493,
-19,789,1,46,3494,
-5,38,1,1901,3495,
-16,0,787,1,2075,
-3496,16,0,787,1,
-1860,943,1,1803,909,
-1,1804,3497,16,0,
-787,1,2413,3498,16,
-0,787,1,2198,3499,
-16,0,787,1,1873,
-958,1,1657,1016,1,
-1989,1038,1,1990,3500,
-16,0,787,1,1775,
-3501,16,0,787,1,
-32,3502,16,0,787,
-1,2105,936,1,2106,
-3503,16,0,787,1,
-2364,949,1,2227,1030,
-1,2337,3504,16,0,
-787,1,2021,840,1,
-2458,998,1,2459,1004,
-1,2462,1011,1,2136,
-965,1,2464,1021,1,
-2029,847,1,2030,853,
-1,2031,858,1,2032,
-863,1,2033,868,1,
-2035,874,1,2037,879,
-1,2039,884,1,1931,
-983,1,2041,890,1,
-2043,896,1,2045,901,
-1,1574,921,1,1958,
-3505,16,0,787,1,
-47,3506,19,660,1,
-47,3507,5,19,1,
-0,3508,16,0,760,
-1,2760,3509,16,0,
-760,1,2779,3510,17,
-3511,15,3512,4,50,
-37,0,71,0,108,
-0,111,0,98,0,
-97,0,108,0,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-1,-1,1,5,3513,
-20,3514,4,52,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,174,1,3,
-1,6,1,5,3515,
-22,1,9,1,2764,
-801,1,2818,3516,17,
-3517,15,3518,4,52,
-37,0,71,0,108,
-0,111,0,98,0,
-97,0,108,0,86,
-0,97,0,114,0,
-105,0,97,0,98,
-0,108,0,101,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,1,-1,1,
-5,3519,20,3520,4,
-54,71,0,108,0,
-111,0,98,0,97,
-0,108,0,86,0,
-97,0,114,0,105,
-0,97,0,98,0,
-108,0,101,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,95,0,49,0,
-1,172,1,3,1,
-3,1,2,3521,22,
-1,7,1,2819,3522,
-16,0,760,1,2751,
-807,1,2022,3523,16,
-0,658,1,2459,1004,
-1,2830,3524,16,0,
-760,1,2647,824,1,
-2464,1021,1,2466,3525,
-17,3526,15,3512,1,
--1,1,5,3527,20,
-3528,4,52,71,0,
+0,1,-1,1,5,
+2336,20,2337,4,56,
+75,0,101,0,121,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,95,0,49,
+0,1,207,1,3,
+1,2,1,1,2338,
+22,1,42,1,477,
+1675,1,1231,1680,1,
+479,1685,1,480,1690,
+1,1485,1696,1,459,
+1953,1,476,1669,1,
+242,1703,1,478,1708,
+1,481,1955,1,1001,
+1713,1,1002,1718,1,
+2509,1960,1,18,2339,
+19,574,1,18,2340,
+5,84,1,1011,1227,
+1,1012,2341,16,0,
+572,1,1013,1385,1,
+262,1244,1,1267,2342,
+16,0,572,1,515,
+2343,16,0,572,1,
+1521,2344,16,0,572,
+1,525,1343,1,2792,
+2345,16,0,572,1,
+283,1299,1,2299,2346,
+16,0,572,1,42,
+2347,16,0,572,1,
+40,1304,1,44,1310,
+1,47,1311,1,1303,
+2348,16,0,572,1,
+1555,2349,16,0,572,
+1,50,1328,1,48,
+1317,1,49,1323,1,
+51,1333,1,63,1349,
+1,305,1338,1,66,
+1355,1,67,1360,1,
+68,1365,1,69,1370,
+1,70,1375,1,73,
+2350,16,0,572,1,
+74,1380,1,328,1429,
+1,1048,2351,16,0,
+572,1,82,2352,16,
+0,572,1,1840,2353,
+16,0,572,1,1591,
+2354,16,0,572,1,
+1341,2355,16,0,572,
+1,1096,1439,1,93,
+1445,1,352,1475,1,
+107,2356,16,0,572,
+1,1114,1469,1,118,
+2357,16,0,572,1,
+1123,2358,16,0,572,
+1,371,1491,1,1628,
+2359,16,0,572,1,
+375,1502,1,1882,2360,
+16,0,572,1,377,
+1507,1,379,1512,1,
+380,1517,1,883,2361,
+16,0,572,1,373,
+1535,1,130,2362,16,
+0,572,1,143,2363,
+16,0,572,1,387,
+2364,16,0,572,1,
+1159,2365,16,0,572,
+1,157,2366,16,0,
+572,1,1413,2367,16,
+0,572,1,1665,2368,
+16,0,572,1,412,
+2369,16,0,572,1,
+1377,2370,16,0,572,
+1,172,2371,16,0,
+572,1,1939,2372,16,
+0,572,1,437,2373,
+16,0,572,1,188,
+2374,16,0,572,1,
+942,2375,16,0,572,
+1,1195,2376,16,0,
+572,1,1449,2377,16,
+0,572,1,1701,2378,
+16,0,572,1,447,
+1637,1,205,2379,16,
+0,572,1,827,2380,
+16,0,572,1,223,
+2381,16,0,572,1,
+476,1669,1,477,1675,
+1,1231,2382,16,0,
+572,1,479,1685,1,
+480,1690,1,1485,2383,
+16,0,572,1,1737,
+2384,16,0,572,1,
+242,2385,16,0,572,
+1,478,1708,1,1001,
+1713,1,1002,1718,1,
+19,2386,19,251,1,
+19,2387,5,176,1,
+942,2388,16,0,537,
+1,256,2389,16,0,
+249,1,1261,2390,16,
+0,249,1,1011,1227,
+1,1012,2391,16,0,
+537,1,2458,1001,1,
+262,1244,1,1267,2392,
+16,0,537,1,2021,
+843,1,1521,2393,16,
+0,537,1,1775,2394,
+16,0,249,1,2029,
+850,1,2030,856,1,
+2031,861,1,2032,866,
+1,2786,2395,16,0,
+249,1,277,2396,16,
+0,249,1,2035,877,
+1,2037,882,1,2792,
+2397,16,0,537,1,
+32,2398,16,0,249,
+1,2464,1024,1,2293,
+2399,16,0,249,1,
+2043,899,1,2045,904,
+1,2299,2400,16,0,
+537,1,41,2401,16,
+0,249,1,42,2402,
+16,0,537,1,40,
+1304,1,44,1310,1,
+43,2403,16,0,249,
+1,1804,2404,16,0,
+249,1,48,1317,1,
+49,1323,1,47,1311,
+1,51,1333,1,52,
+2405,16,0,249,1,
+50,1328,1,305,1338,
+1,1096,1439,1,1515,
+2406,16,0,249,1,
+2318,2407,16,0,249,
+1,283,1299,1,63,
+1349,1,66,1355,1,
+67,1360,1,68,1365,
+1,69,1370,1,70,
+1375,1,71,2408,16,
+0,249,1,73,2409,
+16,0,537,1,74,
+1380,1,1013,1385,1,
+76,2410,16,0,249,
+1,1834,2411,16,0,
+249,1,2337,2412,16,
+0,249,1,79,2413,
+16,0,249,1,1335,
+2414,16,0,249,1,
+299,2415,16,0,249,
+1,82,2416,16,0,
+537,1,1840,2417,16,
+0,537,1,1297,2418,
+16,0,249,1,85,
+2419,16,0,249,1,
+1341,2420,16,0,537,
+1,89,2421,16,0,
+249,1,1303,2422,16,
+0,537,1,509,2423,
+16,0,249,1,93,
+1445,1,322,2424,16,
+0,249,1,2039,887,
+1,97,2425,16,0,
+249,1,2041,893,1,
+1555,2426,16,0,537,
+1,827,2427,16,0,
+537,1,102,2428,16,
+0,249,1,1860,946,
+1,1803,912,1,2364,
+952,1,107,2429,16,
+0,537,1,1114,1469,
+1,112,2430,16,0,
+249,1,1117,2431,16,
+0,249,1,352,1475,
+1,1873,961,1,118,
+2432,16,0,537,1,
+1123,2433,16,0,537,
+1,371,1491,1,515,
+2434,16,0,537,1,
+1377,2435,16,0,537,
+1,124,2436,16,0,
+249,1,1882,2437,16,
+0,537,1,377,1507,
+1,379,1512,1,380,
+1517,1,130,2438,16,
+0,537,1,346,2439,
+16,0,249,1,2075,
+2440,16,0,249,1,
+373,1535,1,387,2441,
+16,0,537,1,137,
+2442,16,0,249,1,
+143,2443,16,0,537,
+1,1901,2444,16,0,
+249,1,1048,2445,16,
+0,537,1,1153,2446,
+16,0,249,1,375,
+1502,1,151,2447,16,
+0,249,1,1407,2448,
+16,0,249,1,1659,
+2449,16,0,249,1,
+2413,2450,16,0,249,
+1,1159,2451,16,0,
+537,1,381,2452,16,
+0,249,1,157,2453,
+16,0,537,1,1413,
+2454,16,0,537,1,
+883,2455,16,0,537,
+1,1371,2456,16,0,
+249,1,328,1429,1,
+2105,939,1,2106,2457,
+16,0,249,1,166,
+2458,16,0,249,1,
+525,2459,16,0,249,
+1,1622,2460,16,0,
+249,1,406,2461,16,
+0,249,1,1574,924,
+1,172,2462,16,0,
+537,1,1931,986,1,
+412,2463,16,0,537,
+1,1933,2464,16,0,
+249,1,1876,2465,16,
+0,249,1,431,2466,
+16,0,249,1,1585,
+2467,16,0,249,1,
+182,2468,16,0,249,
+1,1628,2469,16,0,
+537,1,1189,2470,16,
+0,249,1,437,2471,
+16,0,537,1,1591,
+2472,16,0,537,1,
+188,2473,16,0,537,
+1,1695,2474,16,0,
+249,1,2198,2475,16,
+0,249,1,1195,2476,
+16,0,537,1,1449,
+2477,16,0,537,1,
+1701,2478,16,0,537,
+1,447,2479,16,0,
+249,1,199,2480,16,
+0,249,1,2459,1007,
+1,1958,2481,16,0,
+249,1,2462,1014,1,
+1657,1019,1,205,2482,
+16,0,537,1,459,
+2483,16,0,249,1,
+462,2484,16,0,249,
+1,1665,2485,16,0,
+537,1,217,2486,16,
+0,249,1,2227,1033,
+1,2033,871,1,1225,
+2487,16,0,249,1,
+223,2488,16,0,537,
+1,1479,2489,16,0,
+249,1,1731,2490,16,
+0,249,1,477,1675,
+1,1231,2491,16,0,
+537,1,479,1685,1,
+480,1690,1,1485,2492,
+16,0,537,1,1737,
+2493,16,0,537,1,
+1989,1041,1,1990,2494,
+16,0,249,1,1443,
+2495,16,0,249,1,
+236,2496,16,0,249,
+1,2136,968,1,476,
+1669,1,242,2497,16,
+0,537,1,478,1708,
+1,1939,2498,16,0,
+537,1,1001,1713,1,
+1002,1718,1,1756,2499,
+16,0,249,1,20,
+2500,19,510,1,20,
+2501,5,84,1,1011,
+1227,1,1012,2502,16,
+0,508,1,1013,1385,
+1,262,1244,1,1267,
+2503,16,0,508,1,
+515,2504,16,0,508,
+1,1521,2505,16,0,
+508,1,525,1343,1,
+2792,2506,16,0,508,
+1,283,1299,1,2299,
+2507,16,0,508,1,
+42,2508,16,0,508,
+1,40,1304,1,44,
+1310,1,47,1311,1,
+1303,2509,16,0,508,
+1,1555,2510,16,0,
+508,1,50,1328,1,
+48,1317,1,49,1323,
+1,51,1333,1,63,
+1349,1,305,1338,1,
+66,1355,1,67,1360,
+1,68,1365,1,69,
+1370,1,70,1375,1,
+73,2511,16,0,508,
+1,74,1380,1,328,
+2512,16,0,508,1,
+1048,2513,16,0,508,
+1,82,2514,16,0,
+508,1,1840,2515,16,
+0,508,1,1591,2516,
+16,0,508,1,1341,
+2517,16,0,508,1,
+1096,1439,1,93,1445,
+1,352,2518,16,0,
+508,1,107,2519,16,
+0,508,1,1114,1469,
+1,118,2520,16,0,
+508,1,1123,2521,16,
+0,508,1,371,1491,
+1,1628,2522,16,0,
+508,1,375,1502,1,
+1882,2523,16,0,508,
+1,377,1507,1,379,
+1512,1,380,1517,1,
+883,2524,16,0,508,
+1,373,1535,1,130,
+2525,16,0,508,1,
+143,2526,16,0,508,
+1,387,2527,16,0,
+508,1,1159,2528,16,
+0,508,1,157,2529,
+16,0,508,1,1413,
+2530,16,0,508,1,
+1665,2531,16,0,508,
+1,412,2532,16,0,
+508,1,1377,2533,16,
+0,508,1,172,2534,
+16,0,508,1,1939,
+2535,16,0,508,1,
+437,2536,16,0,508,
+1,188,2537,16,0,
+508,1,942,2538,16,
+0,508,1,1195,2539,
+16,0,508,1,1449,
+2540,16,0,508,1,
+1701,2541,16,0,508,
+1,447,1637,1,205,
+2542,16,0,508,1,
+827,2543,16,0,508,
+1,223,2544,16,0,
+508,1,476,1669,1,
+477,1675,1,1231,2545,
+16,0,508,1,479,
+1685,1,480,1690,1,
+1485,2546,16,0,508,
+1,1737,2547,16,0,
+508,1,242,2548,16,
+0,508,1,478,1708,
+1,1001,1713,1,1002,
+1718,1,21,2549,19,
+478,1,21,2550,5,
+84,1,1011,1227,1,
+1012,2551,16,0,476,
+1,1013,1385,1,262,
+1244,1,1267,2552,16,
+0,476,1,515,2553,
+16,0,476,1,1521,
+2554,16,0,476,1,
+525,1343,1,2792,2555,
+16,0,476,1,283,
+1299,1,2299,2556,16,
+0,476,1,42,2557,
+16,0,476,1,40,
+1304,1,44,1310,1,
+47,1311,1,1303,2558,
+16,0,476,1,1555,
+2559,16,0,476,1,
+50,1328,1,48,1317,
+1,49,1323,1,51,
+1333,1,63,1349,1,
+305,1338,1,66,1355,
+1,67,1360,1,68,
+1365,1,69,1370,1,
+70,1375,1,73,2560,
+16,0,476,1,74,
+1380,1,328,2561,16,
+0,476,1,1048,2562,
+16,0,476,1,82,
+2563,16,0,476,1,
+1840,2564,16,0,476,
+1,1591,2565,16,0,
+476,1,1341,2566,16,
+0,476,1,1096,1439,
+1,93,1445,1,352,
+2567,16,0,476,1,
+107,2568,16,0,476,
+1,1114,1469,1,118,
+2569,16,0,476,1,
+1123,2570,16,0,476,
+1,371,1491,1,1628,
+2571,16,0,476,1,
+375,1502,1,1882,2572,
+16,0,476,1,377,
+1507,1,379,1512,1,
+380,1517,1,883,2573,
+16,0,476,1,373,
+1535,1,130,2574,16,
+0,476,1,143,2575,
+16,0,476,1,387,
+2576,16,0,476,1,
+1159,2577,16,0,476,
+1,157,2578,16,0,
+476,1,1413,2579,16,
+0,476,1,1665,2580,
+16,0,476,1,412,
+2581,16,0,476,1,
+1377,2582,16,0,476,
+1,172,2583,16,0,
+476,1,1939,2584,16,
+0,476,1,437,2585,
+16,0,476,1,188,
+2586,16,0,476,1,
+942,2587,16,0,476,
+1,1195,2588,16,0,
+476,1,1449,2589,16,
+0,476,1,1701,2590,
+16,0,476,1,447,
+1637,1,205,2591,16,
+0,476,1,827,2592,
+16,0,476,1,223,
+2593,16,0,476,1,
+476,1669,1,477,1675,
+1,1231,2594,16,0,
+476,1,479,1685,1,
+480,1690,1,1485,2595,
+16,0,476,1,1737,
+2596,16,0,476,1,
+242,2597,16,0,476,
+1,478,1708,1,1001,
+1713,1,1002,1718,1,
+22,2598,19,429,1,
+22,2599,5,84,1,
+1011,1227,1,1012,2600,
+16,0,427,1,1013,
+1385,1,262,1244,1,
+1267,2601,16,0,427,
+1,515,2602,16,0,
+427,1,1521,2603,16,
+0,427,1,525,1343,
+1,2792,2604,16,0,
+427,1,283,1299,1,
+2299,2605,16,0,427,
+1,42,2606,16,0,
+427,1,40,1304,1,
+44,1310,1,47,1311,
+1,1303,2607,16,0,
+427,1,1555,2608,16,
+0,427,1,50,1328,
+1,48,1317,1,49,
+1323,1,51,1333,1,
+63,1349,1,305,1338,
+1,66,1355,1,67,
+1360,1,68,1365,1,
+69,1370,1,70,1375,
+1,73,2609,16,0,
+427,1,74,1380,1,
+328,2610,16,0,427,
+1,1048,2611,16,0,
+427,1,82,2612,16,
+0,427,1,1840,2613,
+16,0,427,1,1591,
+2614,16,0,427,1,
+1341,2615,16,0,427,
+1,1096,1439,1,93,
+1445,1,352,2616,16,
+0,427,1,107,2617,
+16,0,427,1,1114,
+1469,1,118,2618,16,
+0,427,1,1123,2619,
+16,0,427,1,371,
+1491,1,1628,2620,16,
+0,427,1,375,1502,
+1,1882,2621,16,0,
+427,1,377,1507,1,
+379,1512,1,380,1517,
+1,883,2622,16,0,
+427,1,373,1535,1,
+130,2623,16,0,427,
+1,143,2624,16,0,
+427,1,387,2625,16,
+0,427,1,1159,2626,
+16,0,427,1,157,
+2627,16,0,427,1,
+1413,2628,16,0,427,
+1,1665,2629,16,0,
+427,1,412,2630,16,
+0,427,1,1377,2631,
+16,0,427,1,172,
+2632,16,0,427,1,
+1939,2633,16,0,427,
+1,437,2634,16,0,
+427,1,188,2635,16,
+0,427,1,942,2636,
+16,0,427,1,1195,
+2637,16,0,427,1,
+1449,2638,16,0,427,
+1,1701,2639,16,0,
+427,1,447,1637,1,
+205,2640,16,0,427,
+1,827,2641,16,0,
+427,1,223,2642,16,
+0,427,1,476,1669,
+1,477,1675,1,1231,
+2643,16,0,427,1,
+479,1685,1,480,1690,
+1,1485,2644,16,0,
+427,1,1737,2645,16,
+0,427,1,242,2646,
+16,0,427,1,478,
+1708,1,1001,1713,1,
+1002,1718,1,23,2647,
+19,590,1,23,2648,
+5,38,1,1901,2649,
+16,0,588,1,2075,
+2650,16,0,588,1,
+1860,946,1,1803,912,
+1,1804,2651,16,0,
+588,1,2413,2652,16,
+0,588,1,2198,2653,
+16,0,588,1,1873,
+961,1,1657,1019,1,
+1989,1041,1,1990,2654,
+16,0,588,1,1775,
+2655,16,0,588,1,
+32,2656,16,0,588,
+1,2105,939,1,2106,
+2657,16,0,588,1,
+2364,952,1,2227,1033,
+1,2337,2658,16,0,
+588,1,2021,843,1,
+2458,1001,1,2459,1007,
+1,2462,1014,1,2136,
+968,1,2464,1024,1,
+2029,850,1,2030,856,
+1,2031,861,1,2032,
+866,1,2033,871,1,
+2035,877,1,2037,882,
+1,2039,887,1,1931,
+986,1,2041,893,1,
+2043,899,1,2045,904,
+1,1574,924,1,1958,
+2659,16,0,588,1,
+24,2660,19,193,1,
+24,2661,5,5,1,
+44,2662,16,0,191,
+1,377,2663,16,0,
+626,1,40,2664,16,
+0,799,1,63,2665,
+16,0,219,1,373,
+2666,16,0,622,1,
+25,2667,19,329,1,
+25,2668,5,177,1,
+942,1616,1,256,2669,
+16,0,631,1,1261,
+2670,16,0,631,1,
+1011,1227,1,1012,2671,
+16,0,327,1,2458,
+1001,1,262,1244,1,
+1267,2672,16,0,327,
+1,2021,843,1,1521,
+2673,16,0,327,1,
+1775,2674,16,0,631,
+1,2029,850,1,2030,
+856,1,2031,861,1,
+2032,866,1,2786,2675,
+16,0,631,1,277,
+2676,16,0,631,1,
+2035,877,1,2037,882,
+1,2792,2677,16,0,
+327,1,32,2678,16,
+0,631,1,2464,1024,
+1,2293,2679,16,0,
+631,1,2043,899,1,
+2045,904,1,2299,2680,
+16,0,327,1,41,
+2681,16,0,631,1,
+42,2682,16,0,327,
+1,40,1304,1,44,
+1310,1,43,2683,16,
+0,631,1,1804,2684,
+16,0,631,1,48,
+1317,1,49,1323,1,
+47,1311,1,51,1333,
+1,52,2685,16,0,
+631,1,50,1328,1,
+305,1338,1,1096,1439,
+1,1515,2686,16,0,
+631,1,2318,2687,16,
+0,631,1,62,2688,
+16,0,631,1,63,
+1349,1,66,1355,1,
+67,1360,1,68,1365,
+1,69,1370,1,70,
+1375,1,71,2689,16,
+0,631,1,283,1299,
+1,73,2690,16,0,
+327,1,74,1380,1,
+1013,1385,1,76,2691,
+16,0,631,1,1834,
+2692,16,0,631,1,
+2337,2693,16,0,631,
+1,79,2694,16,0,
+631,1,1335,2695,16,
+0,631,1,299,2696,
+16,0,631,1,82,
+2697,16,0,327,1,
+1840,2698,16,0,327,
+1,1297,2699,16,0,
+631,1,85,2700,16,
+0,631,1,1341,2701,
+16,0,327,1,89,
+2702,16,0,631,1,
+1303,2703,16,0,327,
+1,509,2704,16,0,
+631,1,93,1445,1,
+322,2705,16,0,631,
+1,2039,887,1,97,
+2706,16,0,631,1,
+2041,893,1,1555,2707,
+16,0,327,1,827,
+2708,16,0,327,1,
+102,2709,16,0,631,
+1,1860,946,1,1803,
+912,1,2364,952,1,
+107,2710,16,0,327,
+1,1114,1469,1,112,
+2711,16,0,631,1,
+1117,2712,16,0,631,
+1,352,1475,1,1873,
+961,1,118,1481,1,
+1123,2713,16,0,327,
+1,371,1491,1,515,
+2714,16,0,327,1,
+1377,2715,16,0,327,
+1,124,2716,16,0,
+631,1,1882,2717,16,
+0,327,1,377,1507,
+1,379,1512,1,380,
+1517,1,130,1540,1,
+346,2718,16,0,631,
+1,2075,2719,16,0,
+631,1,373,1535,1,
+387,2720,16,0,327,
+1,137,2721,16,0,
+631,1,143,2722,16,
+0,327,1,1901,2723,
+16,0,631,1,1048,
+1470,1,1153,2724,16,
+0,631,1,375,1502,
+1,151,2725,16,0,
+631,1,1407,2726,16,
+0,631,1,1659,2727,
+16,0,631,1,2413,
+2728,16,0,631,1,
+1159,2729,16,0,327,
+1,381,2730,16,0,
+631,1,157,2731,16,
+0,327,1,1413,2732,
+16,0,327,1,883,
+2733,16,0,327,1,
+1371,2734,16,0,631,
+1,328,1429,1,2105,
+939,1,2106,2735,16,
+0,631,1,166,2736,
+16,0,631,1,525,
+2737,16,0,631,1,
+1622,2738,16,0,631,
+1,406,2739,16,0,
+631,1,1574,924,1,
+172,1595,1,1931,986,
+1,412,2740,16,0,
+327,1,1933,2741,16,
+0,631,1,1876,2742,
+16,0,631,1,431,
+2743,16,0,631,1,
+1585,2744,16,0,631,
+1,182,2745,16,0,
+631,1,1628,2746,16,
+0,327,1,1189,2747,
+16,0,631,1,437,
+2748,16,0,327,1,
+1591,2749,16,0,327,
+1,188,1644,1,1695,
+2750,16,0,631,1,
+2198,2751,16,0,631,
+1,1195,2752,16,0,
+327,1,1449,2753,16,
+0,327,1,1701,2754,
+16,0,327,1,447,
+2755,16,0,631,1,
+199,2756,16,0,631,
+1,2459,1007,1,1958,
+2757,16,0,631,1,
+2462,1014,1,1657,1019,
+1,205,2758,16,0,
+327,1,459,2759,16,
+0,631,1,462,2760,
+16,0,631,1,1665,
+2761,16,0,327,1,
+217,2762,16,0,631,
+1,2227,1033,1,2033,
+871,1,1225,2763,16,
+0,631,1,223,2764,
+16,0,327,1,1479,
+2765,16,0,631,1,
+1731,2766,16,0,631,
+1,477,1675,1,1231,
+2767,16,0,327,1,
+479,1685,1,480,1690,
+1,1485,2768,16,0,
+327,1,1737,2769,16,
+0,327,1,1989,1041,
+1,1990,2770,16,0,
+631,1,1443,2771,16,
+0,631,1,236,2772,
+16,0,631,1,2136,
+968,1,476,1669,1,
+242,2773,16,0,327,
+1,478,1708,1,1939,
+2774,16,0,327,1,
+1001,1713,1,1002,1718,
+1,1756,2775,16,0,
+631,1,26,2776,19,
+348,1,26,2777,5,
+84,1,1011,1227,1,
+1012,2778,16,0,346,
+1,1013,1385,1,262,
+1244,1,1267,2779,16,
+0,346,1,515,2780,
+16,0,780,1,1521,
+2781,16,0,346,1,
+525,1343,1,2792,2782,
+16,0,346,1,283,
+1299,1,2299,2783,16,
+0,346,1,42,2784,
+16,0,346,1,40,
+1304,1,44,1310,1,
+47,1311,1,1303,2785,
+16,0,346,1,1555,
+2786,16,0,346,1,
+50,1328,1,48,1317,
+1,49,1323,1,51,
+1333,1,63,1349,1,
+305,1338,1,66,1355,
+1,67,1360,1,68,
+1365,1,69,1370,1,
+70,1375,1,73,2787,
+16,0,346,1,74,
+1380,1,328,1429,1,
+1048,1470,1,82,2788,
+16,0,346,1,1840,
+2789,16,0,346,1,
+1591,2790,16,0,346,
+1,1341,2791,16,0,
+346,1,1096,1439,1,
+93,1445,1,352,1475,
+1,107,2792,16,0,
+346,1,1114,1469,1,
+118,1481,1,1123,2793,
+16,0,346,1,371,
+1491,1,1628,2794,16,
+0,346,1,375,1502,
+1,1882,2795,16,0,
+346,1,377,1507,1,
+379,1512,1,380,1517,
+1,883,2796,16,0,
+346,1,373,1535,1,
+130,1540,1,143,2797,
+16,0,346,1,387,
+2798,16,0,346,1,
+1159,2799,16,0,346,
+1,157,2800,16,0,
+346,1,1413,2801,16,
+0,346,1,1665,2802,
+16,0,346,1,412,
+2803,16,0,346,1,
+1377,2804,16,0,346,
+1,172,1595,1,1939,
+2805,16,0,346,1,
+437,2806,16,0,709,
+1,188,1644,1,942,
+1616,1,1195,2807,16,
+0,346,1,1449,2808,
+16,0,346,1,1701,
+2809,16,0,346,1,
+447,1637,1,205,2810,
+16,0,346,1,827,
+2811,16,0,346,1,
+223,2812,16,0,346,
+1,476,1669,1,477,
+1675,1,1231,2813,16,
+0,346,1,479,1685,
+1,480,1690,1,1485,
+2814,16,0,346,1,
+1737,2815,16,0,346,
+1,242,2816,16,0,
+346,1,478,1708,1,
+1001,1713,1,1002,1718,
+1,27,2817,19,721,
+1,27,2818,5,95,
+1,256,2819,16,0,
+719,1,1261,2820,16,
+0,719,1,509,2821,
+16,0,719,1,1515,
+2822,16,0,719,1,
+2021,843,1,1775,2823,
+16,0,719,1,2029,
+850,1,2030,856,1,
+2031,861,1,2032,866,
+1,2033,871,1,277,
+2824,16,0,719,1,
+2035,877,1,2037,882,
+1,2039,887,1,32,
+2825,16,0,719,1,
+2041,893,1,2293,2826,
+16,0,719,1,2043,
+899,1,2045,904,1,
+41,2827,16,0,719,
+1,1297,2828,16,0,
+719,1,43,2829,16,
+0,719,1,1803,912,
+1,1804,2830,16,0,
+719,1,299,2831,16,
+0,719,1,52,2832,
+16,0,719,1,2318,
+2833,16,0,719,1,
+62,2834,16,0,719,
+1,2075,2835,16,0,
+719,1,1574,924,1,
+71,2836,16,0,719,
+1,76,2837,16,0,
+719,1,1834,2838,16,
+0,719,1,2337,2839,
+16,0,719,1,79,
+2840,16,0,719,1,
+1335,2841,16,0,719,
+1,322,2842,16,0,
+719,1,85,2843,16,
+0,719,1,89,2844,
+16,0,719,1,346,
+2845,16,0,719,1,
+2105,939,1,2106,2846,
+16,0,719,1,97,
+2847,16,0,719,1,
+1860,946,1,2364,952,
+1,102,2848,16,0,
+719,1,112,2849,16,
+0,719,1,1117,2850,
+16,0,719,1,2786,
+2851,16,0,719,1,
+1873,961,1,1876,2852,
+16,0,719,1,124,
+2853,16,0,719,1,
+2136,968,1,381,2854,
+16,0,719,1,525,
+2855,16,0,719,1,
+137,2856,16,0,719,
+1,1901,2857,16,0,
+719,1,1153,2858,16,
+0,719,1,151,2859,
+16,0,719,1,1407,
+2860,16,0,719,1,
+1659,2861,16,0,719,
+1,2413,2862,16,0,
+719,1,406,2863,16,
+0,719,1,1371,2864,
+16,0,719,1,166,
+2865,16,0,719,1,
+1622,2866,16,0,719,
+1,1931,986,1,1933,
+2867,16,0,719,1,
+431,2868,16,0,719,
+1,1585,2869,16,0,
+719,1,182,2870,16,
+0,719,1,1189,2871,
+16,0,719,1,1443,
+2872,16,0,719,1,
+1695,2873,16,0,719,
+1,2198,2874,16,0,
+719,1,447,2875,16,
+0,719,1,2458,1001,
+1,2459,1007,1,1958,
+2876,16,0,719,1,
+2462,1014,1,1657,1019,
+1,2464,1024,1,199,
+2877,16,0,719,1,
+459,2878,16,0,719,
+1,462,2879,16,0,
+719,1,217,2880,16,
+0,719,1,2227,1033,
+1,1225,2881,16,0,
+719,1,1479,2882,16,
+0,719,1,1731,2883,
+16,0,719,1,1989,
+1041,1,1990,2884,16,
+0,719,1,236,2885,
+16,0,719,1,1756,
+2886,16,0,719,1,
+28,2887,19,749,1,
+28,2888,5,60,1,
+328,1429,1,223,1659,
+1,1096,1439,1,118,
+1481,1,883,1523,1,
+525,1343,1,1001,1713,
+1,130,1540,1,459,
+1953,1,1114,1469,1,
+352,1475,1,447,1637,
+1,464,1948,1,1011,
+1227,1,1013,1385,1,
+242,1703,1,143,1545,
+1,40,1304,1,41,
+1913,1,42,1917,1,
+479,1685,1,44,1310,
+1,481,1955,1,373,
+1535,1,47,1311,1,
+157,1568,1,49,1323,
+1,50,1328,1,48,
+1317,1,379,1512,1,
+380,1517,1,51,1333,
+1,476,1669,1,371,
+1491,1,478,1708,1,
+1048,1470,1,375,1502,
+1,172,1595,1,262,
+1244,1,283,1299,1,
+63,1349,1,67,1360,
+1,68,1365,1,69,
+1370,1,66,1355,1,
+461,2889,16,0,747,
+1,74,1380,1,377,
+1507,1,1002,1718,1,
+70,1375,1,188,1644,
+1,82,1407,1,305,
+1338,1,477,1675,1,
+827,1457,1,93,1445,
+1,480,1690,1,205,
+1649,1,942,1616,1,
+107,1464,1,29,2890,
+19,315,1,29,2891,
+5,84,1,1011,1227,
+1,1012,2892,16,0,
+313,1,1013,1385,1,
+262,1244,1,1267,2893,
+16,0,313,1,515,
+2894,16,0,313,1,
+1521,2895,16,0,313,
+1,525,1343,1,2792,
+2896,16,0,313,1,
+283,1299,1,2299,2897,
+16,0,313,1,42,
+2898,16,0,313,1,
+40,1304,1,44,1310,
+1,47,1311,1,1303,
+2899,16,0,313,1,
+1555,2900,16,0,313,
+1,50,1328,1,48,
+1317,1,49,1323,1,
+51,1333,1,63,1349,
+1,305,1338,1,66,
+1355,1,67,1360,1,
+68,1365,1,69,1370,
+1,70,1375,1,73,
+2901,16,0,313,1,
+74,1380,1,328,1429,
+1,1048,1470,1,82,
+2902,16,0,313,1,
+1840,2903,16,0,313,
+1,1591,2904,16,0,
+313,1,1341,2905,16,
+0,313,1,1096,1439,
+1,93,1445,1,352,
+1475,1,107,2906,16,
+0,313,1,1114,1469,
+1,118,1481,1,1123,
+2907,16,0,313,1,
+371,1491,1,1628,2908,
+16,0,313,1,375,
+1502,1,1882,2909,16,
+0,313,1,377,1507,
+1,379,1512,1,380,
+1517,1,883,2910,16,
+0,313,1,373,1535,
+1,130,1540,1,143,
+1545,1,387,2911,16,
+0,313,1,1159,2912,
+16,0,313,1,157,
+1568,1,1413,2913,16,
+0,313,1,1665,2914,
+16,0,313,1,412,
+2915,16,0,313,1,
+1377,2916,16,0,313,
+1,172,1595,1,1939,
+2917,16,0,313,1,
+437,2918,16,0,313,
+1,188,1644,1,942,
+1616,1,1195,2919,16,
+0,313,1,1449,2920,
+16,0,313,1,1701,
+2921,16,0,313,1,
+447,1637,1,205,2922,
+16,0,313,1,827,
+2923,16,0,313,1,
+223,2924,16,0,313,
+1,476,1669,1,477,
+1675,1,1231,2925,16,
+0,313,1,479,1685,
+1,480,1690,1,1485,
+2926,16,0,313,1,
+1737,2927,16,0,313,
+1,242,2928,16,0,
+313,1,478,1708,1,
+1001,1713,1,1002,1718,
+1,30,2929,19,297,
+1,30,2930,5,84,
+1,1011,1227,1,1012,
+2931,16,0,295,1,
+1013,1385,1,262,1244,
+1,1267,2932,16,0,
+295,1,515,2933,16,
+0,295,1,1521,2934,
+16,0,295,1,525,
+1343,1,2792,2935,16,
+0,295,1,283,1299,
+1,2299,2936,16,0,
+295,1,42,2937,16,
+0,295,1,40,1304,
+1,44,1310,1,47,
+1311,1,1303,2938,16,
+0,295,1,1555,2939,
+16,0,295,1,50,
+1328,1,48,1317,1,
+49,1323,1,51,1333,
+1,63,1349,1,305,
+1338,1,66,1355,1,
+67,1360,1,68,1365,
+1,69,1370,1,70,
+1375,1,73,2940,16,
+0,295,1,74,1380,
+1,328,1429,1,1048,
+1470,1,82,2941,16,
+0,295,1,1840,2942,
+16,0,295,1,1591,
+2943,16,0,295,1,
+1341,2944,16,0,295,
+1,1096,1439,1,93,
+1445,1,352,1475,1,
+107,2945,16,0,295,
+1,1114,1469,1,118,
+1481,1,1123,2946,16,
+0,295,1,371,1491,
+1,1628,2947,16,0,
+295,1,375,1502,1,
+1882,2948,16,0,295,
+1,377,1507,1,379,
+1512,1,380,1517,1,
+883,2949,16,0,295,
+1,373,1535,1,130,
+1540,1,143,1545,1,
+387,2950,16,0,295,
+1,1159,2951,16,0,
+295,1,157,1568,1,
+1413,2952,16,0,295,
+1,1665,2953,16,0,
+295,1,412,2954,16,
+0,295,1,1377,2955,
+16,0,295,1,172,
+1595,1,1939,2956,16,
+0,295,1,437,2957,
+16,0,295,1,188,
+1644,1,942,1616,1,
+1195,2958,16,0,295,
+1,1449,2959,16,0,
+295,1,1701,2960,16,
+0,295,1,447,1637,
+1,205,2961,16,0,
+295,1,827,2962,16,
+0,295,1,223,2963,
+16,0,295,1,476,
+1669,1,477,1675,1,
+1231,2964,16,0,295,
+1,479,1685,1,480,
+1690,1,1485,2965,16,
+0,295,1,1737,2966,
+16,0,295,1,242,
+2967,16,0,295,1,
+478,1708,1,1001,1713,
+1,1002,1718,1,31,
+2968,19,277,1,31,
+2969,5,84,1,1011,
+1227,1,1012,2970,16,
+0,275,1,1013,1385,
+1,262,1244,1,1267,
+2971,16,0,275,1,
+515,2972,16,0,275,
+1,1521,2973,16,0,
+275,1,525,1343,1,
+2792,2974,16,0,275,
+1,283,1299,1,2299,
+2975,16,0,275,1,
+42,2976,16,0,275,
+1,40,1304,1,44,
+1310,1,47,1311,1,
+1303,2977,16,0,275,
+1,1555,2978,16,0,
+275,1,50,1328,1,
+48,1317,1,49,1323,
+1,51,1333,1,63,
+1349,1,305,1338,1,
+66,1355,1,67,1360,
+1,68,1365,1,69,
+1370,1,70,1375,1,
+73,2979,16,0,275,
+1,74,1380,1,328,
+1429,1,1048,1470,1,
+82,2980,16,0,275,
+1,1840,2981,16,0,
+275,1,1591,2982,16,
+0,275,1,1341,2983,
+16,0,275,1,1096,
+1439,1,93,1445,1,
+352,1475,1,107,2984,
+16,0,275,1,1114,
+1469,1,118,1481,1,
+1123,2985,16,0,275,
+1,371,1491,1,1628,
+2986,16,0,275,1,
+375,1502,1,1882,2987,
+16,0,275,1,377,
+1507,1,379,1512,1,
+380,1517,1,883,2988,
+16,0,275,1,373,
+1535,1,130,1540,1,
+143,2989,16,0,275,
+1,387,2990,16,0,
+275,1,1159,2991,16,
+0,275,1,157,2992,
+16,0,275,1,1413,
+2993,16,0,275,1,
+1665,2994,16,0,275,
+1,412,2995,16,0,
+275,1,1377,2996,16,
+0,275,1,172,1595,
+1,1939,2997,16,0,
+275,1,437,2998,16,
+0,275,1,188,1644,
+1,942,1616,1,1195,
+2999,16,0,275,1,
+1449,3000,16,0,275,
+1,1701,3001,16,0,
+275,1,447,1637,1,
+205,3002,16,0,275,
+1,827,3003,16,0,
+275,1,223,3004,16,
+0,275,1,476,1669,
+1,477,1675,1,1231,
+3005,16,0,275,1,
+479,1685,1,480,1690,
+1,1485,3006,16,0,
+275,1,1737,3007,16,
+0,275,1,242,3008,
+16,0,275,1,478,
+1708,1,1001,1713,1,
+1002,1718,1,32,3009,
+19,270,1,32,3010,
+5,84,1,1011,1227,
+1,1012,3011,16,0,
+268,1,1013,1385,1,
+262,1244,1,1267,3012,
+16,0,268,1,515,
+3013,16,0,268,1,
+1521,3014,16,0,268,
+1,525,1343,1,2792,
+3015,16,0,268,1,
+283,1299,1,2299,3016,
+16,0,268,1,42,
+3017,16,0,268,1,
+40,1304,1,44,1310,
+1,47,1311,1,1303,
+3018,16,0,268,1,
+1555,3019,16,0,268,
+1,50,1328,1,48,
+1317,1,49,1323,1,
+51,1333,1,63,1349,
+1,305,1338,1,66,
+1355,1,67,1360,1,
+68,1365,1,69,1370,
+1,70,1375,1,73,
+3020,16,0,268,1,
+74,1380,1,328,1429,
+1,1048,1470,1,82,
+3021,16,0,268,1,
+1840,3022,16,0,268,
+1,1591,3023,16,0,
+268,1,1341,3024,16,
+0,268,1,1096,1439,
+1,93,1445,1,352,
+1475,1,107,3025,16,
+0,268,1,1114,1469,
+1,118,1481,1,1123,
+3026,16,0,268,1,
+371,1491,1,1628,3027,
+16,0,268,1,375,
+1502,1,1882,3028,16,
+0,268,1,377,1507,
+1,379,1512,1,380,
+1517,1,883,3029,16,
+0,268,1,373,1535,
+1,130,1540,1,143,
+3030,16,0,268,1,
+387,3031,16,0,268,
+1,1159,3032,16,0,
+268,1,157,3033,16,
+0,268,1,1413,3034,
+16,0,268,1,1665,
+3035,16,0,268,1,
+412,3036,16,0,268,
+1,1377,3037,16,0,
+268,1,172,1595,1,
+1939,3038,16,0,268,
+1,437,3039,16,0,
+268,1,188,1644,1,
+942,1616,1,1195,3040,
+16,0,268,1,1449,
+3041,16,0,268,1,
+1701,3042,16,0,268,
+1,447,1637,1,205,
+3043,16,0,268,1,
+827,3044,16,0,268,
+1,223,3045,16,0,
+268,1,476,1669,1,
+477,1675,1,1231,3046,
+16,0,268,1,479,
+1685,1,480,1690,1,
+1485,3047,16,0,268,
+1,1737,3048,16,0,
+268,1,242,3049,16,
+0,268,1,478,1708,
+1,1001,1713,1,1002,
+1718,1,33,3050,19,
+378,1,33,3051,5,
+84,1,1011,1227,1,
+1012,3052,16,0,376,
+1,1013,1385,1,262,
+1244,1,1267,3053,16,
+0,376,1,515,3054,
+16,0,376,1,1521,
+3055,16,0,376,1,
+525,1343,1,2792,3056,
+16,0,376,1,283,
+1299,1,2299,3057,16,
+0,376,1,42,3058,
+16,0,376,1,40,
+1304,1,44,1310,1,
+47,1311,1,1303,3059,
+16,0,376,1,1555,
+3060,16,0,376,1,
+50,1328,1,48,1317,
+1,49,1323,1,51,
+1333,1,63,1349,1,
+305,1338,1,66,1355,
+1,67,1360,1,68,
+1365,1,69,1370,1,
+70,1375,1,73,3061,
+16,0,376,1,74,
+1380,1,328,1429,1,
+1048,1470,1,82,3062,
+16,0,376,1,1840,
+3063,16,0,376,1,
+1591,3064,16,0,376,
+1,1341,3065,16,0,
+376,1,1096,1439,1,
+93,1445,1,352,1475,
+1,107,3066,16,0,
+376,1,1114,1469,1,
+118,1481,1,1123,3067,
+16,0,376,1,371,
+1491,1,1628,3068,16,
+0,376,1,375,1502,
+1,1882,3069,16,0,
+376,1,377,1507,1,
+379,1512,1,380,1517,
+1,883,3070,16,0,
+376,1,373,1535,1,
+130,1540,1,143,1545,
+1,387,3071,16,0,
+376,1,1159,3072,16,
+0,376,1,157,1568,
+1,1413,3073,16,0,
+376,1,1665,3074,16,
+0,376,1,412,3075,
+16,0,376,1,1377,
+3076,16,0,376,1,
+172,1595,1,1939,3077,
+16,0,376,1,437,
+3078,16,0,376,1,
+188,1644,1,942,1616,
+1,1195,3079,16,0,
+376,1,1449,3080,16,
+0,376,1,1701,3081,
+16,0,376,1,447,
+1637,1,205,3082,16,
+0,376,1,827,3083,
+16,0,376,1,223,
+3084,16,0,376,1,
+476,1669,1,477,1675,
+1,1231,3085,16,0,
+376,1,479,1685,1,
+480,1690,1,1485,3086,
+16,0,376,1,1737,
+3087,16,0,376,1,
+242,1703,1,478,1708,
+1,1001,1713,1,1002,
+1718,1,34,3088,19,
+365,1,34,3089,5,
+84,1,1011,1227,1,
+1012,3090,16,0,363,
+1,1013,1385,1,262,
+1244,1,1267,3091,16,
+0,363,1,515,3092,
+16,0,363,1,1521,
+3093,16,0,363,1,
+525,1343,1,2792,3094,
+16,0,363,1,283,
+1299,1,2299,3095,16,
+0,363,1,42,3096,
+16,0,363,1,40,
+1304,1,44,1310,1,
+47,1311,1,1303,3097,
+16,0,363,1,1555,
+3098,16,0,363,1,
+50,1328,1,48,1317,
+1,49,1323,1,51,
+1333,1,63,1349,1,
+305,1338,1,66,1355,
+1,67,1360,1,68,
+1365,1,69,1370,1,
+70,1375,1,73,3099,
+16,0,363,1,74,
+1380,1,328,1429,1,
+1048,1470,1,82,3100,
+16,0,363,1,1840,
+3101,16,0,363,1,
+1591,3102,16,0,363,
+1,1341,3103,16,0,
+363,1,1096,1439,1,
+93,1445,1,352,1475,
+1,107,3104,16,0,
+363,1,1114,1469,1,
+118,1481,1,1123,3105,
+16,0,363,1,371,
+1491,1,1628,3106,16,
+0,363,1,375,1502,
+1,1882,3107,16,0,
+363,1,377,1507,1,
+379,1512,1,380,1517,
+1,883,3108,16,0,
+363,1,373,1535,1,
+130,1540,1,143,1545,
+1,387,3109,16,0,
+363,1,1159,3110,16,
+0,363,1,157,1568,
+1,1413,3111,16,0,
+363,1,1665,3112,16,
+0,363,1,412,3113,
+16,0,363,1,1377,
+3114,16,0,363,1,
+172,1595,1,1939,3115,
+16,0,363,1,437,
+3116,16,0,363,1,
+188,1644,1,942,1616,
+1,1195,3117,16,0,
+363,1,1449,3118,16,
+0,363,1,1701,3119,
+16,0,363,1,447,
+1637,1,205,1649,1,
+827,3120,16,0,363,
+1,223,1659,1,476,
+1669,1,477,1675,1,
+1231,3121,16,0,363,
+1,479,1685,1,480,
+1690,1,1485,3122,16,
+0,363,1,1737,3123,
+16,0,363,1,242,
+1703,1,478,1708,1,
+1001,1713,1,1002,1718,
+1,35,3124,19,351,
+1,35,3125,5,84,
+1,1011,1227,1,1012,
+3126,16,0,349,1,
+1013,1385,1,262,1244,
+1,1267,3127,16,0,
+349,1,515,3128,16,
+0,349,1,1521,3129,
+16,0,349,1,525,
+1343,1,2792,3130,16,
+0,349,1,283,1299,
+1,2299,3131,16,0,
+349,1,42,3132,16,
+0,349,1,40,1304,
+1,44,1310,1,47,
+1311,1,1303,3133,16,
+0,349,1,1555,3134,
+16,0,349,1,50,
+1328,1,48,1317,1,
+49,1323,1,51,1333,
+1,63,1349,1,305,
+1338,1,66,1355,1,
+67,1360,1,68,1365,
+1,69,1370,1,70,
+1375,1,73,3135,16,
+0,349,1,74,1380,
+1,328,1429,1,1048,
+1470,1,82,3136,16,
+0,349,1,1840,3137,
+16,0,349,1,1591,
+3138,16,0,349,1,
+1341,3139,16,0,349,
+1,1096,1439,1,93,
+1445,1,352,1475,1,
+107,3140,16,0,349,
+1,1114,1469,1,118,
+1481,1,1123,3141,16,
+0,349,1,371,1491,
+1,1628,3142,16,0,
+349,1,375,1502,1,
+1882,3143,16,0,349,
+1,377,1507,1,379,
+1512,1,380,1517,1,
+883,3144,16,0,349,
+1,373,1535,1,130,
+1540,1,143,1545,1,
+387,3145,16,0,349,
+1,1159,3146,16,0,
+349,1,157,1568,1,
+1413,3147,16,0,349,
+1,1665,3148,16,0,
+349,1,412,3149,16,
+0,349,1,1377,3150,
+16,0,349,1,172,
+1595,1,1939,3151,16,
+0,349,1,437,3152,
+16,0,349,1,188,
+1644,1,942,1616,1,
+1195,3153,16,0,349,
+1,1449,3154,16,0,
+349,1,1701,3155,16,
+0,349,1,447,1637,
+1,205,1649,1,827,
+3156,16,0,349,1,
+223,3157,16,0,349,
+1,476,1669,1,477,
+1675,1,1231,3158,16,
+0,349,1,479,1685,
+1,480,1690,1,1485,
+3159,16,0,349,1,
+1737,3160,16,0,349,
+1,242,1703,1,478,
+1708,1,1001,1713,1,
+1002,1718,1,36,3161,
+19,239,1,36,3162,
+5,94,1,256,3163,
+16,0,237,1,1261,
+3164,16,0,237,1,
+509,3165,16,0,237,
+1,1515,3166,16,0,
+237,1,2021,843,1,
+1775,3167,16,0,237,
+1,2029,850,1,2030,
+856,1,2031,861,1,
+2032,866,1,2033,871,
+1,277,3168,16,0,
+237,1,2035,877,1,
+2037,882,1,2039,887,
+1,32,3169,16,0,
+237,1,2041,893,1,
+2293,3170,16,0,237,
+1,2043,899,1,2045,
+904,1,41,3171,16,
+0,237,1,1297,3172,
+16,0,237,1,43,
+3173,16,0,237,1,
+1803,912,1,1804,3174,
+16,0,237,1,299,
+3175,16,0,237,1,
+52,3176,16,0,237,
+1,2318,3177,16,0,
+237,1,2075,3178,16,
+0,237,1,1574,924,
+1,71,3179,16,0,
+237,1,76,3180,16,
+0,237,1,1834,3181,
+16,0,237,1,2337,
+3182,16,0,237,1,
+79,3183,16,0,237,
+1,1335,3184,16,0,
+237,1,322,3185,16,
+0,237,1,85,3186,
+16,0,237,1,89,
+3187,16,0,237,1,
+346,3188,16,0,237,
+1,2105,939,1,2106,
+3189,16,0,237,1,
+97,3190,16,0,237,
+1,1860,946,1,2364,
+952,1,102,3191,16,
+0,237,1,112,3192,
+16,0,237,1,1117,
+3193,16,0,237,1,
+2786,3194,16,0,237,
+1,1873,961,1,1876,
+3195,16,0,237,1,
+124,3196,16,0,237,
+1,2136,968,1,381,
+3197,16,0,237,1,
+525,3198,16,0,237,
+1,137,3199,16,0,
+237,1,1901,3200,16,
+0,237,1,1153,3201,
+16,0,237,1,151,
+3202,16,0,237,1,
+1407,3203,16,0,237,
+1,1659,3204,16,0,
+237,1,2413,3205,16,
+0,237,1,406,3206,
+16,0,237,1,1371,
+3207,16,0,237,1,
+166,3208,16,0,237,
+1,1622,3209,16,0,
+237,1,1931,986,1,
+1933,3210,16,0,237,
+1,431,3211,16,0,
+237,1,1585,3212,16,
+0,237,1,182,3213,
+16,0,237,1,1189,
+3214,16,0,237,1,
+1443,3215,16,0,237,
+1,1695,3216,16,0,
+237,1,2198,3217,16,
+0,237,1,447,3218,
+16,0,237,1,2458,
+1001,1,2459,1007,1,
+1958,3219,16,0,237,
+1,2462,1014,1,1657,
+1019,1,2464,1024,1,
+199,3220,16,0,237,
+1,459,3221,16,0,
+237,1,462,3222,16,
+0,237,1,217,3223,
+16,0,237,1,2227,
+1033,1,1225,3224,16,
+0,237,1,1479,3225,
+16,0,237,1,1731,
+3226,16,0,237,1,
+1989,1041,1,1990,3227,
+16,0,237,1,236,
+3228,16,0,237,1,
+1756,3229,16,0,237,
+1,37,3230,19,260,
+1,37,3231,5,94,
+1,256,3232,16,0,
+258,1,1261,3233,16,
+0,258,1,509,3234,
+16,0,258,1,1515,
+3235,16,0,258,1,
+2021,843,1,1775,3236,
+16,0,258,1,2029,
+850,1,2030,856,1,
+2031,861,1,2032,866,
+1,2033,871,1,277,
+3237,16,0,258,1,
+2035,877,1,2037,882,
+1,2039,887,1,32,
+3238,16,0,258,1,
+2041,893,1,2293,3239,
+16,0,258,1,2043,
+899,1,2045,904,1,
+41,3240,16,0,258,
+1,1297,3241,16,0,
+258,1,43,3242,16,
+0,258,1,1803,912,
+1,1804,3243,16,0,
+258,1,299,3244,16,
+0,258,1,52,3245,
+16,0,258,1,2318,
+3246,16,0,258,1,
+2075,3247,16,0,258,
+1,1574,924,1,71,
+3248,16,0,258,1,
+76,3249,16,0,258,
+1,1834,3250,16,0,
+258,1,2337,3251,16,
+0,258,1,79,3252,
+16,0,258,1,1335,
+3253,16,0,258,1,
+322,3254,16,0,258,
+1,85,3255,16,0,
+258,1,89,3256,16,
+0,258,1,346,3257,
+16,0,258,1,2105,
+939,1,2106,3258,16,
+0,258,1,97,3259,
+16,0,258,1,1860,
+946,1,2364,952,1,
+102,3260,16,0,258,
+1,112,3261,16,0,
+258,1,1117,3262,16,
+0,258,1,2786,3263,
+16,0,258,1,1873,
+961,1,1876,3264,16,
+0,258,1,124,3265,
+16,0,258,1,2136,
+968,1,381,3266,16,
+0,258,1,525,3267,
+16,0,258,1,137,
+3268,16,0,258,1,
+1901,3269,16,0,258,
+1,1153,3270,16,0,
+258,1,151,3271,16,
+0,258,1,1407,3272,
+16,0,258,1,1659,
+3273,16,0,258,1,
+2413,3274,16,0,258,
+1,406,3275,16,0,
+258,1,1371,3276,16,
+0,258,1,166,3277,
+16,0,258,1,1622,
+3278,16,0,258,1,
+1931,986,1,1933,3279,
+16,0,258,1,431,
+3280,16,0,258,1,
+1585,3281,16,0,258,
+1,182,3282,16,0,
+258,1,1189,3283,16,
+0,258,1,1443,3284,
+16,0,258,1,1695,
+3285,16,0,258,1,
+2198,3286,16,0,258,
+1,447,3287,16,0,
+258,1,2458,1001,1,
+2459,1007,1,1958,3288,
+16,0,258,1,2462,
+1014,1,1657,1019,1,
+2464,1024,1,199,3289,
+16,0,258,1,459,
+3290,16,0,258,1,
+462,3291,16,0,258,
+1,217,3292,16,0,
+258,1,2227,1033,1,
+1225,3293,16,0,258,
+1,1479,3294,16,0,
+258,1,1731,3295,16,
+0,258,1,1989,1041,
+1,1990,3296,16,0,
+258,1,236,3297,16,
+0,258,1,1756,3298,
+16,0,258,1,38,
+3299,19,257,1,38,
+3300,5,84,1,1011,
+1227,1,1012,3301,16,
+0,255,1,1013,1385,
+1,262,1244,1,1267,
+3302,16,0,255,1,
+515,3303,16,0,255,
+1,1521,3304,16,0,
+255,1,525,1343,1,
+2792,3305,16,0,255,
+1,283,1299,1,2299,
+3306,16,0,255,1,
+42,3307,16,0,255,
+1,40,1304,1,44,
+1310,1,47,1311,1,
+1303,3308,16,0,255,
+1,1555,3309,16,0,
+255,1,50,1328,1,
+48,1317,1,49,1323,
+1,51,1333,1,63,
+1349,1,305,1338,1,
+66,1355,1,67,1360,
+1,68,1365,1,69,
+1370,1,70,1375,1,
+73,3310,16,0,255,
+1,74,1380,1,328,
+1429,1,1048,1470,1,
+82,3311,16,0,255,
+1,1840,3312,16,0,
+255,1,1591,3313,16,
+0,255,1,1341,3314,
+16,0,255,1,1096,
+1439,1,93,1445,1,
+352,1475,1,107,3315,
+16,0,255,1,1114,
+1469,1,118,1481,1,
+1123,3316,16,0,255,
+1,371,1491,1,1628,
+3317,16,0,255,1,
+375,1502,1,1882,3318,
+16,0,255,1,377,
+1507,1,379,1512,1,
+380,1517,1,883,1523,
+1,373,1535,1,130,
+1540,1,143,1545,1,
+387,3319,16,0,255,
+1,1159,3320,16,0,
+255,1,157,1568,1,
+1413,3321,16,0,255,
+1,1665,3322,16,0,
+255,1,412,3323,16,
+0,255,1,1377,3324,
+16,0,255,1,172,
+1595,1,1939,3325,16,
+0,255,1,437,3326,
+16,0,255,1,188,
+1644,1,942,1616,1,
+1195,3327,16,0,255,
+1,1449,3328,16,0,
+255,1,1701,3329,16,
+0,255,1,447,1637,
+1,205,1649,1,827,
+1457,1,223,1659,1,
+476,1669,1,477,1675,
+1,1231,3330,16,0,
+255,1,479,1685,1,
+480,1690,1,1485,3331,
+16,0,255,1,1737,
+3332,16,0,255,1,
+242,1703,1,478,1708,
+1,1001,1713,1,1002,
+1718,1,39,3333,19,
+245,1,39,3334,5,
+84,1,1011,1227,1,
+1012,3335,16,0,243,
+1,1013,1385,1,262,
+1244,1,1267,3336,16,
+0,243,1,515,3337,
+16,0,243,1,1521,
+3338,16,0,243,1,
+525,1343,1,2792,3339,
+16,0,243,1,283,
+1299,1,2299,3340,16,
+0,243,1,42,3341,
+16,0,243,1,40,
+1304,1,44,1310,1,
+47,1311,1,1303,3342,
+16,0,243,1,1555,
+3343,16,0,243,1,
+50,1328,1,48,1317,
+1,49,1323,1,51,
+1333,1,63,1349,1,
+305,1338,1,66,1355,
+1,67,1360,1,68,
+1365,1,69,1370,1,
+70,1375,1,73,3344,
+16,0,243,1,74,
+1380,1,328,1429,1,
+1048,1470,1,82,3345,
+16,0,243,1,1840,
+3346,16,0,243,1,
+1591,3347,16,0,243,
+1,1341,3348,16,0,
+243,1,1096,1439,1,
+93,1445,1,352,1475,
+1,107,3349,16,0,
+243,1,1114,1469,1,
+118,1481,1,1123,3350,
+16,0,243,1,371,
+1491,1,1628,3351,16,
+0,243,1,375,1502,
+1,1882,3352,16,0,
+243,1,377,1507,1,
+379,1512,1,380,1517,
+1,883,1523,1,373,
+1535,1,130,1540,1,
+143,1545,1,387,3353,
+16,0,243,1,1159,
+3354,16,0,243,1,
+157,1568,1,1413,3355,
+16,0,243,1,1665,
+3356,16,0,243,1,
+412,3357,16,0,243,
+1,1377,3358,16,0,
+243,1,172,1595,1,
+1939,3359,16,0,243,
+1,437,3360,16,0,
+243,1,188,1644,1,
+942,1616,1,1195,3361,
+16,0,243,1,1449,
+3362,16,0,243,1,
+1701,3363,16,0,243,
+1,447,1637,1,205,
+1649,1,827,1457,1,
+223,1659,1,476,1669,
+1,477,1675,1,1231,
+3364,16,0,243,1,
+479,1685,1,480,1690,
+1,1485,3365,16,0,
+243,1,1737,3366,16,
+0,243,1,242,1703,
+1,478,1708,1,1001,
+1713,1,1002,1718,1,
+40,3367,19,233,1,
+40,3368,5,84,1,
+1011,1227,1,1012,3369,
+16,0,231,1,1013,
+1385,1,262,1244,1,
+1267,3370,16,0,231,
+1,515,3371,16,0,
+231,1,1521,3372,16,
+0,231,1,525,1343,
+1,2792,3373,16,0,
+231,1,283,1299,1,
+2299,3374,16,0,231,
+1,42,3375,16,0,
+231,1,40,1304,1,
+44,1310,1,47,1311,
+1,1303,3376,16,0,
+231,1,1555,3377,16,
+0,231,1,50,1328,
+1,48,1317,1,49,
+1323,1,51,1333,1,
+63,1349,1,305,1338,
+1,66,1355,1,67,
+1360,1,68,1365,1,
+69,1370,1,70,1375,
+1,73,3378,16,0,
+231,1,74,1380,1,
+328,1429,1,1048,1470,
+1,82,3379,16,0,
+231,1,1840,3380,16,
+0,231,1,1591,3381,
+16,0,231,1,1341,
+3382,16,0,231,1,
+1096,1439,1,93,1445,
+1,352,1475,1,107,
+3383,16,0,231,1,
+1114,1469,1,118,3384,
+16,0,231,1,1123,
+3385,16,0,231,1,
+371,1491,1,1628,3386,
+16,0,231,1,375,
+1502,1,1882,3387,16,
+0,231,1,377,1507,
+1,379,1512,1,380,
+1517,1,883,3388,16,
+0,231,1,373,1535,
+1,130,3389,16,0,
+231,1,143,3390,16,
+0,231,1,387,3391,
+16,0,231,1,1159,
+3392,16,0,231,1,
+157,3393,16,0,231,
+1,1413,3394,16,0,
+231,1,1665,3395,16,
+0,231,1,412,3396,
+16,0,231,1,1377,
+3397,16,0,231,1,
+172,3398,16,0,231,
+1,1939,3399,16,0,
+231,1,437,3400,16,
+0,231,1,188,3401,
+16,0,231,1,942,
+1616,1,1195,3402,16,
+0,231,1,1449,3403,
+16,0,231,1,1701,
+3404,16,0,231,1,
+447,1637,1,205,3405,
+16,0,231,1,827,
+3406,16,0,231,1,
+223,3407,16,0,231,
+1,476,1669,1,477,
+1675,1,1231,3408,16,
+0,231,1,479,1685,
+1,480,1690,1,1485,
+3409,16,0,231,1,
+1737,3410,16,0,231,
+1,242,3411,16,0,
+231,1,478,1708,1,
+1001,1713,1,1002,1718,
+1,41,3412,19,188,
+1,41,3413,5,84,
+1,1011,1227,1,1012,
+3414,16,0,186,1,
+1013,1385,1,262,1244,
+1,1267,3415,16,0,
+186,1,515,3416,16,
+0,186,1,1521,3417,
+16,0,186,1,525,
+1343,1,2792,3418,16,
+0,186,1,283,1299,
+1,2299,3419,16,0,
+186,1,42,3420,16,
+0,186,1,40,1304,
+1,44,1310,1,47,
+1311,1,1303,3421,16,
+0,186,1,1555,3422,
+16,0,186,1,50,
+1328,1,48,1317,1,
+49,1323,1,51,1333,
+1,63,1349,1,305,
+1338,1,66,1355,1,
+67,1360,1,68,1365,
+1,69,1370,1,70,
+1375,1,73,3423,16,
+0,186,1,74,1380,
+1,328,1429,1,1048,
+1470,1,82,3424,16,
+0,186,1,1840,3425,
+16,0,186,1,1591,
+3426,16,0,186,1,
+1341,3427,16,0,186,
+1,1096,1439,1,93,
+1445,1,352,1475,1,
+107,3428,16,0,186,
+1,1114,1469,1,118,
+3429,16,0,186,1,
+1123,3430,16,0,186,
+1,371,1491,1,1628,
+3431,16,0,186,1,
+375,1502,1,1882,3432,
+16,0,186,1,377,
+1507,1,379,1512,1,
+380,1517,1,883,3433,
+16,0,186,1,373,
+1535,1,130,3434,16,
+0,186,1,143,3435,
+16,0,186,1,387,
+3436,16,0,186,1,
+1159,3437,16,0,186,
+1,157,3438,16,0,
+186,1,1413,3439,16,
+0,186,1,1665,3440,
+16,0,186,1,412,
+3441,16,0,186,1,
+1377,3442,16,0,186,
+1,172,3443,16,0,
+186,1,1939,3444,16,
+0,186,1,437,3445,
+16,0,186,1,188,
+3446,16,0,186,1,
+942,1616,1,1195,3447,
+16,0,186,1,1449,
+3448,16,0,186,1,
+1701,3449,16,0,186,
+1,447,1637,1,205,
+3450,16,0,186,1,
+827,3451,16,0,186,
+1,223,3452,16,0,
+186,1,476,1669,1,
+477,1675,1,1231,3453,
+16,0,186,1,479,
+1685,1,480,1690,1,
+1485,3454,16,0,186,
+1,1737,3455,16,0,
+186,1,242,3456,16,
+0,186,1,478,1708,
+1,1001,1713,1,1002,
+1718,1,42,3457,19,
+440,1,42,3458,5,
+38,1,1901,3459,16,
+0,438,1,2075,3460,
+16,0,438,1,1860,
+946,1,1803,912,1,
+1804,3461,16,0,438,
+1,2413,3462,16,0,
+438,1,2198,3463,16,
+0,438,1,1873,961,
+1,1657,1019,1,1989,
+1041,1,1990,3464,16,
+0,438,1,1775,3465,
+16,0,438,1,32,
+3466,16,0,438,1,
+2105,939,1,2106,3467,
+16,0,438,1,2364,
+952,1,2227,1033,1,
+2337,3468,16,0,438,
+1,2021,843,1,2458,
+1001,1,2459,1007,1,
+2462,1014,1,2136,968,
+1,2464,1024,1,2029,
+850,1,2030,856,1,
+2031,861,1,2032,866,
+1,2033,871,1,2035,
+877,1,2037,882,1,
+2039,887,1,1931,986,
+1,2041,893,1,2043,
+899,1,2045,904,1,
+1574,924,1,1958,3469,
+16,0,438,1,43,
+3470,19,532,1,43,
+3471,5,25,1,2035,
+877,1,2037,882,1,
+2039,887,1,2041,893,
+1,2227,1033,1,2043,
+899,1,1657,1019,1,
+1860,946,1,2136,968,
+1,2021,843,1,2459,
+1007,1,1574,924,1,
+2105,3472,16,0,698,
+1,1931,986,1,1873,
+961,1,2031,861,1,
+1803,912,1,1989,3473,
+16,0,530,1,2464,
+1024,1,2029,850,1,
+2030,856,1,2364,952,
+1,2032,866,1,2033,
+871,1,2045,904,1,
+44,3474,19,292,1,
+44,3475,5,38,1,
+1901,3476,16,0,290,
+1,2075,3477,16,0,
+290,1,1860,946,1,
+1803,912,1,1804,3478,
+16,0,290,1,2413,
+3479,16,0,290,1,
+2198,3480,16,0,290,
+1,1873,961,1,1657,
+1019,1,1989,1041,1,
+1990,3481,16,0,290,
+1,1775,3482,16,0,
+290,1,32,3483,16,
+0,290,1,2105,939,
+1,2106,3484,16,0,
+290,1,2364,952,1,
+2227,1033,1,2337,3485,
+16,0,290,1,2021,
+843,1,2458,1001,1,
+2459,1007,1,2462,1014,
+1,2136,968,1,2464,
+1024,1,2029,850,1,
+2030,856,1,2031,861,
+1,2032,866,1,2033,
+871,1,2035,877,1,
+2037,882,1,2039,887,
+1,1931,986,1,2041,
+893,1,2043,899,1,
+2045,904,1,1574,924,
+1,1958,3486,16,0,
+290,1,45,3487,19,
+325,1,45,3488,5,
+39,1,1901,3489,16,
+0,355,1,2075,3490,
+16,0,355,1,1860,
+946,1,1803,912,1,
+1804,3491,16,0,355,
+1,2413,3492,16,0,
+355,1,2198,3493,16,
+0,355,1,1873,961,
+1,1657,1019,1,1989,
+1041,1,1990,3494,16,
+0,355,1,1775,3495,
+16,0,355,1,32,
+3496,16,0,355,1,
+2105,939,1,2106,3497,
+16,0,355,1,2364,
+952,1,2227,1033,1,
+2337,3498,16,0,355,
+1,2021,843,1,2458,
+1001,1,2459,1007,1,
+2462,1014,1,2136,968,
+1,2464,1024,1,2029,
+850,1,2030,856,1,
+2031,861,1,2032,866,
+1,2033,871,1,2035,
+877,1,2037,882,1,
+2039,887,1,1931,986,
+1,2041,893,1,2043,
+899,1,2045,904,1,
+1832,3499,16,0,323,
+1,1574,924,1,1958,
+3500,16,0,355,1,
+46,3501,19,794,1,
+46,3502,5,38,1,
+1901,3503,16,0,792,
+1,2075,3504,16,0,
+792,1,1860,946,1,
+1803,912,1,1804,3505,
+16,0,792,1,2413,
+3506,16,0,792,1,
+2198,3507,16,0,792,
+1,1873,961,1,1657,
+1019,1,1989,1041,1,
+1990,3508,16,0,792,
+1,1775,3509,16,0,
+792,1,32,3510,16,
+0,792,1,2105,939,
+1,2106,3511,16,0,
+792,1,2364,952,1,
+2227,1033,1,2337,3512,
+16,0,792,1,2021,
+843,1,2458,1001,1,
+2459,1007,1,2462,1014,
+1,2136,968,1,2464,
+1024,1,2029,850,1,
+2030,856,1,2031,861,
+1,2032,866,1,2033,
+871,1,2035,877,1,
+2037,882,1,2039,887,
+1,1931,986,1,2041,
+893,1,2043,899,1,
+2045,904,1,1574,924,
+1,1958,3513,16,0,
+792,1,47,3514,19,
+283,1,47,3515,5,
+19,1,0,3516,16,
+0,281,1,2783,3517,
+17,3518,15,3519,4,
+50,37,0,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 70,0,117,0,110,
@@ -9953,60 +9917,96 @@ public yyLSLSyntax
 102,0,105,0,110,
 0,105,0,116,0,
 105,0,111,0,110,
-0,95,0,50,0,
-1,175,1,3,1,
-7,1,6,3529,22,
-1,10,1,2837,3530,
-17,3531,15,3532,4,
-36,37,0,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-115,0,1,-1,1,
-5,3533,20,3534,4,
-38,71,0,108,0,
-111,0,98,0,97,
-0,108,0,68,0,
+0,1,-1,1,5,
+3520,20,3521,4,52,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,68,0,
 101,0,102,0,105,
 0,110,0,105,0,
 116,0,105,0,111,
-0,110,0,115,0,
-95,0,52,0,1,
-171,1,3,1,3,
-1,2,3535,22,1,
-6,1,2838,3536,17,
-3537,15,3532,1,-1,
-1,5,3538,20,3539,
-4,38,71,0,108,
-0,111,0,98,0,
-97,0,108,0,68,
-0,101,0,102,0,
-105,0,110,0,105,
+0,110,0,95,0,
+49,0,1,175,1,
+3,1,6,1,5,
+3522,22,1,9,1,
+2464,1024,1,2767,822,
+1,2768,810,1,2822,
+3523,17,3524,15,3525,
+4,52,37,0,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,86,0,97,0,
+114,0,105,0,97,
+0,98,0,108,0,
+101,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
 0,116,0,105,0,
-111,0,110,0,115,
-0,95,0,50,0,
-1,169,1,3,1,
-3,1,2,3540,22,
-1,4,1,2839,3541,
-17,3542,15,3532,1,
--1,1,5,3543,20,
-3544,4,38,71,0,
+111,0,110,0,1,
+-1,1,5,3526,20,
+3527,4,54,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+86,0,97,0,114,
+0,105,0,97,0,
+98,0,108,0,101,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,95,0,
+49,0,1,173,1,
+3,1,3,1,2,
+3528,22,1,7,1,
+2823,3529,16,0,281,
+1,2022,3530,16,0,
+673,1,2755,816,1,
+2834,3531,16,0,281,
+1,2459,1007,1,2466,
+3532,17,3533,15,3519,
+1,-1,1,5,3534,
+20,3535,4,52,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,95,0,50,
+0,1,176,1,3,
+1,7,1,6,3536,
+22,1,10,1,2764,
+3537,16,0,281,1,
+2841,3538,17,3539,15,
+3540,4,36,37,0,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,115,0,1,
+-1,1,5,3541,20,
+3542,4,38,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 68,0,101,0,102,
 0,105,0,110,0,
 105,0,116,0,105,
 0,111,0,110,0,
-115,0,95,0,51,
-0,1,170,1,3,
-1,2,1,1,3545,
-22,1,5,1,2840,
-3546,17,3547,15,3532,
-1,-1,1,5,3548,
-20,3549,4,38,71,
+115,0,95,0,52,
+0,1,172,1,3,
+1,3,1,2,3543,
+22,1,6,1,2842,
+3544,17,3545,15,3540,
+1,-1,1,5,3546,
+20,3547,4,38,71,
 0,108,0,111,0,
 98,0,97,0,108,
 0,68,0,101,0,
@@ -10014,12 +10014,39 @@ public yyLSLSyntax
 0,105,0,116,0,
 105,0,111,0,110,
 0,115,0,95,0,
-49,0,1,168,1,
-3,1,2,1,1,
-3550,22,1,3,1,
-2807,3551,17,3552,15,
-3518,1,-1,1,5,
-3553,20,3554,4,54,
+50,0,1,170,1,
+3,1,3,1,2,
+3548,22,1,4,1,
+2843,3549,17,3550,15,
+3540,1,-1,1,5,
+3551,20,3552,4,38,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,115,0,95,
+0,51,0,1,171,
+1,3,1,2,1,
+1,3553,22,1,5,
+1,2844,3554,17,3555,
+15,3540,1,-1,1,
+5,3556,20,3557,4,
+38,71,0,108,0,
+111,0,98,0,97,
+0,108,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,115,0,
+95,0,49,0,1,
+169,1,3,1,2,
+1,1,3558,22,1,
+3,1,2649,832,1,
+2811,3559,17,3560,15,
+3525,1,-1,1,5,
+3561,20,3562,4,54,
 71,0,108,0,111,
 0,98,0,97,0,
 108,0,86,0,97,
@@ -10031,2846 +10058,2877 @@ public yyLSLSyntax
 97,0,116,0,105,
 0,111,0,110,0,
 95,0,50,0,1,
-173,1,3,1,5,
-1,4,3555,22,1,
-8,1,2763,813,1,
-48,3556,19,375,1,
-48,3557,5,54,1,
-0,3558,16,0,373,
-1,2837,3530,1,2838,
-3536,1,2839,3541,1,
-2840,3546,1,1860,943,
-1,1958,3559,16,0,
-573,1,2760,3560,16,
-0,373,1,2413,3561,
-16,0,573,1,2198,
-3562,16,0,573,1,
-1873,958,1,1657,1016,
-1,2030,853,1,2751,
-807,1,1989,1038,1,
-1990,3563,16,0,573,
-1,2458,998,1,2459,
-1004,1,1775,3564,16,
-0,573,1,32,3565,
-16,0,573,1,2105,
-936,1,2106,3566,16,
-0,573,1,2763,813,
-1,2764,801,1,2227,
-1030,1,2337,3567,16,
-0,573,1,2075,3568,
-16,0,573,1,2779,
-3510,1,1803,909,1,
-1804,3569,16,0,573,
-1,1901,3570,16,0,
-573,1,2462,1011,1,
-2136,965,1,2464,1021,
-1,2029,847,1,2466,
-3525,1,2031,858,1,
-2032,863,1,2033,868,
-1,2035,874,1,2364,
-949,1,2039,884,1,
-1931,983,1,2041,890,
-1,2021,840,1,2043,
-896,1,2807,3551,1,
-2045,901,1,2647,824,
-1,2818,3516,1,2819,
-3571,16,0,373,1,
-2037,879,1,1574,921,
-1,2830,3572,16,0,
-373,1,49,3573,19,
-578,1,49,3574,5,
-38,1,1901,3575,16,
-0,576,1,2075,3576,
-16,0,576,1,1860,
-943,1,1803,909,1,
-1804,3577,16,0,576,
-1,2413,3578,16,0,
-576,1,2198,3579,16,
-0,576,1,1873,958,
-1,1657,1016,1,1989,
-1038,1,1990,3580,16,
-0,576,1,1775,3581,
-16,0,576,1,32,
-3582,16,0,576,1,
-2105,936,1,2106,3583,
-16,0,576,1,2364,
-949,1,2227,1030,1,
-2337,3584,16,0,576,
-1,2021,840,1,2458,
-998,1,2459,1004,1,
-2462,1011,1,2136,965,
-1,2464,1021,1,2029,
-847,1,2030,853,1,
-2031,858,1,2032,863,
-1,2033,868,1,2035,
-874,1,2037,879,1,
-2039,884,1,1931,983,
-1,2041,890,1,2043,
-896,1,2045,901,1,
-1574,921,1,1958,3585,
-16,0,576,1,50,
-3586,19,718,1,50,
-3587,5,38,1,1901,
-3588,16,0,716,1,
-2075,3589,16,0,716,
-1,1860,943,1,1803,
-909,1,1804,3590,16,
-0,716,1,2413,3591,
-16,0,716,1,2198,
-3592,16,0,716,1,
-1873,958,1,1657,1016,
-1,1989,1038,1,1990,
-3593,16,0,716,1,
-1775,3594,16,0,716,
-1,32,3595,16,0,
-716,1,2105,936,1,
-2106,3596,16,0,716,
-1,2364,949,1,2227,
-1030,1,2337,3597,16,
-0,716,1,2021,840,
-1,2458,998,1,2459,
-1004,1,2462,1011,1,
-2136,965,1,2464,1021,
-1,2029,847,1,2030,
-853,1,2031,858,1,
-2032,863,1,2033,868,
-1,2035,874,1,2037,
-879,1,2039,884,1,
-1931,983,1,2041,890,
-1,2043,896,1,2045,
-901,1,1574,921,1,
-1958,3598,16,0,716,
-1,51,3599,19,127,
-1,51,3600,5,58,
-1,0,3601,16,0,
-125,1,2537,3602,16,
-0,691,1,2837,3530,
-1,2838,3536,1,2839,
-3541,1,2840,3546,1,
-1860,943,1,10,3603,
+174,1,3,1,5,
+1,4,3563,22,1,
+8,1,48,3564,19,
+385,1,48,3565,5,
+54,1,0,3566,16,
+0,383,1,2075,3567,
+16,0,581,1,1860,
+946,1,2842,3544,1,
+1804,3568,16,0,581,
+1,2844,3554,1,2413,
+3569,16,0,581,1,
+2198,3570,16,0,581,
+1,1873,961,1,1657,
+1019,1,2030,856,1,
+1989,1041,1,1990,3571,
+16,0,581,1,2755,
+816,1,1775,3572,16,
+0,581,1,32,3573,
+16,0,581,1,2649,
+832,1,2105,939,1,
+2106,3574,16,0,581,
+1,2764,3575,16,0,
+383,1,2841,3538,1,
+1574,924,1,2767,822,
+1,2768,810,1,2227,
+1033,1,2337,3576,16,
+0,581,1,2783,3517,
+1,1803,912,1,2458,
+1001,1,1901,3577,16,
+0,581,1,2462,1014,
+1,2136,968,1,2464,
+1024,1,2029,850,1,
+2466,3532,1,2031,861,
+1,2032,866,1,2033,
+871,1,2035,877,1,
+2364,952,1,2039,887,
+1,1931,986,1,2041,
+893,1,2021,843,1,
+2043,899,1,2045,904,
+1,2811,3559,1,2834,
+3578,16,0,383,1,
+2037,882,1,2822,3523,
+1,2823,3579,16,0,
+383,1,2843,3549,1,
+1958,3580,16,0,581,
+1,2459,1007,1,49,
+3581,19,586,1,49,
+3582,5,38,1,1901,
+3583,16,0,584,1,
+2075,3584,16,0,584,
+1,1860,946,1,1803,
+912,1,1804,3585,16,
+0,584,1,2413,3586,
+16,0,584,1,2198,
+3587,16,0,584,1,
+1873,961,1,1657,1019,
+1,1989,1041,1,1990,
+3588,16,0,584,1,
+1775,3589,16,0,584,
+1,32,3590,16,0,
+584,1,2105,939,1,
+2106,3591,16,0,584,
+1,2364,952,1,2227,
+1033,1,2337,3592,16,
+0,584,1,2021,843,
+1,2458,1001,1,2459,
+1007,1,2462,1014,1,
+2136,968,1,2464,1024,
+1,2029,850,1,2030,
+856,1,2031,861,1,
+2032,866,1,2033,871,
+1,2035,877,1,2037,
+882,1,2039,887,1,
+1931,986,1,2041,893,
+1,2043,899,1,2045,
+904,1,1574,924,1,
+1958,3593,16,0,584,
+1,50,3594,19,733,
+1,50,3595,5,38,
+1,1901,3596,16,0,
+731,1,2075,3597,16,
+0,731,1,1860,946,
+1,1803,912,1,1804,
+3598,16,0,731,1,
+2413,3599,16,0,731,
+1,2198,3600,16,0,
+731,1,1873,961,1,
+1657,1019,1,1989,1041,
+1,1990,3601,16,0,
+731,1,1775,3602,16,
+0,731,1,32,3603,
+16,0,731,1,2105,
+939,1,2106,3604,16,
+0,731,1,2364,952,
+1,2227,1033,1,2337,
+3605,16,0,731,1,
+2021,843,1,2458,1001,
+1,2459,1007,1,2462,
+1014,1,2136,968,1,
+2464,1024,1,2029,850,
+1,2030,856,1,2031,
+861,1,2032,866,1,
+2033,871,1,2035,877,
+1,2037,882,1,2039,
+887,1,1931,986,1,
+2041,893,1,2043,899,
+1,2045,904,1,1574,
+924,1,1958,3606,16,
+0,731,1,51,3607,
+19,127,1,51,3608,
+5,58,1,0,3609,
+16,0,125,1,2538,
+3610,16,0,489,1,
+2075,3611,16,0,125,
+1,2841,3538,1,2515,
+3612,16,0,489,1,
+2843,3549,1,10,3613,
 16,0,125,1,2413,
-3604,16,0,125,1,
-2198,3605,16,0,125,
-1,1873,958,1,21,
-3606,16,0,125,1,
-1657,1016,1,2030,853,
-1,1989,1038,1,1990,
-3607,16,0,125,1,
-2458,998,1,2459,1004,
-1,1775,3608,16,0,
-125,1,32,3609,16,
-0,125,1,2105,936,
-1,2106,3610,16,0,
-125,1,2045,901,1,
-2766,3611,16,0,125,
-1,2227,1030,1,2337,
-3612,16,0,125,1,
-2075,3613,16,0,125,
-1,52,3614,16,0,
-125,1,2560,3615,16,
-0,691,1,2779,3510,
-1,1803,909,1,1804,
-3616,16,0,125,1,
-1901,3617,16,0,125,
-1,2462,1011,1,2136,
-965,1,2464,1021,1,
-2029,847,1,2466,3525,
-1,2031,858,1,2032,
-863,1,2033,868,1,
-2035,874,1,2581,3618,
-16,0,125,1,2364,
-949,1,2039,884,1,
-1931,983,1,2041,890,
-1,2021,840,1,2043,
-896,1,2807,3551,1,
-2510,3619,16,0,691,
-1,2514,3620,16,0,
-691,1,2818,3516,1,
-2819,3621,16,0,125,
-1,2522,3622,16,0,
-691,1,2037,879,1,
-1574,921,1,1958,3623,
-16,0,125,1,52,
-3624,19,124,1,52,
-3625,5,53,1,0,
-3626,16,0,122,1,
-2837,3530,1,2838,3536,
-1,2839,3541,1,2840,
-3546,1,1860,943,1,
-10,3627,16,0,122,
-1,2413,3628,16,0,
-122,1,2198,3629,16,
-0,122,1,1873,958,
-1,21,3630,16,0,
-122,1,1657,1016,1,
-2030,853,1,1989,1038,
-1,1990,3631,16,0,
-122,1,2458,998,1,
-2459,1004,1,1775,3632,
+3614,16,0,125,1,
+2523,3615,16,0,489,
+1,2198,3616,16,0,
+125,1,1873,961,1,
+21,3617,16,0,125,
+1,1657,1019,1,2029,
+850,1,2030,856,1,
+1989,1041,1,1990,3618,
+16,0,125,1,2458,
+1001,1,2459,1007,1,
+1775,3619,16,0,125,
+1,32,3620,16,0,
+125,1,2105,939,1,
+2106,3621,16,0,125,
+1,2823,3622,16,0,
+125,1,2770,3623,16,
+0,125,1,2227,1033,
+1,2337,3624,16,0,
+125,1,52,3625,16,
+0,125,1,2561,3626,
+16,0,489,1,2783,
+3517,1,1803,912,1,
+1804,3627,16,0,125,
+1,1901,3628,16,0,
+125,1,2462,1014,1,
+2136,968,1,2464,1024,
+1,1860,946,1,2466,
+3532,1,2031,861,1,
+2032,866,1,2033,871,
+1,2035,877,1,2364,
+952,1,2039,887,1,
+1931,986,1,2041,893,
+1,2021,843,1,2043,
+899,1,2045,904,1,
+2511,3629,16,0,489,
+1,2811,3559,1,2037,
+882,1,2822,3523,1,
+2842,3544,1,1574,924,
+1,2844,3554,1,2582,
+3630,16,0,125,1,
+1958,3631,16,0,125,
+1,52,3632,19,124,
+1,52,3633,5,53,
+1,0,3634,16,0,
+122,1,2075,3635,16,
+0,122,1,2841,3538,
+1,2842,3544,1,1804,
+3636,16,0,122,1,
+10,3637,16,0,122,
+1,2413,3638,16,0,
+122,1,2198,3639,16,
+0,122,1,1873,961,
+1,21,3640,16,0,
+122,1,1657,1019,1,
+2029,850,1,2030,856,
+1,1989,1041,1,1990,
+3641,16,0,122,1,
+2459,1007,1,1775,3642,
 16,0,122,1,32,
-3633,16,0,122,1,
-2105,936,1,2106,3634,
-16,0,122,1,2766,
-3635,16,0,122,1,
-2227,1030,1,2337,3636,
-16,0,122,1,2075,
-3637,16,0,122,1,
-52,3638,16,0,122,
-1,2779,3510,1,1803,
-909,1,1804,3639,16,
-0,122,1,1901,3640,
-16,0,122,1,2462,
-1011,1,2136,965,1,
-2464,1021,1,2029,847,
-1,2466,3525,1,2031,
-858,1,2032,863,1,
-2033,868,1,2035,874,
-1,2581,3641,16,0,
-122,1,2364,949,1,
-2039,884,1,1931,983,
-1,2041,890,1,2021,
-840,1,2043,896,1,
-2807,3551,1,2045,901,
-1,2818,3516,1,2819,
-3642,16,0,122,1,
-2037,879,1,1574,921,
-1,1958,3643,16,0,
-122,1,53,3644,19,
-121,1,53,3645,5,
-53,1,0,3646,16,
-0,119,1,2837,3530,
-1,2838,3536,1,2839,
-3541,1,2840,3546,1,
-1860,943,1,10,3647,
+3643,16,0,122,1,
+2105,939,1,2106,3644,
+16,0,122,1,1574,
+924,1,2770,3645,16,
+0,122,1,2227,1033,
+1,2337,3646,16,0,
+122,1,52,3647,16,
+0,122,1,2783,3517,
+1,1803,912,1,2458,
+1001,1,1901,3648,16,
+0,122,1,2462,1014,
+1,2136,968,1,2464,
+1024,1,1860,946,1,
+2466,3532,1,2031,861,
+1,2032,866,1,2033,
+871,1,2035,877,1,
+2364,952,1,2039,887,
+1,1931,986,1,2041,
+893,1,2021,843,1,
+2043,899,1,2045,904,
+1,2811,3559,1,2037,
+882,1,2822,3523,1,
+2823,3649,16,0,122,
+1,2843,3549,1,2844,
+3554,1,2582,3650,16,
+0,122,1,1958,3651,
+16,0,122,1,53,
+3652,19,121,1,53,
+3653,5,53,1,0,
+3654,16,0,119,1,
+2075,3655,16,0,119,
+1,2841,3538,1,2842,
+3544,1,1804,3656,16,
+0,119,1,10,3657,
 16,0,119,1,2413,
-3648,16,0,119,1,
-2198,3649,16,0,119,
-1,1873,958,1,21,
-3650,16,0,119,1,
-1657,1016,1,2030,853,
-1,1989,1038,1,1990,
-3651,16,0,119,1,
-2458,998,1,2459,1004,
-1,1775,3652,16,0,
-119,1,32,3653,16,
-0,119,1,2105,936,
-1,2106,3654,16,0,
-119,1,2766,3655,16,
-0,119,1,2227,1030,
-1,2337,3656,16,0,
-119,1,2075,3657,16,
-0,119,1,52,3658,
-16,0,119,1,2779,
-3510,1,1803,909,1,
-1804,3659,16,0,119,
-1,1901,3660,16,0,
-119,1,2462,1011,1,
-2136,965,1,2464,1021,
-1,2029,847,1,2466,
-3525,1,2031,858,1,
-2032,863,1,2033,868,
-1,2035,874,1,2581,
-3661,16,0,119,1,
-2364,949,1,2039,884,
-1,1931,983,1,2041,
-890,1,2021,840,1,
-2043,896,1,2807,3551,
-1,2045,901,1,2818,
-3516,1,2819,3662,16,
-0,119,1,2037,879,
-1,1574,921,1,1958,
-3663,16,0,119,1,
-54,3664,19,118,1,
-54,3665,5,55,1,
-0,3666,16,0,116,
-1,2837,3530,1,2838,
-3536,1,2839,3541,1,
-2840,3546,1,1860,943,
-1,10,3667,16,0,
-116,1,2413,3668,16,
-0,116,1,2198,3669,
+3658,16,0,119,1,
+2198,3659,16,0,119,
+1,1873,961,1,21,
+3660,16,0,119,1,
+1657,1019,1,2029,850,
+1,2030,856,1,1989,
+1041,1,1990,3661,16,
+0,119,1,2459,1007,
+1,1775,3662,16,0,
+119,1,32,3663,16,
+0,119,1,2105,939,
+1,2106,3664,16,0,
+119,1,1574,924,1,
+2770,3665,16,0,119,
+1,2227,1033,1,2337,
+3666,16,0,119,1,
+52,3667,16,0,119,
+1,2783,3517,1,1803,
+912,1,2458,1001,1,
+1901,3668,16,0,119,
+1,2462,1014,1,2136,
+968,1,2464,1024,1,
+1860,946,1,2466,3532,
+1,2031,861,1,2032,
+866,1,2033,871,1,
+2035,877,1,2364,952,
+1,2039,887,1,1931,
+986,1,2041,893,1,
+2021,843,1,2043,899,
+1,2045,904,1,2811,
+3559,1,2037,882,1,
+2822,3523,1,2823,3669,
+16,0,119,1,2843,
+3549,1,2844,3554,1,
+2582,3670,16,0,119,
+1,1958,3671,16,0,
+119,1,54,3672,19,
+118,1,54,3673,5,
+55,1,0,3674,16,
+0,116,1,2075,3675,
+16,0,116,1,2841,
+3538,1,2842,3544,1,
+1804,3676,16,0,116,
+1,10,3677,16,0,
+116,1,2413,3678,16,
+0,116,1,2198,3679,
 16,0,116,1,1873,
-958,1,21,3670,16,
-0,116,1,1657,1016,
-1,2030,853,1,1989,
-1038,1,1990,3671,16,
-0,116,1,2458,998,
-1,2459,1004,1,1775,
-3672,16,0,116,1,
-32,3673,16,0,116,
-1,2105,936,1,2106,
-3674,16,0,116,1,
-2766,3675,16,0,116,
-1,2227,1030,1,2337,
-3676,16,0,116,1,
-2075,3677,16,0,116,
-1,52,3678,16,0,
-116,1,2779,3510,1,
-1803,909,1,1804,3679,
-16,0,116,1,1901,
-3680,16,0,116,1,
-2462,1011,1,2136,965,
-1,2464,1021,1,2029,
-847,1,2466,3525,1,
-2031,858,1,2032,863,
-1,2033,868,1,2035,
-874,1,2581,3681,16,
-0,116,1,2364,949,
-1,2039,884,1,1931,
-983,1,2041,890,1,
-2021,840,1,2043,896,
-1,2807,3551,1,2045,
-901,1,2568,3682,16,
-0,470,1,2818,3516,
-1,2819,3683,16,0,
-116,1,2037,879,1,
-1574,921,1,1958,3684,
-16,0,116,1,2506,
-3685,16,0,470,1,
-55,3686,19,115,1,
-55,3687,5,56,1,
-0,3688,16,0,113,
-1,2837,3530,1,2838,
-3536,1,2839,3541,1,
-2840,3546,1,1860,943,
-1,10,3689,16,0,
-113,1,2413,3690,16,
-0,113,1,2525,3691,
-16,0,493,1,1657,
-1016,1,1873,958,1,
-21,3692,16,0,113,
-1,2529,3693,16,0,
-493,1,2030,853,1,
-1989,1038,1,1990,3694,
-16,0,113,1,2458,
-998,1,2459,1004,1,
-1775,3695,16,0,113,
-1,32,3696,16,0,
-113,1,2105,936,1,
-2106,3697,16,0,113,
-1,2766,3698,16,0,
-113,1,2552,3699,16,
-0,493,1,2227,1030,
-1,2337,3700,16,0,
-113,1,2075,3701,16,
-0,113,1,52,3702,
-16,0,113,1,2779,
-3510,1,1803,909,1,
-1804,3703,16,0,113,
-1,1901,3704,16,0,
-113,1,2462,1011,1,
-2136,965,1,2464,1021,
-1,2029,847,1,2466,
-3525,1,2031,858,1,
-2032,863,1,2033,868,
-1,2035,874,1,2581,
-3705,16,0,113,1,
-2364,949,1,2039,884,
-1,1931,983,1,2041,
-890,1,2021,840,1,
-2043,896,1,2807,3551,
-1,2045,901,1,2198,
+961,1,21,3680,16,
+0,116,1,1657,1019,
+1,2029,850,1,2030,
+856,1,1989,1041,1,
+1990,3681,16,0,116,
+1,2459,1007,1,1775,
+3682,16,0,116,1,
+32,3683,16,0,116,
+1,2105,939,1,2106,
+3684,16,0,116,1,
+2021,843,1,1574,924,
+1,2770,3685,16,0,
+116,1,2227,1033,1,
+2337,3686,16,0,116,
+1,52,3687,16,0,
+116,1,2783,3517,1,
+1803,912,1,2458,1001,
+1,1901,3688,16,0,
+116,1,2569,3689,16,
+0,483,1,2462,1014,
+1,2136,968,1,2464,
+1024,1,1860,946,1,
+2466,3532,1,2031,861,
+1,2032,866,1,2033,
+871,1,2035,877,1,
+2364,952,1,2039,887,
+1,1931,986,1,2041,
+893,1,2507,3690,16,
+0,483,1,2043,899,
+1,2045,904,1,2811,
+3559,1,2037,882,1,
+2822,3523,1,2823,3691,
+16,0,116,1,2843,
+3549,1,2844,3554,1,
+2582,3692,16,0,116,
+1,1958,3693,16,0,
+116,1,55,3694,19,
+115,1,55,3695,5,
+56,1,0,3696,16,
+0,113,1,2075,3697,
+16,0,113,1,2841,
+3538,1,2842,3544,1,
+2843,3549,1,10,3698,
+16,0,113,1,2413,
+3699,16,0,113,1,
+2198,3700,16,0,113,
+1,2526,3701,16,0,
+304,1,1873,961,1,
+21,3702,16,0,113,
+1,1657,1019,1,2530,
+3703,16,0,304,1,
+2030,856,1,1989,1041,
+1,1990,3704,16,0,
+113,1,2458,1001,1,
+2459,1007,1,1775,3705,
+16,0,113,1,32,
 3706,16,0,113,1,
-2818,3516,1,2819,3707,
-16,0,113,1,2037,
-879,1,1574,921,1,
-1958,3708,16,0,113,
-1,56,3709,19,112,
-1,56,3710,5,55,
-1,0,3711,16,0,
-110,1,2837,3530,1,
-2838,3536,1,2839,3541,
-1,2840,3546,1,1860,
-943,1,10,3712,16,
-0,110,1,2413,3713,
+2105,939,1,2106,3707,
+16,0,113,1,2770,
+3708,16,0,113,1,
+2553,3709,16,0,304,
+1,2227,1033,1,2337,
+3710,16,0,113,1,
+52,3711,16,0,113,
+1,2783,3517,1,1803,
+912,1,1804,3712,16,
+0,113,1,1901,3713,
+16,0,113,1,2462,
+1014,1,2136,968,1,
+2464,1024,1,1860,946,
+1,2466,3532,1,2031,
+861,1,2032,866,1,
+2033,871,1,2035,877,
+1,2364,952,1,2039,
+887,1,1931,986,1,
+2041,893,1,2021,843,
+1,2043,899,1,2045,
+904,1,2811,3559,1,
+2029,850,1,2037,882,
+1,2822,3523,1,2823,
+3714,16,0,113,1,
+1574,924,1,2844,3554,
+1,2582,3715,16,0,
+113,1,1958,3716,16,
+0,113,1,56,3717,
+19,112,1,56,3718,
+5,55,1,0,3719,
+16,0,110,1,2075,
+3720,16,0,110,1,
+2841,3538,1,2842,3544,
+1,1804,3721,16,0,
+110,1,10,3722,16,
+0,110,1,2413,3723,
 16,0,110,1,2198,
-3714,16,0,110,1,
-1873,958,1,21,3715,
+3724,16,0,110,1,
+1873,961,1,21,3725,
 16,0,110,1,1657,
-1016,1,2030,853,1,
-1989,1038,1,1990,3716,
-16,0,110,1,2458,
-998,1,2459,1004,1,
-1775,3717,16,0,110,
-1,32,3718,16,0,
-110,1,2540,3719,16,
-0,511,1,2105,936,
-1,2106,3720,16,0,
-110,1,2544,3721,16,
-0,511,1,2766,3722,
+1019,1,2029,850,1,
+2030,856,1,1989,1041,
+1,1990,3726,16,0,
+110,1,2459,1007,1,
+1775,3727,16,0,110,
+1,32,3728,16,0,
+110,1,2541,3729,16,
+0,525,1,2106,3730,
+16,0,110,1,2545,
+3731,16,0,525,1,
+1574,924,1,2770,3732,
 16,0,110,1,2227,
-1030,1,2337,3723,16,
-0,110,1,2075,3724,
-16,0,110,1,52,
-3725,16,0,110,1,
-2779,3510,1,1803,909,
-1,1804,3726,16,0,
-110,1,1901,3727,16,
-0,110,1,2462,1011,
-1,2136,965,1,2464,
-1021,1,2029,847,1,
-2466,3525,1,2031,858,
-1,2032,863,1,2033,
-868,1,2035,874,1,
-2581,3728,16,0,110,
-1,2364,949,1,2039,
-884,1,1931,983,1,
-2041,890,1,2021,840,
-1,2043,896,1,2807,
-3551,1,2045,901,1,
-2818,3516,1,2819,3729,
-16,0,110,1,2037,
-879,1,1574,921,1,
-1958,3730,16,0,110,
-1,57,3731,19,109,
-1,57,3732,5,53,
-1,0,3733,16,0,
-107,1,2837,3530,1,
-2838,3536,1,2839,3541,
-1,2840,3546,1,1860,
-943,1,10,3734,16,
-0,107,1,2413,3735,
+1033,1,2337,3733,16,
+0,110,1,52,3734,
+16,0,110,1,2783,
+3517,1,1803,912,1,
+2458,1001,1,1901,3735,
+16,0,110,1,2462,
+1014,1,2136,968,1,
+2464,1024,1,1860,946,
+1,2466,3532,1,2031,
+861,1,2032,866,1,
+2033,871,1,2035,877,
+1,2364,952,1,2039,
+887,1,1931,986,1,
+2041,893,1,2021,843,
+1,2043,899,1,2045,
+904,1,2811,3559,1,
+2037,882,1,2822,3523,
+1,2823,3736,16,0,
+110,1,2843,3549,1,
+2844,3554,1,2105,939,
+1,2582,3737,16,0,
+110,1,1958,3738,16,
+0,110,1,57,3739,
+19,109,1,57,3740,
+5,53,1,0,3741,
+16,0,107,1,2075,
+3742,16,0,107,1,
+2841,3538,1,2842,3544,
+1,1804,3743,16,0,
+107,1,10,3744,16,
+0,107,1,2413,3745,
 16,0,107,1,2198,
-3736,16,0,107,1,
-1873,958,1,21,3737,
-16,0,107,1,1657,
-1016,1,2030,853,1,
-1989,1038,1,1990,3738,
-16,0,107,1,2458,
-998,1,2459,1004,1,
-1775,3739,16,0,107,
-1,32,3740,16,0,
-107,1,2105,936,1,
-2106,3741,16,0,107,
-1,2766,3742,16,0,
-107,1,2227,1030,1,
-2337,3743,16,0,107,
-1,2075,3744,16,0,
-107,1,52,3745,16,
-0,107,1,2779,3510,
-1,1803,909,1,1804,
 3746,16,0,107,1,
-1901,3747,16,0,107,
-1,2462,1011,1,2136,
-965,1,2464,1021,1,
-2029,847,1,2466,3525,
-1,2031,858,1,2032,
-863,1,2033,868,1,
-2035,874,1,2581,3748,
-16,0,107,1,2364,
-949,1,2039,884,1,
-1931,983,1,2041,890,
-1,2021,840,1,2043,
-896,1,2807,3551,1,
-2045,901,1,2818,3516,
-1,2819,3749,16,0,
-107,1,2037,879,1,
-1574,921,1,1958,3750,
-16,0,107,1,58,
-3751,19,386,1,58,
-3752,5,30,1,2644,
-1753,1,2520,1758,1,
-2639,1765,1,2640,1770,
-1,2641,1775,1,2642,
-1780,1,2643,1747,1,
-2535,1785,1,2645,1791,
-1,2646,1796,1,2648,
-1875,1,2649,1802,1,
-2650,1807,1,2651,1812,
-1,2652,1817,1,2653,
-1822,1,2654,1827,1,
-2655,1832,1,2657,3753,
-16,0,384,1,2550,
-1843,1,2579,1861,1,
-2558,1849,1,2566,1855,
-1,2459,1004,1,2464,
-1021,1,2574,1837,1,
-2470,3754,16,0,384,
-1,2700,3755,16,0,
-384,1,2594,1868,1,
-2596,3756,16,0,384,
-1,59,3757,19,383,
-1,59,3758,5,30,
-1,2644,1753,1,2520,
-1758,1,2639,1765,1,
-2640,1770,1,2641,1775,
-1,2642,1780,1,2643,
-1747,1,2535,1785,1,
-2645,1791,1,2646,1796,
-1,2648,1875,1,2649,
-1802,1,2650,1807,1,
-2651,1812,1,2652,1817,
-1,2653,1822,1,2654,
-1827,1,2655,1832,1,
-2657,3759,16,0,381,
-1,2550,1843,1,2579,
-1861,1,2558,1849,1,
-2566,1855,1,2459,1004,
-1,2464,1021,1,2574,
-1837,1,2470,3760,16,
-0,381,1,2700,3761,
-16,0,381,1,2594,
-1868,1,2596,3762,16,
-0,381,1,60,3763,
-19,545,1,60,3764,
-5,30,1,2644,1753,
-1,2520,1758,1,2639,
-1765,1,2640,1770,1,
-2641,1775,1,2642,1780,
-1,2643,1747,1,2535,
-1785,1,2645,1791,1,
-2646,1796,1,2648,1875,
-1,2649,1802,1,2650,
-1807,1,2651,1812,1,
-2652,1817,1,2653,1822,
-1,2654,1827,1,2655,
-1832,1,2657,3765,16,
-0,543,1,2550,1843,
-1,2579,1861,1,2558,
-1849,1,2566,1855,1,
-2459,1004,1,2464,1021,
-1,2574,1837,1,2470,
-3766,16,0,543,1,
-2700,3767,16,0,543,
-1,2594,1868,1,2596,
-3768,16,0,543,1,
-61,3769,19,423,1,
-61,3770,5,30,1,
-2644,1753,1,2520,1758,
-1,2639,1765,1,2640,
-1770,1,2641,1775,1,
-2642,1780,1,2643,1747,
-1,2535,1785,1,2645,
-1791,1,2646,1796,1,
-2648,1875,1,2649,1802,
-1,2650,1807,1,2651,
-1812,1,2652,1817,1,
-2653,1822,1,2654,1827,
-1,2655,1832,1,2657,
-3771,16,0,421,1,
-2550,1843,1,2579,1861,
-1,2558,1849,1,2566,
-1855,1,2459,1004,1,
-2464,1021,1,2574,1837,
-1,2470,3772,16,0,
-421,1,2700,3773,16,
-0,421,1,2594,1868,
-1,2596,3774,16,0,
-421,1,62,3775,19,
-541,1,62,3776,5,
-30,1,2644,1753,1,
-2520,1758,1,2639,1765,
-1,2640,1770,1,2641,
-1775,1,2642,1780,1,
-2643,1747,1,2535,1785,
-1,2645,1791,1,2646,
-1796,1,2648,1875,1,
-2649,1802,1,2650,1807,
-1,2651,1812,1,2652,
-1817,1,2653,1822,1,
-2654,1827,1,2655,1832,
-1,2657,3777,16,0,
-539,1,2550,1843,1,
-2579,1861,1,2558,1849,
-1,2566,1855,1,2459,
-1004,1,2464,1021,1,
-2574,1837,1,2470,3778,
-16,0,539,1,2700,
-3779,16,0,539,1,
-2594,1868,1,2596,3780,
-16,0,539,1,63,
-3781,19,653,1,63,
-3782,5,30,1,2644,
-1753,1,2520,1758,1,
-2639,1765,1,2640,1770,
-1,2641,1775,1,2642,
-1780,1,2643,1747,1,
-2535,1785,1,2645,1791,
-1,2646,1796,1,2648,
-1875,1,2649,1802,1,
-2650,1807,1,2651,1812,
-1,2652,1817,1,2653,
-1822,1,2654,1827,1,
-2655,1832,1,2657,3783,
-16,0,651,1,2550,
-1843,1,2579,1861,1,
-2558,1849,1,2566,1855,
-1,2459,1004,1,2464,
-1021,1,2574,1837,1,
-2470,3784,16,0,651,
-1,2700,3785,16,0,
-651,1,2594,1868,1,
-2596,3786,16,0,651,
-1,64,3787,19,416,
-1,64,3788,5,30,
-1,2644,1753,1,2520,
-1758,1,2639,1765,1,
-2640,1770,1,2641,1775,
-1,2642,1780,1,2643,
-1747,1,2535,1785,1,
-2645,1791,1,2646,1796,
-1,2648,1875,1,2649,
-1802,1,2650,1807,1,
-2651,1812,1,2652,1817,
-1,2653,1822,1,2654,
-1827,1,2655,1832,1,
-2657,3789,16,0,414,
-1,2550,1843,1,2579,
-1861,1,2558,1849,1,
-2566,1855,1,2459,1004,
-1,2464,1021,1,2574,
-1837,1,2470,3790,16,
-0,414,1,2700,3791,
-16,0,414,1,2594,
-1868,1,2596,3792,16,
-0,414,1,65,3793,
-19,380,1,65,3794,
-5,30,1,2644,1753,
-1,2520,1758,1,2639,
-1765,1,2640,1770,1,
-2641,1775,1,2642,1780,
-1,2643,1747,1,2535,
-1785,1,2645,1791,1,
-2646,1796,1,2648,1875,
-1,2649,1802,1,2650,
-1807,1,2651,1812,1,
-2652,1817,1,2653,1822,
-1,2654,1827,1,2655,
-1832,1,2657,3795,16,
-0,378,1,2550,1843,
-1,2579,1861,1,2558,
-1849,1,2566,1855,1,
-2459,1004,1,2464,1021,
-1,2574,1837,1,2470,
-3796,16,0,378,1,
-2700,3797,16,0,378,
-1,2594,1868,1,2596,
-3798,16,0,378,1,
-66,3799,19,465,1,
-66,3800,5,30,1,
-2644,1753,1,2520,1758,
-1,2639,1765,1,2640,
-1770,1,2641,1775,1,
-2642,1780,1,2643,1747,
-1,2535,1785,1,2645,
-1791,1,2646,1796,1,
-2648,1875,1,2649,1802,
-1,2650,1807,1,2651,
-1812,1,2652,1817,1,
-2653,1822,1,2654,1827,
-1,2655,1832,1,2657,
-3801,16,0,463,1,
-2550,1843,1,2579,1861,
-1,2558,1849,1,2566,
-1855,1,2459,1004,1,
-2464,1021,1,2574,1837,
-1,2470,3802,16,0,
-463,1,2700,3803,16,
-0,463,1,2594,1868,
-1,2596,3804,16,0,
-463,1,67,3805,19,
-462,1,67,3806,5,
-30,1,2644,1753,1,
-2520,1758,1,2639,1765,
-1,2640,1770,1,2641,
-1775,1,2642,1780,1,
-2643,1747,1,2535,1785,
-1,2645,1791,1,2646,
-1796,1,2648,1875,1,
-2649,1802,1,2650,1807,
-1,2651,1812,1,2652,
-1817,1,2653,1822,1,
-2654,1827,1,2655,1832,
-1,2657,3807,16,0,
-460,1,2550,1843,1,
-2579,1861,1,2558,1849,
-1,2566,1855,1,2459,
-1004,1,2464,1021,1,
-2574,1837,1,2470,3808,
-16,0,460,1,2700,
-3809,16,0,460,1,
-2594,1868,1,2596,3810,
-16,0,460,1,68,
-3811,19,459,1,68,
-3812,5,30,1,2644,
-1753,1,2520,1758,1,
-2639,1765,1,2640,1770,
-1,2641,1775,1,2642,
-1780,1,2643,1747,1,
-2535,1785,1,2645,1791,
-1,2646,1796,1,2648,
-1875,1,2649,1802,1,
-2650,1807,1,2651,1812,
-1,2652,1817,1,2653,
-1822,1,2654,1827,1,
-2655,1832,1,2657,3813,
-16,0,457,1,2550,
-1843,1,2579,1861,1,
-2558,1849,1,2566,1855,
-1,2459,1004,1,2464,
-1021,1,2574,1837,1,
-2470,3814,16,0,457,
-1,2700,3815,16,0,
-457,1,2594,1868,1,
-2596,3816,16,0,457,
-1,69,3817,19,395,
-1,69,3818,5,30,
-1,2644,1753,1,2520,
-1758,1,2639,1765,1,
-2640,1770,1,2641,1775,
-1,2642,1780,1,2643,
-1747,1,2535,1785,1,
-2645,1791,1,2646,1796,
-1,2648,1875,1,2649,
-1802,1,2650,1807,1,
-2651,1812,1,2652,1817,
-1,2653,1822,1,2654,
-1827,1,2655,1832,1,
-2657,3819,16,0,393,
-1,2550,1843,1,2579,
-1861,1,2558,1849,1,
-2566,1855,1,2459,1004,
-1,2464,1021,1,2574,
-1837,1,2470,3820,16,
-0,393,1,2700,3821,
-16,0,393,1,2594,
-1868,1,2596,3822,16,
-0,393,1,70,3823,
-19,392,1,70,3824,
-5,30,1,2644,1753,
-1,2520,1758,1,2639,
-1765,1,2640,1770,1,
-2641,1775,1,2642,1780,
-1,2643,1747,1,2535,
-1785,1,2645,1791,1,
-2646,1796,1,2648,1875,
-1,2649,1802,1,2650,
-1807,1,2651,1812,1,
-2652,1817,1,2653,1822,
-1,2654,1827,1,2655,
-1832,1,2657,3825,16,
-0,390,1,2550,1843,
-1,2579,1861,1,2558,
-1849,1,2566,1855,1,
-2459,1004,1,2464,1021,
-1,2574,1837,1,2470,
-3826,16,0,390,1,
-2700,3827,16,0,390,
-1,2594,1868,1,2596,
-3828,16,0,390,1,
-71,3829,19,389,1,
-71,3830,5,30,1,
-2644,1753,1,2520,1758,
-1,2639,1765,1,2640,
-1770,1,2641,1775,1,
-2642,1780,1,2643,1747,
-1,2535,1785,1,2645,
-1791,1,2646,1796,1,
-2648,1875,1,2649,1802,
-1,2650,1807,1,2651,
-1812,1,2652,1817,1,
-2653,1822,1,2654,1827,
-1,2655,1832,1,2657,
-3831,16,0,387,1,
-2550,1843,1,2579,1861,
-1,2558,1849,1,2566,
-1855,1,2459,1004,1,
-2464,1021,1,2574,1837,
-1,2470,3832,16,0,
-387,1,2700,3833,16,
-0,387,1,2594,1868,
-1,2596,3834,16,0,
-387,1,72,3835,19,
-456,1,72,3836,5,
-30,1,2644,1753,1,
-2520,1758,1,2639,1765,
-1,2640,1770,1,2641,
-1775,1,2642,1780,1,
-2643,1747,1,2535,1785,
-1,2645,1791,1,2646,
-1796,1,2648,1875,1,
-2649,1802,1,2650,1807,
-1,2651,1812,1,2652,
-1817,1,2653,1822,1,
-2654,1827,1,2655,1832,
-1,2657,3837,16,0,
-454,1,2550,1843,1,
-2579,1861,1,2558,1849,
-1,2566,1855,1,2459,
-1004,1,2464,1021,1,
-2574,1837,1,2470,3838,
-16,0,454,1,2700,
-3839,16,0,454,1,
-2594,1868,1,2596,3840,
-16,0,454,1,73,
-3841,19,453,1,73,
-3842,5,30,1,2644,
-1753,1,2520,1758,1,
-2639,1765,1,2640,1770,
-1,2641,1775,1,2642,
-1780,1,2643,1747,1,
-2535,1785,1,2645,1791,
-1,2646,1796,1,2648,
-1875,1,2649,1802,1,
-2650,1807,1,2651,1812,
-1,2652,1817,1,2653,
-1822,1,2654,1827,1,
-2655,1832,1,2657,3843,
-16,0,451,1,2550,
-1843,1,2579,1861,1,
-2558,1849,1,2566,1855,
-1,2459,1004,1,2464,
-1021,1,2574,1837,1,
-2470,3844,16,0,451,
-1,2700,3845,16,0,
-451,1,2594,1868,1,
-2596,3846,16,0,451,
-1,74,3847,19,450,
-1,74,3848,5,30,
-1,2644,1753,1,2520,
-1758,1,2639,1765,1,
-2640,1770,1,2641,1775,
-1,2642,1780,1,2643,
-1747,1,2535,1785,1,
-2645,1791,1,2646,1796,
-1,2648,1875,1,2649,
-1802,1,2650,1807,1,
-2651,1812,1,2652,1817,
-1,2653,1822,1,2654,
-1827,1,2655,1832,1,
-2657,3849,16,0,448,
-1,2550,1843,1,2579,
-1861,1,2558,1849,1,
-2566,1855,1,2459,1004,
-1,2464,1021,1,2574,
-1837,1,2470,3850,16,
-0,448,1,2700,3851,
-16,0,448,1,2594,
-1868,1,2596,3852,16,
-0,448,1,75,3853,
-19,439,1,75,3854,
-5,30,1,2644,1753,
-1,2520,1758,1,2639,
-1765,1,2640,1770,1,
-2641,1775,1,2642,1780,
-1,2643,1747,1,2535,
-1785,1,2645,1791,1,
-2646,1796,1,2648,1875,
-1,2649,1802,1,2650,
-1807,1,2651,1812,1,
-2652,1817,1,2653,1822,
-1,2654,1827,1,2655,
-1832,1,2657,3855,16,
-0,437,1,2550,1843,
-1,2579,1861,1,2558,
-1849,1,2566,1855,1,
-2459,1004,1,2464,1021,
-1,2574,1837,1,2470,
-3856,16,0,437,1,
-2700,3857,16,0,437,
-1,2594,1868,1,2596,
-3858,16,0,437,1,
-76,3859,19,560,1,
-76,3860,5,30,1,
-2644,1753,1,2520,1758,
-1,2639,1765,1,2640,
-1770,1,2641,1775,1,
-2642,1780,1,2643,1747,
-1,2535,1785,1,2645,
-1791,1,2646,1796,1,
-2648,1875,1,2649,1802,
-1,2650,1807,1,2651,
-1812,1,2652,1817,1,
-2653,1822,1,2654,1827,
-1,2655,1832,1,2657,
-3861,16,0,558,1,
-2550,1843,1,2579,1861,
-1,2558,1849,1,2566,
-1855,1,2459,1004,1,
-2464,1021,1,2574,1837,
-1,2470,3862,16,0,
-558,1,2700,3863,16,
-0,558,1,2594,1868,
-1,2596,3864,16,0,
-558,1,77,3865,19,
-435,1,77,3866,5,
-30,1,2644,1753,1,
-2520,1758,1,2639,1765,
-1,2640,1770,1,2641,
-1775,1,2642,1780,1,
-2643,1747,1,2535,1785,
-1,2645,1791,1,2646,
-1796,1,2648,1875,1,
-2649,1802,1,2650,1807,
-1,2651,1812,1,2652,
-1817,1,2653,1822,1,
-2654,1827,1,2655,1832,
-1,2657,3867,16,0,
-433,1,2550,1843,1,
-2579,1861,1,2558,1849,
-1,2566,1855,1,2459,
-1004,1,2464,1021,1,
-2574,1837,1,2470,3868,
-16,0,433,1,2700,
-3869,16,0,433,1,
-2594,1868,1,2596,3870,
-16,0,433,1,78,
-3871,19,554,1,78,
-3872,5,30,1,2644,
-1753,1,2520,1758,1,
-2639,1765,1,2640,1770,
-1,2641,1775,1,2642,
-1780,1,2643,1747,1,
-2535,1785,1,2645,1791,
-1,2646,1796,1,2648,
-1875,1,2649,1802,1,
-2650,1807,1,2651,1812,
-1,2652,1817,1,2653,
-1822,1,2654,1827,1,
-2655,1832,1,2657,3873,
-16,0,552,1,2550,
-1843,1,2579,1861,1,
-2558,1849,1,2566,1855,
-1,2459,1004,1,2464,
-1021,1,2574,1837,1,
-2470,3874,16,0,552,
-1,2700,3875,16,0,
-552,1,2594,1868,1,
-2596,3876,16,0,552,
-1,79,3877,19,551,
-1,79,3878,5,30,
-1,2644,1753,1,2520,
-1758,1,2639,1765,1,
-2640,1770,1,2641,1775,
-1,2642,1780,1,2643,
-1747,1,2535,1785,1,
-2645,1791,1,2646,1796,
-1,2648,1875,1,2649,
-1802,1,2650,1807,1,
-2651,1812,1,2652,1817,
-1,2653,1822,1,2654,
-1827,1,2655,1832,1,
-2657,3879,16,0,549,
-1,2550,1843,1,2579,
-1861,1,2558,1849,1,
-2566,1855,1,2459,1004,
-1,2464,1021,1,2574,
-1837,1,2470,3880,16,
-0,549,1,2700,3881,
-16,0,549,1,2594,
-1868,1,2596,3882,16,
-0,549,1,80,3883,
-19,426,1,80,3884,
-5,30,1,2644,1753,
-1,2520,1758,1,2639,
-1765,1,2640,1770,1,
-2641,1775,1,2642,1780,
-1,2643,1747,1,2535,
-1785,1,2645,1791,1,
-2646,1796,1,2648,1875,
-1,2649,1802,1,2650,
-1807,1,2651,1812,1,
-2652,1817,1,2653,1822,
-1,2654,1827,1,2655,
-1832,1,2657,3885,16,
-0,424,1,2550,1843,
-1,2579,1861,1,2558,
-1849,1,2566,1855,1,
-2459,1004,1,2464,1021,
-1,2574,1837,1,2470,
-3886,16,0,424,1,
-2700,3887,16,0,424,
-1,2594,1868,1,2596,
-3888,16,0,424,1,
-81,3889,19,413,1,
-81,3890,5,30,1,
-2644,1753,1,2520,1758,
-1,2639,1765,1,2640,
-1770,1,2641,1775,1,
-2642,1780,1,2643,1747,
-1,2535,1785,1,2645,
-1791,1,2646,1796,1,
-2648,1875,1,2649,1802,
-1,2650,1807,1,2651,
-1812,1,2652,1817,1,
-2653,1822,1,2654,1827,
-1,2655,1832,1,2657,
-3891,16,0,411,1,
-2550,1843,1,2579,1861,
-1,2558,1849,1,2566,
-1855,1,2459,1004,1,
-2464,1021,1,2574,1837,
-1,2470,3892,16,0,
-411,1,2700,3893,16,
-0,411,1,2594,1868,
-1,2596,3894,16,0,
-411,1,82,3895,19,
-758,1,82,3896,5,
-30,1,2644,1753,1,
-2520,1758,1,2639,1765,
-1,2640,1770,1,2641,
-1775,1,2642,1780,1,
-2643,1747,1,2535,1785,
-1,2645,1791,1,2646,
-1796,1,2648,1875,1,
-2649,1802,1,2650,1807,
-1,2651,1812,1,2652,
-1817,1,2653,1822,1,
-2654,1827,1,2655,1832,
-1,2657,3897,16,0,
-756,1,2550,1843,1,
-2579,1861,1,2558,1849,
-1,2566,1855,1,2459,
-1004,1,2464,1021,1,
-2574,1837,1,2470,3898,
-16,0,756,1,2700,
-3899,16,0,756,1,
-2594,1868,1,2596,3900,
-16,0,756,1,83,
-3901,19,410,1,83,
-3902,5,30,1,2644,
-1753,1,2520,1758,1,
-2639,1765,1,2640,1770,
-1,2641,1775,1,2642,
-1780,1,2643,1747,1,
-2535,1785,1,2645,1791,
-1,2646,1796,1,2648,
-1875,1,2649,1802,1,
-2650,1807,1,2651,1812,
-1,2652,1817,1,2653,
-1822,1,2654,1827,1,
-2655,1832,1,2657,3903,
-16,0,408,1,2550,
-1843,1,2579,1861,1,
-2558,1849,1,2566,1855,
-1,2459,1004,1,2464,
-1021,1,2574,1837,1,
-2470,3904,16,0,408,
-1,2700,3905,16,0,
-408,1,2594,1868,1,
-2596,3906,16,0,408,
-1,84,3907,19,407,
-1,84,3908,5,30,
-1,2644,1753,1,2520,
-1758,1,2639,1765,1,
-2640,1770,1,2641,1775,
-1,2642,1780,1,2643,
-1747,1,2535,1785,1,
-2645,1791,1,2646,1796,
-1,2648,1875,1,2649,
-1802,1,2650,1807,1,
-2651,1812,1,2652,1817,
-1,2653,1822,1,2654,
-1827,1,2655,1832,1,
-2657,3909,16,0,405,
-1,2550,1843,1,2579,
-1861,1,2558,1849,1,
-2566,1855,1,2459,1004,
-1,2464,1021,1,2574,
-1837,1,2470,3910,16,
-0,405,1,2700,3911,
-16,0,405,1,2594,
-1868,1,2596,3912,16,
-0,405,1,85,3913,
-19,570,1,85,3914,
-5,30,1,2644,1753,
-1,2520,1758,1,2639,
-1765,1,2640,1770,1,
-2641,1775,1,2642,1780,
-1,2643,1747,1,2535,
-1785,1,2645,1791,1,
-2646,1796,1,2648,1875,
-1,2649,1802,1,2650,
-1807,1,2651,1812,1,
-2652,1817,1,2653,1822,
-1,2654,1827,1,2655,
-1832,1,2657,3915,16,
-0,568,1,2550,1843,
-1,2579,1861,1,2558,
-1849,1,2566,1855,1,
-2459,1004,1,2464,1021,
-1,2574,1837,1,2470,
-3916,16,0,568,1,
-2700,3917,16,0,568,
-1,2594,1868,1,2596,
-3918,16,0,568,1,
-86,3919,19,442,1,
-86,3920,5,30,1,
-2644,1753,1,2520,1758,
-1,2639,1765,1,2640,
-1770,1,2641,1775,1,
-2642,1780,1,2643,1747,
-1,2535,1785,1,2645,
-1791,1,2646,1796,1,
-2648,1875,1,2649,1802,
-1,2650,1807,1,2651,
-1812,1,2652,1817,1,
-2653,1822,1,2654,1827,
-1,2655,1832,1,2657,
-3921,16,0,440,1,
-2550,1843,1,2579,1861,
-1,2558,1849,1,2566,
-1855,1,2459,1004,1,
-2464,1021,1,2574,1837,
-1,2470,3922,16,0,
-440,1,2700,3923,16,
-0,440,1,2594,1868,
-1,2596,3924,16,0,
-440,1,87,3925,19,
-548,1,87,3926,5,
-30,1,2644,1753,1,
-2520,1758,1,2639,1765,
-1,2640,1770,1,2641,
-1775,1,2642,1780,1,
-2643,1747,1,2535,1785,
-1,2645,1791,1,2646,
-1796,1,2648,1875,1,
-2649,1802,1,2650,1807,
-1,2651,1812,1,2652,
-1817,1,2653,1822,1,
-2654,1827,1,2655,1832,
-1,2657,3927,16,0,
-546,1,2550,1843,1,
-2579,1861,1,2558,1849,
-1,2566,1855,1,2459,
-1004,1,2464,1021,1,
-2574,1837,1,2470,3928,
-16,0,546,1,2700,
-3929,16,0,546,1,
-2594,1868,1,2596,3930,
-16,0,546,1,88,
-3931,19,404,1,88,
-3932,5,30,1,2644,
-1753,1,2520,1758,1,
-2639,1765,1,2640,1770,
-1,2641,1775,1,2642,
-1780,1,2643,1747,1,
-2535,1785,1,2645,1791,
-1,2646,1796,1,2648,
-1875,1,2649,1802,1,
-2650,1807,1,2651,1812,
-1,2652,1817,1,2653,
-1822,1,2654,1827,1,
-2655,1832,1,2657,3933,
-16,0,402,1,2550,
-1843,1,2579,1861,1,
-2558,1849,1,2566,1855,
-1,2459,1004,1,2464,
-1021,1,2574,1837,1,
-2470,3934,16,0,402,
-1,2700,3935,16,0,
-402,1,2594,1868,1,
-2596,3936,16,0,402,
-1,89,3937,19,398,
-1,89,3938,5,30,
-1,2644,1753,1,2520,
-1758,1,2639,1765,1,
-2640,1770,1,2641,1775,
-1,2642,1780,1,2643,
-1747,1,2535,1785,1,
-2645,1791,1,2646,1796,
-1,2648,1875,1,2649,
-1802,1,2650,1807,1,
-2651,1812,1,2652,1817,
-1,2653,1822,1,2654,
-1827,1,2655,1832,1,
-2657,3939,16,0,396,
-1,2550,1843,1,2579,
-1861,1,2558,1849,1,
-2566,1855,1,2459,1004,
-1,2464,1021,1,2574,
-1837,1,2470,3940,16,
-0,396,1,2700,3941,
-16,0,396,1,2594,
-1868,1,2596,3942,16,
-0,396,1,90,3943,
-19,401,1,90,3944,
-5,30,1,2644,1753,
-1,2520,1758,1,2639,
-1765,1,2640,1770,1,
-2641,1775,1,2642,1780,
-1,2643,1747,1,2535,
-1785,1,2645,1791,1,
-2646,1796,1,2648,1875,
-1,2649,1802,1,2650,
-1807,1,2651,1812,1,
-2652,1817,1,2653,1822,
-1,2654,1827,1,2655,
-1832,1,2657,3945,16,
-0,399,1,2550,1843,
-1,2579,1861,1,2558,
-1849,1,2566,1855,1,
-2459,1004,1,2464,1021,
-1,2574,1837,1,2470,
-3946,16,0,399,1,
-2700,3947,16,0,399,
-1,2594,1868,1,2596,
-3948,16,0,399,1,
-91,3949,19,446,1,
-91,3950,5,30,1,
-2644,1753,1,2520,1758,
-1,2639,1765,1,2640,
-1770,1,2641,1775,1,
-2642,1780,1,2643,1747,
-1,2535,1785,1,2645,
-1791,1,2646,1796,1,
-2648,1875,1,2649,1802,
-1,2650,1807,1,2651,
-1812,1,2652,1817,1,
-2653,1822,1,2654,1827,
-1,2655,1832,1,2657,
-3951,16,0,444,1,
-2550,1843,1,2579,1861,
-1,2558,1849,1,2566,
-1855,1,2459,1004,1,
-2464,1021,1,2574,1837,
-1,2470,3952,16,0,
-444,1,2700,3953,16,
-0,444,1,2594,1868,
-1,2596,3954,16,0,
-444,1,92,3955,19,
-133,1,92,3956,5,
-129,1,0,3957,16,
-0,314,1,1,2236,
-1,2,2242,1,3,
-2247,1,4,2252,1,
-5,2257,1,6,2262,
-1,7,2267,1,8,
-3958,16,0,131,1,
-1515,3959,16,0,184,
-1,2021,840,1,2022,
-3960,16,0,575,1,
-256,3961,16,0,192,
-1,2526,3962,16,0,
-300,1,2025,3963,16,
-0,579,1,18,3964,
-16,0,138,1,2027,
-3965,16,0,583,1,
-2029,847,1,2030,853,
-1,2031,858,1,2032,
-863,1,2033,868,1,
-277,3966,16,0,192,
-1,2035,874,1,2037,
-879,1,2541,3967,16,
-0,512,1,32,3968,
-16,0,184,1,2041,
-890,1,2293,3969,16,
-0,192,1,2043,896,
-1,2045,901,1,41,
-3970,16,0,192,1,
-1297,3971,16,0,184,
-1,43,3972,16,0,
-192,1,46,3973,16,
-0,197,1,1804,3974,
-16,0,184,1,299,
-3975,16,0,192,1,
-52,3976,16,0,184,
-1,2818,3516,1,2819,
-3977,16,0,314,1,
-2318,3978,16,0,184,
-1,62,3979,16,0,
-221,1,65,3980,16,
-0,223,1,2075,3981,
-16,0,184,1,1574,
-921,1,71,3982,16,
-0,192,1,1775,3983,
-16,0,184,1,2837,
-3530,1,2838,3536,1,
-2337,3984,16,0,184,
-1,79,3985,16,0,
-192,1,1335,3986,16,
-0,184,1,2511,3987,
-16,0,477,1,322,
-3988,16,0,192,1,
-76,3989,16,0,192,
-1,85,3990,16,0,
-192,1,1261,3991,16,
-0,184,1,89,3992,
-16,0,192,1,509,
-3993,16,0,192,1,
-346,3994,16,0,192,
-1,2039,884,1,97,
-3995,16,0,192,1,
-2106,3996,16,0,184,
-1,102,3997,16,0,
-192,1,1860,943,1,
-1803,909,1,2364,949,
-1,2779,3510,1,2782,
-3998,16,0,192,1,
-112,3999,16,0,192,
-1,1117,4000,16,0,
-184,1,1873,958,1,
-1876,4001,16,0,184,
-1,372,4002,16,0,
-613,1,374,4003,16,
-0,615,1,124,4004,
-16,0,192,1,376,
-4005,16,0,617,1,
-378,4006,16,0,619,
-1,2136,965,1,381,
-4007,16,0,192,1,
-525,4008,16,0,192,
-1,2807,3551,1,1834,
-4009,16,0,184,1,
-137,4010,16,0,192,
-1,1901,4011,16,0,
-184,1,1113,4012,16,
-0,176,1,1153,4013,
-16,0,184,1,151,
-4014,16,0,192,1,
-1407,4015,16,0,184,
-1,1659,4016,16,0,
-184,1,2413,4017,16,
-0,184,1,406,4018,
-16,0,192,1,1371,
-4019,16,0,184,1,
-2105,936,1,166,4020,
-16,0,192,1,2839,
-3541,1,2840,3546,1,
-1931,983,1,1933,4021,
-16,0,184,1,431,
-4022,16,0,192,1,
-1585,4023,16,0,192,
-1,182,4024,16,0,
-192,1,1189,4025,16,
-0,184,1,1443,4026,
-16,0,184,1,1695,
-4027,16,0,184,1,
-2198,4028,16,0,184,
-1,447,4029,16,0,
-192,1,2458,998,1,
-2459,1004,1,1958,4030,
-16,0,184,1,2462,
-1011,1,1657,1016,1,
-2464,1021,1,2466,3525,
-1,459,4031,16,0,
-192,1,2468,4032,16,
-0,376,1,462,4033,
-16,0,192,1,199,
-4034,16,0,192,1,
-217,4035,16,0,192,
-1,2227,1030,1,1622,
-4036,16,0,192,1,
-1225,4037,16,0,184,
-1,1479,4038,16,0,
-184,1,1731,4039,16,
-0,192,1,1989,1038,
-1,1990,4040,16,0,
-184,1,236,4041,16,
-0,192,1,2507,4042,
-16,0,471,1,1756,
-4043,16,0,184,1,
-93,4044,19,731,1,
-93,4045,5,95,1,
-256,4046,16,0,729,
-1,1261,4047,16,0,
-729,1,509,4048,16,
-0,729,1,1515,4049,
-16,0,729,1,2021,
-840,1,1775,4050,16,
-0,729,1,2029,847,
-1,2030,853,1,2031,
-858,1,2032,863,1,
-2033,868,1,277,4051,
-16,0,729,1,2035,
-874,1,2037,879,1,
-2039,884,1,32,4052,
-16,0,729,1,2041,
-890,1,2293,4053,16,
-0,729,1,2043,896,
-1,2045,901,1,41,
-4054,16,0,729,1,
-1297,4055,16,0,729,
-1,43,4056,16,0,
-729,1,1803,909,1,
-1804,4057,16,0,729,
-1,299,4058,16,0,
-729,1,52,4059,16,
-0,729,1,2318,4060,
-16,0,729,1,62,
-4061,16,0,729,1,
-2075,4062,16,0,729,
-1,1574,921,1,71,
-4063,16,0,729,1,
-76,4064,16,0,729,
-1,1834,4065,16,0,
-729,1,2337,4066,16,
-0,729,1,79,4067,
-16,0,729,1,1335,
-4068,16,0,729,1,
-322,4069,16,0,729,
-1,85,4070,16,0,
-729,1,89,4071,16,
-0,729,1,346,4072,
-16,0,729,1,2105,
-936,1,2106,4073,16,
-0,729,1,97,4074,
-16,0,729,1,1860,
-943,1,2364,949,1,
-102,4075,16,0,729,
-1,2782,4076,16,0,
-729,1,112,4077,16,
-0,729,1,1117,4078,
-16,0,729,1,1873,
-958,1,1876,4079,16,
-0,729,1,124,4080,
-16,0,729,1,2136,
-965,1,381,4081,16,
-0,729,1,525,4082,
-16,0,729,1,137,
-4083,16,0,729,1,
-1901,4084,16,0,729,
-1,1153,4085,16,0,
-729,1,151,4086,16,
-0,729,1,1407,4087,
-16,0,729,1,1659,
-4088,16,0,729,1,
-2413,4089,16,0,729,
-1,406,4090,16,0,
-729,1,1371,4091,16,
-0,729,1,166,4092,
-16,0,729,1,1622,
-4093,16,0,729,1,
-1931,983,1,1933,4094,
-16,0,729,1,431,
-4095,16,0,729,1,
-1585,4096,16,0,729,
-1,182,4097,16,0,
-729,1,1189,4098,16,
-0,729,1,1443,4099,
-16,0,729,1,1695,
-4100,16,0,729,1,
-2198,4101,16,0,729,
-1,447,4102,16,0,
-729,1,2458,998,1,
-2459,1004,1,1958,4103,
-16,0,729,1,2462,
-1011,1,1657,1016,1,
-2464,1021,1,199,4104,
-16,0,729,1,459,
-4105,16,0,729,1,
-462,4106,16,0,729,
-1,217,4107,16,0,
-729,1,2227,1030,1,
-1225,4108,16,0,729,
-1,1479,4109,16,0,
-729,1,1731,4110,16,
-0,729,1,1989,1038,
-1,1990,4111,16,0,
-729,1,236,4112,16,
-0,729,1,1756,4113,
-16,0,729,1,94,
-4114,19,728,1,94,
-4115,5,95,1,256,
-4116,16,0,726,1,
-1261,4117,16,0,726,
-1,509,4118,16,0,
-726,1,1515,4119,16,
-0,726,1,2021,840,
-1,1775,4120,16,0,
-726,1,2029,847,1,
-2030,853,1,2031,858,
-1,2032,863,1,2033,
-868,1,277,4121,16,
-0,726,1,2035,874,
-1,2037,879,1,2039,
-884,1,32,4122,16,
-0,726,1,2041,890,
-1,2293,4123,16,0,
-726,1,2043,896,1,
-2045,901,1,41,4124,
-16,0,726,1,1297,
-4125,16,0,726,1,
-43,4126,16,0,726,
-1,1803,909,1,1804,
-4127,16,0,726,1,
-299,4128,16,0,726,
-1,52,4129,16,0,
-726,1,2318,4130,16,
-0,726,1,62,4131,
-16,0,726,1,2075,
-4132,16,0,726,1,
-1574,921,1,71,4133,
-16,0,726,1,76,
-4134,16,0,726,1,
-1834,4135,16,0,726,
-1,2337,4136,16,0,
-726,1,79,4137,16,
-0,726,1,1335,4138,
-16,0,726,1,322,
-4139,16,0,726,1,
-85,4140,16,0,726,
-1,89,4141,16,0,
-726,1,346,4142,16,
-0,726,1,2105,936,
-1,2106,4143,16,0,
-726,1,97,4144,16,
-0,726,1,1860,943,
-1,2364,949,1,102,
-4145,16,0,726,1,
-2782,4146,16,0,726,
-1,112,4147,16,0,
-726,1,1117,4148,16,
-0,726,1,1873,958,
-1,1876,4149,16,0,
-726,1,124,4150,16,
-0,726,1,2136,965,
-1,381,4151,16,0,
-726,1,525,4152,16,
-0,726,1,137,4153,
-16,0,726,1,1901,
-4154,16,0,726,1,
-1153,4155,16,0,726,
-1,151,4156,16,0,
-726,1,1407,4157,16,
-0,726,1,1659,4158,
-16,0,726,1,2413,
-4159,16,0,726,1,
-406,4160,16,0,726,
-1,1371,4161,16,0,
-726,1,166,4162,16,
-0,726,1,1622,4163,
-16,0,726,1,1931,
-983,1,1933,4164,16,
-0,726,1,431,4165,
-16,0,726,1,1585,
-4166,16,0,726,1,
-182,4167,16,0,726,
-1,1189,4168,16,0,
-726,1,1443,4169,16,
-0,726,1,1695,4170,
-16,0,726,1,2198,
-4171,16,0,726,1,
-447,4172,16,0,726,
-1,2458,998,1,2459,
-1004,1,1958,4173,16,
-0,726,1,2462,1011,
-1,1657,1016,1,2464,
-1021,1,199,4174,16,
-0,726,1,459,4175,
-16,0,726,1,462,
-4176,16,0,726,1,
-217,4177,16,0,726,
-1,2227,1030,1,1225,
-4178,16,0,726,1,
-1479,4179,16,0,726,
-1,1731,4180,16,0,
-726,1,1989,1038,1,
-1990,4181,16,0,726,
-1,236,4182,16,0,
-726,1,1756,4183,16,
-0,726,1,95,4184,
-19,725,1,95,4185,
-5,95,1,256,4186,
-16,0,723,1,1261,
-4187,16,0,723,1,
-509,4188,16,0,723,
-1,1515,4189,16,0,
-723,1,2021,840,1,
-1775,4190,16,0,723,
-1,2029,847,1,2030,
-853,1,2031,858,1,
-2032,863,1,2033,868,
-1,277,4191,16,0,
-723,1,2035,874,1,
-2037,879,1,2039,884,
-1,32,4192,16,0,
-723,1,2041,890,1,
-2293,4193,16,0,723,
-1,2043,896,1,2045,
-901,1,41,4194,16,
-0,723,1,1297,4195,
-16,0,723,1,43,
-4196,16,0,723,1,
-1803,909,1,1804,4197,
-16,0,723,1,299,
-4198,16,0,723,1,
-52,4199,16,0,723,
-1,2318,4200,16,0,
-723,1,62,4201,16,
-0,723,1,2075,4202,
-16,0,723,1,1574,
-921,1,71,4203,16,
-0,723,1,76,4204,
-16,0,723,1,1834,
-4205,16,0,723,1,
-2337,4206,16,0,723,
-1,79,4207,16,0,
-723,1,1335,4208,16,
-0,723,1,322,4209,
-16,0,723,1,85,
-4210,16,0,723,1,
-89,4211,16,0,723,
-1,346,4212,16,0,
-723,1,2105,936,1,
-2106,4213,16,0,723,
-1,97,4214,16,0,
-723,1,1860,943,1,
-2364,949,1,102,4215,
-16,0,723,1,2782,
-4216,16,0,723,1,
-112,4217,16,0,723,
-1,1117,4218,16,0,
-723,1,1873,958,1,
-1876,4219,16,0,723,
-1,124,4220,16,0,
-723,1,2136,965,1,
-381,4221,16,0,723,
-1,525,4222,16,0,
-723,1,137,4223,16,
-0,723,1,1901,4224,
-16,0,723,1,1153,
-4225,16,0,723,1,
-151,4226,16,0,723,
-1,1407,4227,16,0,
-723,1,1659,4228,16,
-0,723,1,2413,4229,
-16,0,723,1,406,
-4230,16,0,723,1,
-1371,4231,16,0,723,
-1,166,4232,16,0,
-723,1,1622,4233,16,
-0,723,1,1931,983,
-1,1933,4234,16,0,
-723,1,431,4235,16,
-0,723,1,1585,4236,
-16,0,723,1,182,
-4237,16,0,723,1,
-1189,4238,16,0,723,
-1,1443,4239,16,0,
-723,1,1695,4240,16,
-0,723,1,2198,4241,
-16,0,723,1,447,
-4242,16,0,723,1,
-2458,998,1,2459,1004,
-1,1958,4243,16,0,
-723,1,2462,1011,1,
-1657,1016,1,2464,1021,
-1,199,4244,16,0,
-723,1,459,4245,16,
-0,723,1,462,4246,
-16,0,723,1,217,
-4247,16,0,723,1,
-2227,1030,1,1225,4248,
-16,0,723,1,1479,
-4249,16,0,723,1,
-1731,4250,16,0,723,
-1,1989,1038,1,1990,
-4251,16,0,723,1,
-236,4252,16,0,723,
-1,1756,4253,16,0,
-723,1,96,4254,19,
-103,1,96,4255,5,
-1,1,0,4256,16,
-0,104,1,97,4257,
-19,172,1,97,4258,
-5,1,1,0,4259,
-16,0,170,1,98,
-4260,19,213,1,98,
-4261,5,2,1,0,
-4262,16,0,211,1,
-2819,4263,16,0,366,
-1,99,4264,19,210,
-1,99,4265,5,2,
-1,0,4266,16,0,
-208,1,2819,4267,16,
-0,365,1,100,4268,
-19,292,1,100,4269,
-5,2,1,0,4270,
-16,0,775,1,2819,
-4271,16,0,290,1,
-101,4272,19,781,1,
-101,4273,5,4,1,
-0,4274,16,0,782,
-1,2830,4275,16,0,
-779,1,2819,4276,16,
-0,782,1,2760,4277,
-16,0,779,1,102,
-4278,19,698,1,102,
-4279,5,2,1,2470,
-4280,16,0,696,1,
-2657,4281,16,0,719,
-1,103,4282,19,157,
-1,103,4283,5,4,
-1,2596,4284,16,0,
-155,1,2470,4285,16,
-0,674,1,2700,4286,
-16,0,155,1,2657,
-4287,16,0,674,1,
-104,4288,19,154,1,
-104,4289,5,4,1,
-2596,4290,16,0,152,
-1,2470,4291,16,0,
-177,1,2700,4292,16,
-0,152,1,2657,4293,
-16,0,177,1,105,
-4294,19,657,1,105,
-4295,5,4,1,2596,
-4296,16,0,655,1,
-2470,4297,16,0,672,
-1,2700,4298,16,0,
-655,1,2657,4299,16,
-0,672,1,106,4300,
-19,175,1,106,4301,
-5,4,1,2596,4302,
-16,0,654,1,2470,
-4303,16,0,173,1,
-2700,4304,16,0,654,
-1,2657,4305,16,0,
-173,1,107,4306,19,
-670,1,107,4307,5,
-4,1,2596,4308,16,
-0,742,1,2470,4309,
-16,0,668,1,2700,
-4310,16,0,742,1,
-2657,4311,16,0,668,
-1,108,4312,19,169,
-1,108,4313,5,4,
-1,2596,4314,16,0,
-650,1,2470,4315,16,
-0,167,1,2700,4316,
-16,0,650,1,2657,
-4317,16,0,167,1,
-109,4318,19,741,1,
-109,4319,5,4,1,
-2596,4320,16,0,739,
-1,2470,4321,16,0,
-751,1,2700,4322,16,
-0,739,1,2657,4323,
-16,0,751,1,110,
-4324,19,648,1,110,
-4325,5,4,1,2596,
-4326,16,0,646,1,
-2470,4327,16,0,663,
-1,2700,4328,16,0,
-646,1,2657,4329,16,
-0,663,1,111,4330,
-19,141,1,111,4331,
-5,3,1,2766,4332,
-16,0,791,1,2581,
-4333,16,0,355,1,
-10,4334,16,0,139,
-1,112,4335,19,557,
-1,112,4336,5,1,
-1,2568,4337,16,0,
-555,1,113,4338,19,
-745,1,113,4339,5,
-1,1,2560,4340,16,
-0,743,1,114,4341,
-19,529,1,114,4342,
-5,1,1,2552,4343,
-16,0,527,1,115,
-4344,19,251,1,115,
-4345,5,1,1,2537,
-4346,16,0,249,1,
-116,4347,19,502,1,
-116,4348,5,1,1,
-2522,4349,16,0,500,
-1,117,4350,19,486,
-1,117,4351,5,1,
-1,2506,4352,16,0,
-484,1,118,4353,19,
-160,1,118,4354,5,
-17,1,0,4355,16,
-0,794,1,2581,4356,
-16,0,372,1,2075,
-4357,16,0,753,1,
-2337,4358,16,0,753,
-1,2819,4359,16,0,
-794,1,2413,4360,16,
-0,753,1,10,4361,
-16,0,372,1,1901,
-4362,16,0,753,1,
-2198,4363,16,0,753,
-1,21,4364,16,0,
-158,1,2106,4365,16,
-0,753,1,2766,4366,
-16,0,372,1,1804,
-4367,16,0,753,1,
-1990,4368,16,0,753,
-1,32,4369,16,0,
-753,1,1958,4370,16,
-0,753,1,1775,4371,
-16,0,753,1,119,
-4372,19,474,1,119,
-4373,5,2,1,2568,
-4374,16,0,671,1,
-2506,4375,16,0,472,
-1,120,4376,19,480,
-1,120,4377,5,5,
-1,2510,4378,16,0,
-478,1,2522,4379,16,
-0,491,1,2514,4380,
-16,0,483,1,2537,
-4381,16,0,509,1,
-2560,4382,16,0,537,
-1,121,4383,19,309,
-1,121,4384,5,3,
-1,2552,4385,16,0,
-737,1,2525,4386,16,
-0,307,1,2529,4387,
-16,0,499,1,122,
-4388,19,636,1,122,
-4389,5,2,1,2544,
-4390,16,0,637,1,
-2540,4391,16,0,634,
-1,123,4392,19,130,
-1,123,4393,5,18,
-1,0,4394,16,0,
-128,1,2581,4395,16,
-0,137,1,2075,4396,
-16,0,137,1,2337,
-4397,16,0,137,1,
-2819,4398,16,0,128,
-1,2413,4399,16,0,
-137,1,10,4400,16,
-0,137,1,2198,4401,
-16,0,137,1,1901,
-4402,16,0,137,1,
-52,4403,16,0,219,
-1,21,4404,16,0,
-137,1,2106,4405,16,
-0,137,1,2766,4406,
-16,0,137,1,1804,
-4407,16,0,137,1,
-1990,4408,16,0,137,
-1,32,4409,16,0,
-137,1,1958,4410,16,
-0,137,1,1775,4411,
-16,0,137,1,124,
-4412,19,765,1,124,
-4413,5,4,1,2596,
-4414,16,0,763,1,
-2470,4415,16,0,763,
-1,2700,4416,16,0,
-763,1,2657,4417,16,
-0,763,1,125,4418,
-19,567,1,125,4419,
-5,4,1,2596,4420,
-16,0,565,1,2470,
-4421,16,0,565,1,
-2700,4422,16,0,565,
-1,2657,4423,16,0,
-565,1,126,4424,19,
-666,1,126,4425,5,
-4,1,2596,4426,16,
-0,664,1,2470,4427,
-16,0,664,1,2700,
-4428,16,0,664,1,
-2657,4429,16,0,664,
-1,127,4430,19,535,
-1,127,4431,5,4,
-1,2596,4432,16,0,
-533,1,2470,4433,16,
-0,533,1,2700,4434,
-16,0,533,1,2657,
-4435,16,0,533,1,
-128,4436,19,524,1,
-128,4437,5,4,1,
-2596,4438,16,0,522,
-1,2470,4439,16,0,
-522,1,2700,4440,16,
-0,522,1,2657,4441,
-16,0,522,1,129,
-4442,19,632,1,129,
-4443,5,4,1,2596,
-4444,16,0,630,1,
-2470,4445,16,0,630,
-1,2700,4446,16,0,
-630,1,2657,4447,16,
-0,630,1,130,4448,
-19,778,1,130,4449,
-5,4,1,2596,4450,
-16,0,776,1,2470,
-4451,16,0,776,1,
-2700,4452,16,0,776,
-1,2657,4453,16,0,
-776,1,131,4454,19,
-768,1,131,4455,5,
-4,1,2596,4456,16,
-0,766,1,2470,4457,
-16,0,766,1,2700,
-4458,16,0,766,1,
-2657,4459,16,0,766,
-1,132,4460,19,328,
-1,132,4461,5,21,
-1,2518,4462,16,0,
-699,1,2075,4463,16,
-0,584,1,2548,4464,
-16,0,736,1,2337,
-4465,16,0,584,1,
-2413,4466,16,0,584,
-1,2564,4467,16,0,
-542,1,2556,4468,16,
-0,532,1,2592,4469,
-16,0,695,1,1901,
-4470,16,0,584,1,
-2198,4471,16,0,584,
-1,2533,4472,16,0,
-504,1,2777,4473,16,
-0,326,1,2572,4474,
-16,0,675,1,2106,
-4475,16,0,584,1,
-2577,4476,16,0,681,
-1,1804,4477,16,0,
-584,1,1990,4478,16,
-0,584,1,31,4479,
-16,0,371,1,32,
-4480,16,0,584,1,
-1958,4481,16,0,584,
-1,1775,4482,16,0,
-584,1,133,4483,19,
-337,1,133,4484,5,
-1,1,32,4485,16,
-0,335,1,134,4486,
-19,286,1,134,4487,
-5,11,1,2075,4488,
-16,0,682,1,2337,
-4489,16,0,293,1,
-2413,4490,16,0,505,
-1,1901,4491,16,0,
-427,1,2198,4492,16,
-0,354,1,2106,4493,
+1873,961,1,21,3747,
+16,0,107,1,1657,
+1019,1,2029,850,1,
+2030,856,1,1989,1041,
+1,1990,3748,16,0,
+107,1,2459,1007,1,
+1775,3749,16,0,107,
+1,32,3750,16,0,
+107,1,2105,939,1,
+2106,3751,16,0,107,
+1,1574,924,1,2770,
+3752,16,0,107,1,
+2227,1033,1,2337,3753,
+16,0,107,1,52,
+3754,16,0,107,1,
+2783,3517,1,1803,912,
+1,2458,1001,1,1901,
+3755,16,0,107,1,
+2462,1014,1,2136,968,
+1,2464,1024,1,1860,
+946,1,2466,3532,1,
+2031,861,1,2032,866,
+1,2033,871,1,2035,
+877,1,2364,952,1,
+2039,887,1,1931,986,
+1,2041,893,1,2021,
+843,1,2043,899,1,
+2045,904,1,2811,3559,
+1,2037,882,1,2822,
+3523,1,2823,3756,16,
+0,107,1,2843,3549,
+1,2844,3554,1,2582,
+3757,16,0,107,1,
+1958,3758,16,0,107,
+1,58,3759,19,396,
+1,58,3760,5,30,
+1,2536,1750,1,2521,
+1767,1,2641,1779,1,
+2642,1784,1,2643,1756,
+1,2644,1789,1,2645,
+1794,1,2646,1799,1,
+2647,1762,1,2648,1878,
+1,2650,1811,1,2651,
+1816,1,2652,1821,1,
+2653,1826,1,2654,1831,
+1,2655,1836,1,2656,
+1841,1,2657,1774,1,
+2659,3761,16,0,394,
+1,2551,1852,1,2559,
+1864,1,2567,1805,1,
+2459,1007,1,2464,1024,
+1,2575,1846,1,2470,
+3762,16,0,394,1,
+2580,1858,1,2703,3763,
+16,0,394,1,2595,
+1871,1,2597,3764,16,
+0,394,1,59,3765,
+19,393,1,59,3766,
+5,30,1,2536,1750,
+1,2521,1767,1,2641,
+1779,1,2642,1784,1,
+2643,1756,1,2644,1789,
+1,2645,1794,1,2646,
+1799,1,2647,1762,1,
+2648,1878,1,2650,1811,
+1,2651,1816,1,2652,
+1821,1,2653,1826,1,
+2654,1831,1,2655,1836,
+1,2656,1841,1,2657,
+1774,1,2659,3767,16,
+0,391,1,2551,1852,
+1,2559,1864,1,2567,
+1805,1,2459,1007,1,
+2464,1024,1,2575,1846,
+1,2470,3768,16,0,
+391,1,2580,1858,1,
+2703,3769,16,0,391,
+1,2595,1871,1,2597,
+3770,16,0,391,1,
+60,3771,19,557,1,
+60,3772,5,30,1,
+2536,1750,1,2521,1767,
+1,2641,1779,1,2642,
+1784,1,2643,1756,1,
+2644,1789,1,2645,1794,
+1,2646,1799,1,2647,
+1762,1,2648,1878,1,
+2650,1811,1,2651,1816,
+1,2652,1821,1,2653,
+1826,1,2654,1831,1,
+2655,1836,1,2656,1841,
+1,2657,1774,1,2659,
+3773,16,0,555,1,
+2551,1852,1,2559,1864,
+1,2567,1805,1,2459,
+1007,1,2464,1024,1,
+2575,1846,1,2470,3774,
+16,0,555,1,2580,
+1858,1,2703,3775,16,
+0,555,1,2595,1871,
+1,2597,3776,16,0,
+555,1,61,3777,19,
+433,1,61,3778,5,
+30,1,2536,1750,1,
+2521,1767,1,2641,1779,
+1,2642,1784,1,2643,
+1756,1,2644,1789,1,
+2645,1794,1,2646,1799,
+1,2647,1762,1,2648,
+1878,1,2650,1811,1,
+2651,1816,1,2652,1821,
+1,2653,1826,1,2654,
+1831,1,2655,1836,1,
+2656,1841,1,2657,1774,
+1,2659,3779,16,0,
+431,1,2551,1852,1,
+2559,1864,1,2567,1805,
+1,2459,1007,1,2464,
+1024,1,2575,1846,1,
+2470,3780,16,0,431,
+1,2580,1858,1,2703,
+3781,16,0,431,1,
+2595,1871,1,2597,3782,
+16,0,431,1,62,
+3783,19,553,1,62,
+3784,5,30,1,2536,
+1750,1,2521,1767,1,
+2641,1779,1,2642,1784,
+1,2643,1756,1,2644,
+1789,1,2645,1794,1,
+2646,1799,1,2647,1762,
+1,2648,1878,1,2650,
+1811,1,2651,1816,1,
+2652,1821,1,2653,1826,
+1,2654,1831,1,2655,
+1836,1,2656,1841,1,
+2657,1774,1,2659,3785,
+16,0,551,1,2551,
+1852,1,2559,1864,1,
+2567,1805,1,2459,1007,
+1,2464,1024,1,2575,
+1846,1,2470,3786,16,
+0,551,1,2580,1858,
+1,2703,3787,16,0,
+551,1,2595,1871,1,
+2597,3788,16,0,551,
+1,63,3789,19,666,
+1,63,3790,5,30,
+1,2536,1750,1,2521,
+1767,1,2641,1779,1,
+2642,1784,1,2643,1756,
+1,2644,1789,1,2645,
+1794,1,2646,1799,1,
+2647,1762,1,2648,1878,
+1,2650,1811,1,2651,
+1816,1,2652,1821,1,
+2653,1826,1,2654,1831,
+1,2655,1836,1,2656,
+1841,1,2657,1774,1,
+2659,3791,16,0,664,
+1,2551,1852,1,2559,
+1864,1,2567,1805,1,
+2459,1007,1,2464,1024,
+1,2575,1846,1,2470,
+3792,16,0,664,1,
+2580,1858,1,2703,3793,
+16,0,664,1,2595,
+1871,1,2597,3794,16,
+0,664,1,64,3795,
+19,426,1,64,3796,
+5,30,1,2536,1750,
+1,2521,1767,1,2641,
+1779,1,2642,1784,1,
+2643,1756,1,2644,1789,
+1,2645,1794,1,2646,
+1799,1,2647,1762,1,
+2648,1878,1,2650,1811,
+1,2651,1816,1,2652,
+1821,1,2653,1826,1,
+2654,1831,1,2655,1836,
+1,2656,1841,1,2657,
+1774,1,2659,3797,16,
+0,424,1,2551,1852,
+1,2559,1864,1,2567,
+1805,1,2459,1007,1,
+2464,1024,1,2575,1846,
+1,2470,3798,16,0,
+424,1,2580,1858,1,
+2703,3799,16,0,424,
+1,2595,1871,1,2597,
+3800,16,0,424,1,
+65,3801,19,390,1,
+65,3802,5,30,1,
+2536,1750,1,2521,1767,
+1,2641,1779,1,2642,
+1784,1,2643,1756,1,
+2644,1789,1,2645,1794,
+1,2646,1799,1,2647,
+1762,1,2648,1878,1,
+2650,1811,1,2651,1816,
+1,2652,1821,1,2653,
+1826,1,2654,1831,1,
+2655,1836,1,2656,1841,
+1,2657,1774,1,2659,
+3803,16,0,388,1,
+2551,1852,1,2559,1864,
+1,2567,1805,1,2459,
+1007,1,2464,1024,1,
+2575,1846,1,2470,3804,
+16,0,388,1,2580,
+1858,1,2703,3805,16,
+0,388,1,2595,1871,
+1,2597,3806,16,0,
+388,1,66,3807,19,
+778,1,66,3808,5,
+30,1,2536,1750,1,
+2521,1767,1,2641,1779,
+1,2642,1784,1,2643,
+1756,1,2644,1789,1,
+2645,1794,1,2646,1799,
+1,2647,1762,1,2648,
+1878,1,2650,1811,1,
+2651,1816,1,2652,1821,
+1,2653,1826,1,2654,
+1831,1,2655,1836,1,
+2656,1841,1,2657,1774,
+1,2659,3809,16,0,
+776,1,2551,1852,1,
+2559,1864,1,2567,1805,
+1,2459,1007,1,2464,
+1024,1,2575,1846,1,
+2470,3810,16,0,776,
+1,2580,1858,1,2703,
+3811,16,0,776,1,
+2595,1871,1,2597,3812,
+16,0,776,1,67,
+3813,19,475,1,67,
+3814,5,30,1,2536,
+1750,1,2521,1767,1,
+2641,1779,1,2642,1784,
+1,2643,1756,1,2644,
+1789,1,2645,1794,1,
+2646,1799,1,2647,1762,
+1,2648,1878,1,2650,
+1811,1,2651,1816,1,
+2652,1821,1,2653,1826,
+1,2654,1831,1,2655,
+1836,1,2656,1841,1,
+2657,1774,1,2659,3815,
+16,0,473,1,2551,
+1852,1,2559,1864,1,
+2567,1805,1,2459,1007,
+1,2464,1024,1,2575,
+1846,1,2470,3816,16,
+0,473,1,2580,1858,
+1,2703,3817,16,0,
+473,1,2595,1871,1,
+2597,3818,16,0,473,
+1,68,3819,19,472,
+1,68,3820,5,30,
+1,2536,1750,1,2521,
+1767,1,2641,1779,1,
+2642,1784,1,2643,1756,
+1,2644,1789,1,2645,
+1794,1,2646,1799,1,
+2647,1762,1,2648,1878,
+1,2650,1811,1,2651,
+1816,1,2652,1821,1,
+2653,1826,1,2654,1831,
+1,2655,1836,1,2656,
+1841,1,2657,1774,1,
+2659,3821,16,0,470,
+1,2551,1852,1,2559,
+1864,1,2567,1805,1,
+2459,1007,1,2464,1024,
+1,2575,1846,1,2470,
+3822,16,0,470,1,
+2580,1858,1,2703,3823,
+16,0,470,1,2595,
+1871,1,2597,3824,16,
+0,470,1,69,3825,
+19,405,1,69,3826,
+5,30,1,2536,1750,
+1,2521,1767,1,2641,
+1779,1,2642,1784,1,
+2643,1756,1,2644,1789,
+1,2645,1794,1,2646,
+1799,1,2647,1762,1,
+2648,1878,1,2650,1811,
+1,2651,1816,1,2652,
+1821,1,2653,1826,1,
+2654,1831,1,2655,1836,
+1,2656,1841,1,2657,
+1774,1,2659,3827,16,
+0,403,1,2551,1852,
+1,2559,1864,1,2567,
+1805,1,2459,1007,1,
+2464,1024,1,2575,1846,
+1,2470,3828,16,0,
+403,1,2580,1858,1,
+2703,3829,16,0,403,
+1,2595,1871,1,2597,
+3830,16,0,403,1,
+70,3831,19,402,1,
+70,3832,5,30,1,
+2536,1750,1,2521,1767,
+1,2641,1779,1,2642,
+1784,1,2643,1756,1,
+2644,1789,1,2645,1794,
+1,2646,1799,1,2647,
+1762,1,2648,1878,1,
+2650,1811,1,2651,1816,
+1,2652,1821,1,2653,
+1826,1,2654,1831,1,
+2655,1836,1,2656,1841,
+1,2657,1774,1,2659,
+3833,16,0,400,1,
+2551,1852,1,2559,1864,
+1,2567,1805,1,2459,
+1007,1,2464,1024,1,
+2575,1846,1,2470,3834,
+16,0,400,1,2580,
+1858,1,2703,3835,16,
+0,400,1,2595,1871,
+1,2597,3836,16,0,
+400,1,71,3837,19,
+399,1,71,3838,5,
+30,1,2536,1750,1,
+2521,1767,1,2641,1779,
+1,2642,1784,1,2643,
+1756,1,2644,1789,1,
+2645,1794,1,2646,1799,
+1,2647,1762,1,2648,
+1878,1,2650,1811,1,
+2651,1816,1,2652,1821,
+1,2653,1826,1,2654,
+1831,1,2655,1836,1,
+2656,1841,1,2657,1774,
+1,2659,3839,16,0,
+397,1,2551,1852,1,
+2559,1864,1,2567,1805,
+1,2459,1007,1,2464,
+1024,1,2575,1846,1,
+2470,3840,16,0,397,
+1,2580,1858,1,2703,
+3841,16,0,397,1,
+2595,1871,1,2597,3842,
+16,0,397,1,72,
+3843,19,469,1,72,
+3844,5,30,1,2536,
+1750,1,2521,1767,1,
+2641,1779,1,2642,1784,
+1,2643,1756,1,2644,
+1789,1,2645,1794,1,
+2646,1799,1,2647,1762,
+1,2648,1878,1,2650,
+1811,1,2651,1816,1,
+2652,1821,1,2653,1826,
+1,2654,1831,1,2655,
+1836,1,2656,1841,1,
+2657,1774,1,2659,3845,
+16,0,467,1,2551,
+1852,1,2559,1864,1,
+2567,1805,1,2459,1007,
+1,2464,1024,1,2575,
+1846,1,2470,3846,16,
+0,467,1,2580,1858,
+1,2703,3847,16,0,
+467,1,2595,1871,1,
+2597,3848,16,0,467,
+1,73,3849,19,466,
+1,73,3850,5,30,
+1,2536,1750,1,2521,
+1767,1,2641,1779,1,
+2642,1784,1,2643,1756,
+1,2644,1789,1,2645,
+1794,1,2646,1799,1,
+2647,1762,1,2648,1878,
+1,2650,1811,1,2651,
+1816,1,2652,1821,1,
+2653,1826,1,2654,1831,
+1,2655,1836,1,2656,
+1841,1,2657,1774,1,
+2659,3851,16,0,464,
+1,2551,1852,1,2559,
+1864,1,2567,1805,1,
+2459,1007,1,2464,1024,
+1,2575,1846,1,2470,
+3852,16,0,464,1,
+2580,1858,1,2703,3853,
+16,0,464,1,2595,
+1871,1,2597,3854,16,
+0,464,1,74,3855,
+19,463,1,74,3856,
+5,30,1,2536,1750,
+1,2521,1767,1,2641,
+1779,1,2642,1784,1,
+2643,1756,1,2644,1789,
+1,2645,1794,1,2646,
+1799,1,2647,1762,1,
+2648,1878,1,2650,1811,
+1,2651,1816,1,2652,
+1821,1,2653,1826,1,
+2654,1831,1,2655,1836,
+1,2656,1841,1,2657,
+1774,1,2659,3857,16,
+0,461,1,2551,1852,
+1,2559,1864,1,2567,
+1805,1,2459,1007,1,
+2464,1024,1,2575,1846,
+1,2470,3858,16,0,
+461,1,2580,1858,1,
+2703,3859,16,0,461,
+1,2595,1871,1,2597,
+3860,16,0,461,1,
+75,3861,19,449,1,
+75,3862,5,30,1,
+2536,1750,1,2521,1767,
+1,2641,1779,1,2642,
+1784,1,2643,1756,1,
+2644,1789,1,2645,1794,
+1,2646,1799,1,2647,
+1762,1,2648,1878,1,
+2650,1811,1,2651,1816,
+1,2652,1821,1,2653,
+1826,1,2654,1831,1,
+2655,1836,1,2656,1841,
+1,2657,1774,1,2659,
+3863,16,0,447,1,
+2551,1852,1,2559,1864,
+1,2567,1805,1,2459,
+1007,1,2464,1024,1,
+2575,1846,1,2470,3864,
+16,0,447,1,2580,
+1858,1,2703,3865,16,
+0,447,1,2595,1871,
+1,2597,3866,16,0,
+447,1,76,3867,19,
+570,1,76,3868,5,
+30,1,2536,1750,1,
+2521,1767,1,2641,1779,
+1,2642,1784,1,2643,
+1756,1,2644,1789,1,
+2645,1794,1,2646,1799,
+1,2647,1762,1,2648,
+1878,1,2650,1811,1,
+2651,1816,1,2652,1821,
+1,2653,1826,1,2654,
+1831,1,2655,1836,1,
+2656,1841,1,2657,1774,
+1,2659,3869,16,0,
+568,1,2551,1852,1,
+2559,1864,1,2567,1805,
+1,2459,1007,1,2464,
+1024,1,2575,1846,1,
+2470,3870,16,0,568,
+1,2580,1858,1,2703,
+3871,16,0,568,1,
+2595,1871,1,2597,3872,
+16,0,568,1,77,
+3873,19,445,1,77,
+3874,5,30,1,2536,
+1750,1,2521,1767,1,
+2641,1779,1,2642,1784,
+1,2643,1756,1,2644,
+1789,1,2645,1794,1,
+2646,1799,1,2647,1762,
+1,2648,1878,1,2650,
+1811,1,2651,1816,1,
+2652,1821,1,2653,1826,
+1,2654,1831,1,2655,
+1836,1,2656,1841,1,
+2657,1774,1,2659,3875,
+16,0,443,1,2551,
+1852,1,2559,1864,1,
+2567,1805,1,2459,1007,
+1,2464,1024,1,2575,
+1846,1,2470,3876,16,
+0,443,1,2580,1858,
+1,2703,3877,16,0,
+443,1,2595,1871,1,
+2597,3878,16,0,443,
+1,78,3879,19,566,
+1,78,3880,5,30,
+1,2536,1750,1,2521,
+1767,1,2641,1779,1,
+2642,1784,1,2643,1756,
+1,2644,1789,1,2645,
+1794,1,2646,1799,1,
+2647,1762,1,2648,1878,
+1,2650,1811,1,2651,
+1816,1,2652,1821,1,
+2653,1826,1,2654,1831,
+1,2655,1836,1,2656,
+1841,1,2657,1774,1,
+2659,3881,16,0,564,
+1,2551,1852,1,2559,
+1864,1,2567,1805,1,
+2459,1007,1,2464,1024,
+1,2575,1846,1,2470,
+3882,16,0,564,1,
+2580,1858,1,2703,3883,
+16,0,564,1,2595,
+1871,1,2597,3884,16,
+0,564,1,79,3885,
+19,563,1,79,3886,
+5,30,1,2536,1750,
+1,2521,1767,1,2641,
+1779,1,2642,1784,1,
+2643,1756,1,2644,1789,
+1,2645,1794,1,2646,
+1799,1,2647,1762,1,
+2648,1878,1,2650,1811,
+1,2651,1816,1,2652,
+1821,1,2653,1826,1,
+2654,1831,1,2655,1836,
+1,2656,1841,1,2657,
+1774,1,2659,3887,16,
+0,561,1,2551,1852,
+1,2559,1864,1,2567,
+1805,1,2459,1007,1,
+2464,1024,1,2575,1846,
+1,2470,3888,16,0,
+561,1,2580,1858,1,
+2703,3889,16,0,561,
+1,2595,1871,1,2597,
+3890,16,0,561,1,
+80,3891,19,436,1,
+80,3892,5,30,1,
+2536,1750,1,2521,1767,
+1,2641,1779,1,2642,
+1784,1,2643,1756,1,
+2644,1789,1,2645,1794,
+1,2646,1799,1,2647,
+1762,1,2648,1878,1,
+2650,1811,1,2651,1816,
+1,2652,1821,1,2653,
+1826,1,2654,1831,1,
+2655,1836,1,2656,1841,
+1,2657,1774,1,2659,
+3893,16,0,434,1,
+2551,1852,1,2559,1864,
+1,2567,1805,1,2459,
+1007,1,2464,1024,1,
+2575,1846,1,2470,3894,
+16,0,434,1,2580,
+1858,1,2703,3895,16,
+0,434,1,2595,1871,
+1,2597,3896,16,0,
+434,1,81,3897,19,
+423,1,81,3898,5,
+30,1,2536,1750,1,
+2521,1767,1,2641,1779,
+1,2642,1784,1,2643,
+1756,1,2644,1789,1,
+2645,1794,1,2646,1799,
+1,2647,1762,1,2648,
+1878,1,2650,1811,1,
+2651,1816,1,2652,1821,
+1,2653,1826,1,2654,
+1831,1,2655,1836,1,
+2656,1841,1,2657,1774,
+1,2659,3899,16,0,
+421,1,2551,1852,1,
+2559,1864,1,2567,1805,
+1,2459,1007,1,2464,
+1024,1,2575,1846,1,
+2470,3900,16,0,421,
+1,2580,1858,1,2703,
+3901,16,0,421,1,
+2595,1871,1,2597,3902,
+16,0,421,1,82,
+3903,19,460,1,82,
+3904,5,30,1,2536,
+1750,1,2521,1767,1,
+2641,1779,1,2642,1784,
+1,2643,1756,1,2644,
+1789,1,2645,1794,1,
+2646,1799,1,2647,1762,
+1,2648,1878,1,2650,
+1811,1,2651,1816,1,
+2652,1821,1,2653,1826,
+1,2654,1831,1,2655,
+1836,1,2656,1841,1,
+2657,1774,1,2659,3905,
+16,0,458,1,2551,
+1852,1,2559,1864,1,
+2567,1805,1,2459,1007,
+1,2464,1024,1,2575,
+1846,1,2470,3906,16,
+0,458,1,2580,1858,
+1,2703,3907,16,0,
+458,1,2595,1871,1,
+2597,3908,16,0,458,
+1,83,3909,19,420,
+1,83,3910,5,30,
+1,2536,1750,1,2521,
+1767,1,2641,1779,1,
+2642,1784,1,2643,1756,
+1,2644,1789,1,2645,
+1794,1,2646,1799,1,
+2647,1762,1,2648,1878,
+1,2650,1811,1,2651,
+1816,1,2652,1821,1,
+2653,1826,1,2654,1831,
+1,2655,1836,1,2656,
+1841,1,2657,1774,1,
+2659,3911,16,0,418,
+1,2551,1852,1,2559,
+1864,1,2567,1805,1,
+2459,1007,1,2464,1024,
+1,2575,1846,1,2470,
+3912,16,0,418,1,
+2580,1858,1,2703,3913,
+16,0,418,1,2595,
+1871,1,2597,3914,16,
+0,418,1,84,3915,
+19,417,1,84,3916,
+5,30,1,2536,1750,
+1,2521,1767,1,2641,
+1779,1,2642,1784,1,
+2643,1756,1,2644,1789,
+1,2645,1794,1,2646,
+1799,1,2647,1762,1,
+2648,1878,1,2650,1811,
+1,2651,1816,1,2652,
+1821,1,2653,1826,1,
+2654,1831,1,2655,1836,
+1,2656,1841,1,2657,
+1774,1,2659,3917,16,
+0,415,1,2551,1852,
+1,2559,1864,1,2567,
+1805,1,2459,1007,1,
+2464,1024,1,2575,1846,
+1,2470,3918,16,0,
+415,1,2580,1858,1,
+2703,3919,16,0,415,
+1,2595,1871,1,2597,
+3920,16,0,415,1,
+85,3921,19,578,1,
+85,3922,5,30,1,
+2536,1750,1,2521,1767,
+1,2641,1779,1,2642,
+1784,1,2643,1756,1,
+2644,1789,1,2645,1794,
+1,2646,1799,1,2647,
+1762,1,2648,1878,1,
+2650,1811,1,2651,1816,
+1,2652,1821,1,2653,
+1826,1,2654,1831,1,
+2655,1836,1,2656,1841,
+1,2657,1774,1,2659,
+3923,16,0,576,1,
+2551,1852,1,2559,1864,
+1,2567,1805,1,2459,
+1007,1,2464,1024,1,
+2575,1846,1,2470,3924,
+16,0,576,1,2580,
+1858,1,2703,3925,16,
+0,576,1,2595,1871,
+1,2597,3926,16,0,
+576,1,86,3927,19,
+452,1,86,3928,5,
+30,1,2536,1750,1,
+2521,1767,1,2641,1779,
+1,2642,1784,1,2643,
+1756,1,2644,1789,1,
+2645,1794,1,2646,1799,
+1,2647,1762,1,2648,
+1878,1,2650,1811,1,
+2651,1816,1,2652,1821,
+1,2653,1826,1,2654,
+1831,1,2655,1836,1,
+2656,1841,1,2657,1774,
+1,2659,3929,16,0,
+450,1,2551,1852,1,
+2559,1864,1,2567,1805,
+1,2459,1007,1,2464,
+1024,1,2575,1846,1,
+2470,3930,16,0,450,
+1,2580,1858,1,2703,
+3931,16,0,450,1,
+2595,1871,1,2597,3932,
+16,0,450,1,87,
+3933,19,560,1,87,
+3934,5,30,1,2536,
+1750,1,2521,1767,1,
+2641,1779,1,2642,1784,
+1,2643,1756,1,2644,
+1789,1,2645,1794,1,
+2646,1799,1,2647,1762,
+1,2648,1878,1,2650,
+1811,1,2651,1816,1,
+2652,1821,1,2653,1826,
+1,2654,1831,1,2655,
+1836,1,2656,1841,1,
+2657,1774,1,2659,3935,
+16,0,558,1,2551,
+1852,1,2559,1864,1,
+2567,1805,1,2459,1007,
+1,2464,1024,1,2575,
+1846,1,2470,3936,16,
+0,558,1,2580,1858,
+1,2703,3937,16,0,
+558,1,2595,1871,1,
+2597,3938,16,0,558,
+1,88,3939,19,414,
+1,88,3940,5,30,
+1,2536,1750,1,2521,
+1767,1,2641,1779,1,
+2642,1784,1,2643,1756,
+1,2644,1789,1,2645,
+1794,1,2646,1799,1,
+2647,1762,1,2648,1878,
+1,2650,1811,1,2651,
+1816,1,2652,1821,1,
+2653,1826,1,2654,1831,
+1,2655,1836,1,2656,
+1841,1,2657,1774,1,
+2659,3941,16,0,412,
+1,2551,1852,1,2559,
+1864,1,2567,1805,1,
+2459,1007,1,2464,1024,
+1,2575,1846,1,2470,
+3942,16,0,412,1,
+2580,1858,1,2703,3943,
+16,0,412,1,2595,
+1871,1,2597,3944,16,
+0,412,1,89,3945,
+19,408,1,89,3946,
+5,30,1,2536,1750,
+1,2521,1767,1,2641,
+1779,1,2642,1784,1,
+2643,1756,1,2644,1789,
+1,2645,1794,1,2646,
+1799,1,2647,1762,1,
+2648,1878,1,2650,1811,
+1,2651,1816,1,2652,
+1821,1,2653,1826,1,
+2654,1831,1,2655,1836,
+1,2656,1841,1,2657,
+1774,1,2659,3947,16,
+0,406,1,2551,1852,
+1,2559,1864,1,2567,
+1805,1,2459,1007,1,
+2464,1024,1,2575,1846,
+1,2470,3948,16,0,
+406,1,2580,1858,1,
+2703,3949,16,0,406,
+1,2595,1871,1,2597,
+3950,16,0,406,1,
+90,3951,19,411,1,
+90,3952,5,30,1,
+2536,1750,1,2521,1767,
+1,2641,1779,1,2642,
+1784,1,2643,1756,1,
+2644,1789,1,2645,1794,
+1,2646,1799,1,2647,
+1762,1,2648,1878,1,
+2650,1811,1,2651,1816,
+1,2652,1821,1,2653,
+1826,1,2654,1831,1,
+2655,1836,1,2656,1841,
+1,2657,1774,1,2659,
+3953,16,0,409,1,
+2551,1852,1,2559,1864,
+1,2567,1805,1,2459,
+1007,1,2464,1024,1,
+2575,1846,1,2470,3954,
+16,0,409,1,2580,
+1858,1,2703,3955,16,
+0,409,1,2595,1871,
+1,2597,3956,16,0,
+409,1,91,3957,19,
+768,1,91,3958,5,
+30,1,2536,1750,1,
+2521,1767,1,2641,1779,
+1,2642,1784,1,2643,
+1756,1,2644,1789,1,
+2645,1794,1,2646,1799,
+1,2647,1762,1,2648,
+1878,1,2650,1811,1,
+2651,1816,1,2652,1821,
+1,2653,1826,1,2654,
+1831,1,2655,1836,1,
+2656,1841,1,2657,1774,
+1,2659,3959,16,0,
+766,1,2551,1852,1,
+2559,1864,1,2567,1805,
+1,2459,1007,1,2464,
+1024,1,2575,1846,1,
+2470,3960,16,0,766,
+1,2580,1858,1,2703,
+3961,16,0,766,1,
+2595,1871,1,2597,3962,
+16,0,766,1,92,
+3963,19,456,1,92,
+3964,5,30,1,2536,
+1750,1,2521,1767,1,
+2641,1779,1,2642,1784,
+1,2643,1756,1,2644,
+1789,1,2645,1794,1,
+2646,1799,1,2647,1762,
+1,2648,1878,1,2650,
+1811,1,2651,1816,1,
+2652,1821,1,2653,1826,
+1,2654,1831,1,2655,
+1836,1,2656,1841,1,
+2657,1774,1,2659,3965,
+16,0,454,1,2551,
+1852,1,2559,1864,1,
+2567,1805,1,2459,1007,
+1,2464,1024,1,2575,
+1846,1,2470,3966,16,
+0,454,1,2580,1858,
+1,2703,3967,16,0,
+454,1,2595,1871,1,
+2597,3968,16,0,454,
+1,93,3969,19,133,
+1,93,3970,5,129,
+1,0,3971,16,0,
+789,1,1,2244,1,
+2,2250,1,3,2255,
+1,4,2260,1,5,
+2265,1,6,2270,1,
+7,2275,1,8,3972,
+16,0,131,1,1515,
+3973,16,0,181,1,
+2021,843,1,2022,3974,
+16,0,583,1,256,
+3975,16,0,189,1,
+2527,3976,16,0,311,
+1,18,3977,16,0,
+138,1,2027,3978,16,
+0,591,1,2029,850,
+1,2030,856,1,2031,
+861,1,2032,866,1,
+2786,3979,16,0,189,
+1,277,3980,16,0,
+189,1,2035,877,1,
+2037,882,1,2039,887,
+1,32,3981,16,0,
+181,1,2041,893,1,
+2293,3982,16,0,189,
+1,2043,899,1,2045,
+904,1,41,3983,16,
+0,189,1,1297,3984,
+16,0,181,1,43,
+3985,16,0,189,1,
+46,3986,16,0,194,
+1,1804,3987,16,0,
+181,1,299,3988,16,
+0,189,1,2811,3559,
+1,52,3989,16,0,
+181,1,509,3990,16,
+0,189,1,2318,3991,
+16,0,181,1,2822,
+3523,1,62,3992,16,
+0,218,1,65,3993,
+16,0,220,1,2075,
+3994,16,0,181,1,
+1574,924,1,71,3995,
+16,0,189,1,1775,
+3996,16,0,181,1,
+76,3997,16,0,189,
+1,1834,3998,16,0,
+181,1,2337,3999,16,
+0,181,1,79,4000,
+16,0,189,1,1335,
+4001,16,0,181,1,
+2842,3544,1,2843,3549,
+1,2844,3554,1,85,
+4002,16,0,189,1,
+1261,4003,16,0,181,
+1,89,4004,16,0,
+189,1,2033,871,1,
+322,4005,16,0,189,
+1,97,4006,16,0,
+189,1,2106,4007,16,
+0,181,1,102,4008,
+16,0,189,1,1860,
+946,1,1803,912,1,
+2364,952,1,346,4009,
+16,0,189,1,1113,
+4010,16,0,173,1,
+2783,3517,1,112,4011,
+16,0,189,1,1117,
+4012,16,0,181,1,
+1371,4013,16,0,181,
+1,1876,4014,16,0,
+181,1,372,4015,16,
+0,621,1,374,4016,
+16,0,623,1,124,
+4017,16,0,189,1,
+376,4018,16,0,625,
+1,378,4019,16,0,
+627,1,2136,968,1,
+381,4020,16,0,189,
+1,525,4021,16,0,
+189,1,137,4022,16,
+0,189,1,1901,4023,
+16,0,181,1,2025,
+4024,16,0,587,1,
+1153,4025,16,0,181,
+1,151,4026,16,0,
+189,1,1407,4027,16,
+0,181,1,1659,4028,
+16,0,181,1,2413,
+4029,16,0,181,1,
+406,4030,16,0,189,
+1,2512,4031,16,0,
+490,1,2105,939,1,
+166,4032,16,0,189,
+1,1622,4033,16,0,
+189,1,2841,3538,1,
+1931,986,1,1873,961,
+1,431,4034,16,0,
+189,1,1585,4035,16,
+0,189,1,182,4036,
+16,0,189,1,1189,
+4037,16,0,181,1,
+1443,4038,16,0,181,
+1,1695,4039,16,0,
+181,1,2198,4040,16,
+0,181,1,2542,4041,
+16,0,644,1,447,
+4042,16,0,189,1,
+2458,1001,1,2459,1007,
+1,1958,4043,16,0,
+181,1,2462,1014,1,
+1657,1019,1,2464,1024,
+1,2466,3532,1,459,
+4044,16,0,189,1,
+2468,4045,16,0,386,
+1,462,4046,16,0,
+189,1,199,4047,16,
+0,189,1,217,4048,
+16,0,189,1,2227,
+1033,1,1225,4049,16,
+0,181,1,1479,4050,
+16,0,181,1,1731,
+4051,16,0,189,1,
+1989,1041,1,1990,4052,
+16,0,181,1,236,
+4053,16,0,189,1,
+1933,4054,16,0,181,
+1,2823,4055,16,0,
+789,1,2508,4056,16,
+0,484,1,1756,4057,
+16,0,181,1,94,
+4058,19,746,1,94,
+4059,5,95,1,256,
+4060,16,0,744,1,
+1261,4061,16,0,744,
+1,509,4062,16,0,
+744,1,1515,4063,16,
+0,744,1,2021,843,
+1,1775,4064,16,0,
+744,1,2029,850,1,
+2030,856,1,2031,861,
+1,2032,866,1,2033,
+871,1,277,4065,16,
+0,744,1,2035,877,
+1,2037,882,1,2039,
+887,1,32,4066,16,
+0,744,1,2041,893,
+1,2293,4067,16,0,
+744,1,2043,899,1,
+2045,904,1,41,4068,
+16,0,744,1,1297,
+4069,16,0,744,1,
+43,4070,16,0,744,
+1,1803,912,1,1804,
+4071,16,0,744,1,
+299,4072,16,0,744,
+1,52,4073,16,0,
+744,1,2318,4074,16,
+0,744,1,62,4075,
+16,0,744,1,2075,
+4076,16,0,744,1,
+1574,924,1,71,4077,
+16,0,744,1,76,
+4078,16,0,744,1,
+1834,4079,16,0,744,
+1,2337,4080,16,0,
+744,1,79,4081,16,
+0,744,1,1335,4082,
+16,0,744,1,322,
+4083,16,0,744,1,
+85,4084,16,0,744,
+1,89,4085,16,0,
+744,1,346,4086,16,
+0,744,1,2105,939,
+1,2106,4087,16,0,
+744,1,97,4088,16,
+0,744,1,1860,946,
+1,2364,952,1,102,
+4089,16,0,744,1,
+112,4090,16,0,744,
+1,1117,4091,16,0,
+744,1,2786,4092,16,
+0,744,1,1873,961,
+1,1876,4093,16,0,
+744,1,124,4094,16,
+0,744,1,2136,968,
+1,381,4095,16,0,
+744,1,525,4096,16,
+0,744,1,137,4097,
+16,0,744,1,1901,
+4098,16,0,744,1,
+1153,4099,16,0,744,
+1,151,4100,16,0,
+744,1,1407,4101,16,
+0,744,1,1659,4102,
+16,0,744,1,2413,
+4103,16,0,744,1,
+406,4104,16,0,744,
+1,1371,4105,16,0,
+744,1,166,4106,16,
+0,744,1,1622,4107,
+16,0,744,1,1931,
+986,1,1933,4108,16,
+0,744,1,431,4109,
+16,0,744,1,1585,
+4110,16,0,744,1,
+182,4111,16,0,744,
+1,1189,4112,16,0,
+744,1,1443,4113,16,
+0,744,1,1695,4114,
+16,0,744,1,2198,
+4115,16,0,744,1,
+447,4116,16,0,744,
+1,2458,1001,1,2459,
+1007,1,1958,4117,16,
+0,744,1,2462,1014,
+1,1657,1019,1,2464,
+1024,1,199,4118,16,
+0,744,1,459,4119,
+16,0,744,1,462,
+4120,16,0,744,1,
+217,4121,16,0,744,
+1,2227,1033,1,1225,
+4122,16,0,744,1,
+1479,4123,16,0,744,
+1,1731,4124,16,0,
+744,1,1989,1041,1,
+1990,4125,16,0,744,
+1,236,4126,16,0,
+744,1,1756,4127,16,
+0,744,1,95,4128,
+19,743,1,95,4129,
+5,95,1,256,4130,
+16,0,741,1,1261,
+4131,16,0,741,1,
+509,4132,16,0,741,
+1,1515,4133,16,0,
+741,1,2021,843,1,
+1775,4134,16,0,741,
+1,2029,850,1,2030,
+856,1,2031,861,1,
+2032,866,1,2033,871,
+1,277,4135,16,0,
+741,1,2035,877,1,
+2037,882,1,2039,887,
+1,32,4136,16,0,
+741,1,2041,893,1,
+2293,4137,16,0,741,
+1,2043,899,1,2045,
+904,1,41,4138,16,
+0,741,1,1297,4139,
+16,0,741,1,43,
+4140,16,0,741,1,
+1803,912,1,1804,4141,
+16,0,741,1,299,
+4142,16,0,741,1,
+52,4143,16,0,741,
+1,2318,4144,16,0,
+741,1,62,4145,16,
+0,741,1,2075,4146,
+16,0,741,1,1574,
+924,1,71,4147,16,
+0,741,1,76,4148,
+16,0,741,1,1834,
+4149,16,0,741,1,
+2337,4150,16,0,741,
+1,79,4151,16,0,
+741,1,1335,4152,16,
+0,741,1,322,4153,
+16,0,741,1,85,
+4154,16,0,741,1,
+89,4155,16,0,741,
+1,346,4156,16,0,
+741,1,2105,939,1,
+2106,4157,16,0,741,
+1,97,4158,16,0,
+741,1,1860,946,1,
+2364,952,1,102,4159,
+16,0,741,1,112,
+4160,16,0,741,1,
+1117,4161,16,0,741,
+1,2786,4162,16,0,
+741,1,1873,961,1,
+1876,4163,16,0,741,
+1,124,4164,16,0,
+741,1,2136,968,1,
+381,4165,16,0,741,
+1,525,4166,16,0,
+741,1,137,4167,16,
+0,741,1,1901,4168,
+16,0,741,1,1153,
+4169,16,0,741,1,
+151,4170,16,0,741,
+1,1407,4171,16,0,
+741,1,1659,4172,16,
+0,741,1,2413,4173,
+16,0,741,1,406,
+4174,16,0,741,1,
+1371,4175,16,0,741,
+1,166,4176,16,0,
+741,1,1622,4177,16,
+0,741,1,1931,986,
+1,1933,4178,16,0,
+741,1,431,4179,16,
+0,741,1,1585,4180,
+16,0,741,1,182,
+4181,16,0,741,1,
+1189,4182,16,0,741,
+1,1443,4183,16,0,
+741,1,1695,4184,16,
+0,741,1,2198,4185,
+16,0,741,1,447,
+4186,16,0,741,1,
+2458,1001,1,2459,1007,
+1,1958,4187,16,0,
+741,1,2462,1014,1,
+1657,1019,1,2464,1024,
+1,199,4188,16,0,
+741,1,459,4189,16,
+0,741,1,462,4190,
+16,0,741,1,217,
+4191,16,0,741,1,
+2227,1033,1,1225,4192,
+16,0,741,1,1479,
+4193,16,0,741,1,
+1731,4194,16,0,741,
+1,1989,1041,1,1990,
+4195,16,0,741,1,
+236,4196,16,0,741,
+1,1756,4197,16,0,
+741,1,96,4198,19,
+740,1,96,4199,5,
+95,1,256,4200,16,
+0,738,1,1261,4201,
+16,0,738,1,509,
+4202,16,0,738,1,
+1515,4203,16,0,738,
+1,2021,843,1,1775,
+4204,16,0,738,1,
+2029,850,1,2030,856,
+1,2031,861,1,2032,
+866,1,2033,871,1,
+277,4205,16,0,738,
+1,2035,877,1,2037,
+882,1,2039,887,1,
+32,4206,16,0,738,
+1,2041,893,1,2293,
+4207,16,0,738,1,
+2043,899,1,2045,904,
+1,41,4208,16,0,
+738,1,1297,4209,16,
+0,738,1,43,4210,
+16,0,738,1,1803,
+912,1,1804,4211,16,
+0,738,1,299,4212,
+16,0,738,1,52,
+4213,16,0,738,1,
+2318,4214,16,0,738,
+1,62,4215,16,0,
+738,1,2075,4216,16,
+0,738,1,1574,924,
+1,71,4217,16,0,
+738,1,76,4218,16,
+0,738,1,1834,4219,
+16,0,738,1,2337,
+4220,16,0,738,1,
+79,4221,16,0,738,
+1,1335,4222,16,0,
+738,1,322,4223,16,
+0,738,1,85,4224,
+16,0,738,1,89,
+4225,16,0,738,1,
+346,4226,16,0,738,
+1,2105,939,1,2106,
+4227,16,0,738,1,
+97,4228,16,0,738,
+1,1860,946,1,2364,
+952,1,102,4229,16,
+0,738,1,112,4230,
+16,0,738,1,1117,
+4231,16,0,738,1,
+2786,4232,16,0,738,
+1,1873,961,1,1876,
+4233,16,0,738,1,
+124,4234,16,0,738,
+1,2136,968,1,381,
+4235,16,0,738,1,
+525,4236,16,0,738,
+1,137,4237,16,0,
+738,1,1901,4238,16,
+0,738,1,1153,4239,
+16,0,738,1,151,
+4240,16,0,738,1,
+1407,4241,16,0,738,
+1,1659,4242,16,0,
+738,1,2413,4243,16,
+0,738,1,406,4244,
+16,0,738,1,1371,
+4245,16,0,738,1,
+166,4246,16,0,738,
+1,1622,4247,16,0,
+738,1,1931,986,1,
+1933,4248,16,0,738,
+1,431,4249,16,0,
+738,1,1585,4250,16,
+0,738,1,182,4251,
+16,0,738,1,1189,
+4252,16,0,738,1,
+1443,4253,16,0,738,
+1,1695,4254,16,0,
+738,1,2198,4255,16,
+0,738,1,447,4256,
+16,0,738,1,2458,
+1001,1,2459,1007,1,
+1958,4257,16,0,738,
+1,2462,1014,1,1657,
+1019,1,2464,1024,1,
+199,4258,16,0,738,
+1,459,4259,16,0,
+738,1,462,4260,16,
+0,738,1,217,4261,
+16,0,738,1,2227,
+1033,1,1225,4262,16,
+0,738,1,1479,4263,
+16,0,738,1,1731,
+4264,16,0,738,1,
+1989,1041,1,1990,4265,
+16,0,738,1,236,
+4266,16,0,738,1,
+1756,4267,16,0,738,
+1,97,4268,19,103,
+1,97,4269,5,1,
+1,0,4270,16,0,
+104,1,98,4271,19,
+647,1,98,4272,5,
+1,1,0,4273,16,
+0,645,1,99,4274,
+19,210,1,99,4275,
+5,2,1,0,4276,
+16,0,312,1,2823,
+4277,16,0,208,1,
+100,4278,19,207,1,
+100,4279,5,2,1,
+0,4280,16,0,286,
+1,2823,4281,16,0,
+205,1,101,4282,19,
+301,1,101,4283,5,
+2,1,0,4284,16,
+0,785,1,2823,4285,
+16,0,299,1,102,
+4286,19,320,1,102,
+4287,5,4,1,0,
+4288,16,0,788,1,
+2764,4289,16,0,318,
+1,2823,4290,16,0,
+788,1,2834,4291,16,
+0,318,1,103,4292,
+19,714,1,103,4293,
+5,2,1,2470,4294,
+16,0,712,1,2659,
+4295,16,0,734,1,
+104,4296,19,280,1,
+104,4297,5,4,1,
+2597,4298,16,0,680,
+1,2703,4299,16,0,
+680,1,2470,4300,16,
+0,278,1,2659,4301,
+16,0,278,1,105,
+4302,19,679,1,105,
+4303,5,4,1,2597,
+4304,16,0,677,1,
+2703,4305,16,0,677,
+1,2470,4306,16,0,
+690,1,2659,4307,16,
+0,690,1,106,4308,
+19,157,1,106,4309,
+5,4,1,2597,4310,
+16,0,155,1,2703,
+4311,16,0,155,1,
+2470,4312,16,0,769,
+1,2659,4313,16,0,
+769,1,107,4314,19,
+154,1,107,4315,5,
+4,1,2597,4316,16,
+0,152,1,2703,4317,
+16,0,152,1,2470,
+4318,16,0,174,1,
+2659,4319,16,0,174,
+1,108,4320,19,672,
+1,108,4321,5,4,
+1,2597,4322,16,0,
+670,1,2703,4323,16,
+0,670,1,2470,4324,
+16,0,685,1,2659,
+4325,16,0,685,1,
+109,4326,19,669,1,
+109,4327,5,4,1,
+2597,4328,16,0,667,
+1,2703,4329,16,0,
+667,1,2470,4330,16,
+0,684,1,2659,4331,
+16,0,684,1,110,
+4332,19,172,1,110,
+4333,5,4,1,2597,
+4334,16,0,752,1,
+2703,4335,16,0,752,
+1,2470,4336,16,0,
+170,1,2659,4337,16,
+0,170,1,111,4338,
+19,169,1,111,4339,
+5,4,1,2597,4340,
+16,0,663,1,2703,
+4341,16,0,663,1,
+2470,4342,16,0,167,
+1,2659,4343,16,0,
+167,1,112,4344,19,
+141,1,112,4345,5,
+3,1,2582,4346,16,
+0,293,1,2770,4347,
+16,0,331,1,10,
+4348,16,0,139,1,
+113,4349,19,688,1,
+113,4350,5,1,1,
+2569,4351,16,0,686,
+1,114,4352,19,676,
+1,114,4353,5,1,
+1,2561,4354,16,0,
+674,1,115,4355,19,
+660,1,115,4356,5,
+1,1,2553,4357,16,
+0,658,1,116,4358,
+19,535,1,116,4359,
+5,1,1,2538,4360,
+16,0,533,1,117,
+4361,19,638,1,117,
+4362,5,1,1,2523,
+4363,16,0,636,1,
+118,4364,19,498,1,
+118,4365,5,1,1,
+2507,4366,16,0,496,
+1,119,4367,19,160,
+1,119,4368,5,17,
+1,0,4369,16,0,
+333,1,2582,4370,16,
+0,382,1,2075,4371,
+16,0,763,1,2337,
+4372,16,0,763,1,
+2413,4373,16,0,763,
+1,10,4374,16,0,
+382,1,2823,4375,16,
+0,333,1,1901,4376,
+16,0,763,1,2198,
+4377,16,0,763,1,
+21,4378,16,0,158,
+1,2106,4379,16,0,
+763,1,2770,4380,16,
+0,382,1,1804,4381,
+16,0,763,1,1990,
+4382,16,0,763,1,
+32,4383,16,0,763,
+1,1958,4384,16,0,
+763,1,1775,4385,16,
+0,763,1,120,4386,
+19,487,1,120,4387,
+5,2,1,2569,4388,
+16,0,567,1,2507,
+4389,16,0,485,1,
+121,4390,19,493,1,
+121,4391,5,5,1,
+2511,4392,16,0,491,
+1,2523,4393,16,0,
+506,1,2515,4394,16,
+0,495,1,2538,4395,
+16,0,523,1,2561,
+4396,16,0,753,1,
+122,4397,19,514,1,
+122,4398,5,3,1,
+2530,4399,16,0,516,
+1,2553,4400,16,0,
+542,1,2526,4401,16,
+0,512,1,123,4402,
+19,248,1,123,4403,
+5,2,1,2541,4404,
+16,0,527,1,2545,
+4405,16,0,246,1,
+124,4406,19,130,1,
+124,4407,5,18,1,
+0,4408,16,0,128,
+1,2582,4409,16,0,
+137,1,2075,4410,16,
+0,137,1,2337,4411,
+16,0,137,1,2413,
+4412,16,0,137,1,
+10,4413,16,0,137,
+1,2823,4414,16,0,
+128,1,2198,4415,16,
+0,137,1,1901,4416,
+16,0,137,1,52,
+4417,16,0,216,1,
+21,4418,16,0,137,
+1,2106,4419,16,0,
+137,1,2770,4420,16,
+0,137,1,1804,4421,
+16,0,137,1,1990,
+4422,16,0,137,1,
+32,4423,16,0,137,
+1,1958,4424,16,0,
+137,1,1775,4425,16,
+0,137,1,125,4426,
+19,359,1,125,4427,
+5,4,1,2597,4428,
+16,0,357,1,2703,
+4429,16,0,357,1,
+2470,4430,16,0,357,
+1,2659,4431,16,0,
+357,1,126,4432,19,
+772,1,126,4433,5,
+4,1,2597,4434,16,
+0,770,1,2703,4435,
+16,0,770,1,2470,
+4436,16,0,770,1,
+2659,4437,16,0,770,
+1,127,4438,19,760,
+1,127,4439,5,4,
+1,2597,4440,16,0,
+758,1,2703,4441,16,
+0,758,1,2470,4442,
+16,0,758,1,2659,
+4443,16,0,758,1,
+128,4444,19,548,1,
+128,4445,5,4,1,
+2597,4446,16,0,546,
+1,2703,4447,16,0,
+546,1,2470,4448,16,
+0,546,1,2659,4449,
+16,0,546,1,129,
+4450,19,655,1,129,
+4451,5,4,1,2597,
+4452,16,0,653,1,
+2703,4453,16,0,653,
+1,2470,4454,16,0,
+653,1,2659,4455,16,
+0,653,1,130,4456,
+19,643,1,130,4457,
+5,4,1,2597,4458,
+16,0,641,1,2703,
+4459,16,0,641,1,
+2470,4460,16,0,641,
+1,2659,4461,16,0,
+641,1,131,4462,19,
+504,1,131,4463,5,
+4,1,2597,4464,16,
+0,502,1,2703,4465,
+16,0,502,1,2470,
+4466,16,0,502,1,
+2659,4467,16,0,502,
+1,132,4468,19,481,
+1,132,4469,5,4,
+1,2597,4470,16,0,
+479,1,2703,4471,16,
+0,479,1,2470,4472,
+16,0,479,1,2659,
+4473,16,0,479,1,
+133,4474,19,381,1,
+133,4475,5,21,1,
+2781,4476,16,0,798,
+1,2519,4477,16,0,
+784,1,2557,4478,16,
+0,545,1,2337,4479,
+16,0,592,1,2413,
+4480,16,0,592,1,
+2593,4481,16,0,711,
+1,2565,4482,16,0,
+681,1,1901,4483,16,
+0,592,1,2198,4484,
+16,0,592,1,2534,
+4485,16,0,640,1,
+2573,4486,16,0,575,
+1,2106,4487,16,0,
+592,1,2578,4488,16,
+0,775,1,2075,4489,
+16,0,592,1,1804,
+4490,16,0,592,1,
+1990,4491,16,0,592,
+1,31,4492,16,0,
+379,1,32,4493,16,
+0,592,1,2549,4494,
+16,0,538,1,1958,
+4495,16,0,592,1,
+1775,4496,16,0,592,
+1,134,4497,19,342,
+1,134,4498,5,1,
+1,32,4499,16,0,
+340,1,135,4500,19,
+289,1,135,4501,5,
+11,1,2075,4502,16,
+0,697,1,2337,4503,
+16,0,294,1,2413,
+4504,16,0,520,1,
+1901,4505,16,0,437,
+1,2198,4506,16,0,
+362,1,2106,4507,16,
+0,730,1,1804,4508,
+16,0,322,1,1990,
+4509,16,0,580,1,
+32,4510,16,0,375,
+1,1958,4511,16,0,
+529,1,1775,4512,16,
+0,287,1,136,4513,
+19,703,1,136,4514,
+5,11,1,2075,4515,
+16,0,701,1,2337,
+4516,16,0,701,1,
+2413,4517,16,0,701,
+1,1901,4518,16,0,
+701,1,2198,4519,16,
+0,701,1,2106,4520,
+16,0,701,1,1804,
+4521,16,0,701,1,
+1990,4522,16,0,701,
+1,32,4523,16,0,
+701,1,1958,4524,16,
+0,701,1,1775,4525,
+16,0,701,1,137,
+4526,19,756,1,137,
+4527,5,11,1,2075,
+4528,16,0,754,1,
+2337,4529,16,0,754,
+1,2413,4530,16,0,
+754,1,1901,4531,16,
+0,754,1,2198,4532,
+16,0,754,1,2106,
+4533,16,0,754,1,
+1804,4534,16,0,754,
+1,1990,4535,16,0,
+754,1,32,4536,16,
+0,754,1,1958,4537,
+16,0,754,1,1775,
+4538,16,0,754,1,
+138,4539,19,177,1,
+138,4540,5,31,1,
+1901,4541,16,0,762,
+1,1479,4542,16,0,
+648,1,2075,4543,16,
+0,762,1,1695,4544,
+16,0,214,1,1756,
+4545,16,0,204,1,
+2413,4546,16,0,762,
+1,2198,4547,16,0,
+762,1,1876,4548,16,
+0,781,1,1659,4549,
+16,0,204,1,1443,
+4550,16,0,608,1,
+1117,4551,16,0,175,
+1,1990,4552,16,0,
+762,1,1189,4553,16,
+0,264,1,1775,4554,
+16,0,762,1,32,
+4555,16,0,762,1,
+2106,4556,16,0,762,
+1,1515,4557,16,0,
+699,1,2337,4558,16,
+0,762,1,52,4559,
 16,0,715,1,1804,
-4494,16,0,317,1,
-1990,4495,16,0,572,
-1,32,4496,16,0,
-367,1,1958,4497,16,
-0,515,1,1775,4498,
-16,0,284,1,135,
-4499,19,688,1,135,
-4500,5,11,1,2075,
-4501,16,0,686,1,
-2337,4502,16,0,686,
-1,2413,4503,16,0,
-686,1,1901,4504,16,
-0,686,1,2198,4505,
-16,0,686,1,2106,
-4506,16,0,686,1,
-1804,4507,16,0,686,
-1,1990,4508,16,0,
-686,1,32,4509,16,
-0,686,1,1958,4510,
-16,0,686,1,1775,
-4511,16,0,686,1,
-136,4512,19,748,1,
-136,4513,5,11,1,
-2075,4514,16,0,746,
-1,2337,4515,16,0,
-746,1,2413,4516,16,
-0,746,1,1901,4517,
-16,0,746,1,2198,
-4518,16,0,746,1,
-2106,4519,16,0,746,
-1,1804,4520,16,0,
-746,1,1990,4521,16,
-0,746,1,32,4522,
-16,0,746,1,1958,
-4523,16,0,746,1,
-1775,4524,16,0,746,
-1,137,4525,19,180,
-1,137,4526,5,31,
-1,1901,4527,16,0,
-752,1,1479,4528,16,
-0,638,1,2075,4529,
-16,0,752,1,1695,
-4530,16,0,217,1,
-1756,4531,16,0,207,
-1,2413,4532,16,0,
-752,1,2198,4533,16,
-0,752,1,1876,4534,
-16,0,771,1,1659,
-4535,16,0,207,1,
-1443,4536,16,0,600,
-1,1117,4537,16,0,
-178,1,1990,4538,16,
-0,752,1,1189,4539,
-16,0,267,1,1775,
-4540,16,0,752,1,
-32,4541,16,0,752,
-1,2106,4542,16,0,
-752,1,1515,4543,16,
-0,684,1,2337,4544,
-16,0,752,1,52,
-4545,16,0,700,1,
-1804,4546,16,0,752,
-1,1261,4547,16,0,
-331,1,1153,4548,16,
-0,274,1,1225,4549,
-16,0,303,1,1335,
-4550,16,0,497,1,
-1933,4551,16,0,640,
-1,1834,4552,16,0,
-347,1,1297,4553,16,
-0,359,1,1407,4554,
-16,0,667,1,2318,
-4555,16,0,207,1,
-1958,4556,16,0,752,
-1,1371,4557,16,0,
-488,1,138,4558,19,
-609,1,138,4559,5,
-11,1,2075,4560,16,
-0,607,1,2337,4561,
-16,0,607,1,2413,
-4562,16,0,607,1,
-1901,4563,16,0,607,
-1,2198,4564,16,0,
-607,1,2106,4565,16,
-0,607,1,1804,4566,
-16,0,607,1,1990,
-4567,16,0,607,1,
-32,4568,16,0,607,
-1,1958,4569,16,0,
-607,1,1775,4570,16,
-0,607,1,139,4571,
-19,605,1,139,4572,
-5,11,1,2075,4573,
-16,0,603,1,2337,
-4574,16,0,603,1,
-2413,4575,16,0,603,
-1,1901,4576,16,0,
-603,1,2198,4577,16,
-0,603,1,2106,4578,
-16,0,603,1,1804,
-4579,16,0,603,1,
-1990,4580,16,0,603,
-1,32,4581,16,0,
-603,1,1958,4582,16,
-0,603,1,1775,4583,
-16,0,603,1,140,
-4584,19,679,1,140,
-4585,5,11,1,2075,
-4586,16,0,677,1,
-2337,4587,16,0,677,
-1,2413,4588,16,0,
-677,1,1901,4589,16,
-0,677,1,2198,4590,
-16,0,677,1,2106,
-4591,16,0,677,1,
-1804,4592,16,0,677,
-1,1990,4593,16,0,
-677,1,32,4594,16,
-0,677,1,1958,4595,
-16,0,677,1,1775,
-4596,16,0,677,1,
-141,4597,19,599,1,
-141,4598,5,11,1,
-2075,4599,16,0,597,
-1,2337,4600,16,0,
-597,1,2413,4601,16,
-0,597,1,1901,4602,
-16,0,597,1,2198,
-4603,16,0,597,1,
-2106,4604,16,0,597,
-1,1804,4605,16,0,
-597,1,1990,4606,16,
-0,597,1,32,4607,
-16,0,597,1,1958,
-4608,16,0,597,1,
-1775,4609,16,0,597,
-1,142,4610,19,596,
-1,142,4611,5,11,
-1,2075,4612,16,0,
-594,1,2337,4613,16,
-0,594,1,2413,4614,
-16,0,594,1,1901,
-4615,16,0,594,1,
-2198,4616,16,0,594,
-1,2106,4617,16,0,
-594,1,1804,4618,16,
-0,594,1,1990,4619,
-16,0,594,1,32,
-4620,16,0,594,1,
-1958,4621,16,0,594,
-1,1775,4622,16,0,
-594,1,143,4623,19,
-593,1,143,4624,5,
-11,1,2075,4625,16,
-0,591,1,2337,4626,
-16,0,591,1,2413,
-4627,16,0,591,1,
-1901,4628,16,0,591,
-1,2198,4629,16,0,
-591,1,2106,4630,16,
-0,591,1,1804,4631,
-16,0,591,1,1990,
-4632,16,0,591,1,
-32,4633,16,0,591,
-1,1958,4634,16,0,
-591,1,1775,4635,16,
-0,591,1,144,4636,
-19,590,1,144,4637,
-5,11,1,2075,4638,
-16,0,588,1,2337,
-4639,16,0,588,1,
-2413,4640,16,0,588,
-1,1901,4641,16,0,
-588,1,2198,4642,16,
-0,588,1,2106,4643,
-16,0,588,1,1804,
-4644,16,0,588,1,
-1990,4645,16,0,588,
-1,32,4646,16,0,
-588,1,1958,4647,16,
-0,588,1,1775,4648,
-16,0,588,1,145,
-4649,19,587,1,145,
-4650,5,11,1,2075,
-4651,16,0,585,1,
-2337,4652,16,0,585,
-1,2413,4653,16,0,
-585,1,1901,4654,16,
-0,585,1,2198,4655,
-16,0,585,1,2106,
-4656,16,0,585,1,
-1804,4657,16,0,585,
-1,1990,4658,16,0,
-585,1,32,4659,16,
-0,585,1,1958,4660,
-16,0,585,1,1775,
-4661,16,0,585,1,
-146,4662,19,150,1,
-146,4663,5,3,1,
-1756,4664,16,0,316,
-1,2318,4665,16,0,
-330,1,1659,4666,16,
-0,148,1,147,4667,
-19,626,1,147,4668,
-5,68,1,1901,4669,
-16,0,624,1,1479,
-4670,16,0,624,1,
-112,4671,16,0,624,
-1,2293,4672,16,0,
-624,1,1804,4673,16,
-0,624,1,431,4674,
-16,0,624,1,1443,
-4675,16,0,624,1,
-1756,4676,16,0,624,
-1,124,4677,16,0,
-624,1,525,4678,16,
-0,624,1,236,4679,
-16,0,624,1,346,
-4680,16,0,624,1,
-1876,4681,16,0,624,
-1,1659,4682,16,0,
-624,1,1225,4683,16,
-0,624,1,1117,4684,
-16,0,624,1,137,
-4685,16,0,624,1,
-2318,4686,16,0,624,
-1,1775,4687,16,0,
-624,1,32,4688,16,
-0,624,1,1407,4689,
-16,0,624,1,2782,
-4690,16,0,624,1,
-256,4691,16,0,624,
-1,459,4692,16,0,
-624,1,406,4693,16,
-0,624,1,41,4694,
-16,0,624,1,151,
-4695,16,0,624,1,
-43,4696,16,0,624,
-1,1585,4697,16,0,
-624,1,1990,4698,16,
-0,624,1,2337,4699,
-16,0,624,1,509,
-4700,16,0,624,1,
-52,4701,16,0,624,
-1,381,4702,16,0,
-624,1,447,4703,16,
-0,624,1,166,4704,
-16,0,624,1,462,
-4705,16,0,624,1,
-277,4706,16,0,624,
-1,1695,4707,16,0,
-624,1,62,4708,16,
-0,692,1,1153,4709,
-16,0,624,1,2106,
-4710,16,0,624,1,
-1335,4711,16,0,624,
-1,71,4712,16,0,
-624,1,182,4713,16,
-0,624,1,76,4714,
-16,0,624,1,79,
-4715,16,0,624,1,
-1933,4716,16,0,624,
-1,299,4717,16,0,
-624,1,85,4718,16,
-0,624,1,1515,4719,
-16,0,624,1,2198,
-4720,16,0,624,1,
-89,4721,16,0,624,
-1,1834,4722,16,0,
-624,1,1622,4723,16,
-0,624,1,2413,4724,
-16,0,624,1,2075,
-4725,16,0,624,1,
-1731,4726,16,0,624,
-1,97,4727,16,0,
-624,1,1297,4728,16,
-0,624,1,1189,4729,
-16,0,624,1,102,
-4730,16,0,624,1,
-1261,4731,16,0,624,
-1,322,4732,16,0,
-624,1,1958,4733,16,
-0,624,1,199,4734,
-16,0,624,1,1371,
-4735,16,0,624,1,
-217,4736,16,0,624,
-1,148,4737,19,710,
-1,148,4738,5,2,
-1,459,4739,16,0,
-708,1,41,4740,16,
-0,783,1,149,4741,
-19,714,1,149,4742,
-5,3,1,462,4743,
-16,0,712,1,459,
-4744,16,0,735,1,
-41,4745,16,0,735,
-1,150,4746,19,4747,
-4,36,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,1,150,
-4742,1,151,4748,19,
-622,1,151,4749,5,
-68,1,1901,4750,16,
-0,620,1,1479,4751,
-16,0,620,1,112,
-4752,16,0,620,1,
-2293,4753,16,0,620,
-1,1804,4754,16,0,
-620,1,431,4755,16,
-0,620,1,1443,4756,
-16,0,620,1,1756,
-4757,16,0,620,1,
-124,4758,16,0,620,
-1,525,4759,16,0,
-620,1,236,4760,16,
-0,620,1,346,4761,
-16,0,620,1,1876,
-4762,16,0,620,1,
-1659,4763,16,0,620,
-1,1225,4764,16,0,
-620,1,1117,4765,16,
-0,620,1,137,4766,
-16,0,620,1,2318,
-4767,16,0,620,1,
-1775,4768,16,0,620,
-1,32,4769,16,0,
-620,1,1407,4770,16,
-0,620,1,2782,4771,
-16,0,620,1,256,
-4772,16,0,620,1,
-459,4773,16,0,620,
-1,406,4774,16,0,
-620,1,41,4775,16,
-0,620,1,151,4776,
-16,0,620,1,43,
-4777,16,0,620,1,
-1585,4778,16,0,620,
-1,1990,4779,16,0,
-620,1,2337,4780,16,
-0,620,1,509,4781,
-16,0,620,1,52,
-4782,16,0,620,1,
-381,4783,16,0,620,
-1,447,4784,16,0,
-620,1,166,4785,16,
-0,620,1,462,4786,
-16,0,620,1,277,
-4787,16,0,620,1,
-1695,4788,16,0,620,
-1,62,4789,16,0,
-693,1,1153,4790,16,
-0,620,1,2106,4791,
-16,0,620,1,1335,
-4792,16,0,620,1,
-71,4793,16,0,620,
-1,182,4794,16,0,
-620,1,76,4795,16,
-0,620,1,79,4796,
-16,0,620,1,1933,
-4797,16,0,620,1,
-299,4798,16,0,620,
-1,85,4799,16,0,
-620,1,1515,4800,16,
-0,620,1,2198,4801,
-16,0,620,1,89,
-4802,16,0,620,1,
-1834,4803,16,0,620,
-1,1622,4804,16,0,
-620,1,2413,4805,16,
-0,620,1,2075,4806,
-16,0,620,1,1731,
-4807,16,0,620,1,
-97,4808,16,0,620,
-1,1297,4809,16,0,
-620,1,1189,4810,16,
-0,620,1,102,4811,
-16,0,620,1,1261,
-4812,16,0,620,1,
-322,4813,16,0,620,
-1,1958,4814,16,0,
-620,1,199,4815,16,
-0,620,1,1371,4816,
-16,0,620,1,217,
-4817,16,0,620,1,
-152,4818,19,4819,4,
-28,86,0,101,0,
-99,0,116,0,111,
-0,114,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,1,
-152,4749,1,153,4820,
-19,4821,4,32,82,
-0,111,0,116,0,
-97,0,116,0,105,
-0,111,0,110,0,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,1,153,4749,1,
-154,4822,19,4823,4,
-24,76,0,105,0,
-115,0,116,0,67,
+4560,16,0,762,1,
+1261,4561,16,0,338,
+1,1153,4562,16,0,
+271,1,1225,4563,16,
+0,307,1,1335,4564,
+16,0,511,1,1933,
+4565,16,0,651,1,
+1834,4566,16,0,352,
+1,1297,4567,16,0,
+366,1,1407,4568,16,
+0,682,1,2318,4569,
+16,0,204,1,1958,
+4570,16,0,762,1,
+1371,4571,16,0,500,
+1,139,4572,19,617,
+1,139,4573,5,11,
+1,2075,4574,16,0,
+615,1,2337,4575,16,
+0,615,1,2413,4576,
+16,0,615,1,1901,
+4577,16,0,615,1,
+2198,4578,16,0,615,
+1,2106,4579,16,0,
+615,1,1804,4580,16,
+0,615,1,1990,4581,
+16,0,615,1,32,
+4582,16,0,615,1,
+1958,4583,16,0,615,
+1,1775,4584,16,0,
+615,1,140,4585,19,
+613,1,140,4586,5,
+11,1,2075,4587,16,
+0,611,1,2337,4588,
+16,0,611,1,2413,
+4589,16,0,611,1,
+1901,4590,16,0,611,
+1,2198,4591,16,0,
+611,1,2106,4592,16,
+0,611,1,1804,4593,
+16,0,611,1,1990,
+4594,16,0,611,1,
+32,4595,16,0,611,
+1,1958,4596,16,0,
+611,1,1775,4597,16,
+0,611,1,141,4598,
+19,694,1,141,4599,
+5,11,1,2075,4600,
+16,0,692,1,2337,
+4601,16,0,692,1,
+2413,4602,16,0,692,
+1,1901,4603,16,0,
+692,1,2198,4604,16,
+0,692,1,2106,4605,
+16,0,692,1,1804,
+4606,16,0,692,1,
+1990,4607,16,0,692,
+1,32,4608,16,0,
+692,1,1958,4609,16,
+0,692,1,1775,4610,
+16,0,692,1,142,
+4611,19,607,1,142,
+4612,5,11,1,2075,
+4613,16,0,605,1,
+2337,4614,16,0,605,
+1,2413,4615,16,0,
+605,1,1901,4616,16,
+0,605,1,2198,4617,
+16,0,605,1,2106,
+4618,16,0,605,1,
+1804,4619,16,0,605,
+1,1990,4620,16,0,
+605,1,32,4621,16,
+0,605,1,1958,4622,
+16,0,605,1,1775,
+4623,16,0,605,1,
+143,4624,19,604,1,
+143,4625,5,11,1,
+2075,4626,16,0,602,
+1,2337,4627,16,0,
+602,1,2413,4628,16,
+0,602,1,1901,4629,
+16,0,602,1,2198,
+4630,16,0,602,1,
+2106,4631,16,0,602,
+1,1804,4632,16,0,
+602,1,1990,4633,16,
+0,602,1,32,4634,
+16,0,602,1,1958,
+4635,16,0,602,1,
+1775,4636,16,0,602,
+1,144,4637,19,601,
+1,144,4638,5,11,
+1,2075,4639,16,0,
+599,1,2337,4640,16,
+0,599,1,2413,4641,
+16,0,599,1,1901,
+4642,16,0,599,1,
+2198,4643,16,0,599,
+1,2106,4644,16,0,
+599,1,1804,4645,16,
+0,599,1,1990,4646,
+16,0,599,1,32,
+4647,16,0,599,1,
+1958,4648,16,0,599,
+1,1775,4649,16,0,
+599,1,145,4650,19,
+598,1,145,4651,5,
+11,1,2075,4652,16,
+0,596,1,2337,4653,
+16,0,596,1,2413,
+4654,16,0,596,1,
+1901,4655,16,0,596,
+1,2198,4656,16,0,
+596,1,2106,4657,16,
+0,596,1,1804,4658,
+16,0,596,1,1990,
+4659,16,0,596,1,
+32,4660,16,0,596,
+1,1958,4661,16,0,
+596,1,1775,4662,16,
+0,596,1,146,4663,
+19,595,1,146,4664,
+5,11,1,2075,4665,
+16,0,593,1,2337,
+4666,16,0,593,1,
+2413,4667,16,0,593,
+1,1901,4668,16,0,
+593,1,2198,4669,16,
+0,593,1,2106,4670,
+16,0,593,1,1804,
+4671,16,0,593,1,
+1990,4672,16,0,593,
+1,32,4673,16,0,
+593,1,1958,4674,16,
+0,593,1,1775,4675,
+16,0,593,1,147,
+4676,19,147,1,147,
+4677,5,3,1,1756,
+4678,16,0,321,1,
+2318,4679,16,0,337,
+1,1659,4680,16,0,
+145,1,148,4681,19,
+634,1,148,4682,5,
+68,1,1901,4683,16,
+0,632,1,1479,4684,
+16,0,632,1,112,
+4685,16,0,632,1,
+2293,4686,16,0,632,
+1,1804,4687,16,0,
+632,1,431,4688,16,
+0,632,1,1443,4689,
+16,0,632,1,1756,
+4690,16,0,632,1,
+124,4691,16,0,632,
+1,525,4692,16,0,
+632,1,236,4693,16,
+0,632,1,346,4694,
+16,0,632,1,1876,
+4695,16,0,632,1,
+1659,4696,16,0,632,
+1,1225,4697,16,0,
+632,1,1117,4698,16,
+0,632,1,137,4699,
+16,0,632,1,2318,
+4700,16,0,632,1,
+1775,4701,16,0,632,
+1,32,4702,16,0,
+632,1,1407,4703,16,
+0,632,1,256,4704,
+16,0,632,1,459,
+4705,16,0,632,1,
+406,4706,16,0,632,
+1,41,4707,16,0,
+632,1,151,4708,16,
+0,632,1,43,4709,
+16,0,632,1,1585,
+4710,16,0,632,1,
+1990,4711,16,0,632,
+1,2337,4712,16,0,
+632,1,509,4713,16,
+0,632,1,52,4714,
+16,0,632,1,381,
+4715,16,0,632,1,
+447,4716,16,0,632,
+1,166,4717,16,0,
+632,1,462,4718,16,
+0,632,1,277,4719,
+16,0,632,1,1695,
+4720,16,0,632,1,
+2786,4721,16,0,632,
+1,62,4722,16,0,
+707,1,1153,4723,16,
+0,632,1,2106,4724,
+16,0,632,1,1335,
+4725,16,0,632,1,
+71,4726,16,0,632,
+1,182,4727,16,0,
+632,1,76,4728,16,
+0,632,1,79,4729,
+16,0,632,1,1933,
+4730,16,0,632,1,
+299,4731,16,0,632,
+1,85,4732,16,0,
+632,1,1515,4733,16,
+0,632,1,2198,4734,
+16,0,632,1,89,
+4735,16,0,632,1,
+1834,4736,16,0,632,
+1,1622,4737,16,0,
+632,1,2413,4738,16,
+0,632,1,2075,4739,
+16,0,632,1,1731,
+4740,16,0,632,1,
+97,4741,16,0,632,
+1,1297,4742,16,0,
+632,1,1189,4743,16,
+0,632,1,102,4744,
+16,0,632,1,1261,
+4745,16,0,632,1,
+322,4746,16,0,632,
+1,1958,4747,16,0,
+632,1,199,4748,16,
+0,632,1,1371,4749,
+16,0,632,1,217,
+4750,16,0,632,1,
+149,4751,19,725,1,
+149,4752,5,2,1,
+459,4753,16,0,723,
+1,41,4754,16,0,
+786,1,150,4755,19,
+729,1,150,4756,5,
+3,1,462,4757,16,
+0,727,1,459,4758,
+16,0,750,1,41,
+4759,16,0,750,1,
+151,4760,19,4761,4,
+36,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,1,151,4756,
+1,152,4762,19,630,
+1,152,4763,5,68,
+1,1901,4764,16,0,
+628,1,1479,4765,16,
+0,628,1,112,4766,
+16,0,628,1,2293,
+4767,16,0,628,1,
+1804,4768,16,0,628,
+1,431,4769,16,0,
+628,1,1443,4770,16,
+0,628,1,1756,4771,
+16,0,628,1,124,
+4772,16,0,628,1,
+525,4773,16,0,628,
+1,236,4774,16,0,
+628,1,346,4775,16,
+0,628,1,1876,4776,
+16,0,628,1,1659,
+4777,16,0,628,1,
+1225,4778,16,0,628,
+1,1117,4779,16,0,
+628,1,137,4780,16,
+0,628,1,2318,4781,
+16,0,628,1,1775,
+4782,16,0,628,1,
+32,4783,16,0,628,
+1,1407,4784,16,0,
+628,1,256,4785,16,
+0,628,1,459,4786,
+16,0,628,1,406,
+4787,16,0,628,1,
+41,4788,16,0,628,
+1,151,4789,16,0,
+628,1,43,4790,16,
+0,628,1,1585,4791,
+16,0,628,1,1990,
+4792,16,0,628,1,
+2337,4793,16,0,628,
+1,509,4794,16,0,
+628,1,52,4795,16,
+0,628,1,381,4796,
+16,0,628,1,447,
+4797,16,0,628,1,
+166,4798,16,0,628,
+1,462,4799,16,0,
+628,1,277,4800,16,
+0,628,1,1695,4801,
+16,0,628,1,2786,
+4802,16,0,628,1,
+62,4803,16,0,708,
+1,1153,4804,16,0,
+628,1,2106,4805,16,
+0,628,1,1335,4806,
+16,0,628,1,71,
+4807,16,0,628,1,
+182,4808,16,0,628,
+1,76,4809,16,0,
+628,1,79,4810,16,
+0,628,1,1933,4811,
+16,0,628,1,299,
+4812,16,0,628,1,
+85,4813,16,0,628,
+1,1515,4814,16,0,
+628,1,2198,4815,16,
+0,628,1,89,4816,
+16,0,628,1,1834,
+4817,16,0,628,1,
+1622,4818,16,0,628,
+1,2413,4819,16,0,
+628,1,2075,4820,16,
+0,628,1,1731,4821,
+16,0,628,1,97,
+4822,16,0,628,1,
+1297,4823,16,0,628,
+1,1189,4824,16,0,
+628,1,102,4825,16,
+0,628,1,1261,4826,
+16,0,628,1,322,
+4827,16,0,628,1,
+1958,4828,16,0,628,
+1,199,4829,16,0,
+628,1,1371,4830,16,
+0,628,1,217,4831,
+16,0,628,1,153,
+4832,19,4833,4,28,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,1,153,
+4763,1,154,4834,19,
+4835,4,32,82,0,
+111,0,116,0,97,
+0,116,0,105,0,
+111,0,110,0,67,
 0,111,0,110,0,
 115,0,116,0,97,
 0,110,0,116,0,
-1,154,4749,1,155,
-4824,19,188,1,155,
-4825,5,67,1,1901,
-4826,16,0,690,1,
-1479,4827,16,0,611,
-1,112,4828,16,0,
-276,1,2293,4829,16,
-0,302,1,1804,4830,
-16,0,690,1,431,
-4831,16,0,685,1,
-1443,4832,16,0,538,
-1,1756,4833,16,0,
-793,1,124,4834,16,
-0,283,1,525,4835,
-16,0,340,1,236,
-4836,16,0,377,1,
-346,4837,16,0,574,
-1,1876,4838,16,0,
-353,1,1659,4839,16,
-0,793,1,1225,4840,
-16,0,275,1,1117,
-4841,16,0,245,1,
-137,4842,16,0,301,
-1,2318,4843,16,0,
-793,1,1775,4844,16,
-0,690,1,32,4845,
-16,0,690,1,1407,
-4846,16,0,561,1,
-2782,4847,16,0,256,
-1,256,4848,16,0,
-431,1,459,4849,16,
-0,186,1,406,4850,
-16,0,649,1,41,
-4851,16,0,186,1,
-151,4852,16,0,315,
-1,43,4853,16,0,
-738,1,1990,4854,16,
-0,690,1,2337,4855,
-16,0,690,1,509,
-4856,16,0,762,1,
-52,4857,16,0,702,
-1,381,4858,16,0,
-629,1,447,4859,16,
-0,340,1,166,4860,
-16,0,329,1,462,
-4861,16,0,186,1,
-277,4862,16,0,476,
-1,1695,4863,16,0,
-298,1,1261,4864,16,
-0,313,1,1153,4865,
-16,0,193,1,2106,
-4866,16,0,690,1,
-1335,4867,16,0,362,
-1,71,4868,16,0,
-229,1,182,4869,16,
-0,340,1,76,4870,
-16,0,627,1,79,
-4871,16,0,244,1,
-1933,4872,16,0,443,
-1,299,4873,16,0,
-503,1,85,4874,16,
-0,526,1,1515,4875,
-16,0,644,1,2198,
-4876,16,0,690,1,
-89,4877,16,0,257,
-1,1834,4878,16,0,
-325,1,1622,4879,16,
-0,761,1,2413,4880,
-16,0,690,1,2075,
-4881,16,0,690,1,
-1731,4882,16,0,277,
-1,97,4883,16,0,
-447,1,1297,4884,16,
-0,364,1,1189,4885,
-16,0,243,1,102,
-4886,16,0,265,1,
-1585,4887,16,0,773,
-1,322,4888,16,0,
-530,1,1958,4889,16,
-0,690,1,199,4890,
-16,0,351,1,1371,
-4891,16,0,432,1,
-217,4892,16,0,361,
-1,156,4893,19,4894,
-4,36,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,156,
-4825,1,157,4895,19,
-4896,4,30,73,0,
-100,0,101,0,110,
+1,154,4763,1,155,
+4836,19,4837,4,24,
+76,0,105,0,115,
+0,116,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,1,
+155,4763,1,156,4838,
+19,185,1,156,4839,
+5,67,1,1901,4840,
+16,0,705,1,1479,
+4841,16,0,619,1,
+112,4842,16,0,273,
+1,2293,4843,16,0,
+306,1,1804,4844,16,
+0,705,1,431,4845,
+16,0,700,1,1443,
+4846,16,0,550,1,
+1756,4847,16,0,796,
+1,124,4848,16,0,
+285,1,525,4849,16,
+0,345,1,236,4850,
+16,0,387,1,346,
+4851,16,0,582,1,
+1876,4852,16,0,361,
+1,1659,4853,16,0,
+796,1,1225,4854,16,
+0,272,1,1117,4855,
+16,0,242,1,137,
+4856,16,0,305,1,
+2318,4857,16,0,796,
+1,1775,4858,16,0,
+705,1,32,4859,16,
+0,705,1,1407,4860,
+16,0,571,1,256,
+4861,16,0,441,1,
+459,4862,16,0,183,
+1,406,4863,16,0,
+662,1,41,4864,16,
+0,183,1,151,4865,
+16,0,317,1,43,
+4866,16,0,751,1,
+1990,4867,16,0,705,
+1,2337,4868,16,0,
+705,1,509,4869,16,
+0,774,1,52,4870,
+16,0,717,1,381,
+4871,16,0,639,1,
+447,4872,16,0,345,
+1,166,4873,16,0,
+332,1,462,4874,16,
+0,183,1,277,4875,
+16,0,488,1,1695,
+4876,16,0,302,1,
+2786,4877,16,0,254,
+1,1261,4878,16,0,
+316,1,1153,4879,16,
+0,190,1,2106,4880,
+16,0,705,1,1335,
+4881,16,0,372,1,
+71,4882,16,0,226,
+1,182,4883,16,0,
+345,1,76,4884,16,
+0,635,1,79,4885,
+16,0,241,1,1933,
+4886,16,0,453,1,
+299,4887,16,0,517,
+1,85,4888,16,0,
+541,1,1515,4889,16,
+0,657,1,2198,4890,
+16,0,705,1,89,
+4891,16,0,253,1,
+1834,4892,16,0,330,
+1,1622,4893,16,0,
+773,1,2413,4894,16,
+0,705,1,2075,4895,
+16,0,705,1,1731,
+4896,16,0,274,1,
+97,4897,16,0,457,
+1,1297,4898,16,0,
+374,1,1189,4899,16,
+0,240,1,102,4900,
+16,0,262,1,1585,
+4901,16,0,783,1,
+322,4902,16,0,543,
+1,1958,4903,16,0,
+705,1,199,4904,16,
+0,356,1,1371,4905,
+16,0,442,1,217,
+4906,16,0,368,1,
+157,4907,19,4908,4,
+36,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,157,4839,
+1,158,4909,19,4910,
+4,30,73,0,100,
+0,101,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,158,4839,
+1,159,4911,19,4912,
+4,36,73,0,100,
+0,101,0,110,0,
+116,0,68,0,111,
 0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,157,
-4825,1,158,4897,19,
-4898,4,36,73,0,
-100,0,101,0,110,
-0,116,0,68,0,
-111,0,116,0,69,
+0,110,0,1,159,
+4839,1,160,4913,19,
+4914,4,44,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,160,4839,
+1,161,4915,19,4916,
+4,32,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
-158,4825,1,159,4899,
-19,4900,4,44,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-67,0,97,0,108,
-0,108,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,159,
-4825,1,160,4901,19,
-4902,4,32,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
+161,4839,1,162,4917,
+19,4918,4,30,85,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+162,4839,1,163,4919,
+19,4920,4,36,84,
+0,121,0,112,0,
+101,0,99,0,97,
+0,115,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,160,4825,1,161,
-4903,19,4904,4,30,
-85,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
+1,163,4839,1,164,
+4921,19,4922,4,42,
+80,0,97,0,114,
+0,101,0,110,0,
+116,0,104,0,101,
+0,115,0,105,0,
+115,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,164,4839,
+1,165,4923,19,4924,
+4,56,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
 0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,161,4825,1,162,
-4905,19,4906,4,36,
-84,0,121,0,112,
-0,101,0,99,0,
-97,0,115,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,162,4825,1,
-163,4907,19,4908,4,
-42,80,0,97,0,
-114,0,101,0,110,
-0,116,0,104,0,
-101,0,115,0,105,
-0,115,0,69,0,
+109,0,101,0,110,
+0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,163,
-4825,1,164,4909,19,
-4910,4,56,73,0,
-110,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
-164,4825,1,166,4911,
-19,822,1,166,4255,
-1,167,4912,19,832,
-1,167,4255,1,168,
-4913,19,3549,1,168,
-4258,1,169,4914,19,
-3539,1,169,4258,1,
-170,4915,19,3544,1,
-170,4258,1,171,4916,
-19,3534,1,171,4258,
-1,172,4917,19,3520,
-1,172,4261,1,173,
-4918,19,3554,1,173,
-4261,1,174,4919,19,
-3514,1,174,4265,1,
-175,4920,19,3528,1,
-175,4265,1,176,4921,
-19,805,1,176,4269,
-1,177,4922,19,816,
-1,177,4269,1,178,
-4923,19,811,1,178,
-4273,1,179,4924,19,
-827,1,179,4273,1,
-180,4925,19,1835,1,
-180,4279,1,181,4926,
-19,1799,1,181,4279,
-1,182,4927,19,1830,
-1,182,4279,1,183,
-4928,19,1794,1,183,
-4279,1,184,4929,19,
-1825,1,184,4279,1,
-185,4930,19,1756,1,
-185,4279,1,186,4931,
-19,1820,1,186,4279,
-1,187,4932,19,1751,
-1,187,4279,1,188,
-4933,19,1815,1,188,
-4279,1,189,4934,19,
-1783,1,189,4279,1,
-190,4935,19,1810,1,
-190,4279,1,191,4936,
-19,1778,1,191,4279,
-1,192,4937,19,1805,
-1,192,4279,1,193,
-4938,19,1773,1,193,
-4279,1,194,4939,19,
-1878,1,194,4279,1,
-195,4940,19,1768,1,
-195,4279,1,196,4941,
-19,1872,1,196,4283,
-1,197,4942,19,1865,
-1,197,4289,1,198,
-4943,19,1841,1,198,
-4295,1,199,4944,19,
-1859,1,199,4301,1,
-200,4945,19,1853,1,
-200,4307,1,201,4946,
-19,1847,1,201,4313,
-1,202,4947,19,1789,
-1,202,4319,1,203,
-4948,19,1762,1,203,
-4325,1,204,4949,19,
-1941,1,204,4331,1,
-205,4950,19,1907,1,
-205,4331,1,206,4951,
-19,2302,1,206,4336,
-1,207,4952,19,2294,
-1,207,4339,1,208,
-4953,19,2327,1,208,
-4342,1,209,4954,19,
-2285,1,209,4345,1,
-210,4955,19,2279,1,
-210,4348,1,211,4956,
-19,2313,1,211,4351,
-1,212,4957,19,1239,
-1,212,4354,1,213,
-4958,19,1960,1,213,
-4373,1,214,4959,19,
-1886,1,214,4377,1,
-215,4960,19,1899,1,
-215,4384,1,216,4961,
-19,1913,1,216,4389,
-1,217,4962,19,1024,
-1,217,4461,1,218,
-4963,19,1008,1,218,
-4461,1,219,4964,19,
-1014,1,219,4484,1,
-220,4965,19,1002,1,
-220,4484,1,221,4966,
-19,1267,1,221,4500,
-1,222,4967,19,904,
-1,222,4487,1,223,
-4968,19,1019,1,223,
-4487,1,224,4969,19,
-899,1,224,4487,1,
-225,4970,19,924,1,
-225,4487,1,226,4971,
-19,893,1,226,4487,
-1,227,4972,19,887,
-1,227,4487,1,228,
-4973,19,882,1,228,
-4487,1,229,4974,19,
-877,1,229,4487,1,
-230,4975,19,871,1,
-230,4487,1,231,4976,
-19,866,1,231,4487,
-1,232,4977,19,861,
-1,232,4487,1,233,
-4978,19,856,1,233,
-4487,1,234,4979,19,
-851,1,234,4487,1,
-235,4980,19,1274,1,
-235,4572,1,236,4981,
-19,1413,1,236,4585,
-1,237,4982,19,1261,
-1,237,4598,1,238,
-4983,19,1401,1,238,
-4598,1,239,4984,19,
-1041,1,239,4611,1,
-240,4985,19,844,1,
-240,4611,1,241,4986,
-19,939,1,241,4611,
-1,242,4987,19,968,
-1,242,4611,1,243,
-4988,19,987,1,243,
-4624,1,244,4989,19,
-1033,1,244,4624,1,
-245,4990,19,947,1,
-245,4637,1,246,4991,
-19,961,1,246,4637,
-1,247,4992,19,913,
-1,247,4650,1,248,
-4993,19,952,1,248,
-4650,1,249,4994,19,
-1594,1,249,4663,1,
-250,4995,19,1280,1,
-250,4663,1,251,4996,
-19,1626,1,251,4663,
-1,252,4997,19,1658,
-1,252,4663,1,253,
-4998,19,1524,1,253,
-4513,1,254,4999,19,
-1583,1,254,4513,1,
-255,5000,19,1255,1,
-255,4526,1,256,5001,
-19,1690,1,256,4526,
-1,257,5002,19,1621,
-1,257,4526,1,258,
-5003,19,1568,1,258,
-4526,1,259,5004,19,
-1492,1,259,4526,1,
-260,5005,19,1423,1,
-260,4526,1,261,5006,
-19,1433,1,261,4526,
-1,262,5007,19,1250,
-1,262,4526,1,263,
-5008,19,1674,1,263,
-4526,1,264,5009,19,
-1616,1,264,4526,1,
-265,5010,19,1558,1,
-265,4526,1,266,5011,
-19,1481,1,266,4526,
-1,267,5012,19,1443,
-1,267,4526,1,268,
-5013,19,1233,1,268,
-4526,1,269,5014,19,
-1578,1,269,4526,1,
-270,5015,19,1604,1,
-270,4526,1,271,5016,
-19,1551,1,271,4526,
-1,272,5017,19,1573,
-1,272,4526,1,273,
-5018,19,1389,1,273,
-4526,1,274,5019,19,
-1293,1,274,4526,1,
-275,5020,19,1222,1,
-275,4526,1,276,5021,
-19,1648,1,276,4526,
-1,277,5022,19,1599,
-1,277,4526,1,278,
-5023,19,1546,1,278,
-4526,1,279,5024,19,
-1418,1,279,4559,1,
-280,5025,19,1396,1,
-280,4559,1,281,5026,
-19,1679,1,281,4749,
-1,282,5027,19,1708,
-1,282,4749,1,283,
-5028,19,1669,1,283,
-4749,1,284,5029,19,
-1664,1,284,4749,1,
-285,5030,19,1685,1,
-285,4749,1,286,5031,
-19,1632,1,286,4749,
-1,287,5032,19,1343,
-1,287,4749,1,288,
-5033,19,1513,1,288,
-4825,1,289,5034,19,
-1304,1,289,4825,1,
-290,5035,19,1311,1,
-290,4825,1,291,5036,
-19,1332,1,291,4825,
-1,292,5037,19,1327,
-1,292,4825,1,293,
-5038,19,1322,1,293,
-4825,1,294,5039,19,
-1317,1,294,4825,1,
-295,5040,19,1502,1,
-295,4825,1,296,5041,
-19,1530,1,296,4825,
-1,297,5042,19,1507,
-1,297,4825,1,298,
-5043,19,1497,1,298,
-4825,1,299,5044,19,
-1487,1,299,4825,1,
-300,5045,19,1470,1,
-300,4825,1,301,5046,
-19,1428,1,301,4825,
-1,302,5047,19,1337,
-1,302,4825,1,303,
-5048,19,1298,1,303,
-4825,1,304,5049,19,
-1245,1,304,4825,1,
-305,5050,19,1703,1,
-305,4825,1,306,5051,
-19,1653,1,306,4825,
-1,307,5052,19,1643,
-1,307,4825,1,308,
-5053,19,1638,1,308,
-4825,1,309,5054,19,
-1589,1,309,4825,1,
-310,5055,19,1563,1,
-310,4825,1,311,5056,
-19,1540,1,311,4825,
-1,312,5057,19,1535,
-1,312,4825,1,313,
-5058,19,1476,1,313,
-4825,1,314,5059,19,
-1451,1,314,4825,1,
-315,5060,19,1518,1,
-315,4825,1,316,5061,
-19,1610,1,316,4825,
-1,317,5062,19,1465,
-1,317,4825,1,318,
-5063,19,1458,1,318,
-4825,1,319,5064,19,
-1438,1,319,4825,1,
-320,5065,19,1407,1,
-320,4825,1,321,5066,
-19,1384,1,321,4825,
-1,322,5067,19,1228,
-1,322,4825,1,323,
-5068,19,1718,1,323,
-4825,1,324,5069,19,
-1349,1,324,4825,1,
-325,5070,19,1354,1,
-325,4825,1,326,5071,
-19,1374,1,326,4825,
-1,327,5072,19,1364,
-1,327,4825,1,328,
-5073,19,1369,1,328,
-4825,1,329,5074,19,
-1359,1,329,4825,1,
-330,5075,19,1713,1,
-330,4825,1,331,5076,
-19,1379,1,331,4825,
-1,332,5077,19,1698,
-1,332,4668,1,333,
-5078,19,1954,1,333,
-4738,1,334,5079,19,
-1947,1,334,4738,1,
-335,5080,19,1924,1,
-335,4742,1,336,5081,
-19,2270,1,336,4393,
-1,337,5082,19,2265,
-1,337,4393,1,338,
-5083,19,2260,1,338,
-4393,1,339,5084,19,
-2255,1,339,4393,1,
-340,5085,19,2250,1,
-340,4393,1,341,5086,
-19,2245,1,341,4393,
-1,342,5087,19,2240,
-1,342,4393,1,343,
-5088,19,2229,1,343,
-4413,1,344,5089,19,
-2224,1,344,4413,1,
-345,5090,19,2219,1,
-345,4413,1,346,5091,
-19,2214,1,346,4413,
-1,347,5092,19,2209,
-1,347,4413,1,348,
-5093,19,2204,1,348,
-4413,1,349,5094,19,
-2199,1,349,4413,1,
-350,5095,19,2194,1,
-350,4413,1,351,5096,
-19,2188,1,351,4419,
-1,352,5097,19,2014,
-1,352,4419,1,353,
-5098,19,2182,1,353,
-4419,1,354,5099,19,
-2177,1,354,4419,1,
-355,5100,19,2172,1,
-355,4419,1,356,5101,
-19,2007,1,356,4419,
-1,357,5102,19,2167,
-1,357,4419,1,358,
-5103,19,2162,1,358,
-4419,1,359,5104,19,
-2157,1,359,4425,1,
-360,5105,19,2152,1,
-360,4425,1,361,5106,
-19,2146,1,361,4431,
-1,362,5107,19,2141,
-1,362,4431,1,363,
-5108,19,1998,1,363,
-4431,1,364,5109,19,
-2135,1,364,4431,1,
-365,5110,19,2130,1,
-365,4431,1,366,5111,
-19,2125,1,366,4431,
-1,367,5112,19,1992,
-1,367,4431,1,368,
-5113,19,2119,1,368,
-4431,1,369,5114,19,
-2047,1,369,4431,1,
-370,5115,19,2114,1,
-370,4431,1,371,5116,
-19,2109,1,371,4437,
-1,372,5117,19,2104,
-1,372,4437,1,373,
-5118,19,2099,1,373,
-4437,1,374,5119,19,
-2093,1,374,4443,1,
-375,5120,19,2087,1,
-375,4449,1,376,5121,
-19,2081,1,376,4455,
-1,377,5122,19,5123,
-4,50,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
+0,110,0,1,165,
+4839,1,167,4925,19,
+830,1,167,4269,1,
+168,4926,19,808,1,
+168,4269,1,169,4927,
+19,3557,1,169,4272,
+1,170,4928,19,3547,
+1,170,4272,1,171,
+4929,19,3552,1,171,
+4272,1,172,4930,19,
+3542,1,172,4272,1,
+173,4931,19,3527,1,
+173,4275,1,174,4932,
+19,3562,1,174,4275,
+1,175,4933,19,3521,
+1,175,4279,1,176,
+4934,19,3535,1,176,
+4279,1,177,4935,19,
+814,1,177,4283,1,
+178,4936,19,825,1,
+178,4283,1,179,4937,
+19,820,1,179,4287,
+1,180,4938,19,835,
+1,180,4287,1,181,
+4939,19,1777,1,181,
+4293,1,182,4940,19,
+1881,1,182,4293,1,
+183,4941,19,1844,1,
+183,4293,1,184,4942,
+19,1765,1,184,4293,
+1,185,4943,19,1839,
+1,185,4293,1,186,
+4944,19,1802,1,186,
+4293,1,187,4945,19,
+1834,1,187,4293,1,
+188,4946,19,1797,1,
+188,4293,1,189,4947,
+19,1829,1,189,4293,
+1,190,4948,19,1792,
+1,190,4293,1,191,
+4949,19,1824,1,191,
+4293,1,192,4950,19,
+1760,1,192,4293,1,
+193,4951,19,1819,1,
+193,4293,1,194,4952,
+19,1787,1,194,4293,
+1,195,4953,19,1814,
+1,195,4293,1,196,
+4954,19,1782,1,196,
+4293,1,197,4955,19,
+1875,1,197,4297,1,
+198,4956,19,1862,1,
+198,4303,1,199,4957,
+19,1850,1,199,4309,
+1,200,4958,19,1809,
+1,200,4315,1,201,
+4959,19,1868,1,201,
+4321,1,202,4960,19,
+1856,1,202,4327,1,
+203,4961,19,1754,1,
+203,4333,1,204,4962,
+19,1771,1,204,4339,
+1,205,4963,19,1945,
+1,205,4345,1,206,
+4964,19,1904,1,206,
+4345,1,207,4965,19,
+2337,1,207,4350,1,
+208,4966,19,2308,1,
+208,4353,1,209,4967,
+19,2302,1,209,4356,
+1,210,4968,19,2294,
+1,210,4359,1,211,
+4969,19,2287,1,211,
+4362,1,212,4970,19,
+2319,1,212,4365,1,
+213,4971,19,1242,1,
+213,4368,1,214,4972,
+19,1964,1,214,4387,
+1,215,4973,19,1890,
+1,215,4391,1,216,
+4974,19,1931,1,216,
+4398,1,217,4975,19,
+1910,1,217,4403,1,
+218,4976,19,1027,1,
+218,4475,1,219,4977,
+19,1011,1,219,4475,
+1,220,4978,19,1017,
+1,220,4498,1,221,
+4979,19,1005,1,221,
+4498,1,222,4980,19,
+1270,1,222,4514,1,
+223,4981,19,907,1,
+223,4501,1,224,4982,
+19,1022,1,224,4501,
+1,225,4983,19,902,
+1,225,4501,1,226,
+4984,19,927,1,226,
+4501,1,227,4985,19,
+896,1,227,4501,1,
+228,4986,19,890,1,
+228,4501,1,229,4987,
+19,885,1,229,4501,
+1,230,4988,19,880,
+1,230,4501,1,231,
+4989,19,874,1,231,
+4501,1,232,4990,19,
+869,1,232,4501,1,
+233,4991,19,864,1,
+233,4501,1,234,4992,
+19,859,1,234,4501,
+1,235,4993,19,854,
+1,235,4501,1,236,
+4994,19,1277,1,236,
+4586,1,237,4995,19,
+1417,1,237,4599,1,
+238,4996,19,1264,1,
+238,4612,1,239,4997,
+19,1405,1,239,4612,
+1,240,4998,19,1044,
+1,240,4625,1,241,
+4999,19,847,1,241,
+4625,1,242,5000,19,
+942,1,242,4625,1,
+243,5001,19,971,1,
+243,4625,1,244,5002,
+19,990,1,244,4638,
+1,245,5003,19,1036,
+1,245,4638,1,246,
+5004,19,950,1,246,
+4651,1,247,5005,19,
+964,1,247,4651,1,
+248,5006,19,916,1,
+248,4664,1,249,5007,
+19,955,1,249,4664,
+1,250,5008,19,1603,
+1,250,4677,1,251,
+5009,19,1283,1,251,
+4677,1,252,5010,19,
+1635,1,252,4677,1,
+253,5011,19,1667,1,
+253,4677,1,254,5012,
+19,1532,1,254,4527,
+1,255,5013,19,1592,
+1,255,4527,1,256,
+5014,19,1258,1,256,
+4540,1,257,5015,19,
+1699,1,257,4540,1,
+258,5016,19,1630,1,
+258,4540,1,259,5017,
+19,1576,1,259,4540,
+1,260,5018,19,1500,
+1,260,4540,1,261,
+5019,19,1427,1,261,
+4540,1,262,5020,19,
+1437,1,262,4540,1,
+263,5021,19,1253,1,
+263,4540,1,264,5022,
+19,1683,1,264,4540,
+1,265,5023,19,1625,
+1,265,4540,1,266,
+5024,19,1566,1,266,
+4540,1,267,5025,19,
+1489,1,267,4540,1,
+268,5026,19,1453,1,
+268,4540,1,269,5027,
+19,1236,1,269,4540,
+1,270,5028,19,1586,
+1,270,4540,1,271,
+5029,19,1613,1,271,
+4540,1,272,5030,19,
+1559,1,272,4540,1,
+273,5031,19,1581,1,
+273,4540,1,274,5032,
+19,1393,1,274,4540,
+1,275,5033,19,1297,
+1,275,4540,1,276,
+5034,19,1225,1,276,
+4540,1,277,5035,19,
+1657,1,277,4540,1,
+278,5036,19,1608,1,
+278,4540,1,279,5037,
+19,1554,1,279,4540,
+1,280,5038,19,1422,
+1,280,4573,1,281,
+5039,19,1400,1,281,
+4573,1,282,5040,19,
+1688,1,282,4763,1,
+283,5041,19,1711,1,
+283,4763,1,284,5042,
+19,1678,1,284,4763,
+1,285,5043,19,1673,
+1,285,4763,1,286,
+5044,19,1694,1,286,
+4763,1,287,5045,19,
+1641,1,287,4763,1,
+288,5046,19,1347,1,
+288,4763,1,289,5047,
+19,1521,1,289,4839,
+1,290,5048,19,1308,
+1,290,4839,1,291,
+5049,19,1315,1,291,
+4839,1,292,5050,19,
+1336,1,292,4839,1,
+293,5051,19,1331,1,
+293,4839,1,294,5052,
+19,1326,1,294,4839,
+1,295,5053,19,1321,
+1,295,4839,1,296,
+5054,19,1510,1,296,
+4839,1,297,5055,19,
+1538,1,297,4839,1,
+298,5056,19,1515,1,
+298,4839,1,299,5057,
+19,1505,1,299,4839,
+1,300,5058,19,1495,
+1,300,4839,1,301,
+5059,19,1478,1,301,
+4839,1,302,5060,19,
+1432,1,302,4839,1,
+303,5061,19,1341,1,
+303,4839,1,304,5062,
+19,1302,1,304,4839,
+1,305,5063,19,1248,
+1,305,4839,1,306,
+5064,19,1706,1,306,
+4839,1,307,5065,19,
+1662,1,307,4839,1,
+308,5066,19,1652,1,
+308,4839,1,309,5067,
+19,1647,1,309,4839,
+1,310,5068,19,1598,
+1,310,4839,1,311,
+5069,19,1571,1,311,
+4839,1,312,5070,19,
+1548,1,312,4839,1,
+313,5071,19,1543,1,
+313,4839,1,314,5072,
+19,1484,1,314,4839,
+1,315,5073,19,1460,
+1,315,4839,1,316,
+5074,19,1526,1,316,
+4839,1,317,5075,19,
+1619,1,317,4839,1,
+318,5076,19,1473,1,
+318,4839,1,319,5077,
+19,1467,1,319,4839,
+1,320,5078,19,1448,
+1,320,4839,1,321,
+5079,19,1411,1,321,
+4839,1,322,5080,19,
+1388,1,322,4839,1,
+323,5081,19,1231,1,
+323,4839,1,324,5082,
+19,1721,1,324,4839,
+1,325,5083,19,1353,
+1,325,4839,1,326,
+5084,19,1358,1,326,
+4839,1,327,5085,19,
+1378,1,327,4839,1,
+328,5086,19,1368,1,
+328,4839,1,329,5087,
+19,1373,1,329,4839,
+1,330,5088,19,1363,
+1,330,4839,1,331,
+5089,19,1716,1,331,
+4839,1,332,5090,19,
+1383,1,332,4839,1,
+333,5091,19,1443,1,
+333,4682,1,334,5092,
+19,1958,1,334,4752,
+1,335,5093,19,1951,
+1,335,4752,1,336,
+5094,19,1921,1,336,
+4756,1,337,5095,19,
+2278,1,337,4407,1,
+338,5096,19,2273,1,
+338,4407,1,339,5097,
+19,2268,1,339,4407,
+1,340,5098,19,2263,
+1,340,4407,1,341,
+5099,19,2258,1,341,
+4407,1,342,5100,19,
+2253,1,342,4407,1,
+343,5101,19,2248,1,
+343,4407,1,344,5102,
+19,2237,1,344,4427,
+1,345,5103,19,2232,
+1,345,4427,1,346,
+5104,19,2227,1,346,
+4427,1,347,5105,19,
+2222,1,347,4427,1,
+348,5106,19,2217,1,
+348,4427,1,349,5107,
+19,2212,1,349,4427,
+1,350,5108,19,2207,
+1,350,4427,1,351,
+5109,19,2202,1,351,
+4427,1,352,5110,19,
+2197,1,352,4427,1,
+353,5111,19,2191,1,
+353,4433,1,354,5112,
+19,2019,1,354,4433,
+1,355,5113,19,2185,
+1,355,4433,1,356,
+5114,19,2180,1,356,
+4433,1,357,5115,19,
+2175,1,357,4433,1,
+358,5116,19,2012,1,
+358,4433,1,359,5117,
+19,2170,1,359,4433,
+1,360,5118,19,2165,
+1,360,4433,1,361,
+5119,19,2160,1,361,
+4439,1,362,5120,19,
+2155,1,362,4439,1,
+363,5121,19,2149,1,
+363,4445,1,364,5122,
+19,2144,1,364,4445,
+1,365,5123,19,2004,
+1,365,4445,1,366,
+5124,19,2138,1,366,
+4445,1,367,5125,19,
+2133,1,367,4445,1,
+368,5126,19,2128,1,
+368,4445,1,369,5127,
+19,1997,1,369,4445,
+1,370,5128,19,2122,
+1,370,4445,1,371,
+5129,19,2049,1,371,
+4445,1,372,5130,19,
+2117,1,372,4445,1,
+373,5131,19,2112,1,
+373,4451,1,374,5132,
+19,2107,1,374,4451,
+1,375,5133,19,2102,
+1,375,4451,1,376,
+5134,19,2096,1,376,
+4457,1,377,5135,19,
+2090,1,377,4463,1,
+378,5136,19,2084,1,
+378,4469,1,379,5137,
+19,5138,4,50,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+95,0,51,0,1,
+379,4345,1,380,5139,
+19,5140,4,28,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
 76,0,105,0,115,
 0,116,0,95,0,
-51,0,1,377,4331,
-1,378,5124,19,5125,
+51,0,1,380,4752,
+1,381,5141,19,5142,
 4,28,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
 0,116,0,76,0,
 105,0,115,0,116,
-0,95,0,51,0,
-1,378,4738,1,379,
-5126,19,5127,4,50,
+0,95,0,52,0,
+1,381,4752,1,382,
+5143,19,5144,4,50,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -12881,27 +12939,19 @@ public yyLSLSyntax
 0,110,0,76,0,
 105,0,115,0,116,
 0,95,0,52,0,
-1,379,4331,1,380,
-5128,19,5129,4,28,
+1,382,4345,1,383,
+5145,19,5146,4,50,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
-0,76,0,105,0,
-115,0,116,0,95,
-0,52,0,1,380,
-4738,1,381,5130,19,
-5131,4,50,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,95,
-0,53,0,1,381,
-4331,2,0,0};
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,95,0,53,0,
+1,383,4345,2,0,0};
 new Sfactory(this,"ExpressionArgument_1",new SCreator(ExpressionArgument_1_factory));
 new Sfactory(this,"VectorArgStateEvent",new SCreator(VectorArgStateEvent_factory));
 new Sfactory(this,"IntVecVecArgStateEvent",new SCreator(IntVecVecArgStateEvent_factory));
@@ -12998,7 +13048,7 @@ new Sfactory(this,"SimpleAssignment_22",new SCreator(SimpleAssignment_22_factory
 new Sfactory(this,"KeyIntIntArgStateEvent",new SCreator(KeyIntIntArgStateEvent_factory));
 new Sfactory(this,"TypecastExpression_9",new SCreator(TypecastExpression_9_factory));
 new Sfactory(this,"VoidArgEvent_2",new SCreator(VoidArgEvent_2_factory));
-new Sfactory(this,"VoidArgEvent_3",new SCreator(VoidArgEvent_3_factory));
+new Sfactory(this,"Event_9",new SCreator(Event_9_factory));
 new Sfactory(this,"ArgumentDeclarationList_1",new SCreator(ArgumentDeclarationList_1_factory));
 new Sfactory(this,"ArgumentDeclarationList_2",new SCreator(ArgumentDeclarationList_2_factory));
 new Sfactory(this,"GlobalDefinitions_1",new SCreator(GlobalDefinitions_1_factory));
@@ -13142,6 +13192,7 @@ new Sfactory(this,"BinaryExpression_13",new SCreator(BinaryExpression_13_factory
 new Sfactory(this,"GlobalFunctionDefinition_2",new SCreator(GlobalFunctionDefinition_2_factory));
 new Sfactory(this,"StateChange_2",new SCreator(StateChange_2_factory));
 new Sfactory(this,"VoidArgEvent_1",new SCreator(VoidArgEvent_1_factory));
+new Sfactory(this,"VoidArgEvent_3",new SCreator(VoidArgEvent_3_factory));
 new Sfactory(this,"BinaryExpression_10",new SCreator(BinaryExpression_10_factory));
 new Sfactory(this,"VoidArgEvent_5",new SCreator(VoidArgEvent_5_factory));
 new Sfactory(this,"VoidArgEvent_6",new SCreator(VoidArgEvent_6_factory));
@@ -13285,7 +13336,7 @@ public static object SimpleAssignment_22_factory(Parser yyp) { return new Simple
 public static object KeyIntIntArgStateEvent_factory(Parser yyp) { return new KeyIntIntArgStateEvent(yyp); }
 public static object TypecastExpression_9_factory(Parser yyp) { return new TypecastExpression_9(yyp); }
 public static object VoidArgEvent_2_factory(Parser yyp) { return new VoidArgEvent_2(yyp); }
-public static object VoidArgEvent_3_factory(Parser yyp) { return new VoidArgEvent_3(yyp); }
+public static object Event_9_factory(Parser yyp) { return new Event_9(yyp); }
 public static object ArgumentDeclarationList_1_factory(Parser yyp) { return new ArgumentDeclarationList_1(yyp); }
 public static object ArgumentDeclarationList_2_factory(Parser yyp) { return new ArgumentDeclarationList_2(yyp); }
 public static object GlobalDefinitions_1_factory(Parser yyp) { return new GlobalDefinitions_1(yyp); }
@@ -13429,6 +13480,7 @@ public static object BinaryExpression_13_factory(Parser yyp) { return new Binary
 public static object GlobalFunctionDefinition_2_factory(Parser yyp) { return new GlobalFunctionDefinition_2(yyp); }
 public static object StateChange_2_factory(Parser yyp) { return new StateChange_2(yyp); }
 public static object VoidArgEvent_1_factory(Parser yyp) { return new VoidArgEvent_1(yyp); }
+public static object VoidArgEvent_3_factory(Parser yyp) { return new VoidArgEvent_3(yyp); }
 public static object BinaryExpression_10_factory(Parser yyp) { return new BinaryExpression_10(yyp); }
 public static object VoidArgEvent_5_factory(Parser yyp) { return new VoidArgEvent_5(yyp); }
 public static object VoidArgEvent_6_factory(Parser yyp) { return new VoidArgEvent_6(yyp); }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
index 815d11b..3eaaed0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 275b608..49df5e7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -52,6 +52,7 @@ using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Region.ScriptEngine.Shared.CodeTools;
 using OpenSim.Region.ScriptEngine.Interfaces;
+using System.Diagnostics;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Instance
 {
@@ -59,6 +60,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        public bool StatePersistedHere { get { return m_AttachedAvatar == UUID.Zero; } }
+
         /// <summary>
         /// The current work item if an event for this script is running or waiting to run,
         /// </summary>
@@ -72,14 +75,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         private bool m_TimerQueued;
         private DateTime m_EventStart;
         private bool m_InEvent;
-        private string m_Assembly;
+        private string m_assemblyPath;
+        private string m_dataPath;
         private string m_CurrentEvent = String.Empty;
         private bool m_InSelfDelete;
         private int m_MaxScriptQueue;
-        private bool m_SaveState = true;
+        private bool m_SaveState;
         private int m_ControlEventsInQueue;
         private int m_LastControlLevel;
         private bool m_CollisionInQueue;
+        private bool m_StateChangeInProgress;
 
         // The following is for setting a minimum delay between events
         private double m_minEventDelay;
@@ -96,6 +101,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public int DebugLevel { get; set; }
 
+        public WaitHandle CoopWaitHandle { get; private set; }
+        public Stopwatch ExecutionTimer { get; private set; }
+
         public Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> LineMap { get; set; }
 
         private Dictionary<string,IScriptApi> m_Apis = new Dictionary<string,IScriptApi>();
@@ -122,7 +130,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             }
         }
 
-        public bool Running { get; set; }
+        public bool Running
+        {
+            get { return m_running; }
+
+            set
+            {
+                m_running = value;
+                if (m_running)
+                    StayStopped = false;
+            }
+        }
+        private bool m_running;
 
         public bool Suspended
         {
@@ -154,6 +173,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public string State { get; set; }
 
+        public bool StayStopped { get; set; }
+
         public IScriptEngine Engine { get; private set; }
 
         public UUID AppDomain { get; set; }
@@ -195,11 +216,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public DateTime TimeStarted { get; private set; }
 
-        public long MeasurementPeriodTickStart { get; private set; }
-
-        public long MeasurementPeriodExecutionTime { get; private set; }
+        public MetricsCollectorTime ExecutionTime { get; private set; }
 
-        public static readonly long MaxMeasurementPeriod = 30 * TimeSpan.TicksPerMinute;
+        private static readonly int MeasurementWindow = 30 * 1000;   // show the *recent* time used by the script, to find currently active scripts
 
         private bool m_coopTermination;
  
@@ -208,6 +227,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         public void ClearQueue()
         {
             m_TimerQueued = false;
+            m_StateChangeInProgress = false;
             EventQueue.Clear();
         }
 
@@ -218,6 +238,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         {
             State = "default";
             EventQueue = new Queue(32);
+            ExecutionTimer = new Stopwatch();
 
             Engine = engine;
             Part = part;
@@ -240,11 +261,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             m_AttachedAvatar = part.ParentGroup.AttachedAvatar;
             m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID;
 
-            if (Engine.Config.GetString("ScriptStopStrategy", "abort") == "co-op")
-            {
-                m_coopTermination = true;
-                m_coopSleepHandle = new XEngineEventWaitHandle(false, EventResetMode.AutoReset);
-            }
+            m_SaveState = StatePersistedHere;
+
+            ExecutionTime = new MetricsCollectorTime(MeasurementWindow, 10);
+
+//            m_log.DebugFormat(
+//                "[SCRIPT INSTANCE]: Instantiated script instance {0} (id {1}) in part {2} (id {3}) in object {4} attached avatar {5} in {6}",
+//                ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, m_AttachedAvatar, Engine.World.Name);
         }
 
         /// <summary>
@@ -252,86 +275,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         /// </summary>
         /// <param name='dom'></param>
         /// <param name='assembly'></param>
+        /// <param name='dataPath'>
+        /// Path for all script associated data (state, etc.).  In a multi-region set up
+        /// with all scripts loading into the same AppDomain this may not be the same place as the DLL itself.
+        /// </param>
         /// <param name='stateSource'></param>
         /// <returns>false if load failed, true if suceeded</returns>
-        public bool Load(AppDomain dom, string assembly, StateSource stateSource)
+        public bool Load(
+            IScript script, EventWaitHandle coopSleepHandle, string assemblyPath, 
+            string dataPath, StateSource stateSource, bool coopTermination)
         {
-            m_Assembly = assembly;
+            m_Script = script;
+            m_coopSleepHandle = coopSleepHandle;
+            m_assemblyPath = assemblyPath;
+            m_dataPath = dataPath;
             m_stateSource = stateSource;
+            m_coopTermination = coopTermination;
+
+            if (m_coopTermination)
+                CoopWaitHandle = coopSleepHandle;
+            else
+                CoopWaitHandle = null;
 
             ApiManager am = new ApiManager();
 
             foreach (string api in am.GetApis())
             {
                 m_Apis[api] = am.CreateApi(api);
-                m_Apis[api].Initialize(Engine, Part, ScriptTask, m_coopSleepHandle);
-            }
-    
-            try
-            {
-                object[] constructorParams;
-
-                Assembly scriptAssembly = dom.Load(Path.GetFileNameWithoutExtension(assembly));
-                Type scriptType = scriptAssembly.GetType("SecondLife.XEngineScript");
-
-                if (scriptType != null)
-                {
-                    constructorParams = new object[] { m_coopSleepHandle };
-                }
-                else if (!m_coopTermination)
-                {
-                    scriptType = scriptAssembly.GetType("SecondLife.Script");
-                    constructorParams = null;
-                }
-                else
-                {
-                    m_log.ErrorFormat(
-                        "[SCRIPT INSTANCE]: Not starting script {0} (id {1}) in part {2} (id {3}) in object {4} in {5}.  You must remove all existing {6}* script DLL files before using enabling co-op termination"
-                        + ", either by setting DeleteScriptsOnStartup = true in [XEngine] for one run"
-                        + " or by deleting these files manually.",
-                        ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name, assembly);
-
-                    return false;
-                }
-
-//                m_log.DebugFormat(
-//                    "[SCRIPT INSTANCE]: Looking to load {0} from assembly {1} in {2}", 
-//                    scriptType.FullName, Path.GetFileNameWithoutExtension(assembly), Engine.World.Name);
-
-                if (dom != System.AppDomain.CurrentDomain)
-                    m_Script 
-                        = (IScript)dom.CreateInstanceAndUnwrap(
-                            Path.GetFileNameWithoutExtension(assembly),
-                            scriptType.FullName,
-                            false,
-                            BindingFlags.Default,
-                            null,
-                            constructorParams,
-                            null,
-                            null,
-                            null);
-                else
-                    m_Script 
-                        = (IScript)scriptAssembly.CreateInstance(
-                            scriptType.FullName, 
-                            false, 
-                            BindingFlags.Default, 
-                            null, 
-                            constructorParams, 
-                            null, 
-                            null);
-
-                //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
-                //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
-//                lease.Register(this);
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat(
-                    "[SCRIPT INSTANCE]: Not starting script {0} (id {1}) in part {2} (id {3}) in object {4} in {5}.  Error loading assembly {6}.  Exception {7}{8}",
-                    ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name, assembly, e.Message, e.StackTrace);
-
-                return false;
+                m_Apis[api].Initialize(Engine, Part, ScriptTask);
             }
 
             try
@@ -341,10 +312,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     m_Script.InitApi(kv.Key, kv.Value);
                 }
 
-//                // m_log.Debug("[Script] Script instance created");
+                //                // m_log.Debug("[Script] Script instance created");
 
-                Part.SetScriptEvents(ItemID,
-                                     (int)m_Script.GetStateEventFlags(State));
+                Part.SetScriptEvents(ItemID, (int)m_Script.GetStateEventFlags(State));
             }
             catch (Exception e)
             {
@@ -355,12 +325,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 return false;
             }
 
-            m_SaveState = true;
+            // For attachments, XEngine saves the state into a .state file when XEngine.SetXMLState() is called.           
+            string savedState = Path.Combine(m_dataPath, ItemID.ToString() + ".state");
 
-            string savedState = Path.Combine(Path.GetDirectoryName(assembly),
-                    ItemID.ToString() + ".state");
             if (File.Exists(savedState))
             {
+                //                m_log.DebugFormat(
+                //                    "[SCRIPT INSTANCE]: Found state for script {0} for {1} ({2}) at {3} in {4}", 
+                //                    ItemID, savedState, Part.Name, Part.ParentGroup.Name, Part.ParentGroup.Scene.Name);
+
                 string xml = String.Empty;
 
                 try
@@ -380,13 +353,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                             ScriptSerializer.Deserialize(xml, this);
 
                             AsyncCommandManager.CreateFromData(Engine,
-                                LocalID, ItemID, ObjectID,
-                                PluginData);
+                                                               LocalID, ItemID, ObjectID,
+                                                               PluginData);
 
-//                            m_log.DebugFormat("[Script] Successfully retrieved state for script {0}.{1}", PrimName, m_ScriptName);
+                            //                            m_log.DebugFormat("[Script] Successfully retrieved state for script {0}.{1}", PrimName, m_ScriptName);
 
                             Part.SetScriptEvents(ItemID,
-                                    (int)m_Script.GetStateEventFlags(State));
+                                                 (int)m_Script.GetStateEventFlags(State));
 
                             if (!Running)
                                 m_startOnInit = false;
@@ -401,29 +374,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                             m_SaveState = false;
                             m_startedFromSavedState = true;
                         }
+
+                        // If this script is in an attachment then we no longer need the state file.
+                        if (!StatePersistedHere)
+                            RemoveState();
                     }
-                    else
-                    {
-                        m_log.WarnFormat(
-                            "[SCRIPT INSTANCE]: Not starting script {0} (id {1}) in part {2} (id {3}) in object {4} in {5}.  Unable to load script state file {6}.  Memory limit exceeded.",
-                            ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name, savedState);
-                    }
+                    //                    else
+                    //                    {
+                    //                        m_log.WarnFormat(
+                    //                            "[SCRIPT INSTANCE]: Not starting script {0} (id {1}) in part {2} (id {3}) in object {4} in {5}.  Unable to load script state file {6}.  Memory limit exceeded.",
+                    //                            ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name, savedState);
+                    //                    }
                 }
                 catch (Exception e)
                 {
-                     m_log.ErrorFormat(
-                         "[SCRIPT INSTANCE]: Not starting script {0} (id {1}) in part {2} (id {3}) in object {4} in {5}.  Unable to load script state file {6}.  XML is {7}.  Exception {8}{9}",
-                         ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name, savedState, xml, e.Message, e.StackTrace);
+                    m_log.ErrorFormat(
+                        "[SCRIPT INSTANCE]: Not starting script {0} (id {1}) in part {2} (id {3}) in object {4} in {5}.  Unable to load script state file {6}.  XML is {7}.  Exception {8}{9}",
+                        ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name, savedState, xml, e.Message, e.StackTrace);
                 }
             }
-//            else
-//            {
-//                ScenePresence presence = Engine.World.GetScenePresence(part.OwnerID);
-
-//                if (presence != null && (!postOnRez))
-//                    presence.ControllingClient.SendAgentAlertMessage("Compile successful", false);
-
-//            }
+            //            else
+            //            {
+            //                m_log.DebugFormat(
+            //                    "[SCRIPT INSTANCE]: Did not find state for script {0} for {1} ({2}) at {3} in {4}", 
+            //                    ItemID, savedState, Part.Name, Part.ParentGroup.Name, Part.ParentGroup.Scene.Name);
+            //            }
 
             return true;
         }
@@ -522,8 +497,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public void RemoveState()
         {
-            string savedState = Path.Combine(Path.GetDirectoryName(m_Assembly),
-                    ItemID.ToString() + ".state");
+            string savedState = Path.Combine(m_dataPath, ItemID.ToString() + ".state");
+
+//            m_log.DebugFormat(
+//                "[SCRIPT INSTANCE]: Deleting state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}.",
+//                savedState, ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name);
 
             try
             {
@@ -558,8 +536,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 Running = true;
 
                 TimeStarted = DateTime.Now;
-                MeasurementPeriodTickStart = Util.EnvironmentTickCount();
-                MeasurementPeriodExecutionTime = 0;
+
+                // Note: we don't reset ExecutionTime. The reason is that runaway scripts are stopped and restarted
+                // automatically, and we *do* want to show that they had high CPU in that case. If we had reset
+                // ExecutionTime here then runaway scripts, paradoxically, would never show up in the "Top Scripts" dialog.
 
                 if (EventQueue.Count > 0)
                 {
@@ -571,7 +551,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             }
         }
 
-        public bool Stop(int timeout)
+        public bool Stop(int timeout, bool clearEventQueue = false)
         {
             if (DebugLevel >= 1)
                 m_log.DebugFormat(
@@ -582,6 +562,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             lock (EventQueue)
             {
+                if (clearEventQueue)
+                    ClearQueue();
+
                 if (!Running)
                     return true;
 
@@ -671,6 +654,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             if (state == State)
                 return;
 
+<<<<<<< HEAD
+            EventParams lastTimerEv = null;
+
+            lock (EventQueue)
+            {
+                // Remove all queued events, remembering the last timer event
+                while (EventQueue.Count > 0)
+                {
+                    EventParams tempv = (EventParams)EventQueue.Dequeue();
+                    if (tempv.EventName == "timer") lastTimerEv = tempv;
+                }
+
+                // Post events
+                PostEvent(new EventParams("state_exit", new Object[0],
+                                           new DetectParams[0]));
+                PostEvent(new EventParams("state", new Object[] { state },
+                                           new DetectParams[0]));
+                PostEvent(new EventParams("state_entry", new Object[0],
+                                           new DetectParams[0]));
+
+                // Requeue the timer event after the state changing events
+                if (lastTimerEv != null) EventQueue.Enqueue(lastTimerEv);
+
+                // This will stop events from being queued and processed
+                // until the new state is started
+                m_StateChangeInProgress = true;
+            }
+
+=======
             PostEvent(new EventParams("state_exit", new Object[0],
                                        new DetectParams[0]));
             PostEvent(new EventParams("state", new Object[] { state },
@@ -678,6 +690,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             PostEvent(new EventParams("state_entry", new Object[0],
                                        new DetectParams[0]));
             
+>>>>>>> avn/ubitvar
             throw new EventAbortException();
         }
 
@@ -708,6 +721,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             lock (EventQueue)
             {
+                // The only events that persist across state changes are timers
+                if (m_StateChangeInProgress && data.EventName != "timer") 
+                    return;
+
                 if (EventQueue.Count >= m_MaxScriptQueue)
                     return;
 
@@ -774,12 +791,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
 //                m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName);
 
+<<<<<<< HEAD
+                if (Suspended)
+                    return 0;
+
+                ExecutionTimer.Restart();
+                
+                try
+                {
+                    return EventProcessorInt();
+                }
+                finally
+                {
+                    ExecutionTimer.Stop();
+                    ExecutionTime.AddSample(ExecutionTimer);
+                    Part.ParentGroup.Scene.AddScriptExecutionTime(ExecutionTimer.ElapsedTicks);
+                }
+            }
+        }
+
+        private object EventProcessorInt()
+        {
+            EventParams data = null;
+
+            lock (EventQueue)
+            {
+                data = (EventParams)EventQueue.Dequeue();
+=======
             if (Suspended)
                 return 0;
 
             lock (EventQueue)
             {
                 data = (EventParams) EventQueue.Dequeue();
+>>>>>>> avn/ubitvar
                 if (data == null) // Shouldn't happen
                 {
                     if (EventQueue.Count > 0 && Running && !ShuttingDown)
@@ -804,6 +849,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     m_CollisionInQueue = false;
             }
 
+<<<<<<< HEAD
+            if (DebugLevel >= 2)
+                m_log.DebugFormat(
+                    "[SCRIPT INSTANCE]: Processing event {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}",
+                    data.EventName,
+                    ScriptName,
+                    Part.Name,
+                    Part.LocalId,
+                    Part.ParentGroup.Name,
+                    Part.ParentGroup.UUID,
+                    Part.AbsolutePosition,
+                    Part.ParentGroup.Scene.Name);
+
+            m_DetectParams = data.DetectParams;
+
+            if (data.EventName == "state") // Hardcoded state change
+            {
+                State = data.Params[0].ToString();
+
+                if (DebugLevel >= 1)
+                    m_log.DebugFormat(
+                        "[SCRIPT INSTANCE]: Changing state to {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}",
+                        State,
+                        ScriptName,
+                        Part.Name,
+                        Part.LocalId,
+                        Part.ParentGroup.Name,
+                        Part.ParentGroup.UUID,
+                        Part.AbsolutePosition,
+                        Part.ParentGroup.Scene.Name);
+=======
             lock(m_Script)
             {
                 
@@ -821,13 +897,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                         part.ParentGroup.UUID, 
                         part.AbsolutePosition, 
                         part.ParentGroup.Scene.Name);
+>>>>>>> avn/ubitvar
 
-                m_DetectParams = data.DetectParams;
+                AsyncCommandManager.StateChange(Engine,
+                    LocalID, ItemID);
+                // we are effectively in the new state now, so we can resume queueing
+                // and processing other non-timer events
+                m_StateChangeInProgress = false;
 
-                if (data.EventName == "state") // Hardcoded state change
+                Part.SetScriptEvents(ItemID, (int)m_Script.GetStateEventFlags(State));
+            }
+            else
+            {
+                if (Engine.World.PipeEventsForScript(LocalID) ||
+                    data.EventName == "control") // Don't freeze avies!
                 {
-                    State = data.Params[0].ToString();
+                    //                        m_log.DebugFormat("[Script] Delivered event {2} in state {3} to {0}.{1}",
+                    //                                PrimName, ScriptName, data.EventName, State);
 
+<<<<<<< HEAD
+                    try
+=======
                     if (DebugLevel >= 1)
                         m_log.DebugFormat(
                             "[SCRIPT INSTANCE]: Changing state to {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}", 
@@ -853,41 +943,68 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 {
                     if (Engine.World.PipeEventsForScript(LocalID) ||
                         data.EventName == "control") // Don't freeze avies!
+>>>>>>> avn/ubitvar
                     {
-        //                m_log.DebugFormat("[Script] Delivered event {2} in state {3} to {0}.{1}",
-        //                        PrimName, ScriptName, data.EventName, State);
+                        m_CurrentEvent = data.EventName;
+                        m_EventStart = DateTime.Now;
+                        m_InEvent = true;
 
                         try
                         {
-                            m_CurrentEvent = data.EventName;
-                            m_EventStart = DateTime.Now;
-                            m_InEvent = true;
-
-                            int start = Util.EnvironmentTickCount();
-
-                            // Reset the measurement period when we reach the end of the current one.
-                            if (start - MeasurementPeriodTickStart > MaxMeasurementPeriod)
-                                MeasurementPeriodTickStart = start;
-
                             m_Script.ExecuteEvent(State, data.EventName, data.Params);
-
-                            MeasurementPeriodExecutionTime += Util.EnvironmentTickCount() - start;
-
+                        }
+                        finally
+                        {
                             m_InEvent = false;
                             m_CurrentEvent = String.Empty;
+                        }
 
-                            if (m_SaveState)
-                            {
-                                // This will be the very first event we deliver
-                                // (state_entry) in default state
-                                //
-                                SaveState(m_Assembly);
+                        if (m_SaveState)
+                        {
+                            // This will be the very first event we deliver
+                            // (state_entry) in default state
+                            //
+                            SaveState();
 
-                                m_SaveState = false;
-                            }
+                            m_SaveState = false;
                         }
-                        catch (Exception e)
+                    }
+                    catch (Exception e)
+                    {
+                        //                            m_log.DebugFormat(
+                        //                                "[SCRIPT] Exception in script {0} {1}: {2}{3}",
+                        //                                ScriptName, ItemID, e.Message, e.StackTrace);
+
+                        if ((!(e is TargetInvocationException)
+                            || (!(e.InnerException is SelfDeleteException)
+                                && !(e.InnerException is ScriptDeleteException)
+                                && !(e.InnerException is ScriptCoopStopException)))
+                            && !(e is ThreadAbortException))
                         {
+<<<<<<< HEAD
+                            try
+                            {
+                                // DISPLAY ERROR INWORLD
+                                string text = FormatException(e);
+
+                                if (text.Length > 1000)
+                                    text = text.Substring(0, 1000);
+                                Engine.World.SimChat(Utils.StringToBytes(text),
+                                                       ChatTypeEnum.DebugChannel, 2147483647,
+                                                       Part.AbsolutePosition,
+                                                       Part.Name, Part.UUID, false);
+
+
+                                m_log.Debug(string.Format(
+                                    "[SCRIPT INSTANCE]: Runtime error in script {0} (event {1}), part {2} {3} at {4} in {5} ",
+                                    ScriptName,
+                                    data.EventName,
+                                    PrimName,
+                                    Part.UUID,
+                                    Part.AbsolutePosition,
+                                    Part.ParentGroup.Scene.Name),
+                                    e);
+=======
 //                            m_log.DebugFormat(
 //                                "[SCRIPT] Exception in script {0} {1}: {2}{3}",
 //                                ScriptName, ItemID, e.Message, e.StackTrace);
@@ -942,9 +1059,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                                 m_InSelfDelete = true;
                                 if (part != null)
                                     Engine.World.DeleteSceneObject(part.ParentGroup, false);
+>>>>>>> avn/ubitvar
                             }
-                            else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException))
+                            catch (Exception)
                             {
+<<<<<<< HEAD
+=======
                                 m_InSelfDelete = true;
                                 if (part != null)
                                     part.Inventory.RemoveInventoryItem(ItemID);
@@ -955,31 +1075,68 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                                     m_log.DebugFormat(
                                         "[SCRIPT INSTANCE]: Script {0}.{1} in event {2}, state {3} stopped co-operatively.",
                                         PrimName, ScriptName, data.EventName, State);
+>>>>>>> avn/ubitvar
                             }
+                            // catch (Exception e2) // LEGIT: User Scripting
+                            // {
+                            // m_log.Error("[SCRIPT]: "+
+                            //           "Error displaying error in-world: " +
+                            //         e2.ToString());
+                            //    m_log.Error("[SCRIPT]: " +
+                            //              "Errormessage: Error compiling script:\r\n" +
+                            //            e.ToString());
+                            // }
+                        }
+                        else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
+                        {
+                            m_InSelfDelete = true;
+                            Engine.World.DeleteSceneObject(Part.ParentGroup, false);
+                        }
+                        else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException))
+                        {
+                            m_InSelfDelete = true;
+                            Part.Inventory.RemoveInventoryItem(ItemID);
+                        }
+                        else if ((e is TargetInvocationException) && (e.InnerException is ScriptCoopStopException))
+                        {
+                            if (DebugLevel >= 1)
+                                m_log.DebugFormat(
+                                    "[SCRIPT INSTANCE]: Script {0}.{1} in event {2}, state {3} stopped co-operatively.",
+                                    PrimName, ScriptName, data.EventName, State);
                         }
                     }
                 }
+            }
 
-                // If there are more events and we are currently running and not shutting down, then ask the
-                // script engine to run the next event.
-                lock (EventQueue)
+            // If there are more events and we are currently running and not shutting down, then ask the
+            // script engine to run the next event.
+            lock (EventQueue)
+            {
+                // Increase processed events counter and prevent wrap;
+                if (++EventsProcessed == 1000000)
+                    EventsProcessed = 100000;
+
+                if ((EventsProcessed % 100000) == 0 && DebugLevel > 0)
                 {
-                    EventsProcessed++;
+                    m_log.DebugFormat("[SCRIPT INSTANCE]: Script \"{0}\" (Object \"{1}\" {2} @ {3}.{4}, Item ID {5}, Asset {6}) in event {7}: processed {8:n0} script events",
+                                    ScriptTask.Name,
+                                    Part.ParentGroup.Name, Part.ParentGroup.UUID, Part.ParentGroup.AbsolutePosition, Part.ParentGroup.Scene.Name,
+                                    ScriptTask.ItemID, ScriptTask.AssetID, data.EventName, EventsProcessed);
+                }
 
-                    if (EventQueue.Count > 0 && Running && !ShuttingDown)
-                    {
-                        m_CurrentWorkItem = Engine.QueueEventHandler(this);
-                    }
-                    else
-                    {
-                        m_CurrentWorkItem = null;
-                    }
+                if (EventQueue.Count > 0 && Running && !ShuttingDown)
+                {
+                    m_CurrentWorkItem = Engine.QueueEventHandler(this);
+                }
+                else
+                {
+                    m_CurrentWorkItem = null;
                 }
+            }
 
-                m_DetectParams = null;
+            m_DetectParams = null;
 
-                return 0;
-            }
+            return 0;
         }
 
         public int EventTime()
@@ -1008,13 +1165,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID);
             EventQueue.Clear();
             m_Script.ResetVars();
+            StartParam = 0;
             State = "default";
 
             part.SetScriptEvents(ItemID,
                                  (int)m_Script.GetStateEventFlags(State));
             if (running)
                 Start();
-            m_SaveState = true;
+
+            m_SaveState = StatePersistedHere;
+
             PostEvent(new EventParams("state_entry",
                     new Object[0], new DetectParams[0]));
         }
@@ -1036,14 +1196,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             EventQueue.Clear();
             m_Script.ResetVars();
+            string oldState = State;
+            StartParam = 0;
             State = "default";
 
             part.SetScriptEvents(ItemID,
                                  (int)m_Script.GetStateEventFlags(State));
 
-            if (m_CurrentEvent != "state_entry")
+            if (m_CurrentEvent != "state_entry" || oldState != "default")
             {
-                m_SaveState = true;
+                m_SaveState = StatePersistedHere;
                 PostEvent(new EventParams("state_entry",
                         new Object[0], new DetectParams[0]));
                 throw new EventAbortException();
@@ -1057,6 +1219,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public void SetVars(Dictionary<string, object> vars)
         {
+//            foreach (KeyValuePair<string, object> kvp in vars)
+//                m_log.DebugFormat("[SCRIPT INSTANCE]: Setting var {0}={1}", kvp.Key, kvp.Value);
+
             m_Script.SetVars(vars);
         }
 
@@ -1080,42 +1245,63 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             return m_DetectParams[idx].Key;
         }
 
-        public void SaveState(string assembly)
+        public void SaveState()
         {
-            // If we're currently in an event, just tell it to save upon return
-            //
-            if (m_InEvent)
-            {
-                m_SaveState = true;
+            if (!Running && !StayStopped)
                 return;
-            }
 
+            // We cannot call this inside the EventQueue lock since it will currently take AsyncCommandManager.staticLock.
+            // This may already be held by AsyncCommandManager.DoOneCmdHandlerPass() which in turn can take EventQueue
+            // lock via ScriptInstance.PostEvent().
             PluginData = AsyncCommandManager.GetSerializationData(Engine, ItemID);
 
-            string xml = ScriptSerializer.Serialize(this);
-
-            // Compare hash of the state we just just created with the state last written to disk
-            // If the state is different, update the disk file.
-            UUID hash = UUID.Parse(Utils.MD5String(xml));
-
-            if (hash != m_CurrentStateHash)
+            // We need to lock here to avoid any race with a thread that is removing this script.
+            lock (EventQueue)
             {
-                try
+                // Check again to avoid a race with a thread in Stop()
+                if (!Running && !StayStopped)
+                    return;
+
+                // If we're currently in an event, just tell it to save upon return
+                //
+                if (m_InEvent)
                 {
-                    FileStream fs = File.Create(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state"));
-                    Byte[] buf = Util.UTF8NoBomEncoding.GetBytes(xml);
-                    fs.Write(buf, 0, buf.Length);
-                    fs.Close();
+                    m_SaveState = true;
+                    return;
                 }
-                catch(Exception)
+
+    //            m_log.DebugFormat(
+    //                "[SCRIPT INSTANCE]: Saving state for script {0} (id {1}) in part {2} (id {3}) in object {4} in {5}",
+    //                ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name);
+
+                string xml = ScriptSerializer.Serialize(this);
+
+                // Compare hash of the state we just just created with the state last written to disk
+                // If the state is different, update the disk file.
+                UUID hash = UUID.Parse(Utils.MD5String(xml));
+
+                if (hash != m_CurrentStateHash)
                 {
-                    // m_log.Error("Unable to save xml\n"+e.ToString());
+                    try
+                    {
+                        using (FileStream fs = File.Create(Path.Combine(m_dataPath, ItemID.ToString() + ".state")))
+                        {
+                            Byte[] buf = Util.UTF8NoBomEncoding.GetBytes(xml);
+                            fs.Write(buf, 0, buf.Length);
+                        }
+                    }
+                    catch(Exception)
+                    {
+                        // m_log.Error("Unable to save xml\n"+e.ToString());
+                    }
+                    //if (!File.Exists(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state")))
+                    //{
+                    //    throw new Exception("Completed persistence save, but no file was created");
+                    //}
+                    m_CurrentStateHash = hash;
                 }
-                //if (!File.Exists(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state")))
-                //{
-                //    throw new Exception("Completed persistence save, but no file was created");
-                //}
-                m_CurrentStateHash = hash;
+
+                StayStopped = false;
             }
         }
 
@@ -1185,7 +1371,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public string GetAssemblyName()
         {
-            return m_Assembly;
+            return m_assemblyPath;
         }
 
         public string GetXMLState()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
index ac822c6..5b9794b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
@@ -37,7 +37,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.ScriptEngine.XEngine;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
 {
@@ -77,6 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             //AppDomain.CurrentDomain.SetData("APPBASE", Environment.CurrentDirectory + "/bin");
 //            Console.WriteLine(AppDomain.CurrentDomain.BaseDirectory);
             m_xEngine = new OpenSim.Region.ScriptEngine.XEngine.XEngine();
+            m_xEngine.DebugLevel = 1;
 
             IniConfigSource configSource = new IniConfigSource();
             
@@ -337,7 +337,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
         public void TestStopOnInfiniteJumpLoop()
         {
             TestHelpers.InMethod();
-//            TestHelpers.EnableLogging();
+            TestHelpers.EnableLogging();
 
             string script = 
 @"default
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 8f02230..885559a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -102,19 +102,31 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public override string ToString()
             {
+<<<<<<< HEAD
+                                string s=String.Format(Culture.FormatProvider,"<{0:0.000000},{1:0.000000},{2:0.000000}>", x, y, z);
+=======
                 string s = String.Format(Culture.FormatProvider, "<{0:0.000000}, {1:0.000000}, {2:0.000000}>", x, y, z);
+>>>>>>> avn/ubitvar
                 return s;
             }
 
             public static explicit operator LSLString(Vector3 vec)
             {
+<<<<<<< HEAD
+                                string s=String.Format(Culture.FormatProvider,"<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z);
+=======
                 string s = String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
+>>>>>>> avn/ubitvar
                 return new LSLString(s);
             }
 
             public static explicit operator string(Vector3 vec)
             {
+<<<<<<< HEAD
+                                string s=String.Format(Culture.FormatProvider,"<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z);
+=======
                 string s = String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
+>>>>>>> avn/ubitvar
                 return s;
             }
 
@@ -502,7 +514,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
         }
 
         [Serializable]
-        public class list
+        public struct list
         {
             private object[] m_data;
 
@@ -583,7 +595,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
             /// <param name='itemIndex'></param>
             public Type GetLSLListItemType(int itemIndex)
             {
-                return m_data[itemIndex].GetType();
+                return Data[itemIndex].GetType();
             }
 
             /// <summary>
@@ -600,107 +612,107 @@ namespace OpenSim.Region.ScriptEngine.Shared
             /// <param name='itemIndex'></param>
             public LSL_Types.LSLFloat GetLSLFloatItem(int itemIndex)
             {
-                if (m_data[itemIndex] is LSL_Types.LSLInteger)
+                if (Data[itemIndex] is LSL_Types.LSLInteger)
                 {
-                    return (LSL_Types.LSLInteger)m_data[itemIndex];
+                    return (LSL_Types.LSLInteger)Data[itemIndex];
                 }
-                else if (m_data[itemIndex] is Int32)
+                else if (Data[itemIndex] is Int32)
                 {
-                    return new LSL_Types.LSLFloat((int)m_data[itemIndex]);
+                    return new LSL_Types.LSLFloat((int)Data[itemIndex]);
                 }
-                else if (m_data[itemIndex] is float)
+                else if (Data[itemIndex] is float)
                 {
-                    return new LSL_Types.LSLFloat((float)m_data[itemIndex]);
+                    return new LSL_Types.LSLFloat((float)Data[itemIndex]);
                 }
-                else if (m_data[itemIndex] is Double)
+                else if (Data[itemIndex] is Double)
                 {
-                    return new LSL_Types.LSLFloat((Double)m_data[itemIndex]);
+                    return new LSL_Types.LSLFloat((Double)Data[itemIndex]);
                 }
-                else if (m_data[itemIndex] is LSL_Types.LSLString)
+                else if (Data[itemIndex] is LSL_Types.LSLString)
                 {
-                    return new LSL_Types.LSLFloat(m_data[itemIndex].ToString());
+                    return new LSL_Types.LSLFloat(Data[itemIndex].ToString());
                 }
                 else
                 {
-                    return (LSL_Types.LSLFloat)m_data[itemIndex];
+                    return (LSL_Types.LSLFloat)Data[itemIndex];
                 }
             }
 
             public LSL_Types.LSLString GetLSLStringItem(int itemIndex)
             {
-                if (m_data[itemIndex] is LSL_Types.key)
+                if (Data[itemIndex] is LSL_Types.key)
                 {
-                    return (LSL_Types.key)m_data[itemIndex];
+                    return (LSL_Types.key)Data[itemIndex];
                 }
                 else
                 {
-                    return new LSL_Types.LSLString(m_data[itemIndex].ToString());
+                    return new LSL_Types.LSLString(Data[itemIndex].ToString());
                 }
             }
 
             public LSL_Types.LSLInteger GetLSLIntegerItem(int itemIndex)
             {
-                if (m_data[itemIndex] is LSL_Types.LSLInteger)
-                    return (LSL_Types.LSLInteger)m_data[itemIndex];
-                if (m_data[itemIndex] is LSL_Types.LSLFloat)
-                    return new LSLInteger((int)m_data[itemIndex]);
-                else if (m_data[itemIndex] is Int32)
-                    return new LSLInteger((int)m_data[itemIndex]);
-                else if (m_data[itemIndex] is LSL_Types.LSLString)
-                    return new LSLInteger(m_data[itemIndex].ToString());
+                if (Data[itemIndex] is LSL_Types.LSLInteger)
+                    return (LSL_Types.LSLInteger)Data[itemIndex];
+                if (Data[itemIndex] is LSL_Types.LSLFloat)
+                    return new LSLInteger((int)Data[itemIndex]);
+                else if (Data[itemIndex] is Int32)
+                    return new LSLInteger((int)Data[itemIndex]);
+                else if (Data[itemIndex] is LSL_Types.LSLString)
+                    return new LSLInteger(Data[itemIndex].ToString());
                 else
                     throw new InvalidCastException(string.Format(
                         "{0} expected but {1} given",
                         typeof(LSL_Types.LSLInteger).Name,
-                        m_data[itemIndex] != null ?
-                        m_data[itemIndex].GetType().Name : "null"));
+                        Data[itemIndex] != null ?
+                        Data[itemIndex].GetType().Name : "null"));
             }
 
             public LSL_Types.Vector3 GetVector3Item(int itemIndex)
             {
-                if (m_data[itemIndex] is LSL_Types.Vector3)
+                if (Data[itemIndex] is LSL_Types.Vector3)
                 {
-                    return (LSL_Types.Vector3)m_data[itemIndex];
+                    return (LSL_Types.Vector3)Data[itemIndex];
                 }
-                else if(m_data[itemIndex] is OpenMetaverse.Vector3)
+                else if(Data[itemIndex] is OpenMetaverse.Vector3)
                 {
                     return new LSL_Types.Vector3(
-                            (OpenMetaverse.Vector3)m_data[itemIndex]);
+                            (OpenMetaverse.Vector3)Data[itemIndex]);
                 }
                 else
                 {
                     throw new InvalidCastException(string.Format(
                         "{0} expected but {1} given",
                         typeof(LSL_Types.Vector3).Name,
-                        m_data[itemIndex] != null ?
-                        m_data[itemIndex].GetType().Name : "null"));
+                        Data[itemIndex] != null ?
+                        Data[itemIndex].GetType().Name : "null"));
                 }
             }
 
             public LSL_Types.Quaternion GetQuaternionItem(int itemIndex)
             {
-                if (m_data[itemIndex] is LSL_Types.Quaternion)
+                if (Data[itemIndex] is LSL_Types.Quaternion)
                 {
-                    return (LSL_Types.Quaternion)m_data[itemIndex];
+                    return (LSL_Types.Quaternion)Data[itemIndex];
                 }
-                else if(m_data[itemIndex] is OpenMetaverse.Quaternion)
+                else if(Data[itemIndex] is OpenMetaverse.Quaternion)
                 {
                     return new LSL_Types.Quaternion(
-                            (OpenMetaverse.Quaternion)m_data[itemIndex]);
+                            (OpenMetaverse.Quaternion)Data[itemIndex]);
                 }
                 else
                 {
                     throw new InvalidCastException(string.Format(
                         "{0} expected but {1} given",
                         typeof(LSL_Types.Quaternion).Name,
-                        m_data[itemIndex] != null ?
-                        m_data[itemIndex].GetType().Name : "null"));
+                        Data[itemIndex] != null ?
+                        Data[itemIndex].GetType().Name : "null"));
                 }
             }
 
             public LSL_Types.key GetKeyItem(int itemIndex)
             {
-              return (LSL_Types.key)m_data[itemIndex];
+              return (LSL_Types.key)Data[itemIndex];
             }
 
             public static list operator +(list a, list b)
@@ -715,10 +727,17 @@ namespace OpenSim.Region.ScriptEngine.Shared
             private void ExtendAndAdd(object o)
             {
                 object[] tmp;
+<<<<<<< HEAD
+                tmp = new object[Data.Length + 1];
+                Data.CopyTo(tmp, 0);
+                tmp.SetValue(o, tmp.Length - 1);
+                Data = tmp;
+=======
                 tmp = new object[m_data.Length + 1];
                 m_data.CopyTo(tmp, 0);
                 tmp.SetValue(o, tmp.Length - 1);
                 m_data = tmp;
+>>>>>>> avn/ubitvar
             }
 
             public static list operator +(list a, LSLString s)
@@ -758,10 +777,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
             public void Add(object o)
             {
                 object[] tmp;
-                tmp = new object[m_data.Length + 1];
-                m_data.CopyTo(tmp, 0);
-                tmp[m_data.Length] = o;
-                m_data = tmp;
+                tmp = new object[Data.Length + 1];
+                Data.CopyTo(tmp, 0);
+                tmp[Data.Length] = o; // Since this is tmp.Length - 1
+                Data = tmp;
             }
 
             public bool Contains(object o)
@@ -788,53 +807,53 @@ namespace OpenSim.Region.ScriptEngine.Shared
                 Object[] ret;
 
                 if (start < 0)
-                    start=m_data.Length+start;
+                    start=Data.Length+start;
 
                 if (start < 0)
                     start=0;
 
                 if (end < 0)
-                    end=m_data.Length+end;
+                    end=Data.Length+end;
                 if (end < 0)
                     end=0;
 
                 if (start > end)
                 {
-                    if (end >= m_data.Length)
+                    if (end >= Data.Length)
                         return new list(new Object[0]);
 
-                    if (start >= m_data.Length)
-                        start=m_data.Length-1;
+                    if (start >= Data.Length)
+                        start=Data.Length-1;
 
                     return GetSublist(end, start);
                 }
 
                 // start >= 0 && end >= 0 here
-                if (start >= m_data.Length)
+                if (start >= Data.Length)
                 {
-                    ret=new Object[m_data.Length];
-                    Array.Copy(m_data, 0, ret, 0, m_data.Length);
+                    ret=new Object[Data.Length];
+                    Array.Copy(Data, 0, ret, 0, Data.Length);
 
                     return new list(ret);
                 }
 
-                if (end >= m_data.Length)
-                    end=m_data.Length-1;
+                if (end >= Data.Length)
+                    end=Data.Length-1;
 
                 // now, this makes the math easier
                 int remove=end+1-start;
 
-                ret=new Object[m_data.Length-remove];
+                ret=new Object[Data.Length-remove];
                 if (ret.Length == 0)
                     return new list(ret);
 
                 int src;
                 int dest=0;
 
-                for (src = 0; src < m_data.Length; src++)
+                for (src = 0; src < Data.Length; src++)
                 {
                     if (src < start || src > end)
-                        ret[dest++]=m_data[src];
+                        ret[dest++]=Data[src];
                 }
 
                 return new list(ret);
@@ -854,12 +873,12 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
                 if (start < 0)
                 {
-                    start = m_data.Length + start;
+                    start = Data.Length + start;
                 }
 
                 if (end < 0)
                 {
-                    end = m_data.Length + end;
+                    end = Data.Length + end;
                 }
 
                 // The conventional case is start <= end
@@ -873,15 +892,15 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
                     // Start sublist beyond length
                     // Also deals with start AND end still negative
-                    if (start >= m_data.Length || end < 0)
+                    if (start >= Data.Length || end < 0)
                     {
                         return new list();
                     }
 
                     // Sublist extends beyond the end of the supplied list
-                    if (end >= m_data.Length)
+                    if (end >= Data.Length)
                     {
-                        end = m_data.Length - 1;
+                        end = Data.Length - 1;
                     }
 
                     // Sublist still starts before the beginning of the list
@@ -892,7 +911,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
                     ret = new object[end - start + 1];
 
-                    Array.Copy(m_data, start, ret, 0, end - start + 1);
+                    Array.Copy(Data, start, ret, 0, end - start + 1);
 
                     return new list(ret);
 
@@ -903,7 +922,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
                 else
                 {
 
-                    list result = null;
+                    list result;
 
                     // If end is negative, then prefix list is empty
                     if (end < 0)
@@ -925,7 +944,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
                     // If start is outside of list, then just return
                     // the prefix, whatever it is.
-                    if (start >= m_data.Length)
+                    if (start >= Data.Length)
                     {
                         return result;
                     }
@@ -1106,11 +1125,11 @@ namespace OpenSim.Region.ScriptEngine.Shared
             {
                 string output;
                 output = String.Empty;
-                if (m_data.Length == 0)
+                if (Data.Length == 0)
                 {
                     return String.Empty;
                 }
-                foreach (object o in m_data)
+                foreach (object o in Data)
                 {
                     output = output + o.ToString();
                 }
@@ -1305,12 +1324,12 @@ namespace OpenSim.Region.ScriptEngine.Shared
             public string ToPrettyString()
             {
                 string output;
-                if (m_data.Length == 0)
+                if (Data.Length == 0)
                 {
                     return "[]";
                 }
                 output = "[";
-                foreach (object o in m_data)
+                foreach (object o in Data)
                 {
                     if (o is String)
                     {
@@ -1377,27 +1396,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
             }
         }
 
-        //
-        // BELOW IS WORK IN PROGRESS... IT WILL CHANGE, SO DON'T USE YET! :)
-        //
-
-        public struct StringTest
-        {
-            // Our own little string
-            internal string actualString;
-            public static implicit operator bool(StringTest mString)
-            {
-                if (mString.actualString.Length == 0)
-                    return true;
-                return false;
-            }
-            public override string ToString()
-            {
-                return actualString;
-            }
-
-        }
-
         [Serializable]
         public struct key
         {
@@ -1451,6 +1449,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
                     return false;
                 }
             }
+            
+            public static bool operator true(key k)
+            {
+                return (Boolean)k;
+            }
+
+            public static bool operator false(key k)
+            {
+                return !(Boolean)k;
+            }
 
             static public implicit operator key(string s)
             {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiAvatarTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiAvatarTests.cs
new file mode 100644
index 0000000..af1da7c
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiAvatarTests.cs
@@ -0,0 +1,158 @@
+/*
+ * 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;
+using System.Text;
+using log4net;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenMetaverse.Assets;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.AvatarFactory;
+using OpenSim.Region.OptionalModules.World.NPC;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api;
+using OpenSim.Region.ScriptEngine.Shared.Instance;
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
+using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Tests
+{
+    /// <summary>
+    /// Tests relating directly to avatars
+    /// </summary>
+    [TestFixture]
+    public class LSL_ApiAvatarTests : OpenSimTestCase
+    {
+        protected Scene m_scene;
+        protected XEngine.XEngine m_engine;
+
+        [SetUp]
+        public override void SetUp()
+        {
+            base.SetUp();
+
+            IConfigSource initConfigSource = new IniConfigSource();
+            IConfig config = initConfigSource.AddConfig("XEngine");
+            config.Set("Enabled", "true");
+
+            m_scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, initConfigSource);
+
+            m_engine = new XEngine.XEngine();
+            m_engine.Initialise(initConfigSource);
+            m_engine.AddRegion(m_scene);
+        }
+
+        /// <summary>
+        /// Test llSetLinkPrimtiveParams for agents.
+        /// </summary>
+        /// <remarks>
+        /// Also testing entity updates here as well.  Possibly that's putting 2 different concerns into one test and
+        /// this should be separated.
+        /// </remarks>
+        [Test]
+        public void TestllSetLinkPrimitiveParamsForAgent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
+            part.RotationOffset = new Quaternion(0.7071068f, 0, 0, 0.7071068f);
+
+            LSL_Api apiGrp1 = new LSL_Api();
+            apiGrp1.Initialize(m_engine, part, null);
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
+
+            // sp has to be less than 10 meters away from 0, 0, 0 (default part position)
+            Vector3 startPos = new Vector3(3, 2, 1);
+            sp.AbsolutePosition = startPos;
+
+            sp.HandleAgentRequestSit(sp.ControllingClient, sp.UUID, part.UUID, Vector3.Zero);
+
+            int entityUpdates = 0;
+            ((TestClient)sp.ControllingClient).OnReceivedEntityUpdate += (entity, flags) => { if (entity is ScenePresence) { entityUpdates++; }};
+
+            // Test position
+            {
+                Vector3 newPos = new Vector3(1, 2, 3);
+                apiGrp1.llSetLinkPrimitiveParams(2, new LSL_Types.list(ScriptBaseClass.PRIM_POSITION, newPos));
+
+                Assert.That(sp.OffsetPosition, Is.EqualTo(newPos));
+
+                m_scene.Update(1);
+                Assert.That(entityUpdates, Is.EqualTo(1));
+            }
+
+            // Test small reposition
+            {
+                Vector3 newPos = new Vector3(1.001f, 2, 3);
+                apiGrp1.llSetLinkPrimitiveParams(2, new LSL_Types.list(ScriptBaseClass.PRIM_POSITION, newPos));
+
+                Assert.That(sp.OffsetPosition, Is.EqualTo(newPos));
+
+                m_scene.Update(1);
+                Assert.That(entityUpdates, Is.EqualTo(2));
+            }
+
+            // Test world rotation
+            {
+                Quaternion newRot = new Quaternion(0, 0.7071068f, 0, 0.7071068f);
+                apiGrp1.llSetLinkPrimitiveParams(2, new LSL_Types.list(ScriptBaseClass.PRIM_ROTATION, newRot));
+
+                Assert.That(
+                    sp.Rotation, new QuaternionToleranceConstraint(part.GetWorldRotation() * newRot, 0.000001));
+
+                m_scene.Update(1);
+                Assert.That(entityUpdates, Is.EqualTo(3));
+            }
+
+            // Test local rotation
+            {
+                Quaternion newRot = new Quaternion(0, 0.7071068f, 0, 0.7071068f);
+                apiGrp1.llSetLinkPrimitiveParams(2, new LSL_Types.list(ScriptBaseClass.PRIM_ROT_LOCAL, newRot));
+
+                Assert.That(
+                    sp.Rotation, new QuaternionToleranceConstraint(newRot, 0.000001));
+
+                m_scene.Update(1);
+                Assert.That(entityUpdates, Is.EqualTo(4));
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
index ab44e38..9a5ebce 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
@@ -45,7 +45,6 @@ using OpenSim.Region.ScriptEngine.Shared.Api;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Tests
 {
@@ -101,12 +100,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             SceneHelpers.SetupSceneModules(m_scene, new IniConfigSource(), m_engine, m_urlModule);
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
-            m_scriptItem = TaskInventoryHelpers.AddScript(m_scene, so.RootPart);
+            m_scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, so.RootPart);
 
             // This is disconnected from the actual script - the mock engine does not set up any LSL_Api atm.
             // Possibly this could be done and we could obtain it directly from the MockScriptEngine.
             m_lslApi = new LSL_Api();
-            m_lslApi.Initialize(m_engine, so.RootPart, m_scriptItem, null);
+            m_lslApi.Initialize(m_engine, so.RootPart, m_scriptItem);
         }
 
         [TearDown]
@@ -246,4 +245,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
index 6dd6c17..9b7cab2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
@@ -44,7 +44,7 @@ using OpenSim.Region.ScriptEngine.Shared.Api;
 using OpenSim.Region.ScriptEngine.Shared.Instance;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
+using PermissionMask = OpenSim.Framework.PermissionMask;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Tests
 {
@@ -91,10 +91,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             // Create an object embedded inside the first
             UUID itemId = TestHelpers.ParseTail(0x20);
-            TaskInventoryHelpers.AddSceneObject(m_scene, so1.RootPart, inventoryItemName, itemId, userId);
+            TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, so1.RootPart, inventoryItemName, itemId, userId);
 
             LSL_Api api = new LSL_Api();
-            api.Initialize(m_engine, so1.RootPart, null, null);
+            api.Initialize(m_engine, so1.RootPart, null);
 
             // Create a second object
             SceneObjectGroup so2 = SceneHelpers.CreateSceneObject(1, userId, "so2", 0x100);
@@ -127,17 +127,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, user1Id, "so1", 0x10);
             m_scene.AddSceneObject(so1);
             LSL_Api api = new LSL_Api();
-            api.Initialize(m_engine, so1.RootPart, null, null);
+            api.Initialize(m_engine, so1.RootPart, null);
 
             // Create an object embedded inside the first
             UUID itemId = TestHelpers.ParseTail(0x20);
-            TaskInventoryHelpers.AddSceneObject(m_scene, so1.RootPart, inventoryItemName, itemId, user1Id);
+            TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, so1.RootPart, inventoryItemName, itemId, user1Id);
 
             // Create a second object
             SceneObjectGroup so2 = SceneHelpers.CreateSceneObject(1, user2Id, "so2", 0x100);
             m_scene.AddSceneObject(so2);
             LSL_Api api2 = new LSL_Api();
-            api2.Initialize(m_engine, so2.RootPart, null, null);
+            api2.Initialize(m_engine, so2.RootPart, null);
 
             // *** Firstly, we test where llAllowInventoryDrop() has not been called. ***
             api.llGiveInventory(so2.UUID.ToString(), inventoryItemName);
@@ -167,5 +167,122 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
                 Assert.That(copiedItems[0].Name, Is.EqualTo(inventoryItemName));
             }
         }
+
+        /// <summary>
+        /// Test giving inventory from an object to an avatar that is not the object's owner.
+        /// </summary>
+        [Test]
+        public void TestLlGiveInventoryO2DifferentAvatar()
+        {
+            TestHelpers.InMethod();
+            //            TestHelpers.EnableLogging();
+
+            UUID user1Id = TestHelpers.ParseTail(0x1);
+            UUID user2Id = TestHelpers.ParseTail(0x2);
+            string inventoryItemName = "item1";
+
+            SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, user1Id, "so1", 0x10);
+            m_scene.AddSceneObject(so1);
+            LSL_Api api = new LSL_Api();
+            api.Initialize(m_engine, so1.RootPart, null);
+
+            // Create an object embedded inside the first
+            UUID itemId = TestHelpers.ParseTail(0x20);
+            TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, so1.RootPart, inventoryItemName, itemId, user1Id);
+
+            UserAccountHelpers.CreateUserWithInventory(m_scene, user2Id);
+
+            api.llGiveInventory(user2Id.ToString(), inventoryItemName);
+
+            InventoryItemBase receivedItem 
+                = UserInventoryHelpers.GetInventoryItem(
+                    m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName));
+
+            Assert.IsNotNull(receivedItem);
+        }
+
+        /// <summary>
+        /// Test giving inventory from an object to an avatar that is not the object's owner and where the next
+        /// permissions do not include mod.
+        /// </summary>
+        [Test]
+        public void TestLlGiveInventoryO2DifferentAvatarNoMod()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID user1Id = TestHelpers.ParseTail(0x1);
+            UUID user2Id = TestHelpers.ParseTail(0x2);
+            string inventoryItemName = "item1";
+
+            SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, user1Id, "so1", 0x10);
+            m_scene.AddSceneObject(so1);
+            LSL_Api api = new LSL_Api();
+            api.Initialize(m_engine, so1.RootPart, null);
+
+            // Create an object embedded inside the first
+            UUID itemId = TestHelpers.ParseTail(0x20);
+            TaskInventoryItem tii 
+                = TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, so1.RootPart, inventoryItemName, itemId, user1Id);
+            tii.NextPermissions &= ~((uint)PermissionMask.Modify);
+
+            UserAccountHelpers.CreateUserWithInventory(m_scene, user2Id);
+
+            api.llGiveInventory(user2Id.ToString(), inventoryItemName);
+
+            InventoryItemBase receivedItem 
+                = UserInventoryHelpers.GetInventoryItem(
+                    m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName));
+
+            Assert.IsNotNull(receivedItem);
+            Assert.AreEqual(0, receivedItem.CurrentPermissions & (uint)PermissionMask.Modify);
+        }
+
+        [Test]
+        public void TestLlRemoteLoadScriptPin()
+        {
+            TestHelpers.InMethod();
+//                        TestHelpers.EnableLogging();
+
+            UUID user1Id = TestHelpers.ParseTail(0x1);
+            UUID user2Id = TestHelpers.ParseTail(0x2);
+
+            SceneObjectGroup sourceSo = SceneHelpers.AddSceneObject(m_scene, "sourceSo", user1Id);
+            m_scene.AddSceneObject(sourceSo);
+            LSL_Api api = new LSL_Api();
+            api.Initialize(m_engine, sourceSo.RootPart, null);
+            TaskInventoryHelpers.AddScript(m_scene.AssetService, sourceSo.RootPart, "script", "Hello World");
+
+            SceneObjectGroup targetSo = SceneHelpers.AddSceneObject(m_scene, "targetSo", user1Id);
+            SceneObjectGroup otherOwnedTargetSo = SceneHelpers.AddSceneObject(m_scene, "otherOwnedTargetSo", user2Id);
+
+            // Test that we cannot load a script when the target pin has never been set (i.e. it is zero)
+            api.llRemoteLoadScriptPin(targetSo.UUID.ToString(), "script", 0, 0, 0);
+            Assert.IsNull(targetSo.RootPart.Inventory.GetInventoryItem("script"));
+
+            // Test that we cannot load a script when the given pin does not match the target
+            targetSo.RootPart.ScriptAccessPin = 5;
+            api.llRemoteLoadScriptPin(targetSo.UUID.ToString(), "script", 3, 0, 0);
+            Assert.IsNull(targetSo.RootPart.Inventory.GetInventoryItem("script"));
+
+            // Test that we cannot load into a prim with a different owner
+            otherOwnedTargetSo.RootPart.ScriptAccessPin = 3;
+            api.llRemoteLoadScriptPin(otherOwnedTargetSo.UUID.ToString(), "script", 3, 0, 0);
+            Assert.IsNull(otherOwnedTargetSo.RootPart.Inventory.GetInventoryItem("script"));
+
+            // Test that we can load a script when given pin and dest pin match.
+            targetSo.RootPart.ScriptAccessPin = 3;
+            api.llRemoteLoadScriptPin(targetSo.UUID.ToString(), "script", 3, 0, 0);
+            TaskInventoryItem insertedItem = targetSo.RootPart.Inventory.GetInventoryItem("script");
+            Assert.IsNotNull(insertedItem);
+
+            // Test that we can no longer load if access pin is unset
+            targetSo.RootPart.Inventory.RemoveInventoryItem(insertedItem.ItemID);
+            Assert.IsNull(targetSo.RootPart.Inventory.GetInventoryItem("script"));
+
+            targetSo.RootPart.ScriptAccessPin = 0;
+            api.llRemoteLoadScriptPin(otherOwnedTargetSo.UUID.ToString(), "script", 3, 0, 0);
+            Assert.IsNull(otherOwnedTargetSo.RootPart.Inventory.GetInventoryItem("script"));
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
index ac9f93b..14b1890 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
@@ -45,7 +45,6 @@ using OpenSim.Region.ScriptEngine.Shared.Instance;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Tests
 {
@@ -93,7 +92,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             // FIXME: This should really be a script item (with accompanying script)
             TaskInventoryItem grp1Item
                 = TaskInventoryHelpers.AddNotecard(
-                    m_scene, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
+                    m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
             grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
 
             SceneObjectGroup grp2 = SceneHelpers.CreateSceneObject(2, ownerId, "grp2-", 0x20);
@@ -105,7 +104,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(grp2);
 
             LSL_Api apiGrp1 = new LSL_Api();
-            apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item, null);
+            apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item);
 
             apiGrp1.llCreateLink(grp2.UUID.ToString(), ScriptBaseClass.TRUE);
 
@@ -127,12 +126,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             // FIXME: This should really be a script item (with accompanying script)
             TaskInventoryItem grp1Item
                 = TaskInventoryHelpers.AddNotecard(
-                    m_scene, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
+                    m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
             
             grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
 
             LSL_Api apiGrp1 = new LSL_Api();
-            apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item, null);
+            apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item);
 
             apiGrp1.llBreakLink(2);
 
@@ -141,5 +140,47 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             SceneObjectGroup grp2 = m_scene.GetSceneObjectGroup("grp1-Part1");
             Assert.That(grp2, Is.Not.Null);
         }
+
+        [Test]
+        public void TestllBreakAllLinks()
+        {
+            TestHelpers.InMethod();
+
+            UUID ownerId = TestHelpers.ParseTail(0x1);
+
+            SceneObjectGroup grp1 = SceneHelpers.CreateSceneObject(3, ownerId, "grp1-", 0x10);
+            grp1.AbsolutePosition = new Vector3(10, 10, 10);
+            m_scene.AddSceneObject(grp1);
+
+            // FIXME: This should really be a script item (with accompanying script)
+            TaskInventoryItem grp1Item
+                = TaskInventoryHelpers.AddNotecard(
+                    m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
+            
+            grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
+
+            LSL_Api apiGrp1 = new LSL_Api();
+            apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item);
+
+            apiGrp1.llBreakAllLinks();
+
+            {
+                SceneObjectGroup nowGrp = m_scene.GetSceneObjectGroup("grp1-Part1");
+                Assert.That(nowGrp, Is.Not.Null);
+                Assert.That(nowGrp.Parts.Length, Is.EqualTo(1));
+            }
+
+            {
+                SceneObjectGroup nowGrp = m_scene.GetSceneObjectGroup("grp1-Part2");
+                Assert.That(nowGrp, Is.Not.Null);
+                Assert.That(nowGrp.Parts.Length, Is.EqualTo(1));
+            }
+
+            {
+                SceneObjectGroup nowGrp = m_scene.GetSceneObjectGroup("grp1-Part3");
+                Assert.That(nowGrp, Is.Not.Null);
+                Assert.That(nowGrp.Parts.Length, Is.EqualTo(1));
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
index 60de5cb..34a29e6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
@@ -37,7 +37,6 @@ using OpenSim.Region.ScriptEngine.Shared.Api;
 using OpenSim.Region.ScriptEngine.Shared.Instance;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenMetaverse;
-using OpenSim.Tests.Common.Mock;
  
 using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
 using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
@@ -68,7 +67,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             engine.AddRegion(scene);
 
             m_lslApi = new LSL_Api();
-            m_lslApi.Initialize(engine, part, null, null);
+            m_lslApi.Initialize(engine, part, null);
         }
  
         [Test]
@@ -134,4 +133,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             }
          }
      }
- }
\ No newline at end of file
+ }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
index 42d1b3b..9ab3115 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
@@ -18,7 +18,6 @@ using OpenSim.Region.ScriptEngine.Shared.Api;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Tests
 {
@@ -62,12 +61,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             SceneHelpers.SetupSceneModules(m_scene, new IniConfigSource(), m_engine);
 
             m_so = SceneHelpers.AddSceneObject(m_scene);
-            m_scriptItem = TaskInventoryHelpers.AddScript(m_scene, m_so.RootPart);
+            m_scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, m_so.RootPart);
 
             // This is disconnected from the actual script - the mock engine does not set up any LSL_Api atm.
             // Possibly this could be done and we could obtain it directly from the MockScriptEngine.
             m_lslApi = new LSL_Api();
-            m_lslApi.Initialize(m_engine, m_so.RootPart, m_scriptItem, null);
+            m_lslApi.Initialize(m_engine, m_so.RootPart, m_scriptItem);
         }
 
         [Test]
@@ -78,7 +77,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             string[] ncLines = { "One", "Twoè", "Three" };
 
             TaskInventoryItem ncItem 
-                = TaskInventoryHelpers.AddNotecard(m_scene, m_so.RootPart, "nc", "1", "10", string.Join("\n", ncLines));
+                = TaskInventoryHelpers.AddNotecard(m_scene.AssetService, m_so.RootPart, "nc", "1", "10", string.Join("\n", ncLines));
 
             AssertValidNotecardLine(ncItem.Name, 0, ncLines[0]);
             AssertValidNotecardLine(ncItem.Name, 2, ncLines[2]);
@@ -103,7 +102,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         {
             TestHelpers.InMethod();
 
-            TaskInventoryItem ncItem = TaskInventoryHelpers.AddScript(m_scene, m_so.RootPart, "nc1", "Not important");
+            TaskInventoryItem ncItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, m_so.RootPart, "nc1", "Not important");
 
             AssertInValidNotecardLine(ncItem.Name, 0);
         }
@@ -267,4 +266,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            }
 //        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
index ed61dc0..d957bf2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
@@ -45,7 +45,6 @@ using OpenSim.Region.ScriptEngine.Shared.Instance;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
 using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
 
@@ -90,7 +89,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(grp1);
 
             LSL_Api apiGrp1 = new LSL_Api();
-            apiGrp1.Initialize(m_engine, grp1.RootPart, null, null);
+            apiGrp1.Initialize(m_engine, grp1.RootPart, null);
 
             // Check simple 1 prim case
             {
@@ -168,7 +167,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True);
 
             LSL_Api apiGrp1 = new LSL_Api();
-            apiGrp1.Initialize(m_engine, part1, null, null);
+            apiGrp1.Initialize(m_engine, part1, null);
 
             // Note that prim hollow check is passed with the other prim params in order to allow the
             // specification of a different check value from the prim param. A cylinder, prism, sphere,
@@ -210,11 +209,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
                 ScriptBaseClass.PRIM_TYPE_BOX,              // Prim type
                 ScriptBaseClass.PRIM_HOLE_TRIANGLE,         // Prim hole type
                 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
-                0.95f,                                      // Prim hollow
+                0.99f,                                      // Prim hollow
                 new LSL_Types.Vector3(1.0d, 0.0d, 0.0d),    // Prim twist
                 new LSL_Types.Vector3(1.0d, 1.0d, 0.0d),    // Prim taper 
                 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
-                0.95f);                                     // Prim hollow check
+                0.99f);                                     // Prim hollow check
 
             // Test a tube.
             CheckllSetPrimitiveParams(
@@ -247,7 +246,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
                 ScriptBaseClass.PRIM_TYPE_PRISM,            // Prim type
                 ScriptBaseClass.PRIM_HOLE_SQUARE,           // Prim hole type
                 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
-                0.95f,                                      // Prim hollow
+                0.99f,                                      // Prim hollow
                 // Expression for x selected to test precision problems during sbyte
                 // cast in SetPrimitiveShapeBlockParams.
                 new LSL_Types.Vector3(0.7d + 0.2d, 0.0d, 0.0d),     // Prim twist
@@ -396,4 +395,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index 7e3726a..d929da8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -37,7 +37,6 @@ using OpenSim.Region.ScriptEngine.Shared.Instance;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenMetaverse;
 using System;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Tests
 {
@@ -66,7 +65,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             engine.AddRegion(scene);
 
             m_lslApi = new LSL_Api();
-            m_lslApi.Initialize(engine, part, null, null);
+            m_lslApi.Initialize(engine, part, null);
         }
 
         [Test]
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiUserTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiUserTests.cs
new file mode 100644
index 0000000..a8964bf
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiUserTests.cs
@@ -0,0 +1,157 @@
+/*
+ * 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.Threading;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.Shared.Api;
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Tests
+{
+    [TestFixture]
+    public class LSL_ApiUserTests : OpenSimTestCase
+    {
+        private Scene m_scene;
+        private MockScriptEngine m_engine;
+
+        [SetUp]
+        public override void SetUp()
+        {
+            base.SetUp();
+
+            m_engine = new MockScriptEngine();
+
+            m_scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, m_engine);
+        }
+
+        [Test]
+        public void TestLlRequestAgentDataOnline()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(m_scene, userId);
+
+            SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
+            TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, part);
+
+            LSL_Api apiGrp1 = new LSL_Api();
+            apiGrp1.Initialize(m_engine, part, scriptItem);
+
+            // Initially long timeout to test cache
+            apiGrp1.LlRequestAgentDataCacheTimeoutMs = 20000;
+
+            // Offline test
+            {
+                apiGrp1.llRequestAgentData(userId.ToString(), ScriptBaseClass.DATA_ONLINE);
+
+                Assert.That(m_engine.PostedEvents.ContainsKey(scriptItem.ItemID));
+
+                List<EventParams> events = m_engine.PostedEvents[scriptItem.ItemID];
+                Assert.That(events.Count, Is.EqualTo(1));
+                EventParams eventParams = events[0];
+                Assert.That(eventParams.EventName, Is.EqualTo("dataserver"));
+
+                string data = eventParams.Params[1].ToString();
+                Assert.AreEqual(0, int.Parse(data));
+
+                m_engine.PostedEvents.Clear();
+            }
+
+            // Online test.  Should get the 'wrong' result because of caching.
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, ua1);
+
+            {
+                apiGrp1.llRequestAgentData(userId.ToString(), ScriptBaseClass.DATA_ONLINE);
+
+                Assert.That(m_engine.PostedEvents.ContainsKey(scriptItem.ItemID));
+
+                List<EventParams> events = m_engine.PostedEvents[scriptItem.ItemID];
+                Assert.That(events.Count, Is.EqualTo(1));
+                EventParams eventParams = events[0];
+                Assert.That(eventParams.EventName, Is.EqualTo("dataserver"));
+
+                string data = eventParams.Params[1].ToString();
+                Assert.AreEqual(0, int.Parse(data));
+
+                m_engine.PostedEvents.Clear();
+            }
+
+            apiGrp1.LlRequestAgentDataCacheTimeoutMs = 1;
+
+            // Make absolutely sure that we should trigger cache timeout.
+            Thread.Sleep(apiGrp1.LlRequestAgentDataCacheTimeoutMs + 1);
+
+            {
+                apiGrp1.llRequestAgentData(userId.ToString(), ScriptBaseClass.DATA_ONLINE);
+
+                Assert.That(m_engine.PostedEvents.ContainsKey(scriptItem.ItemID));
+
+                List<EventParams> events = m_engine.PostedEvents[scriptItem.ItemID];
+                Assert.That(events.Count, Is.EqualTo(1));
+                EventParams eventParams = events[0];
+                Assert.That(eventParams.EventName, Is.EqualTo("dataserver"));
+
+                string data = eventParams.Params[1].ToString();
+                Assert.AreEqual(1, int.Parse(data));
+
+                m_engine.PostedEvents.Clear();
+            }
+
+            m_scene.CloseAgent(userId, false);
+
+            Thread.Sleep(apiGrp1.LlRequestAgentDataCacheTimeoutMs + 1 + 1);
+
+            {
+                apiGrp1.llRequestAgentData(userId.ToString(), ScriptBaseClass.DATA_ONLINE);
+
+                Assert.That(m_engine.PostedEvents.ContainsKey(scriptItem.ItemID));
+
+                List<EventParams> events = m_engine.PostedEvents[scriptItem.ItemID];
+                Assert.That(events.Count, Is.EqualTo(1));
+                EventParams eventParams = events[0];
+                Assert.That(eventParams.EventName, Is.EqualTo("dataserver"));
+
+                string data = eventParams.Params[1].ToString();
+                Assert.AreEqual(0, int.Parse(data));
+
+                m_engine.PostedEvents.Clear();
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
index c88bad5..2f9a564 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -44,7 +44,6 @@ using OpenSim.Region.ScriptEngine.Shared.Api;
 using OpenSim.Region.ScriptEngine.Shared.Instance;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Tests
 {
@@ -94,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, null, null);
+            osslApi.Initialize(m_engine, part, null);
 
             string notecardName = "appearanceNc";
 
@@ -135,7 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, null, null);
+            osslApi.Initialize(m_engine, part, null);
 
             string notecardName = "appearanceNc";
 
@@ -159,4 +158,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             Assert.That(savedAppearance.AvatarHeight, Is.EqualTo(sp.Appearance.AvatarHeight));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
index e422f5b..b6b3f12 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
@@ -44,7 +44,6 @@ using OpenSim.Region.ScriptEngine.Shared.Api;
 using OpenSim.Region.ScriptEngine.Shared.Instance;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Tests
 {
@@ -97,16 +96,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(m_scene, 0x1);
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, ua1.PrincipalID);
             SceneObjectGroup inWorldObj = SceneHelpers.AddSceneObject(m_scene, "inWorldObj", ua1.PrincipalID);
-            TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene, inWorldObj.RootPart);
+            TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, inWorldObj.RootPart);
 
-            new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
+            new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem);
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
+            osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem);
 
 //            SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, ua1.PrincipalID);
 
             // Create an object embedded inside the first
-            TaskInventoryHelpers.AddSceneObject(m_scene, inWorldObj.RootPart, taskInvObjItemName, taskInvObjItemId, ua1.PrincipalID);
+            TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, inWorldObj.RootPart, taskInvObjItemName, taskInvObjItemId, ua1.PrincipalID);
 
             osslApi.osForceAttachToAvatarFromInventory(taskInvObjItemName, (int)attachPoint);
 
@@ -143,15 +142,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(m_scene, 0x1);
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, ua1.PrincipalID);
             SceneObjectGroup inWorldObj = SceneHelpers.AddSceneObject(m_scene, "inWorldObj", ua1.PrincipalID);
-            TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene, inWorldObj.RootPart);
+            TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, inWorldObj.RootPart);
 
-            new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
+            new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem);
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
+            osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem);
 
             // Create an object embedded inside the first
             TaskInventoryHelpers.AddNotecard(
-                m_scene, inWorldObj.RootPart, taskInvObjItemName, taskInvObjItemId, TestHelpers.ParseTail(0x900), "Hello World!");
+                m_scene.AssetService, inWorldObj.RootPart, taskInvObjItemName, taskInvObjItemId, TestHelpers.ParseTail(0x900), "Hello World!");
 
             bool exceptionCaught = false;
 
@@ -191,15 +190,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, ua1);
             SceneObjectGroup inWorldObj = SceneHelpers.AddSceneObject(m_scene, "inWorldObj", ua1.PrincipalID);
-            TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene, inWorldObj.RootPart);
+            TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, inWorldObj.RootPart);
 
-            new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
+            new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem);
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
+            osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem);
 
             // Create an object embedded inside the first
             TaskInventoryHelpers.AddSceneObject(
-                m_scene, inWorldObj.RootPart, taskInvObjItemName, taskInvObjItemId, ua1.PrincipalID);
+                m_scene.AssetService, inWorldObj.RootPart, taskInvObjItemName, taskInvObjItemId, ua1.PrincipalID);
 
             ScenePresence sp2 = SceneHelpers.AddScenePresence(m_scene, ua2);
 
@@ -230,4 +229,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             Assert.That(sp2.Appearance.GetAttachpoint(attachmentsInAppearance2[0].ItemID), Is.EqualTo((uint)attachPoint));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index 495e684..99bff83 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -46,7 +46,6 @@ using OpenSim.Region.ScriptEngine.Shared.Instance;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Tests
 {
@@ -100,7 +99,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, null, null);
+            osslApi.Initialize(m_engine, part, null);
 
             string notecardName = "appearanceNc";
             osslApi.osOwnerSaveAppearance(notecardName);
@@ -126,7 +125,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, so.RootPart, null, null);
+            osslApi.Initialize(m_engine, so.RootPart, null);
 
             bool gotExpectedException = false;
             try
@@ -161,7 +160,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, null, null);
+            osslApi.Initialize(m_engine, part, null);
 
             string notecardName = "appearanceNc";
             osslApi.osOwnerSaveAppearance(notecardName);
@@ -196,7 +195,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, null, null);
+            osslApi.Initialize(m_engine, part, null);
 
             osslApi.osOwnerSaveAppearance(firstAppearanceNcName);
 
@@ -234,7 +233,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, null, null);
+            osslApi.Initialize(m_engine, part, null);
 
             osslApi.osOwnerSaveAppearance(firstAppearanceNcName);
 
@@ -286,10 +285,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(otherSo);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, null, null);
+            osslApi.Initialize(m_engine, part, null);
 
             OSSL_Api otherOsslApi = new OSSL_Api();
-            otherOsslApi.Initialize(m_engine, otherPart, null, null);
+            otherOsslApi.Initialize(m_engine, otherPart, null);
 
             string notecardName = "appearanceNc";
             osslApi.osOwnerSaveAppearance(notecardName);
@@ -333,7 +332,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, null, null);
+            osslApi.Initialize(m_engine, part, null);
 
             string notecardName = "appearanceNc";
             osslApi.osOwnerSaveAppearance(notecardName);
@@ -349,4 +348,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             Assert.That(npc, Is.Null);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
index 87ea9c4..0094af6 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Mono.Addins;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -29,5 +30,7 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
+[assembly: Addin("OpenSim.Region.ScriptEngine.XEngine", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml b/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml
deleted file mode 100644
index 96c9c3a..0000000
--- a/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Addin id="OpenSim.Region.ScriptEngine.XEngine" version="0.2">
-    <Runtime>
-        <Import assembly="OpenSim.Region.ScriptEngine.XEngine.dll"/>
-    </Runtime>
-
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-
-    <Extension path = "/OpenSim/RegionModules">
-        <RegionModule id="XEngine" type="OpenSim.Region.ScriptEngine.XEngine.XEngine" />
-    </Extension>
-</Addin>
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs
index 5abfe9a..878e571 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs
@@ -36,15 +36,14 @@ using OpenSim.Region.CoreModules.Scripting.WorldComm;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ScriptEngine.XEngine.Tests
 {
     /// <summary>
-    /// XEngine tests.
+    /// Basic XEngine tests.
     /// </summary>
     [TestFixture]
-    public class XEngineTest : OpenSimTestCase
+    public class XEngineBasicTests : OpenSimTestCase
     {
         private TestScene m_scene;
         private XEngine m_xEngine;
@@ -87,7 +86,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
         public void TestCompileAndStartScript()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+            TestHelpers.EnableLogging();
 
             UUID userId = TestHelpers.ParseTail(0x1);
 //            UUID objectId = TestHelpers.ParseTail(0x100);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs
new file mode 100644
index 0000000..587695f
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs
@@ -0,0 +1,195 @@
+/*
+ * 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.Threading;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Framework.EntityTransfer;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.ScriptEngine.XEngine.Tests
+{
+    /// <summary>
+    /// XEngine tests connected with crossing scripts between regions.
+    /// </summary>
+    [TestFixture]
+    public class XEngineCrossingTests : OpenSimTestCase
+    {
+        [TestFixtureSetUp]
+        public void FixtureInit()
+        {
+            // Don't allow tests to be bamboozled by asynchronous events.  Execute everything on the same thread.
+            Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest;
+        }
+
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+            // threads.  Possibly, later tests should be rewritten so none of them require async stuff (which regression
+            // tests really shouldn't).
+            Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+        }
+
+        /// <summary>
+        /// Test script state preservation when a script crosses between regions on the same simulator.
+        /// </summary>
+        [Test]
+        public void TestScriptCrossOnSameSimulator()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+            int sceneObjectIdTail = 0x2;
+
+            EntityTransferModule etmA = new EntityTransferModule();
+            EntityTransferModule etmB = new EntityTransferModule();
+            LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+            XEngine xEngineA = new XEngine();
+            XEngine xEngineB = new XEngine();
+            xEngineA.DebugLevel = 1;
+            xEngineB.DebugLevel = 1;
+
+            IConfigSource configSource = new IniConfigSource();
+
+            IConfig startupConfig = configSource.AddConfig("Startup");
+            startupConfig.Set("DefaultScriptEngine", "XEngine");
+
+            IConfig xEngineConfig = configSource.AddConfig("XEngine");
+            xEngineConfig.Set("Enabled", "true");
+            xEngineConfig.Set("StartDelay", "0");
+
+            // These tests will not run with AppDomainLoading = true, at least on mono.  For unknown reasons, the call
+            // to AssemblyResolver.OnAssemblyResolve fails.
+            xEngineConfig.Set("AppDomainLoading", "false");
+
+            IConfig modulesConfig = configSource.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etmA.Name);
+            modulesConfig.Set("SimulationServices", lscm.Name);
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000, configSource);
+            TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1000, 999, configSource);
+
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, configSource, lscm);
+            SceneHelpers.SetupSceneModules(sceneA, configSource, etmA, xEngineA);
+            SceneHelpers.SetupSceneModules(sceneB, configSource, etmB, xEngineB);
+            sceneA.StartScripts();
+            sceneB.StartScripts();
+
+            SceneObjectGroup soSceneA = SceneHelpers.AddSceneObject(sceneA, 1, userId, "so1-", sceneObjectIdTail);
+            soSceneA.AbsolutePosition = new Vector3(128, 10, 20);
+
+            // CREATE SCRIPT TODO
+            InventoryItemBase scriptItemSceneA = new InventoryItemBase();
+            //            itemTemplate.ID = itemId;
+            scriptItemSceneA.Name = "script1";
+            scriptItemSceneA.Folder = soSceneA.UUID;
+            scriptItemSceneA.InvType = (int)InventoryType.LSL;
+
+            AutoResetEvent chatEvent = new AutoResetEvent(false);
+            OSChatMessage messageReceived = null;
+            sceneA.EventManager.OnChatFromWorld += (s, m) => { messageReceived = m; chatEvent.Set(); };
+
+            sceneA.RezNewScript(userId, scriptItemSceneA, 
+@"integer c = 0;
+
+default
+{    
+    state_entry()
+    {
+        llSay(0, ""Script running"");
+    }
+
+    changed(integer change)
+    {
+        llSay(0, ""Changed"");
+    }
+
+    touch_start(integer n)
+    {
+        c = c + 1; 
+        llSay(0, (string)c);
+    }
+}");
+
+            chatEvent.WaitOne(60000);
+
+            Assert.That(messageReceived, Is.Not.Null, "No chat message received.");
+            Assert.That(messageReceived.Message, Is.EqualTo("Script running"));           
+
+            {
+                // XXX: Should not be doing this so directly.  Should call some variant of EventManager.touch() instead.
+                DetectParams[] det = new DetectParams[1];
+                det[0] = new DetectParams();
+                det[0].Key = userId;
+                det[0].Populate(sceneA);
+
+                EventParams ep = new EventParams("touch_start", new Object[] { new LSL_Types.LSLInteger(1) }, det);
+
+                xEngineA.PostObjectEvent(soSceneA.LocalId, ep);
+                chatEvent.WaitOne(60000);
+
+                Assert.That(messageReceived.Message, Is.EqualTo("1")); 
+            }
+
+            sceneB.EventManager.OnChatFromWorld += (s, m) => { messageReceived = m; chatEvent.Set(); };
+
+            // Cross with a negative value
+            soSceneA.AbsolutePosition = new Vector3(128, -10, 20);
+
+            chatEvent.WaitOne(60000);
+            Assert.That(messageReceived.Message, Is.EqualTo("Changed")); 
+
+            // TEST sending event to moved prim and output
+            {
+                SceneObjectGroup soSceneB = sceneB.GetSceneObjectGroup(soSceneA.Name);
+                TaskInventoryItem scriptItemSceneB = soSceneB.RootPart.Inventory.GetInventoryItem(scriptItemSceneA.Name);
+
+                // XXX: Should not be doing this so directly.  Should call some variant of EventManager.touch() instead.
+                DetectParams[] det = new DetectParams[1];
+                det[0] = new DetectParams();
+                det[0].Key = userId;
+                det[0].Populate(sceneB);
+
+                EventParams ep = new EventParams("touch_start", new Object[] { new LSL_Types.LSLInteger(1) }, det);
+
+                xEngineB.PostObjectEvent(soSceneB.LocalId, ep);
+                chatEvent.WaitOne(60000);
+
+                Assert.That(messageReceived.Message, Is.EqualTo("2")); 
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEnginePersistenceTests.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEnginePersistenceTests.cs
new file mode 100644
index 0000000..2ef4058
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEnginePersistenceTests.cs
@@ -0,0 +1,152 @@
+/*
+ * 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.IO;
+using System.Linq;
+using System.Threading;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.Attachments;
+using OpenSim.Region.CoreModules.Framework.InventoryAccess;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.XEngine;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.ScriptEngine.Tests
+{
+    [TestFixture]
+    public class XEnginePersistenceTests : OpenSimTestCase
+    {
+        private AutoResetEvent m_chatEvent = new AutoResetEvent(false);
+
+        private void OnChatFromWorld(object sender, OSChatMessage oscm)
+        {
+            //            Console.WriteLine("Got chat [{0}]", oscm.Message);
+
+            //            m_osChatMessageReceived = oscm;
+            m_chatEvent.Set();
+        }
+
+        private void AddCommonConfig(IConfigSource config, List<object> modules)
+        {
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
+
+            AttachmentsModule attMod = new AttachmentsModule();
+            attMod.DebugLevel = 1;
+            modules.Add(attMod);
+            modules.Add(new BasicInventoryAccessModule());
+        }
+
+        private void AddScriptingConfig(IConfigSource config, XEngine.XEngine xEngine, List<object> modules)
+        {
+            IConfig startupConfig = config.AddConfig("Startup");
+            startupConfig.Set("DefaultScriptEngine", "XEngine");
+
+            IConfig xEngineConfig = config.AddConfig("XEngine");
+            xEngineConfig.Set("Enabled", "true");
+            xEngineConfig.Set("StartDelay", "0");
+
+            // These tests will not run with AppDomainLoading = true, at least on mono.  For unknown reasons, the call
+            // to AssemblyResolver.OnAssemblyResolve fails.
+            xEngineConfig.Set("AppDomainLoading", "false");
+
+            modules.Add(xEngine);
+        }
+
+        private Scene CreateScriptingEnabledTestScene(XEngine.XEngine xEngine)
+        {
+            IConfigSource config = new IniConfigSource();
+            List<object> modules = new List<object>();
+
+            AddCommonConfig(config, modules);
+            AddScriptingConfig(config, xEngine, modules);
+
+            Scene scene
+                = new SceneHelpers().SetupScene(
+                    "attachments-test-scene", TestHelpers.ParseTail(999), 1000, 1000, config);
+            SceneHelpers.SetupSceneModules(scene, config, modules.ToArray());
+
+            scene.StartScripts();
+
+            return scene;
+        }
+
+        [Test]
+        public void TestScriptedAttachmentPersistence()
+        {
+            TestHelpers.InMethod();
+//                        TestHelpers.EnableLogging();
+
+            XEngine.XEngine xEngine = new XEngine.XEngine();
+            Scene scene = CreateScriptingEnabledTestScene(xEngine);
+            UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1);
+
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10);
+            TaskInventoryHelpers.AddScript(
+                scene.AssetService,
+                so.RootPart,
+                "scriptItem",
+                "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }");
+
+            InventoryItemBase userItem = UserInventoryHelpers.AddInventoryItem(scene, so, 0x100, 0x1000);
+
+            // FIXME: Right now, we have to do a tricksy chat listen to make sure we know when the script is running.
+            // In the future, we need to be able to do this programatically more predicably.
+            scene.EventManager.OnChatFromWorld += OnChatFromWorld;
+
+            SceneObjectGroup rezzedSo
+                = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest);
+            TaskInventoryItem rezzedScriptItem = rezzedSo.RootPart.Inventory.GetInventoryItem("scriptItem");
+
+            // Wait for chat to signal rezzed script has been started.
+            m_chatEvent.WaitOne(60000);
+
+            // Force save
+            xEngine.DoBackup(new Object[] { 0 });
+
+//            Console.WriteLine("ItemID {0}", rezzedScriptItem.ItemID);
+//
+//            foreach (
+//                string s in Directory.EnumerateFileSystemEntries(
+//                    string.Format("ScriptEngines/{0}", scene.RegionInfo.RegionID)))
+//                Console.WriteLine(s);
+
+            Assert.IsFalse(
+                File.Exists(
+                    string.Format("ScriptEngines/{0}/{1}.state", scene.RegionInfo.RegionID, rezzedScriptItem.ItemID)));
+
+            scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, rezzedSo);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 1831c39..466c190 100644..100755
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -43,6 +43,7 @@ using OpenMetaverse.StructuredData;
 using log4net;
 using Nini.Config;
 using Amib.Threading;
+using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Scenes;
@@ -61,6 +62,7 @@ using ScriptCompileQueue = OpenSim.Framework.LocklessQueue<object[]>;
 
 namespace OpenSim.Region.ScriptEngine.XEngine
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEngine")]
     public class XEngine : INonSharedRegionModule, IScriptModule, IScriptEngine
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -71,7 +73,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         /// <remarks>
         /// If DebugLevel >= 1, then we log every time that a script is started.
         /// </remarks>
-//        public int DebugLevel { get; set; }
+        public int DebugLevel { get; set; }
+
+        /// <summary>
+        /// A parameter to allow us to notify the log if at least one script has a compilation that is not compatible
+        /// with ScriptStopStrategy.
+        /// </summary>
+        public bool HaveNotifiedLogOfScriptStopMistmatch { get; private set; }
 
         private SmartThreadPool m_ThreadPool;
         private int m_MaxScriptQueue;
@@ -87,6 +95,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         /// </summary>
         private int m_StartDelay;
 
+        /// <summary>
+        /// Are we stopping scripts co-operatively by inserting checks in them at C# compile time (true) or aborting
+        /// their threads (false)?
+        /// </summary>
+        private bool m_coopTermination;
+
         private int m_IdleTimeout;
         private int m_StackSize;
         private int m_SleepTime;
@@ -96,7 +110,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         private bool m_InitialStartup = true;
         private int m_ScriptFailCount; // Number of script fails since compile queue was last empty
         private string m_ScriptErrorMessage;
-        private Dictionary<string, string> m_uniqueScripts = new Dictionary<string, string>();
         private bool m_AppDomainLoading;
         private Dictionary<UUID,ArrayList> m_ScriptErrors =
                 new Dictionary<UUID,ArrayList>();
@@ -308,12 +321,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             m_ScriptConfig = configSource.Configs["XEngine"];
             m_ConfigSource = configSource;
 
-            string rawScriptStopStrategy = m_ScriptConfig.GetString("ScriptStopStrategy", "abort");
+            string rawScriptStopStrategy = m_ScriptConfig.GetString("ScriptStopStrategy", "co-op");
 
             m_log.InfoFormat("[XEngine]: Script stop strategy is {0}", rawScriptStopStrategy);
 
             if (rawScriptStopStrategy == "co-op")
             {
+                m_coopTermination = true;
                 ScriptClassName = "XEngineScript";
                 ScriptBaseClassName = typeof(XEngineScriptBase).FullName;
                 ScriptBaseClassParameters = typeof(XEngineScriptBase).GetConstructor(new Type[] { typeof(WaitHandle) }).GetParameters();
@@ -457,19 +471,19 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 (module, cmdparams) => HandleScriptsAction(cmdparams, HandleStartScript));
 
             MainConsole.Instance.Commands.AddCommand(
-                "Scripts", false, "debug scripts log", "debug scripts log <item-id> <log-level>", "Extra debug logging for a script",
+                "Debug", false, "debug scripts log", "debug scripts log <item-id> <log-level>", "Extra debug logging for a particular script.",
                 "Activates or deactivates extra debug logging for the given script.\n"
                     + "Level == 0, deactivate extra debug logging.\n"
                     + "Level >= 1, log state changes.\n"
                     + "Level >= 2, log event invocations.\n",
                 HandleDebugScriptLogCommand);
 
-//            MainConsole.Instance.Commands.AddCommand(
-//                "Debug", false, "debug xengine", "debug xengine [<level>]",
-//                "Turn on detailed xengine debugging.",
-//                  "If level <= 0, then no extra logging is done.\n"
-//                + "If level >= 1, then we log every time that a script is started.",
-//                HandleDebugLevelCommand);
+            MainConsole.Instance.Commands.AddCommand(
+                "Debug", false, "debug xengine log", "debug xengine log [<level>]",
+                "Turn on detailed xengine debugging.",
+                  "If level <= 0, then no extra logging is done.\n"
+                + "If level >= 1, then we log every time that a script is started.",
+                HandleDebugLevelCommand);
         }
 
         private void HandleDebugScriptLogCommand(string module, string[] args)
@@ -512,26 +526,26 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         /// </summary>
         /// <param name="module"></param>
         /// <param name="args"></param>
-//        private void HandleDebugLevelCommand(string module, string[] args)
-//        {
-//            if (args.Length == 3)
-//            {
-//                int newDebug;
-//                if (int.TryParse(args[2], out newDebug))
-//                {
-//                    DebugLevel = newDebug;
-//                    MainConsole.Instance.OutputFormat("Debug level set to {0}", newDebug);
-//                }
-//            }
-//            else if (args.Length == 2)
-//            {
-//                MainConsole.Instance.OutputFormat("Current debug level is {0}", DebugLevel);
-//            }
-//            else
-//            {
-//                MainConsole.Instance.Output("Usage: debug xengine 0..1");
-//            }
-//        }
+        private void HandleDebugLevelCommand(string module, string[] args)
+        {
+            if (args.Length >= 4)
+            {
+                int newDebug;
+                if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, args[3], out newDebug))
+                {
+                    DebugLevel = newDebug;
+                    MainConsole.Instance.OutputFormat("Debug level set to {0} in XEngine for region {1}", newDebug, m_Scene.Name);
+                }
+            }
+            else if (args.Length == 3)
+            {
+                MainConsole.Instance.OutputFormat("Current debug level is {0}", DebugLevel);
+            }
+            else
+            {
+                MainConsole.Instance.Output("Usage: debug xengine log <level>");
+            }
+        }
 
         /// <summary>
         /// Parse the raw item id into a script instance from the command params if it's present.
@@ -631,7 +645,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
 
             sb.AppendFormat("Scripts loaded             : {0}\n", scriptsLoaded);
-            sb.AppendFormat("Unique scripts             : {0}\n", m_uniqueScripts.Count);
             sb.AppendFormat("Scripts waiting for load   : {0}\n", m_CompileQueue.Count);
             sb.AppendFormat("Max threads                : {0}\n", m_ThreadPool.MaxThreads);
             sb.AppendFormat("Min threads                : {0}\n", m_ThreadPool.MinThreads);
@@ -754,6 +767,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         {
             if (instance.Running)
             {
+                instance.StayStopped = true;    // the script was stopped explicitly
+
                 instance.Stop(0);
 
                 SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
@@ -778,11 +793,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 //
                 if (m_Assemblies.ContainsKey(instance.AssetID))
                 {
+<<<<<<< HEAD
+                    // Force a final state save
+                    //
+                    try
+                    {
+                        if (instance.StatePersistedHere)
+                            instance.SaveState();
+=======
                     string assembly = m_Assemblies[instance.AssetID];
 
                     try
                     {
                         instance.SaveState(assembly);
+>>>>>>> avn/ubitvar
                     }
                     catch (Exception e)
                     {
@@ -794,10 +818,16 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     }
                 }
 
+<<<<<<< HEAD
+                    // Clear the event queue and abort the instance thread
+                    //
+                    instance.Stop(0, true);
+=======
                 // Clear the event queue and abort the instance thread
                 //
                 instance.ClearQueue();
                 instance.Stop(0);
+>>>>>>> avn/ubitvar
 
                 // Release events, timer, etc
                 //
@@ -898,6 +928,25 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             List<IScriptInstance> instances = new List<IScriptInstance>();
 
+<<<<<<< HEAD
+            lock (m_Scripts)
+            {
+                foreach (IScriptInstance instance in m_Scripts.Values)
+                {
+                    if (instance.StatePersistedHere)
+                    {
+//                        m_log.DebugFormat(
+//                            "[XEngine]: Adding script {0}.{1}, item UUID {2}, prim UUID {3} in {4} for state persistence",
+//                            instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, World.Name);
+
+                        instances.Add(instance);
+                    }
+                }
+            }
+
+            foreach (IScriptInstance i in instances)
+            {
+=======
             lockScriptsForRead(true);
                  foreach (IScriptInstance instance in m_Scripts.Values)
                     instances.Add(instance);
@@ -913,9 +962,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     assembly = m_Assemblies[i.AssetID];
                 
 
+>>>>>>> avn/ubitvar
                 try
                 {
-                    i.SaveState(assembly);
+                    i.SaveState();
                 }
                 catch (Exception e)
                 {
@@ -927,8 +977,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 }
             }
 
-            instances.Clear();
-
             if (saveTime > 0)
                 m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup),
                                            new Object[] { saveTime });
@@ -938,6 +986,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void SaveAllState()
         {
+            DoBackup(new object[] { 0 });
+        }
+
+        public object DoMaintenance(object p)
+        {
+            object[] parms = (object[])p;
+            int sleepTime = (int)parms[0];
+
             foreach (IScriptInstance inst in m_Scripts.Values)
             {
                 if (inst.EventTime() > m_EventLimit)
@@ -947,14 +1003,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                         inst.Start();
                 }
             }
-        }
-
-        public object DoMaintenance(object p)
-        {
-            object[] parms = (object[])p;
-            int sleepTime = (int)parms[0];
-
-            SaveAllState();
 
             System.Threading.Thread.Sleep(sleepTime);
 
@@ -1032,8 +1080,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                             if (restOfFirstLine.StartsWith("c#")
                                 || restOfFirstLine.StartsWith("vb")
                                 || restOfFirstLine.StartsWith("lsl")
-                                || restOfFirstLine.StartsWith("js")
-                                || restOfFirstLine.StartsWith("yp")
                                 || restOfFirstLine.Length == 0)
                                 warnRunningInXEngine = true;
 
@@ -1067,12 +1113,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             if (engine != ScriptEngineName)
                 return;
 
-            // If we've seen this exact script text before, use that reference instead
-            if (m_uniqueScripts.ContainsKey(script))
-                script = m_uniqueScripts[script];
-            else
-                m_uniqueScripts[script] = script;
-
             Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez, (StateSource)stateSource};
 
             if (stateSource == (int)StateSource.ScriptedRez)
@@ -1086,11 +1126,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
             else
             {
-                m_CompileQueue.Enqueue(parms);
                 lock (m_CompileDict)
-                {
                     m_CompileDict[itemID] = 0;
-                }
+
+                // This must occur after the m_CompileDict so that an existing compile thread cannot hit the check
+                // in DoOnRezScript() before m_CompileDict has been updated.
+                m_CompileQueue.Enqueue(parms);
 
 //                m_log.DebugFormat("[XEngine]: Added script {0} to compile queue", itemID);
 
@@ -1112,49 +1153,81 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public Object DoOnRezScriptQueue(Object dummy)
         {
-            if (m_InitialStartup)
+            try
             {
-                // This delay exists to stop mono problems where script compilation and startup would stop the sim
-                // working properly for the session.
-                System.Threading.Thread.Sleep(m_StartDelay);
+                if (m_InitialStartup)
+                {
+                    // This delay exists to stop mono problems where script compilation and startup would stop the sim
+                    // working properly for the session.
+                    System.Threading.Thread.Sleep(m_StartDelay);
 
-                m_log.InfoFormat("[XEngine]: Performing initial script startup on {0}", m_Scene.Name);
-            }
+                    m_log.InfoFormat("[XEngine]: Performing initial script startup on {0}", m_Scene.Name);
+                }
 
-            object[] o;
+                object[] o;
 
-            int scriptsStarted = 0;
+                int scriptsStarted = 0;
 
-            while (m_CompileQueue.Dequeue(out o))
-            {
-                if (DoOnRezScript(o))
+                while (m_CompileQueue.Dequeue(out o))
                 {
-                    scriptsStarted++;
+                    try
+                    {
+                        if (DoOnRezScript(o))
+                        {
+                            scriptsStarted++;
 
-                    if (m_InitialStartup)
-                        if (scriptsStarted % 50 == 0)
-                            m_log.InfoFormat(
-                                "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name);
+                            if (m_InitialStartup)
+                                if (scriptsStarted % 50 == 0)
+                                    m_log.InfoFormat(
+                                        "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(
+                            string.Format(
+                                "[XEngine]: Failure in DoOnRezScriptQueue() for item {0} in {1}.  Continuing.  Exception  ", 
+                                o[1], m_Scene.Name), 
+                            e);
+                    }
                 }
-            }
 
-            if (m_InitialStartup)
-                m_log.InfoFormat(
-                    "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.Name);
+                if (m_InitialStartup)
+                    m_log.InfoFormat(
+                        "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.Name);
 
-            // NOTE: Despite having a lockless queue, this lock is required
-            // to make sure there is never no compile thread while there
-            // are still scripts to compile. This could otherwise happen
-            // due to a race condition
-            //
-            lock (m_CompileQueue)
-                m_CurrentCompile = null;
+            }
+            catch (Exception e)
+            {
+                m_log.Error(
+                    string.Format("[XEngine]: Failure in DoOnRezScriptQueue() in {0}.  Exception  ", m_Scene.Name), e);
+            }
+            finally
+            {
+                // FIXME: On failure we must trigger this even if the compile queue is not actually empty so that the 
+                // RegionReadyModule is not forever waiting.  This event really needs a different name.
+                m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount,
+                                                                    m_ScriptErrorMessage);
 
-            m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount,
-                                                                m_ScriptErrorMessage);
+                m_ScriptFailCount = 0;
+                m_InitialStartup = false;
 
-            m_ScriptFailCount = 0;
-            m_InitialStartup = false;
+                // NOTE: Despite having a lockless queue, this lock is required
+                // to make sure there is never no compile thread while there
+                // are still scripts to compile. This could otherwise happen
+                // due to a race condition
+                //
+                lock (m_CompileQueue)
+                {
+                    m_CurrentCompile = null;
+
+                    // This is to avoid a situation where the m_CompileQueue while loop above could complete but 
+                    // OnRezScript() place a new script on the queue and check m_CurrentCompile = null before we hit 
+                    // this section.
+                    if (m_CompileQueue.Count > 0)
+                        m_CurrentCompile = m_ThreadPool.QueueWorkItem(DoOnRezScriptQueue, null);
+                }
+            }
 
             return null;
         }
@@ -1201,16 +1274,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 return false;
             }
 
-            m_log.DebugFormat(
-                "[XEngine]: Loading script {0}.{1}, item UUID {2}, prim UUID {3} @ {4}.{5}",
-                part.ParentGroup.RootPart.Name, item.Name, itemID, part.UUID,
-                part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
+            if (DebugLevel > 0)
+                m_log.DebugFormat(
+                    "[XEngine]: Loading script {0}.{1}, item UUID {2}, prim UUID {3} @ {4}.{5}",
+                    part.ParentGroup.RootPart.Name, item.Name, itemID, part.UUID,
+                    part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
 
             UUID assetID = item.AssetID;
 
             ScenePresence presence = m_Scene.GetScenePresence(item.OwnerID);
 
-            string assembly = "";
+            string assemblyPath = "";
 
             Culture.SetCurrentCulture();
 
@@ -1222,12 +1296,16 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 {
                     lock (m_AddingAssemblies)
                     {
-                        m_Compiler.PerformScriptCompile(script, assetID.ToString(), item.OwnerID, out assembly, out linemap);
-                        
-                        if (!m_AddingAssemblies.ContainsKey(assembly)) {
-                            m_AddingAssemblies[assembly] = 1;
+                        m_Compiler.PerformScriptCompile(script, assetID.ToString(), item.OwnerID, out assemblyPath, out linemap);
+
+//                        m_log.DebugFormat(
+//                            "[XENGINE]: Found assembly path {0} onrez {1} in {2}", 
+//                            assemblyPath, item.ItemID, World.Name);
+
+                        if (!m_AddingAssemblies.ContainsKey(assemblyPath)) {
+                            m_AddingAssemblies[assemblyPath] = 1;
                         } else {
-                            m_AddingAssemblies[assembly]++;
+                            m_AddingAssemblies[assemblyPath]++;
                         }
                     }
 
@@ -1387,11 +1465,156 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                         }
                         else
                         {
+<<<<<<< HEAD
+                            m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
+                            m_ScriptErrorMessage += "Exception creating app domain:\n";
+                            m_ScriptFailCount++;
+                            lock (m_AddingAssemblies) 
+                            {
+                                m_AddingAssemblies[assemblyPath]--;
+                            }
+                            return false;
+=======
                             sandbox = AppDomain.CurrentDomain;
+>>>>>>> avn/ubitvar
+                        }
+
+<<<<<<< HEAD
+                    IScript scriptObj = null;
+                    EventWaitHandle coopSleepHandle;
+                    bool coopTerminationForThisScript;
+
+                    // Set up assembly name to point to the appropriate scriptEngines directory
+                    AssemblyName assemblyName = new AssemblyName(Path.GetFileNameWithoutExtension(assemblyPath));
+                    assemblyName.CodeBase = Path.GetDirectoryName(assemblyPath);
+
+                    if (m_coopTermination)
+                    {
+                        try
+                        {
+                            coopSleepHandle = new XEngineEventWaitHandle(false, EventResetMode.AutoReset);
+
+                            scriptObj 
+                                = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
+                                    assemblyName.FullName,
+                                    "SecondLife.XEngineScript",
+                                    false,
+                                    BindingFlags.Default,
+                                    null,
+                                    new object[] { coopSleepHandle }, 
+                                    null,
+                                    null);
+
+                            coopTerminationForThisScript = true;
+                        }
+                        catch (TypeLoadException)
+                        {
+                            coopSleepHandle = null;
+
+                            try
+                            {
+                                scriptObj 
+                                    = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
+                                        assemblyName.FullName,
+                                        "SecondLife.Script",
+                                        false,
+                                        BindingFlags.Default,
+                                        null,
+                                        null,
+                                        null,
+                                        null);
+                            }
+                            catch (Exception e2)
+                            {
+                                m_log.Error(
+                                    string.Format(
+                                        "[XENGINE]: Could not load previous SecondLife.Script from assembly {0} in {1}.  Not starting.  Exception  ", 
+                                        assemblyName.FullName, World.Name),
+                                    e2);
+
+                                return false;
+                            }
+
+                            coopTerminationForThisScript = false;
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            scriptObj 
+                                = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
+                                    assemblyName.FullName,
+                                    "SecondLife.Script",
+                                    false,
+                                    BindingFlags.Default,
+                                    null,
+                                    null,
+                                    null,
+                                    null);
+
+                            coopSleepHandle = null;
+                            coopTerminationForThisScript = false;
                         }
+                        catch (TypeLoadException)
+                        {
+                            coopSleepHandle = new XEngineEventWaitHandle(false, EventResetMode.AutoReset);
+
+                            try
+                            {
+                                scriptObj 
+                                    = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
+                                        assemblyName.FullName,
+                                        "SecondLife.XEngineScript",
+                                        false,
+                                        BindingFlags.Default,
+                                        null,
+                                        new object[] { coopSleepHandle },
+                                        null,
+                                        null);
+                            }
+                            catch (Exception e2)
+                            {
+                                m_log.Error(
+                                    string.Format(
+                                        "[XENGINE]: Could not load previous SecondLife.XEngineScript from assembly {0} in {1}.  Not starting.  Exception  ", 
+                                        assemblyName.FullName, World.Name),
+                                    e2);
+
+                                return false;
+                            }
+
+                            coopTerminationForThisScript = true;
+                        }
+                    }
 
+                    if (m_coopTermination != coopTerminationForThisScript && !HaveNotifiedLogOfScriptStopMistmatch)
+                    {
+                        // Notify the log that there is at least one script compile that doesn't match the
+                        // ScriptStopStrategy.  Operator has to manually delete old DLLs - we can't do this on Windows
+                        // once the assembly has been loaded evne if the instantiation of a class was unsuccessful.
+                        m_log.WarnFormat(
+                            "[XEngine]: At least one existing compiled script DLL in {0} has {1} as ScriptStopStrategy whereas config setting is {2}."
+                            + "\nContinuing with script compiled strategy but to remove this message please set [XEngine] DeleteScriptsOnStartup = true for one simulator session to remove old script DLLs (script state will not be lost).",
+                            World.Name, coopTerminationForThisScript ? "co-op" : "abort", m_coopTermination ? "co-op" : "abort");
+
+                        HaveNotifiedLogOfScriptStopMistmatch = true;
+                    }
+
+                    instance = new ScriptInstance(this, part,
+                                                  item,
+                                                  startParam, postOnRez,
+                                                  m_MaxScriptQueue);
+
+                    if (
+                        !instance.Load(
+                            scriptObj, coopSleepHandle, assemblyPath,
+                            Path.Combine(ScriptEnginePath, World.RegionInfo.RegionID.ToString()), stateSource, coopTerminationForThisScript))
+                            return false;
+=======
 //                    if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource))
 //                        return false;
+>>>>>>> avn/ubitvar
 
                         m_AppDomains[appDomain] = sandbox;
 
@@ -1444,11 +1667,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
 
             if (!m_Assemblies.ContainsKey(assetID))
-                m_Assemblies[assetID] = assembly;
+                m_Assemblies[assetID] = assemblyPath;
 
             lock (m_AddingAssemblies) 
             {
-                m_AddingAssemblies[assembly]--;
+                m_AddingAssemblies[assemblyPath]--;
             }
 
             if (instance!=null) 
@@ -1482,6 +1705,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 return;
             }           
 
+<<<<<<< HEAD
+            instance.Stop(m_WaitForEventCompletionOnScriptStop, true);
+=======
             IScriptInstance instance=m_Scripts[itemID];
             lockScriptsForRead(false);
             lockScriptsForWrite(true);
@@ -1492,6 +1718,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             instance.Stop(m_WaitForEventCompletionOnScriptStop);
 
 //                bool objectRemoved = false;
+>>>>>>> avn/ubitvar
 
             lock (m_PrimObjects)
             {
@@ -1504,14 +1731,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                     // If there are no more scripts, remove prim
                     if (m_PrimObjects[localID].Count == 0)
-                    {
                         m_PrimObjects.Remove(localID);
-//                            objectRemoved = true;
-                    }
                 }
             }
 
-            instance.RemoveState();
+            if (instance.StatePersistedHere)
+                instance.RemoveState(); 
+
             instance.DestroyScriptInstance();
 
             if (m_DomainScripts.ContainsKey(instance.AppDomain))
@@ -1653,7 +1879,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             IScriptInstance instance = (ScriptInstance) parms;
             
-            //m_log.DebugFormat("[XEngine]: Processing event for {0}", instance);
+//            m_log.DebugFormat("[XEngine]: Processing event for {0}", instance);
 
             return instance.EventProcessor();
         }
@@ -1829,6 +2055,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             IScriptInstance instance = GetInstance(itemID);
             if (instance != null)
                 instance.ApiResetScript();
+
+            // Send the new number of threads that are in use by the thread
+            // pool, I believe that by adding them to the locations where the
+            // script is changing states that I will catch all changes to the
+            // thread pool
+            m_Scene.setThreadCount(m_ThreadPool.InUseThreads);
         }
 
         public void ResetScript(UUID itemID)
@@ -1836,6 +2068,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             IScriptInstance instance = GetInstance(itemID);
             if (instance != null)
                 instance.ResetScript(m_WaitForEventCompletionOnScriptStop);
+
+            // Send the new number of threads that are in use by the thread
+            // pool, I believe that by adding them to the locations where the
+            // script is changing states that I will catch all changes to the
+            // thread pool
+            m_Scene.setThreadCount(m_ThreadPool.InUseThreads);
         }
 
         public void StartScript(UUID itemID)
@@ -1845,6 +2083,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 instance.Start();
             else
                 m_runFlags.AddOrUpdate(itemID, true, 240);
+
+            // Send the new number of threads that are in use by the thread
+            // pool, I believe that by adding them to the locations where the
+            // script is changing states that I will catch all changes to the
+            // thread pool
+            m_Scene.setThreadCount(m_ThreadPool.InUseThreads);
         }
 
         public void StopScript(UUID itemID)
@@ -1853,6 +2097,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             if (instance != null)
             {
+                lock (instance.EventQueue)
+                    instance.StayStopped = true;    // the script was stopped explicitly
+
                 instance.Stop(m_WaitForEventCompletionOnScriptStop);
             }
             else
@@ -1860,6 +2107,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 //                m_log.DebugFormat("[XENGINE]: Could not find script with ID {0} to stop in {1}", itemID, World.Name);
                 m_runFlags.AddOrUpdate(itemID, false, 240);
             }
+
+            // Send the new number of threads that are in use by the thread
+            // pool, I believe that by adding them to the locations where the
+            // script is changing states that I will catch all changes to the
+            // thread pool
+            m_Scene.setThreadCount(m_ThreadPool.InUseThreads);
         }
 
         public DetectParams GetDetectParams(UUID itemID, int idx)
@@ -2225,7 +2478,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     catch (IOException ex)
                     {
                         // if there already exists a file at that location, it may be locked.
-                        m_log.ErrorFormat("[XEngine]: Linemap file {0} already exists! {1}", mappath, ex.Message);
+                        m_log.Error(
+                            string.Format("[XEngine]: Linemap file {0} could not be written.  Exception  ", mappath), ex);
                     }
                 }
             }
@@ -2251,6 +2505,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 m_log.ErrorFormat("[XEngine]: Error whilst writing state file {0}, {1}", statepath, ex.Message);
             }
 
+//            m_log.DebugFormat(
+//                "[XEngine]: Wrote state for script item with ID {0} at {1} in {2}", itemID, statepath, m_Scene.Name);
+
             return true;
         }
 
@@ -2272,7 +2529,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public Dictionary<uint, float> GetObjectScriptsExecutionTimes()
         {
-            long tickNow = Util.EnvironmentTickCount();
             Dictionary<uint, float> topScripts = new Dictionary<uint, float>();
 
             lock (m_Scripts)
@@ -2282,7 +2538,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     if (!topScripts.ContainsKey(si.LocalID))
                         topScripts[si.RootLocalID] = 0;
 
-                    topScripts[si.RootLocalID] += CalculateAdjustedExectionTime(si, tickNow);
+                    topScripts[si.RootLocalID] += GetExectionTime(si);
                 }
             }
 
@@ -2296,7 +2552,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 return 0.0f;
             }
             float time = 0.0f;
-            long tickNow = Util.EnvironmentTickCount();
             IScriptInstance si;
             // Calculate the time for all scripts that this engine is executing
             // Ignore any others
@@ -2305,36 +2560,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 si = GetInstance(id);
                 if (si != null && si.Running)
                 {
-                    time += CalculateAdjustedExectionTime(si, tickNow);
+                    time += GetExectionTime(si);
                 }
             }
             return time;
         }
 
-        private float CalculateAdjustedExectionTime(IScriptInstance si, long tickNow)
+        private float GetExectionTime(IScriptInstance si)
         {
-            long ticksElapsed = tickNow - si.MeasurementPeriodTickStart;
-
-            // Avoid divide by zero
-            if (ticksElapsed == 0)
-                ticksElapsed = 1;
-
-            // Scale execution time to the ideal 55 fps frame time for these reasons.
-            //
-            // 1) XEngine does not execute scripts per frame, unlike other script engines.  Hence, there is no
-            // 'script execution time per frame', which is the original purpose of this value.
-            //
-            // 2) Giving the raw execution times is misleading since scripts start at different times, making
-            // it impossible to compare scripts.
-            //
-            // 3) Scaling the raw execution time to the time that the script has been running is better but
-            // is still misleading since a script that has just been rezzed may appear to have been running
-            // for much longer.
-            //
-            // 4) Hence, we scale execution time to an idealised frame time (55 fps).  This is also not perfect
-            // since the figure does not represent actual execution time and very hard running scripts will
-            // never exceed 18ms (though this is a very high number for script execution so is a warning sign).
-            return ((float)si.MeasurementPeriodExecutionTime / ticksElapsed) * 18.1818f;
+            return (float)si.ExecutionTime.GetSumTime().TotalMilliseconds;
         }
 
         public void SuspendScript(UUID itemID)
@@ -2346,6 +2580,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 instance.Suspend();
 //            else
 //                m_log.DebugFormat("[XEngine]: Could not find script with ID {0} to resume", itemID);
+
+            // Send the new number of threads that are in use by the thread
+            // pool, I believe that by adding them to the locations where the
+            // script is changing states that I will catch all changes to the
+            // thread pool
+            m_Scene.setThreadCount(m_ThreadPool.InUseThreads);
         }
 
         public void ResumeScript(UUID itemID)
@@ -2357,6 +2597,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 instance.Resume();
 //            else
 //                m_log.DebugFormat("[XEngine]: Could not find script with ID {0} to resume", itemID);
+
+            // Send the new number of threads that are in use by the thread
+            // pool, I believe that by adding them to the locations where the
+            // script is changing states that I will catch all changes to the
+            // thread pool
+            m_Scene.setThreadCount(m_ThreadPool.InUseThreads);
         }
 
         public bool HasScript(UUID itemID, out bool running)
@@ -2370,5 +2616,30 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             running = instance.Running;
             return true;
         }
+
+        public void SleepScript(UUID itemID, int delay)
+        {
+            IScriptInstance instance = GetInstance(itemID);
+            if (instance == null)
+                return;
+
+            instance.ExecutionTimer.Stop();
+            try
+            {
+                if (instance.CoopWaitHandle != null)
+                {
+                    if (instance.CoopWaitHandle.WaitOne(delay))
+                        throw new ScriptCoopStopException();
+                }
+                else
+                {
+                    Thread.Sleep(delay);
+                }
+            }
+            finally
+            {
+                instance.ExecutionTimer.Start();
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs b/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs
index f2d3255..9fac53e 100644
--- a/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
index ad848a1..06d9e91 100644
--- a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
+++ b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
@@ -162,9 +162,6 @@ namespace OpenSim.Region.UserStatistics
                 output.Append("OthrMS");
                 HTMLUtil.TD_C(ref output);
                 HTMLUtil.TD_O(ref output, TDHeaderClass);
-                output.Append("ScrLPS");
-                HTMLUtil.TD_C(ref output);
-                HTMLUtil.TD_O(ref output, TDHeaderClass);
                 output.Append("OutPPS");
                 HTMLUtil.TD_C(ref output);
                 HTMLUtil.TD_O(ref output, TDHeaderClass);
@@ -194,9 +191,6 @@ namespace OpenSim.Region.UserStatistics
                 output.Append(sdata.OtherFrameTime);
                 HTMLUtil.TD_C(ref output);
                 HTMLUtil.TD_O(ref output, TDDataClassCenter);
-                output.Append(sdata.ScriptLinesPerSecond);
-                HTMLUtil.TD_C(ref output);
-                HTMLUtil.TD_O(ref output, TDDataClassCenter);
                 output.Append(sdata.OutPacketsPerSecond);
                 HTMLUtil.TD_C(ref output);
                 HTMLUtil.TD_O(ref output, TDDataClassCenter);
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index b98b762..1383208 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -50,8 +50,8 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
 using OSD = OpenMetaverse.StructuredData.OSD;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
-[assembly: Addin("WebStats", "1.0")]
-[assembly: AddinDependency("OpenSim", "0.5")]
+[assembly: Addin("WebStats", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
 
 namespace OpenSim.Region.UserStatistics
 {