10 files changed, 29 insertions, 335 deletions

diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index a484300..f3382b2 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -890,10 +890,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void Close()
         {
-            Close(true);
+            Close(true, false);
         }
 
-        public void Close(bool sendStop)
+        public void Close(bool sendStop, bool force)
         {
             Disconnect();
         }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
index 31d0034..17971e3 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
@@ -130,37 +130,37 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
             SendConsoleOutput(agentID, String.Format("auto_grant_attach_perms set to {0}", val));
         }
 
-        private void llAttachToAvatarTemp(UUID host, UUID script, int attachmentPoint)
+        private int llAttachToAvatarTemp(UUID host, UUID script, int attachmentPoint)
         {
             SceneObjectPart hostPart = m_scene.GetSceneObjectPart(host);
 
             if (hostPart == null)
-                return;
+                return 0;
 
             if (hostPart.ParentGroup.IsAttachment)
-                return;
+                return 0;
 
             IAttachmentsModule attachmentsModule = m_scene.RequestModuleInterface<IAttachmentsModule>();
             if (attachmentsModule == null)
-                return;
+                return 0;
 
             TaskInventoryItem item = hostPart.Inventory.GetInventoryItem(script);
             if (item == null)
-                return;
+                return 0;
 
             if ((item.PermsMask & 32) == 0) // PERMISSION_ATTACH
-                return;
+                return 0;
 
             ScenePresence target;
             if (!m_scene.TryGetScenePresence(item.PermsGranter, out target))
-                return;
+                return 0;
             
             if (target.UUID != hostPart.ParentGroup.OwnerID)
             {
                 uint effectivePerms = hostPart.ParentGroup.GetEffectivePermissions();
 
                 if ((effectivePerms & (uint)PermissionMask.Transfer) == 0)
-                    return;
+                    return 0;
 
                 hostPart.ParentGroup.SetOwnerId(target.UUID);
                 hostPart.ParentGroup.SetRootPartOwner(hostPart.ParentGroup.RootPart, target.UUID, target.ControllingClient.ActiveGroupId);
@@ -183,7 +183,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
                 hostPart.ParentGroup.RootPart.ScheduleFullUpdate();
             }
 
-            attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true, true);
+            return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true, true) ? 1 : 0;
         }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index ca956fb..a014798 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -231,12 +231,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             if (m_server == null || m_baseNick == null || m_ircChannel == null || m_user == null)
                 throw new Exception("Invalid connector configuration");
 
-            // Generate an initial nickname if randomizing is enabled
+            // Generate an initial nickname
 
             if (m_randomizeNick)
-            {
                 m_nick = m_baseNick + Util.RandomClass.Next(1, 99);
-            }
+            else 
+                m_nick = m_baseNick;
 
             m_log.InfoFormat("[IRC-Connector-{0}]: Initialization complete", idn);
 
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 7b20446..f292a75 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -447,7 +447,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                 // settings allow voice, then whether parcel allows
                 // voice, if all do retrieve or obtain the parcel
                 // voice channel
-                LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+                LandData land = scene.GetLandData(avatar.AbsolutePosition);
 
                 //m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}",
                 //                  scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param);
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index a30a38d..8a8a31c 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -623,7 +623,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 // settings allow voice, then whether parcel allows
                 // voice, if all do retrieve or obtain the parcel
                 // voice channel
-                LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+                LandData land = scene.GetLandData(avatar.AbsolutePosition);
 
 //                    m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}",
 //                                      scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param);
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
index 311531c..732c28f 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -175,14 +175,15 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         /// 
         /// </summary>
         // -----------------------------------------------------------------
-        public bool CreateStore(string value, out UUID result)
+        public bool CreateStore(string value, ref UUID result)
         {
-            result = UUID.Zero;
+            if (result == UUID.Zero)
+                result = UUID.Random();
+
+            JsonStore map = null;
             
             if (! m_enabled) return false;
             
-            UUID uuid = UUID.Random();
-            JsonStore map = null;
 
             try
             { 
@@ -195,9 +196,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             }
 
             lock (m_JsonValueStore)
-                m_JsonValueStore.Add(uuid,map);
+                m_JsonValueStore.Add(result,map);
             
-            result = uuid;
             return true;
         }
 
@@ -231,7 +231,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 if (! m_JsonValueStore.TryGetValue(storeID,out map))
                 {
                     m_log.InfoFormat("[JsonStore] Missing store {0}",storeID);
-                    return true;
+                    return false;
                 }
             }
             
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index eaba816..6910d14 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -227,7 +227,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         protected UUID JsonCreateStore(UUID hostID, UUID scriptID, string value)
         {
             UUID uuid = UUID.Zero;
-            if (! m_store.CreateStore(value, out uuid))
+            if (! m_store.CreateStore(value, ref uuid))
                 GenerateRuntimeError("Failed to create Json store");
             
             return uuid;
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index fff3a32..bad75f7 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -181,7 +181,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
             }
         }
 
-        void OnOarFileLoaded(Guid requestId, string message)
+        void OnOarFileLoaded(Guid requestId, List<UUID> loadedScenes, string message)
         {
             m_oarFileLoading = true;
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
deleted file mode 100644
index 705a847..0000000
--- a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ /dev/null
@@ -1,308 +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.Reflection;
-using System.Collections.Generic;
-using Nini.Config;
-using log4net;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using Mono.Addins;
-using OpenMetaverse;
-using System.Linq;
-using System.Linq.Expressions;
-
-namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
-{
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ScriptModuleCommsModule")]
-    class ScriptModuleCommsModule : INonSharedRegionModule, IScriptModuleComms
-    {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private Dictionary<string,object> m_constants = new Dictionary<string,object>();
-
-#region ScriptInvocation
-        protected class ScriptInvocationData
-        {
-            public Delegate ScriptInvocationDelegate { get; private set; }
-            public string FunctionName { get; private set; }
-            public Type[] TypeSignature { get; private set; }
-            public Type ReturnType { get; private set; }
-
-            public ScriptInvocationData(string fname, Delegate fn, Type[] callsig, Type returnsig)
-            {
-                FunctionName = fname;
-                ScriptInvocationDelegate = fn;
-                TypeSignature = callsig;
-                ReturnType = returnsig;
-            }
-        }
-
-        private Dictionary<string,ScriptInvocationData> m_scriptInvocation = new Dictionary<string,ScriptInvocationData>();
-#endregion
-
-        private IScriptModule m_scriptModule = null;
-        public event ScriptCommand OnScriptCommand;
-
-#region RegionModuleInterface
-        public void Initialise(IConfigSource config)
-        {
-        }
-
-        public void AddRegion(Scene scene)
-        {
-            scene.RegisterModuleInterface<IScriptModuleComms>(this);
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-            m_scriptModule = scene.RequestModuleInterface<IScriptModule>();
-            
-            if (m_scriptModule != null)
-                m_log.Info("[MODULE COMMANDS]: Script engine found, module active");
-        }
-
-        public string Name
-        {
-            get { return "ScriptModuleCommsModule"; }
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        public void Close()
-        {
-        }
-#endregion
-
-#region ScriptModuleComms
-
-        public void RaiseEvent(UUID script, string id, string module, string command, string k)
-        {
-            ScriptCommand c = OnScriptCommand;
-
-            if (c == null)
-                return;
-
-            c(script, id, module, command, k);
-        }
-
-        public void DispatchReply(UUID script, int code, string text, string k)
-        {
-            if (m_scriptModule == null)
-                return;
-
-            Object[] args = new Object[] {-1, code, text, k};
-
-            m_scriptModule.PostScriptEvent(script, "link_message", args);
-        }
-
-        public void RegisterScriptInvocation(object target, string meth)
-        {
-            MethodInfo mi = target.GetType().GetMethod(meth,
-                    BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
-            if (mi == null)
-            {
-                m_log.WarnFormat("[MODULE COMMANDS] Failed to register method {0}",meth);
-                return;
-            }
-
-            RegisterScriptInvocation(target, mi);
-        }
-
-        public void RegisterScriptInvocation(object target, string[] meth)
-        {
-            foreach (string m in meth)
-                RegisterScriptInvocation(target, m);
-        }
-
-        public void RegisterScriptInvocation(object target, MethodInfo mi)
-        {
-            m_log.DebugFormat("[MODULE COMMANDS] Register method {0} from type {1}", mi.Name, target.GetType().Name);
-
-            Type delegateType;
-            var typeArgs = mi.GetParameters()
-                    .Select(p => p.ParameterType)
-                    .ToList();
-
-            if (mi.ReturnType == typeof(void))
-            {
-                    delegateType = Expression.GetActionType(typeArgs.ToArray());
-            }
-            else
-            {
-                    typeArgs.Add(mi.ReturnType);
-                    delegateType = Expression.GetFuncType(typeArgs.ToArray());
-            }
-
-            Delegate fcall = Delegate.CreateDelegate(delegateType, target, mi);
-
-            lock (m_scriptInvocation)
-            {
-                ParameterInfo[] parameters = fcall.Method.GetParameters ();
-                if (parameters.Length < 2) // Must have two UUID params
-                    return;
-
-                // Hide the first two parameters
-                Type[] parmTypes = new Type[parameters.Length - 2];
-                for (int i = 2 ; i < parameters.Length ; i++)
-                    parmTypes[i - 2] = parameters[i].ParameterType;
-                m_scriptInvocation[fcall.Method.Name] = new ScriptInvocationData(fcall.Method.Name, fcall, parmTypes, fcall.Method.ReturnType);
-            }
-        }
-        
-        public Delegate[] GetScriptInvocationList()
-        {
-            List<Delegate> ret = new List<Delegate>();
-
-            lock (m_scriptInvocation)
-            {
-                foreach (ScriptInvocationData d in m_scriptInvocation.Values)
-                    ret.Add(d.ScriptInvocationDelegate);
-            }
-            return ret.ToArray();
-        }
-
-        public string LookupModInvocation(string fname)
-        {
-            lock (m_scriptInvocation)
-            {
-                ScriptInvocationData sid;
-                if (m_scriptInvocation.TryGetValue(fname,out sid))
-                {
-                    if (sid.ReturnType == typeof(string))
-                        return "modInvokeS";
-                    else if (sid.ReturnType == typeof(int))
-                        return "modInvokeI";
-                    else if (sid.ReturnType == typeof(float))
-                        return "modInvokeF";
-                    else if (sid.ReturnType == typeof(UUID))
-                        return "modInvokeK";
-                    else if (sid.ReturnType == typeof(OpenMetaverse.Vector3))
-                        return "modInvokeV";
-                    else if (sid.ReturnType == typeof(OpenMetaverse.Quaternion))
-                        return "modInvokeR";
-                    else if (sid.ReturnType == typeof(object[]))
-                        return "modInvokeL";
-
-                    m_log.WarnFormat("[MODULE COMMANDS] failed to find match for {0} with return type {1}",fname,sid.ReturnType.Name);
-                }
-            }
-
-            return null;
-        }
-
-        public Delegate LookupScriptInvocation(string fname)
-        {
-            lock (m_scriptInvocation)
-            {
-                ScriptInvocationData sid;
-                if (m_scriptInvocation.TryGetValue(fname,out sid))
-                    return sid.ScriptInvocationDelegate;
-            }
-
-            return null;
-        }
-
-        public Type[] LookupTypeSignature(string fname)
-        {
-            lock (m_scriptInvocation)
-            {
-                ScriptInvocationData sid;
-                if (m_scriptInvocation.TryGetValue(fname,out sid))
-                    return sid.TypeSignature;
-            }
-
-            return null;
-        }
-
-        public Type LookupReturnType(string fname)
-        {
-            lock (m_scriptInvocation)
-            {
-                ScriptInvocationData sid;
-                if (m_scriptInvocation.TryGetValue(fname,out sid))
-                    return sid.ReturnType;
-            }
-
-            return null;
-        }
-
-        public object InvokeOperation(UUID hostid, UUID scriptid, string fname, params object[] parms)
-        {
-            List<object> olist = new List<object>();
-            olist.Add(hostid);
-            olist.Add(scriptid);
-            foreach (object o in parms)
-                olist.Add(o);
-            Delegate fn = LookupScriptInvocation(fname);
-            return fn.DynamicInvoke(olist.ToArray());
-        }
-
-        /// <summary>
-        /// Operation to for a region module to register a constant to be used
-        /// by the script engine
-        /// </summary>
-        public void RegisterConstant(string cname, object value)
-        {
-            m_log.DebugFormat("[MODULE COMMANDS] register constant <{0}> with value {1}",cname,value.ToString());
-            lock (m_constants)
-            {
-                m_constants.Add(cname,value);
-            }
-        }
-
-        /// <summary>
-        /// Operation to check for a registered constant
-        /// </summary>
-        public object LookupModConstant(string cname)
-        {
-            // m_log.DebugFormat("[MODULE COMMANDS] lookup constant <{0}>",cname);
-            
-            lock (m_constants)
-            {
-                object value = null;
-                if (m_constants.TryGetValue(cname,out value))
-                    return value;
-            }
-            
-            return null;
-        }
-
-#endregion
-
-    }
-}
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 7c693b6..bb3748e 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -909,11 +909,13 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         public void Close()
         {
-            Close(true);
+            Close(true, false);
         }
 
-        public void Close(bool sendStop)
+        public void Close(bool sendStop, bool force)
         {
+            // Remove ourselves from the scene
+            m_scene.RemoveClient(AgentId, false);
         }
 
         public void Start()