rename XMREngine as Yengine (still not all done), big mess source formating changes, move state files to proper folder, fix a source file locking on errors, more changes for cross platform including from Mike,... yes yes i know a messy commit

1 files changed, 201 insertions, 206 deletions

diff --git a/OpenSim/Region/ScriptEngine/XMREngine/XMRInstBackend.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
index a24036a..fb5c75e 100644
--- a/OpenSim/Region/ScriptEngine/XMREngine/XMRInstBackend.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
@@ -42,13 +42,13 @@ 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;
 
-namespace OpenSim.Region.ScriptEngine.XMREngine
+namespace OpenSim.Region.ScriptEngine.Yengine
 {
     /****************************************************\
      *  This file contains routines called by scripts.  *
     \****************************************************/
 
-    public class XMRLSL_Api : LSL_Api
+    public class XMRLSL_Api: LSL_Api
     {
         public AsyncCommandManager acm;
         private XMRInstance inst;
@@ -83,38 +83,38 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          *         -2: no av granted perms
          *         -3: av not in region
          */
-/* engines should not have own API
-        public int xmrSeatAvatar (bool owner)
-        {
-            // Get avatar to be seated and make sure they have given us ANIMATION permission
-
-            UUID avuuid;
-            if (owner) {
-                avuuid = inst.m_Part.OwnerID;
-            } else {
-                if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) == 0) {
-                    return -1;
-                }
-                avuuid = m_item.PermsGranter;
-            }
-            if (avuuid == UUID.Zero) {
-                return -2;
-            }
+        /* engines should not have own API
+                public int xmrSeatAvatar (bool owner)
+                {
+                    // Get avatar to be seated and make sure they have given us ANIMATION permission
+
+                    UUID avuuid;
+                    if (owner) {
+                        avuuid = inst.m_Part.OwnerID;
+                    } else {
+                        if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) == 0) {
+                            return -1;
+                        }
+                        avuuid = m_item.PermsGranter;
+                    }
+                    if (avuuid == UUID.Zero) {
+                        return -2;
+                    }
 
-            ScenePresence presence = World.GetScenePresence (avuuid);
-            if (presence == null) {
-                return -3;
-            }
+                    ScenePresence presence = World.GetScenePresence (avuuid);
+                    if (presence == null) {
+                        return -3;
+                    }
 
-            // remoteClient = not used by ScenePresence.HandleAgentRequestSit()
-            //      agentID = not used by ScenePresence.HandleAgentRequestSit()
-            //     targetID = UUID of prim to sit on
-            //       offset = offset of sitting position
+                    // remoteClient = not used by ScenePresence.HandleAgentRequestSit()
+                    //      agentID = not used by ScenePresence.HandleAgentRequestSit()
+                    //     targetID = UUID of prim to sit on
+                    //       offset = offset of sitting position
 
-            presence.HandleAgentRequestSit (null, UUID.Zero, m_host.UUID, OpenMetaverse.Vector3.Zero);
-            return 0;
-        }
-*/
+                    presence.HandleAgentRequestSit (null, UUID.Zero, m_host.UUID, OpenMetaverse.Vector3.Zero);
+                    return 0;
+                }
+        */
         /**
          * @brief llTeleportAgent() is broken in that if you pass it a landmark,
          *        it still subjects the position to spawn points, as it always
@@ -125,80 +125,80 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          * @param landmark = inventory name or UUID of a landmark object
          * @param lookat   = looking direction after teleport
          */
-/* engines should not have own API
-        public void xmrTeleportAgent2Landmark (string agent, string landmark, LSL_Vector lookat)
-        {
-            // find out about agent to be teleported
-            UUID agentId;
-            if (!UUID.TryParse (agent, out agentId)) throw new ApplicationException ("bad agent uuid");
-
-            ScenePresence presence = World.GetScenePresence (agentId);
-            if (presence == null) throw new ApplicationException ("agent not present in scene");
-            if (presence.IsNPC) throw new ApplicationException ("agent is an NPC");
-            if (presence.IsGod) throw new ApplicationException ("agent is a god");
-
-            // prim must be owned by land owner or prim must be attached to agent
-            if (m_host.ParentGroup.AttachmentPoint == 0) {
-                if (m_host.OwnerID != World.LandChannel.GetLandObject (presence.AbsolutePosition).LandData.OwnerID) {
-                    throw new ApplicationException ("prim not owned by land's owner");
-                }
-            } else {
-                if (m_host.OwnerID != presence.UUID) throw new ApplicationException ("prim not attached to agent");
-            }
+        /* engines should not have own API
+                public void xmrTeleportAgent2Landmark (string agent, string landmark, LSL_Vector lookat)
+                {
+                    // find out about agent to be teleported
+                    UUID agentId;
+                    if (!UUID.TryParse (agent, out agentId)) throw new ApplicationException ("bad agent uuid");
+
+                    ScenePresence presence = World.GetScenePresence (agentId);
+                    if (presence == null) throw new ApplicationException ("agent not present in scene");
+                    if (presence.IsNPC) throw new ApplicationException ("agent is an NPC");
+                    if (presence.IsGod) throw new ApplicationException ("agent is a god");
+
+                    // prim must be owned by land owner or prim must be attached to agent
+                    if (m_host.ParentGroup.AttachmentPoint == 0) {
+                        if (m_host.OwnerID != World.LandChannel.GetLandObject (presence.AbsolutePosition).LandData.OwnerID) {
+                            throw new ApplicationException ("prim not owned by land's owner");
+                        }
+                    } else {
+                        if (m_host.OwnerID != presence.UUID) throw new ApplicationException ("prim not attached to agent");
+                    }
 
-            // find landmark in inventory or by UUID
-            UUID assetID = ScriptUtils.GetAssetIdFromKeyOrItemName (m_host, landmark);
-            if (assetID == UUID.Zero) throw new ApplicationException ("no such landmark");
+                    // find landmark in inventory or by UUID
+                    UUID assetID = ScriptUtils.GetAssetIdFromKeyOrItemName (m_host, landmark);
+                    if (assetID == UUID.Zero) throw new ApplicationException ("no such landmark");
 
-            // read it in and make sure it is a landmark
-            AssetBase lma = World.AssetService.Get (assetID.ToString ());
-            if ((lma == null) || (lma.Type != (sbyte)AssetType.Landmark)) throw new ApplicationException ("not a landmark");
+                    // read it in and make sure it is a landmark
+                    AssetBase lma = World.AssetService.Get (assetID.ToString ());
+                    if ((lma == null) || (lma.Type != (sbyte)AssetType.Landmark)) throw new ApplicationException ("not a landmark");
 
-            // parse the record
-            AssetLandmark lm = new AssetLandmark (lma);
+                    // parse the record
+                    AssetLandmark lm = new AssetLandmark (lma);
 
-            // the regionhandle (based on region's world X,Y) might be out of date
-            // re-read the handle so we can pass it to RequestTeleportLocation()
-            var region = World.GridService.GetRegionByUUID (World.RegionInfo.ScopeID, lm.RegionID);
-            if (region == null) throw new ApplicationException ("no such region");
+                    // the regionhandle (based on region's world X,Y) might be out of date
+                    // re-read the handle so we can pass it to RequestTeleportLocation()
+                    var region = World.GridService.GetRegionByUUID (World.RegionInfo.ScopeID, lm.RegionID);
+                    if (region == null) throw new ApplicationException ("no such region");
 
-            // finally ready to teleport
-            World.RequestTeleportLocation (presence.ControllingClient,
-                                           region.RegionHandle,
-                                           lm.Position,
-                                           lookat,
-                                           (uint)TeleportFlags.ViaLandmark);
-        }
-*/
+                    // finally ready to teleport
+                    World.RequestTeleportLocation (presence.ControllingClient,
+                                                   region.RegionHandle,
+                                                   lm.Position,
+                                                   lookat,
+                                                   (uint)TeleportFlags.ViaLandmark);
+                }
+        */
         /**
          * @brief Allow any member of group given by config SetParcelMusicURLGroup to set music URL.
          *        Code modelled after llSetParcelMusicURL().
          * @param newurl = new URL to set (or "" to leave it alone)
          * @returns previous URL string
          */
-/* engines should not have own API
-        public string xmrSetParcelMusicURLGroup (string newurl)
-        {
-            string groupname = m_ScriptEngine.Config.GetString ("SetParcelMusicURLGroup", "");
-            if (groupname == "") throw new ApplicationException ("no SetParcelMusicURLGroup config param set");
+        /* engines should not have own API
+                public string xmrSetParcelMusicURLGroup (string newurl)
+                {
+                    string groupname = m_ScriptEngine.Config.GetString ("SetParcelMusicURLGroup", "");
+                    if (groupname == "") throw new ApplicationException ("no SetParcelMusicURLGroup config param set");
 
-            IGroupsModule igm = World.RequestModuleInterface<IGroupsModule> ();
-            if (igm == null) throw new ApplicationException ("no GroupsModule loaded");
+                    IGroupsModule igm = World.RequestModuleInterface<IGroupsModule> ();
+                    if (igm == null) throw new ApplicationException ("no GroupsModule loaded");
 
-            GroupRecord grouprec = igm.GetGroupRecord (groupname);
-            if (grouprec == null) throw new ApplicationException ("no such group " + groupname);
+                    GroupRecord grouprec = igm.GetGroupRecord (groupname);
+                    if (grouprec == null) throw new ApplicationException ("no such group " + groupname);
 
-            GroupMembershipData gmd = igm.GetMembershipData (grouprec.GroupID, m_host.OwnerID);
-            if (gmd == null) throw new ApplicationException ("not a member of group " + groupname);
+                    GroupMembershipData gmd = igm.GetMembershipData (grouprec.GroupID, m_host.OwnerID);
+                    if (gmd == null) throw new ApplicationException ("not a member of group " + groupname);
 
-            ILandObject land = World.LandChannel.GetLandObject (m_host.AbsolutePosition);
-            if (land == null) throw new ApplicationException ("no land at " + m_host.AbsolutePosition.ToString ());
-            string oldurl = land.GetMusicUrl ();
-            if (oldurl == null) oldurl = "";
-            if ((newurl != null) && (newurl != "")) land.SetMusicUrl (newurl);
-            return oldurl;
-        }
-*/
+                    ILandObject land = World.LandChannel.GetLandObject (m_host.AbsolutePosition);
+                    if (land == null) throw new ApplicationException ("no land at " + m_host.AbsolutePosition.ToString ());
+                    string oldurl = land.GetMusicUrl ();
+                    if (oldurl == null) oldurl = "";
+                    if ((newurl != null) && (newurl != "")) land.SetMusicUrl (newurl);
+                    return oldurl;
+                }
+        */
     }
 
     public partial class XMRInstance
@@ -222,9 +222,9 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         public DetectParams GetDetectParams(int number)
         {
             DetectParams dp = null;
-            if ((number >= 0) && (m_DetectParams != null) && (number < m_DetectParams.Length)) {
+            if((number >= 0) && (m_DetectParams != null) && (number < m_DetectParams.Length))
                 dp = m_DetectParams[number];
-            }
+
             return dp;
         }
 
@@ -236,7 +236,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         public void Die()
         {
             // llDie doesn't work in attachments!
-            if (m_Part.ParentGroup.IsAttachment || m_DetachQuantum > 0)
+            if(m_Part.ParentGroup.IsAttachment || m_DetachQuantum > 0)
                 return;
 
             throw new ScriptDieException();
@@ -247,8 +247,8 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          */
         public void Sleep(int ms)
         {
-            lock (m_QueueLock) {
-
+            lock(m_QueueLock)
+            {
                 /*
                  * Say how long to sleep.
                  */
@@ -306,12 +306,12 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          *      be returned by xmrEventDequeue, to let the runtime know that the script is capable
          *      of processing that event type.  Otherwise, the event may not be queued to the script.
          */
-        private static LSL_List emptyList = new LSL_List (new object[0]);
+        private static LSL_List emptyList = new LSL_List(new object[0]);
 
-        public override LSL_List xmrEventDequeue (double timeout, int returnMask1, int returnMask2,
+        public override LSL_List xmrEventDequeue(double timeout, int returnMask1, int returnMask2,
                                                   int backgroundMask1, int backgroundMask2)
         {
-            DateTime sleepUntil = DateTime.UtcNow + TimeSpan.FromMilliseconds (timeout * 1000.0);
+            DateTime sleepUntil = DateTime.UtcNow + TimeSpan.FromMilliseconds(timeout * 1000.0);
             EventParams evt = null;
             int callNo, evc2;
             int evc1 = 0;
@@ -324,45 +324,47 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
             callNo = -1;
             try
             {
-                if (callMode == CallMode_NORMAL) goto findevent;
+                if(callMode == CallMode_NORMAL)
+                    goto findevent;
 
                 /*
                  * Stack frame is being restored as saved via CheckRun...().
                  * Restore necessary values then jump to __call<n> label to resume processing.
                  */
-                sv          = RestoreStackFrame ("xmrEventDequeue", out callNo);
-                sleepUntil  = DateTime.Parse ((string)sv[0]);
+                sv = RestoreStackFrame("xmrEventDequeue", out callNo);
+                sleepUntil = DateTime.Parse((string)sv[0]);
                 returnMask1 = (int)sv[1];
                 returnMask2 = (int)sv[2];
-                mask1       = (int)sv[3];
-                mask2       = (int)sv[4];
-                switch (callNo)
+                mask1 = (int)sv[3];
+                mask2 = (int)sv[4];
+                switch(callNo)
                 {
-                    case 0: goto __call0;
+                    case 0:
+                        goto __call0;
                     case 1:
-                    {
-                        evc1 = (int)sv[5];
-                        evc  = (ScriptEventCode)(int)sv[6];
-                        DetectParams[] detprms = ObjArrToDetPrms ((object[])sv[7]);
-                        object[]       ehargs  = (object[])sv[8];
-                        evt = new EventParams (evc.ToString (), ehargs, detprms);
-                        goto __call1;
-                    }
+                        {
+                            evc1 = (int)sv[5];
+                            evc = (ScriptEventCode)(int)sv[6];
+                            DetectParams[] detprms = ObjArrToDetPrms((object[])sv[7]);
+                            object[] ehargs = (object[])sv[8];
+                            evt = new EventParams(evc.ToString(), ehargs, detprms);
+                            goto __call1;
+                        }
                 }
-                throw new ScriptBadCallNoException (callNo);
+                throw new ScriptBadCallNoException(callNo);
 
                 /*
                  * Find first event that matches either the return or background masks.
                  */
-            findevent:
-                Monitor.Enter (m_QueueLock);
-                for (lln = m_EventQueue.First; lln != null; lln = lln.Next)
+                findevent:
+                Monitor.Enter(m_QueueLock);
+                for(lln = m_EventQueue.First; lln != null; lln = lln.Next)
                 {
-                    evt  = lln.Value;
-                    evc  = (ScriptEventCode)Enum.Parse (typeof (ScriptEventCode), evt.EventName);
+                    evt = lln.Value;
+                    evc = (ScriptEventCode)Enum.Parse(typeof(ScriptEventCode), evt.EventName);
                     evc1 = (int)evc;
                     evc2 = evc1 - 32;
-                    if ((((uint)evc1 < (uint)32) && (((mask1 >> evc1) & 1) != 0)) ||
+                    if((((uint)evc1 < (uint)32) && (((mask1 >> evc1) & 1) != 0)) ||
                         (((uint)evc2 < (uint)32) && (((mask2 >> evc2) & 1) != 0)))
                         goto remfromq;
                 }
@@ -373,51 +375,50 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
                 m_SleepUntil = sleepUntil;
                 m_SleepEventMask1 = mask1;
                 m_SleepEventMask2 = mask2;
-                Monitor.Exit (m_QueueLock);
+                Monitor.Exit(m_QueueLock);
                 suspendOnCheckRunTemp = true;
                 callNo = 0;
-            __call0:
-                CheckRunQuick ();
+                __call0:
+                CheckRunQuick();
                 goto checktmo;
 
                 /*
                  * Found one, remove it from queue.
                  */
-            remfromq:
-                m_EventQueue.Remove (lln);
-                if ((uint)evc1 < (uint)m_EventCounts.Length)
-                    m_EventCounts[evc1] --;
+                remfromq:
+                m_EventQueue.Remove(lln);
+                if((uint)evc1 < (uint)m_EventCounts.Length)
+                    m_EventCounts[evc1]--;
 
-                Monitor.Exit (m_QueueLock);
-                m_InstEHEvent ++;
+                Monitor.Exit(m_QueueLock);
+                m_InstEHEvent++;
 
                 /*
                  * See if returnable or background event.
                  */
-                if ((((uint)evc1 < (uint)32) && (((returnMask1 >> evc1) & 1) != 0)) ||
+                if((((uint)evc1 < (uint)32) && (((returnMask1 >> evc1) & 1) != 0)) ||
                     (((uint)evc2 < (uint)32) && (((returnMask2 >> evc2) & 1) != 0)))
                 {
-
                     /*
                      * Returnable event, return its parameters in a list.
                      * Also set the detect parameters to what the event has.
                      */
                     int plen = evt.Params.Length;
-                    object[] plist = new object[plen+1];
+                    object[] plist = new object[plen + 1];
                     plist[0] = (LSL_Integer)evc1;
-                    for (int i = 0; i < plen;)
+                    for(int i = 0; i < plen;)
                     {
                         object ob = evt.Params[i];
-                        if (ob is int)
+                        if(ob is int)
                             ob = (LSL_Integer)(int)ob;
-                        else if (ob is double)
+                        else if(ob is double)
                             ob = (LSL_Float)(double)ob;
-                        else if (ob is string)
+                        else if(ob is string)
                             ob = (LSL_String)(string)ob;
                         plist[++i] = ob;
                     }
                     m_DetectParams = evt.DetectParams;
-                    return new LSL_List (plist);
+                    return new LSL_List(plist);
                 }
 
                 /*
@@ -425,35 +426,35 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
                  * then check event queue again.
                  */
                 callNo = 1;
-            __call1:
-                ScriptEventHandler seh = m_ObjCode.scriptEventHandlerTable[stateCode,evc1];
-                if (seh == null)
+                __call1:
+                ScriptEventHandler seh = m_ObjCode.scriptEventHandlerTable[stateCode, evc1];
+                if(seh == null)
                     goto checktmo;
 
-                DetectParams[]  saveDetParams = this.m_DetectParams;
-                object[]        saveEHArgs    = this.ehArgs;
+                DetectParams[] saveDetParams = this.m_DetectParams;
+                object[] saveEHArgs = this.ehArgs;
                 ScriptEventCode saveEventCode = this.eventCode;
 
                 this.m_DetectParams = evt.DetectParams;
-                this.ehArgs         = evt.Params;
-                this.eventCode      = evc;
+                this.ehArgs = evt.Params;
+                this.eventCode = evc;
 
                 try
                 {
-                    seh (this);
+                    seh(this);
                 }
                 finally
                 {
-                    m_DetectParams = saveDetParams;
-                    ehArgs         = saveEHArgs;
-                    eventCode      = saveEventCode;
+                    this.m_DetectParams = saveDetParams;
+                    this.ehArgs = saveEHArgs;
+                    this.eventCode = saveEventCode;
                 }
 
                 /*
                  * Keep waiting until we find a returnable event or timeout.
                  */
-            checktmo:
-                if (DateTime.UtcNow < sleepUntil)
+                checktmo:
+                if(DateTime.UtcNow < sleepUntil)
                     goto findevent;
 
                 /*
@@ -463,7 +464,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
             }
             finally
             {
-                if (callMode != CallMode_NORMAL)
+                if(callMode != CallMode_NORMAL)
                 {
 
                     /*
@@ -471,17 +472,17 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
                      * Save everything we need at the __call<n> labels so we can restore it
                      * when we need to.
                      */
-                    sv    = CaptureStackFrame ("xmrEventDequeue", callNo, 9);
-                    sv[0] = sleepUntil.ToString ();                  // needed at __call0,__call1
+                    sv = CaptureStackFrame("xmrEventDequeue", callNo, 9);
+                    sv[0] = sleepUntil.ToString();                  // needed at __call0,__call1
                     sv[1] = returnMask1;                             // needed at __call0,__call1
                     sv[2] = returnMask2;                             // needed at __call0,__call1
                     sv[3] = mask1;                                   // needed at __call0,__call1
                     sv[4] = mask2;                                   // needed at __call0,__call1
-                    if (callNo == 1)
+                    if(callNo == 1)
                     {
                         sv[5] = evc1;                                // needed at __call1
                         sv[6] = (int)evc;                            // needed at __call1
-                        sv[7] = DetPrmsToObjArr (evt.DetectParams);  // needed at __call1
+                        sv[7] = DetPrmsToObjArr(evt.DetectParams);  // needed at __call1
                         sv[8] = evt.Params;                          // needed at __call1
                     }
                 }
@@ -495,16 +496,16 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          *             are as currently set for the script (use xmrEventLoadDets to set how
          *             you want them to be different).
          */
-        public override void xmrEventEnqueue (LSL_List ev)
+        public override void xmrEventEnqueue(LSL_List ev)
         {
             object[] data = ev.Data;
-            ScriptEventCode evc = (ScriptEventCode)ListInt (data[0]);
+            ScriptEventCode evc = (ScriptEventCode)ListInt(data[0]);
 
             int nargs = data.Length - 1;
             object[] args = new object[nargs];
-            Array.Copy (data, 1, args, 0, nargs);
+            Array.Copy(data, 1, args, 0, nargs);
 
-            PostEvent (new EventParams (evc.ToString (), args, m_DetectParams));
+            PostEvent(new EventParams(evc.ToString(), args, m_DetectParams));
         }
 
         /**
@@ -513,19 +514,19 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          */
         private const int saveDPVer = 1;
 
-        public override LSL_List xmrEventSaveDets ()
+        public override LSL_List xmrEventSaveDets()
         {
-            object[] obs = DetPrmsToObjArr (m_DetectParams);
-            return new LSL_List (obs);
+            object[] obs = DetPrmsToObjArr(m_DetectParams);
+            return new LSL_List(obs);
         }
 
-        private static object[] DetPrmsToObjArr (DetectParams[] dps)
+        private static object[] DetPrmsToObjArr(DetectParams[] dps)
         {
             int len = dps.Length;
-            object[] obs = new object[len*16+1];
+            object[] obs = new object[len * 16 + 1];
             int j = 0;
             obs[j++] = (LSL_Integer)saveDPVer;
-            for (int i = 0; i < len; i ++)
+            for(int i = 0; i < len; i++)
             {
                 DetectParams dp = dps[i];
                 obs[j++] = (LSL_String)dp.Key.ToString();    // UUID
@@ -548,54 +549,52 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
             return obs;
         }
 
-
         /**
          * @brief Load current detect params from a list
          * @param dpList = as returned by xmrEventSaveDets()
          */
-        public override void xmrEventLoadDets (LSL_List dpList)
+        public override void xmrEventLoadDets(LSL_List dpList)
         {
-            m_DetectParams = ObjArrToDetPrms (dpList.Data);
+            m_DetectParams = ObjArrToDetPrms(dpList.Data);
         }
 
-        private static DetectParams[] ObjArrToDetPrms (object[] objs)
+        private static DetectParams[] ObjArrToDetPrms(object[] objs)
         {
             int j = 0;
-            if ((objs.Length % 16 != 1) || (ListInt (objs[j++]) != saveDPVer))
-                throw new Exception ("invalid detect param format");
+            if((objs.Length % 16 != 1) || (ListInt(objs[j++]) != saveDPVer))
+                throw new Exception("invalid detect param format");
 
             int len = objs.Length / 16;
             DetectParams[] dps = new DetectParams[len];
 
-            for (int i = 0; i < len; i ++)
+            for(int i = 0; i < len; i++)
             {
-                DetectParams dp = new DetectParams ();
-
-                dp.Key         = new UUID (ListStr (objs[j++]));
-                dp.OffsetPos   = (LSL_Vector)objs[j++];
-                dp.LinkNum     = ListInt (objs[j++]);
-                dp.Group       = new UUID (ListStr (objs[j++]));
-                dp.Name        = ListStr (objs[j++]);
-                dp.Owner       = new UUID (ListStr (objs[j++]));
-                dp.Position    = (LSL_Vector)objs[j++];
-                dp.Rotation    = (LSL_Rotation)objs[j++];
-                dp.Type        = ListInt (objs[j++]);
-                dp.Velocity    = (LSL_Vector)objs[j++];
-
-                SurfaceTouchEventArgs stea = new SurfaceTouchEventArgs ();
-
-                stea.STCoord   = LSLVec2OMVec ((LSL_Vector)objs[j++]);
-                stea.Normal    = LSLVec2OMVec ((LSL_Vector)objs[j++]);
-                stea.Binormal  = LSLVec2OMVec ((LSL_Vector)objs[j++]);
-                stea.Position  = LSLVec2OMVec ((LSL_Vector)objs[j++]);
-                stea.UVCoord   = LSLVec2OMVec ((LSL_Vector)objs[j++]);
-                stea.FaceIndex = ListInt (objs[j++]);
+                DetectParams dp = new DetectParams();
+
+                dp.Key = new UUID(ListStr(objs[j++]));
+                dp.OffsetPos = (LSL_Vector)objs[j++];
+                dp.LinkNum = ListInt(objs[j++]);
+                dp.Group = new UUID(ListStr(objs[j++]));
+                dp.Name = ListStr(objs[j++]);
+                dp.Owner = new UUID(ListStr(objs[j++]));
+                dp.Position = (LSL_Vector)objs[j++];
+                dp.Rotation = (LSL_Rotation)objs[j++];
+                dp.Type = ListInt(objs[j++]);
+                dp.Velocity = (LSL_Vector)objs[j++];
+
+                SurfaceTouchEventArgs stea = new SurfaceTouchEventArgs();
+
+                stea.STCoord = LSLVec2OMVec((LSL_Vector)objs[j++]);
+                stea.Normal = LSLVec2OMVec((LSL_Vector)objs[j++]);
+                stea.Binormal = LSLVec2OMVec((LSL_Vector)objs[j++]);
+                stea.Position = LSLVec2OMVec((LSL_Vector)objs[j++]);
+                stea.UVCoord = LSLVec2OMVec((LSL_Vector)objs[j++]);
+                stea.FaceIndex = ListInt(objs[j++]);
 
                 dp.SurfaceTouchArgs = stea;
 
                 dps[i] = dp;
             }
-
             return dps;
         }
 
@@ -623,21 +622,13 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
             /*
              * Clear out any old events from the queue.
              */
-            lock (m_QueueLock)
+            lock(m_QueueLock)
             {
                 m_EventQueue.Clear();
-                for (int i = m_EventCounts.Length; -- i >= 0;)
+                for(int i = m_EventCounts.Length; --i >= 0;)
                     m_EventCounts[i] = 0;
             }
         }
-
-        /**
-         * @brief Script is calling xmrStackLeft().
-         */
-        public override int xmrStackLeft ()
-        {
-            return microthread.StackLeft ();
-        }
     }
 
     /**
@@ -646,12 +637,16 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
      *        handler.  We don't want script-level try/catch to intercept
      *        these so scripts can't interfere with the behavior.
      */
-    public class ScriptResetException : Exception, IXMRUncatchable { }
+    public class ScriptResetException: Exception, IXMRUncatchable
+    {
+    }
 
     /**
      * @brief Thrown by things like llDie() to unconditionally unwind as 
      *        script.  We don't want script-level try/catch to intercept
      *        these so scripts can't interfere with the behavior.
      */
-    public class ScriptDieException : Exception, IXMRUncatchable { }
+    public class ScriptDieException: Exception, IXMRUncatchable
+    {
+    }
 }