Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork

20 files changed, 535 insertions, 107 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 61e4934..3cbdde5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -137,7 +137,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (cmdHandlerThread == null)
             {
                 // Start the thread that will be doing the work
-                cmdHandlerThread = Watchdog.StartThread(CmdHandlerThreadLoop, "AsyncLSLCmdHandlerThread", ThreadPriority.Normal, true);
+                cmdHandlerThread
+                    = Watchdog.StartThread(
+                        CmdHandlerThreadLoop, "AsyncLSLCmdHandlerThread", ThreadPriority.Normal, true, true);
             }
         }
 
@@ -245,7 +247,58 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             // Remove Sensors
             m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID);
+        }
+
+        /// <summary>
+        /// Get the sensor repeat plugin for this script engine.
+        /// </summary>
+        /// <param name="engine"></param>
+        /// <returns></returns>
+        public static SensorRepeat GetSensorRepeatPlugin(IScriptEngine engine)
+        {
+            if (m_SensorRepeat.ContainsKey(engine))
+                return m_SensorRepeat[engine];
+            else
+                return null;
+        }
 
+        /// <summary>
+        /// Get the dataserver plugin for this script engine.
+        /// </summary>
+        /// <param name="engine"></param>
+        /// <returns></returns>
+        public static Dataserver GetDataserverPlugin(IScriptEngine engine)
+        {
+            if (m_Dataserver.ContainsKey(engine))
+                return m_Dataserver[engine];
+            else
+                return null;
+        }
+
+        /// <summary>
+        /// Get the timer plugin for this script engine.
+        /// </summary>
+        /// <param name="engine"></param>
+        /// <returns></returns>
+        public static Timer GetTimerPlugin(IScriptEngine engine)
+        {
+            if (m_Timer.ContainsKey(engine))
+                return m_Timer[engine];
+            else
+                return null;
+        }
+
+        /// <summary>
+        /// Get the listener plugin for this script engine.
+        /// </summary>
+        /// <param name="engine"></param>
+        /// <returns></returns>
+        public static Listener GetListenerPlugin(IScriptEngine engine)
+        {
+            if (m_Listener.ContainsKey(engine))
+                return m_Listener[engine];
+            else
+                return null;
         }
 
         public static void StateChange(IScriptEngine engine, uint localID, UUID itemID)
@@ -288,7 +341,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 data.AddRange(timers);
             }
 
-            Object[] sensors=m_SensorRepeat[engine].GetSerializationData(itemID);
+            Object[] sensors = m_SensorRepeat[engine].GetSerializationData(itemID);
             if (sensors.Length > 0)
             {
                 data.Add("sensor");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0cc8829..e2d17a7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4213,7 +4213,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             List<String> nametable = new List<String>();
             World.ForEachRootScenePresence(delegate(ScenePresence presence)
             {
-                if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
+                SceneObjectPart sitPart = presence.ParentPart;
+                if (sitPart != null && m_host.ParentGroup.HasChildPrim(sitPart.LocalId))
                     nametable.Add(presence.ControllingClient.Name);
             });
 
@@ -4450,7 +4451,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             Vector3 av3 = new Vector3(Util.Clip((float)color.x, 0.0f, 1.0f),
                                       Util.Clip((float)color.y, 0.0f, 1.0f),
                                       Util.Clip((float)color.z, 0.0f, 1.0f));
-            m_host.SetText(text.Length > 254 ? text.Remove(255) : text, av3, Util.Clip((float)alpha, 0.0f, 1.0f));
+            m_host.SetText(text.Length > 254 ? text.Remove(254) : text, av3, Util.Clip((float)alpha, 0.0f, 1.0f));
             //m_host.ParentGroup.HasGroupChanged = true;
             //m_host.ParentGroup.ScheduleGroupForFullUpdate();
         }
@@ -4844,22 +4845,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 // Find pushee position
                 // Pushee Linked?
-                if (pusheeav.ParentID != 0)
-                {
-                    SceneObjectPart parentobj = World.GetSceneObjectPart(pusheeav.ParentID);
-                    if (parentobj != null)
-                    {
-                        PusheePos = parentobj.AbsolutePosition;
-                    }
-                    else
-                    {
-                        PusheePos = pusheeav.AbsolutePosition;
-                    }
-                }
+                SceneObjectPart sitPart = pusheeav.ParentPart;
+                if (sitPart != null)
+                    PusheePos = sitPart.AbsolutePosition;
                 else
-                {
                     PusheePos = pusheeav.AbsolutePosition;
-                }
             }
 
             if (!pusheeIsAvatar)
@@ -6067,7 +6057,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     flags |= ScriptBaseClass.AGENT_IN_AIR;
             }
 
-             if (agent.ParentID != 0)
+             if (agent.ParentPart != null)
              {
                  flags |= ScriptBaseClass.AGENT_ON_OBJECT;
                  flags |= ScriptBaseClass.AGENT_SITTING;
@@ -6866,16 +6856,38 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public void llSitTarget(LSL_Vector offset, LSL_Rotation rot)
+        protected void SitTarget(SceneObjectPart part, LSL_Vector offset, LSL_Rotation rot)
         {
-            m_host.AddScriptLPS(1);
             // LSL quaternions can normalize to 0, normal Quaternions can't.
             if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0)
                 rot.z = 1; // ZERO_ROTATION = 0,0,0,1
 
-            m_host.SitTargetPosition = new Vector3((float)offset.x, (float)offset.y, (float)offset.z);
-            m_host.SitTargetOrientation = Rot2Quaternion(rot);
-            m_host.ParentGroup.HasGroupChanged = true;
+            part.SitTargetPosition = new Vector3((float)offset.x, (float)offset.y, (float)offset.z);
+            part.SitTargetOrientation = Rot2Quaternion(rot);
+            part.ParentGroup.HasGroupChanged = true;
+        }
+
+        public void llSitTarget(LSL_Vector offset, LSL_Rotation rot)
+        {
+            m_host.AddScriptLPS(1);
+            SitTarget(m_host, offset, rot);
+        }
+
+        public void llLinkSitTarget(LSL_Integer link, LSL_Vector offset, LSL_Rotation rot)
+        {
+            m_host.AddScriptLPS(1);
+            if (link == ScriptBaseClass.LINK_ROOT)
+                SitTarget(m_host.ParentGroup.RootPart, offset, rot);
+            else if (link == ScriptBaseClass.LINK_THIS)
+                SitTarget(m_host, offset, rot);
+            else
+            {
+                SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(link);
+                if (null != part)
+                {
+                    SitTarget(part, offset, rot);
+                }
+            }
         }
 
         public LSL_String llAvatarOnSitTarget()
@@ -7560,10 +7572,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             shapeBlock.PathScaleX = 100;
             shapeBlock.PathScaleY = 150;
 
-            if ((type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER) == 0 &&
-                (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE) == 0 &&
-                (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE) == 0 &&
-                (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) == 0)
+            int flag = type & (ScriptBaseClass.PRIM_SCULPT_FLAG_INVERT | ScriptBaseClass.PRIM_SCULPT_FLAG_MIRROR);
+
+            if (type != (ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER | flag) &&
+                type != (ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE | flag) &&
+                type != (ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE | flag) &&
+                type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag))
             {
                 // default
                 type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
@@ -8851,23 +8865,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             ScriptSleep(1000);
+            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);
+            if (link == ScriptBaseClass.LINK_ROOT)
+                return GetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules);
+            else if (link == ScriptBaseClass.LINK_THIS)
+                return GetPrimMediaParams(m_host, face, rules);
+            else
+            {
+                SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(link);
+                if (null != part)
+                    return GetPrimMediaParams(part, face, rules);
+            }
 
+            return new LSL_List();
+        }
+
+        private LSL_List GetPrimMediaParams(SceneObjectPart part, int face, LSL_List rules)
+        {
             // LSL Spec http://wiki.secondlife.com/wiki/LlGetPrimMediaParams says to fail silently if face is invalid
             // TODO: Need to correctly handle case where a face has no media (which gives back an empty list).
             // Assuming silently fail means give back an empty list.  Ideally, need to check this.
-            if (face < 0 || face > m_host.GetNumberOfSides() - 1)
+            if (face < 0 || face > part.GetNumberOfSides() - 1)
                 return new LSL_List();
 
-            return GetPrimMediaParams(face, rules);
-        }
-
-        private LSL_List GetPrimMediaParams(int face, LSL_List rules)
-        {
             IMoapModule module = m_ScriptEngine.World.RequestModuleInterface<IMoapModule>();
             if (null == module)
-                throw new Exception("Media on a prim functions not available");
+                return new LSL_List();
 
-            MediaEntry me = module.GetMediaEntry(m_host, face);
+            MediaEntry me = module.GetMediaEntry(part, face);
 
             // As per http://wiki.secondlife.com/wiki/LlGetPrimMediaParams
             if (null == me)
@@ -8949,33 +8980,52 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case ScriptBaseClass.PRIM_MEDIA_PERMS_CONTROL:
                         res.Add(new LSL_Integer((int)me.ControlPermissions));
                         break;
+
+                    default: return ScriptBaseClass.LSL_STATUS_MALFORMED_PARAMS;
                 }
             }
 
             return res;
         }
 
-        public LSL_Integer llSetPrimMediaParams(int face, LSL_List rules)
+        public LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules)
         {
             m_host.AddScriptLPS(1);
             ScriptSleep(1000);
+            return SetPrimMediaParams(m_host, face, rules);
+        }
 
-            // LSL Spec http://wiki.secondlife.com/wiki/LlSetPrimMediaParams says to fail silently if face is invalid
-            // Assuming silently fail means sending back LSL_STATUS_OK.  Ideally, need to check this.
-            // Don't perform the media check directly
-            if (face < 0 || face > m_host.GetNumberOfSides() - 1)
-                return ScriptBaseClass.LSL_STATUS_OK;
+        public LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules)
+        {
+            m_host.AddScriptLPS(1);
+            ScriptSleep(1000);
+            if (link == ScriptBaseClass.LINK_ROOT)
+                return SetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules);
+            else if (link == ScriptBaseClass.LINK_THIS)
+                return SetPrimMediaParams(m_host, face, rules);
+            else
+            {
+                SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(link);
+                if (null != part)
+                    return SetPrimMediaParams(part, face, rules);
+            }
 
-            return SetPrimMediaParams(face, rules);
+            return ScriptBaseClass.LSL_STATUS_NOT_FOUND;
         }
 
-        private LSL_Integer SetPrimMediaParams(int face, LSL_List rules)
+        private LSL_Integer SetPrimMediaParams(SceneObjectPart part, LSL_Integer face, LSL_List rules)
         {
+            // LSL Spec http://wiki.secondlife.com/wiki/LlSetPrimMediaParams says to fail silently if face is invalid
+            // Assuming silently fail means sending back LSL_STATUS_OK.  Ideally, need to check this.
+            // Don't perform the media check directly
+            if (face < 0 || face > part.GetNumberOfSides() - 1)
+                return ScriptBaseClass.LSL_STATUS_NOT_FOUND;
+
             IMoapModule module = m_ScriptEngine.World.RequestModuleInterface<IMoapModule>();
             if (null == module)
-                throw new Exception("Media on a prim functions not available");
+                return ScriptBaseClass.LSL_STATUS_NOT_SUPPORTED;
 
-            MediaEntry me = module.GetMediaEntry(m_host, face);
+            MediaEntry me = module.GetMediaEntry(part, face);
             if (null == me)
                 me = new MediaEntry();
 
@@ -9054,10 +9104,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case ScriptBaseClass.PRIM_MEDIA_PERMS_CONTROL:
                         me.ControlPermissions = (MediaPermission)(byte)(int)rules.GetLSLIntegerItem(i++);
                         break;
+
+                    default: return ScriptBaseClass.LSL_STATUS_MALFORMED_PARAMS;
                 }
             }
 
-            module.SetMediaEntry(m_host, face, me);
+            module.SetMediaEntry(part, face, me);
 
             return ScriptBaseClass.LSL_STATUS_OK;
         }
@@ -9066,18 +9118,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             ScriptSleep(1000);
+            return ClearPrimMedia(m_host, face);
+        }
 
+        public LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face)
+        {
+            m_host.AddScriptLPS(1);
+            ScriptSleep(1000);
+            if (link == ScriptBaseClass.LINK_ROOT)
+                return ClearPrimMedia(m_host.ParentGroup.RootPart, face);
+            else if (link == ScriptBaseClass.LINK_THIS)
+                return ClearPrimMedia(m_host, face);
+            else
+            {
+                SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(link);
+                if (null != part)
+                    return ClearPrimMedia(part, face);
+            }
+
+            return ScriptBaseClass.LSL_STATUS_NOT_FOUND;
+        }
+
+        private LSL_Integer ClearPrimMedia(SceneObjectPart part, LSL_Integer face)
+        {
             // LSL Spec http://wiki.secondlife.com/wiki/LlClearPrimMedia says to fail silently if face is invalid
             // Assuming silently fail means sending back LSL_STATUS_OK.  Ideally, need to check this.
             // FIXME: Don't perform the media check directly
-            if (face < 0 || face > m_host.GetNumberOfSides() - 1)
-                return ScriptBaseClass.LSL_STATUS_OK;
+            if (face < 0 || face > part.GetNumberOfSides() - 1)
+                return ScriptBaseClass.LSL_STATUS_NOT_FOUND;
 
             IMoapModule module = m_ScriptEngine.World.RequestModuleInterface<IMoapModule>();
             if (null == module)
-                throw new Exception("Media on a prim functions not available");
+                return ScriptBaseClass.LSL_STATUS_NOT_SUPPORTED;
 
-            module.ClearMediaEntry(m_host, face);
+            module.ClearMediaEntry(part, face);
 
             return ScriptBaseClass.LSL_STATUS_OK;
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index a9b8e04..ecc5fb5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2169,6 +2169,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return result;
         }
 
+        public LSL_String osReplaceString(string src, string pattern, string replace, int count, int start)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osReplaceString");
+            m_host.AddScriptLPS(1);
+
+            // Normalize indices (if negative).
+            // After normlaization they may still be
+            // negative, but that is now relative to
+            // the start, rather than the end, of the
+            // sequence.
+            if (start < 0)
+            {
+                start = src.Length + start;
+            }
+
+            if (start < 0 || start >= src.Length)
+            {
+                return src;
+            }
+
+            // Find matches beginning at start position
+            Regex matcher = new Regex(pattern);
+            return matcher.Replace(src,replace,count,start);
+        }
+
         public string osLoadedCreationDate()
         {
             CheckThreatLevel(ThreatLevel.Low, "osLoadedCreationDate");
@@ -2786,7 +2811,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed");
             m_host.AddScriptLPS(1);
             ScenePresence avatar = World.GetScenePresence(new UUID(UUID));
-            avatar.SpeedModifier = (float)SpeedModifier;
+
+            if (avatar != null)
+                avatar.SpeedModifier = (float)SpeedModifier;
         }
         
         public void osKickAvatar(string FirstName,string SurName,string alert)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs
index 7fa19b1..9f78a49 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs
@@ -38,6 +38,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
     {
         public AsyncCommandManager m_CmdManager;
 
+        public int DataserverRequestsCount
+        {
+            get
+            {
+                lock (DataserverRequests)
+                    return DataserverRequests.Count;
+            }
+        }
+
         private Dictionary<string, DataserverRequest> DataserverRequests =
                 new Dictionary<string, DataserverRequest>();
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
index 740816f..93e0261 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
@@ -42,22 +42,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
         public AsyncCommandManager m_CmdManager;
 
+        private IWorldComm m_commsPlugin;
+
+        public int ListenerCount
+        {
+            get { return m_commsPlugin.ListenerCount; }
+        }
+
         public Listener(AsyncCommandManager CmdManager)
         {
             m_CmdManager = CmdManager;
+            m_commsPlugin = m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
         }
 
         public void CheckListeners()
         {
             if (m_CmdManager.m_ScriptEngine.World == null)
                 return;
-            IWorldComm comms = m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
 
-            if (comms != null)
+            if (m_commsPlugin != null)
             {
-                while (comms.HasMessages())
+                while (m_commsPlugin.HasMessages())
                 {
-                    ListenerInfo lInfo = (ListenerInfo)comms.GetNextMessage();
+                    ListenerInfo lInfo = (ListenerInfo)m_commsPlugin.GetNextMessage();
 
                     //Deliver data to prim's listen handler
                     object[] resobj = new object[]
@@ -81,17 +88,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
         public Object[] GetSerializationData(UUID itemID)
         {
-            IWorldComm comms = m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
-
-            return comms.GetSerializationData(itemID);
+            return m_commsPlugin.GetSerializationData(itemID);
         }
 
         public void CreateFromData(uint localID, UUID itemID, UUID hostID,
                 Object[] data)
         {
-            IWorldComm comms = m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
-
-            comms.CreateFromData(localID, itemID, hostID, data);
+            m_commsPlugin.CreateFromData(localID, itemID, hostID, data);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 83da204..1373971 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -44,6 +44,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
         public AsyncCommandManager m_CmdManager;
 
+        /// <summary>
+        /// Number of sensors active.
+        /// </summary>
+        public int SensorsCount
+        {
+            get
+            {
+                lock (SenseRepeatListLock)
+                    return SenseRepeaters.Count;
+            }
+        }
+
         public SensorRepeat(AsyncCommandManager CmdManager)
         {
             m_CmdManager = CmdManager;
@@ -157,12 +169,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
         public void CheckSenseRepeaterEvents()
         {
-            // Nothing to do here?
-            if (SenseRepeaters.Count == 0)
-                return;
-
             lock (SenseRepeatListLock)
             {
+                // Nothing to do here?
+                if (SenseRepeaters.Count == 0)
+                    return;
+
                 // Go through all timers
                 foreach (SenseRepeatClass ts in SenseRepeaters)
                 {
@@ -640,7 +652,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 ts.next =
                     DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
 
-                SenseRepeaters.Add(ts);
+                lock (SenseRepeatListLock)
+                    SenseRepeaters.Add(ts);
+                
                 idx += 6;
             }
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index 2fd33fe..9ee6946 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -37,6 +37,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
     {
         public AsyncCommandManager m_CmdManager;
 
+        public int TimersCount
+        {
+            get
+            {
+                lock (TimerListLock)
+                    return Timers.Count;
+            }
+        }
+
         public Timer(AsyncCommandManager CmdManager)
         {
             m_CmdManager = CmdManager;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 5b8c316..8d97a7c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
           LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options);
        LSL_Integer llCeil(double f);
               void llClearCameraParams();
+       LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face);
        LSL_Integer llClearPrimMedia(LSL_Integer face);
               void llCloseRemoteDataChannel(string channel);
          LSL_Float llCloud(LSL_Vector offset);
@@ -140,7 +141,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_String llGetLinkName(int linknum);
        LSL_Integer llGetLinkNumber();
        LSL_Integer llGetLinkNumberOfSides(int link);
-       LSL_List    llGetLinkPrimitiveParams(int linknum, LSL_List rules);
+          LSL_List llGetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules);
+          LSL_List llGetLinkPrimitiveParams(int linknum, LSL_List rules);
        LSL_Integer llGetListEntryType(LSL_List src, int index);
        LSL_Integer llGetListLength(LSL_List src);
         LSL_Vector llGetLocalPos();
@@ -220,6 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_String llGetDisplayName(string id);
         LSL_String llRequestDisplayName(string id);
         void llLinkParticleSystem(int linknum, LSL_List rules);
+        void llLinkSitTarget(LSL_Integer link, LSL_Vector offset, LSL_Rotation rot);
         LSL_String llList2CSV(LSL_List src);
          LSL_Float llList2Float(LSL_List src, int index);
        LSL_Integer llList2Integer(LSL_List src, int index);
@@ -336,6 +339,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSetInventoryPermMask(string item, int mask, int value);
               void llSetLinkAlpha(int linknumber, double alpha, int face);
               void llSetLinkColor(int linknumber, LSL_Vector color, int face);
+       LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules);
               void llSetLinkPrimitiveParams(int linknumber, LSL_List rules);
               void llSetLinkTexture(int linknumber, string texture, int face);
               void llSetLinkTextureAnim(int linknum, int mode, int face, int sizex, int sizey, double start, double length, double rate);
@@ -347,7 +351,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSetPayPrice(int price, LSL_List quick_pay_buttons);
               void llSetPos(LSL_Vector pos);
        LSL_Integer llSetRegionPos(LSL_Vector pos);
-       LSL_Integer llSetPrimMediaParams(int face, LSL_List rules);
+       LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules);
               void llSetPrimitiveParams(LSL_List rules);
               void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules);
               void llSetPrimURL(string url);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index ca24051..fb52600 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -165,6 +165,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 
         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);
 
         // Information about data loaded into the region
         string osLoadedCreationDate();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 1366141..a8d1ddb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1710,6 +1710,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSitTarget(offset, rot);
         }
 
+        public void llLinkSitTarget(LSL_Integer link, LSL_Vector offset, LSL_Rotation rot)
+        {
+            m_LSL_Functions.llLinkSitTarget(link, offset, rot);
+        }
+
         public void llSleep(double sec)
         {
             m_LSL_Functions.llSleep(sec);
@@ -1909,17 +1914,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_LSL_Functions.llGetPrimMediaParams(face, rules);
         }
-        
+
+        public LSL_List llGetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules)
+        {
+            return m_LSL_Functions.llGetLinkMedia(link, face, rules);
+        }
+
         public LSL_Integer llSetPrimMediaParams(int face, LSL_List rules)
         {
             return m_LSL_Functions.llSetPrimMediaParams(face, rules);
         }
-        
+
+        public LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules)
+        {
+            return m_LSL_Functions.llSetLinkMedia(link, face, rules);
+        }
+
         public LSL_Integer llClearPrimMedia(LSL_Integer face)
         {
             return m_LSL_Functions.llClearPrimMedia(face);
         }
 
+        public LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face)
+        {
+            return m_LSL_Functions.llClearLinkMedia(link, face);
+        }
+
         public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
         {
             return m_LSL_Functions.llGetLinkNumberOfSides(link);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index cc8d417..4341246 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -472,6 +472,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osMatchString(src, pattern, start);
         }
 
+        public LSL_String osReplaceString(string src, string pattern, string replace, int count, int start)
+        {
+            return m_OSSL_Functions.osReplaceString(src,pattern,replace,count,start);
+        }
+        
+
         // Information about data loaded into the region
         public string osLoadedCreationDate()
         {
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index 8b88588..65d3b9b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                     emessage = emessage.Substring(slinfo.Length+2);
 
                 message = String.Format("({0},{1}) {2}",
-                        e.slInfo.lineNumber - 2,
+                        e.slInfo.lineNumber - 1,
                         e.slInfo.charPosition - 1, emessage);
 
                 throw new Exception(message);
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
index 63afb0b..7763619 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using NUnit.Framework;
 using OpenSim.Region.ScriptEngine.Shared.CodeTools;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
 {
@@ -43,6 +44,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
         [Test]
         public void TestDefaultState()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     state_entry()
@@ -63,6 +66,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
         [Test]
         public void TestCustomState()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     state_entry()
@@ -93,6 +98,8 @@ state another_state
         [Test]
         public void TestEventWithArguments()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     at_rot_target(integer tnum, rotation targetrot, rotation ourrot)
@@ -113,6 +120,8 @@ state another_state
         [Test]
         public void TestIntegerDeclaration()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     touch_start(integer num_detected)
@@ -135,6 +144,8 @@ state another_state
         [Test]
         public void TestLoneIdent()
         {
+            TestHelpers.InMethod();
+
             // A lone ident should be removed completely as it's an error in C#
             // (MONO at least).
             string input = @"default
@@ -161,6 +172,8 @@ state another_state
         [Test]
         public void TestAssignments()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     touch_start(integer num_detected)
@@ -187,6 +200,8 @@ state another_state
         [Test]
         public void TestAdditionSubtractionOperator()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     touch_start(integer num_detected)
@@ -215,6 +230,8 @@ state another_state
         [Test]
         public void TestStrings()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     touch_start(integer num_detected)
@@ -242,6 +259,8 @@ state another_state
         [Test]
         public void TestBinaryExpression()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     touch_start(integer num_detected)
@@ -284,6 +303,8 @@ state another_state
         [Test]
         public void TestFloatConstants()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     touch_start(integer num_detected)
@@ -336,6 +357,8 @@ state another_state
         [Test]
         public void TestComments()
         {
+            TestHelpers.InMethod();
+
             string input = @"// this test tests comments
 default
 {
@@ -358,6 +381,8 @@ default
         [Test]
         public void TestStringsWithEscapedQuotesAndComments()
         {
+            TestHelpers.InMethod();
+
             string input = @"// this test tests strings, with escaped quotes and comments in strings
 default
 {
@@ -397,6 +422,8 @@ default
         [Test]
         public void TestCStyleComments()
         {
+            TestHelpers.InMethod();
+
             string input = @"/* this test tests comments
    of the C variety
 */
@@ -426,6 +453,8 @@ default
         [Test]
         public void TestGlobalDefinedFunctions()
         {
+            TestHelpers.InMethod();
+
             string input = @"// this test tests custom defined functions
 
 string onefunc()
@@ -470,6 +499,8 @@ default
         [Test]
         public void TestGlobalDeclaredVariables()
         {
+            TestHelpers.InMethod();
+
             string input = @"// this test tests custom defined functions and global variables
 
 string globalString;
@@ -525,6 +556,8 @@ default
         [Test]
         public void TestMoreAssignments()
         {
+            TestHelpers.InMethod();
+
             string input = @"// this test tests +=, -=, *=, /=, %=
 
 string globalString;
@@ -579,6 +612,8 @@ default
         [Test]
         public void TestVectorConstantNotation()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     touch_start(integer num_detected)
@@ -606,6 +641,8 @@ default
         [Test]
         public void TestVectorMemberAccess()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     touch_start(integer num_detected)
@@ -632,6 +669,8 @@ default
         [Test]
         public void TestExpressionInParentheses()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     touch_start(integer num_detected)
@@ -660,6 +699,8 @@ default
         [Test]
         public void TestIncrementDecrementOperator()
         {
+            TestHelpers.InMethod();
+
             string input = @"// here we'll test the ++ and -- operators
 
 default
@@ -690,6 +731,8 @@ default
         [Test]
         public void TestLists()
         {
+            TestHelpers.InMethod();
+
             string input = @"// testing lists
 
 default
@@ -718,6 +761,8 @@ default
         [Test]
         public void TestIfStatement()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test if statements
 
 default
@@ -822,6 +867,8 @@ default
         [Test]
         public void TestIfElseStatement()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test complex logical expressions
 
 default
@@ -928,6 +975,8 @@ default
         [Test]
         public void TestWhileLoop()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test while loops
 
 default
@@ -968,6 +1017,8 @@ default
         [Test]
         public void TestDoWhileLoop()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test do-while loops
 
 default
@@ -1012,6 +1063,8 @@ default
         [Test]
         public void TestForLoop()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test for loops
 
 default
@@ -1056,6 +1109,8 @@ default
         [Test]
         public void TestFloatsWithTrailingDecimal()
         {
+            TestHelpers.InMethod();
+
             string input = @"// a curious feature of LSL that allows floats to be defined with a trailing dot
 
 default
@@ -1108,6 +1163,8 @@ default
         [Test]
         public void TestUnaryAndBinaryOperators()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test a few more operators
 
 default
@@ -1144,6 +1201,8 @@ default
         [Test]
         public void TestTypecasts()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test typecasts
 
 default
@@ -1189,6 +1248,8 @@ default
         [Test]
         public void TestStates()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test states
 
 default
@@ -1229,6 +1290,8 @@ state statetwo
         [Test]
         public void TestHexIntegerConstants()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test hex integers
 
 default
@@ -1261,6 +1324,8 @@ default
         [Test]
         public void TestJumps()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test jumps
 
 default
@@ -1291,6 +1356,8 @@ default
         [Test]
         public void TestImplicitVariableInitialization()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test implicitly initializing variables
 
 default
@@ -1334,6 +1401,8 @@ default
         [Test]
         public void TestMultipleEqualsExpression()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test x = y = 5 type expressions
 
 default
@@ -1366,6 +1435,8 @@ default
         [Test]
         public void TestUnaryExpressionLastInVectorConstant()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test unary expressions some more
 
 default
@@ -1390,6 +1461,8 @@ default
         [Test]
         public void TestVectorMemberPlusEquals()
         {
+            TestHelpers.InMethod();
+
             string input = @"// let's test unary expressions some more
 
 default
@@ -1424,6 +1497,8 @@ default
         [Test]
         public void TestWhileLoopWithNoBody()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     state_entry()
@@ -1447,6 +1522,8 @@ default
         [Test]
         public void TestDoWhileLoopWithNoBody()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     state_entry()
@@ -1472,6 +1549,8 @@ default
         [Test]
         public void TestIfWithNoBody()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     state_entry()
@@ -1495,6 +1574,8 @@ default
         [Test]
         public void TestIfElseWithNoBody()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     state_entry()
@@ -1521,6 +1602,8 @@ default
         [Test]
         public void TestForLoopWithNoBody()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     state_entry()
@@ -1544,6 +1627,8 @@ default
         [Test]
         public void TestForLoopWithNoAssignment()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     state_entry()
@@ -1569,6 +1654,8 @@ default
         [Test]
         public void TestForLoopWithOnlyIdentInAssignment()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     state_entry()
@@ -1594,6 +1681,8 @@ default
         [Test]
         public void TestAssignmentInIfWhileDoWhile()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     state_entry()
@@ -1631,6 +1720,8 @@ default
         [Test]
         public void TestLSLListHack()
         {
+            TestHelpers.InMethod();
+
             string input = @"default
 {
     state_entry()
@@ -1653,9 +1744,12 @@ default
         }
 
         [Test]
-        [ExpectedException(typeof(System.Exception))]
         public void TestSyntaxError()
         {
+            TestHelpers.InMethod();
+
+            bool gotException = false;
+
             string input = @"default
 {
     state_entry()
@@ -1671,17 +1765,22 @@ default
             }
             catch (System.Exception e)
             {
-                // The syntax error is on line 6, char 5 (expected ';', found
+                // The syntax error is on line 5, char 4 (expected ';', found
                 // '}').
-                Assert.AreEqual("(4,4) syntax error", e.Message);
-                throw;
+                Assert.AreEqual("(5,4) syntax error", e.Message);
+                gotException = true;
             }
+
+            Assert.That(gotException, Is.True);
         }
 
         [Test]
-        [ExpectedException(typeof(System.Exception))]
         public void TestSyntaxErrorDeclaringVariableInForLoop()
         {
+            TestHelpers.InMethod();
+
+            bool gotException = false;
+
             string input = @"default
 {
     state_entry()
@@ -1697,11 +1796,13 @@ default
             }
             catch (System.Exception e)
             {
-                // The syntax error is on line 5, char 14 (Syntax error)
-                Assert.AreEqual("(3,13) syntax error", e.Message);
+                // The syntax error is on line 4, char 13 (Syntax error)
+                Assert.AreEqual("(4,13) syntax error", e.Message);
 
-                throw;
+                gotException = true;
             }
+
+            Assert.That(gotException, Is.True);
         }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
index c5483c8..1fa6954 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using Microsoft.CSharp;
 using NUnit.Framework;
 using OpenSim.Region.ScriptEngine.Shared.CodeTools;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
 {
@@ -92,6 +93,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
         //[Test]
         public void TestUseUndeclaredVariable()
         {
+            TestHelpers.InMethod();
+
             m_compilerParameters.OutputAssembly = Path.Combine(m_testDir, Path.GetRandomFileName() + ".dll");
 
             string input = @"default
@@ -124,6 +127,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
         //[Test]
         public void TestCastAndConcatString()
         {
+            TestHelpers.InMethod();
+
             m_compilerParameters.OutputAssembly = Path.Combine(m_testDir, Path.GetRandomFileName() + ".dll");
 
             string input = @"string s = "" a string"";
@@ -150,4 +155,4 @@ default
             Assert.AreEqual(0, m_compilerResults.Errors.Count);
         }
     }
-}
+}
\ 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 3baa723..9cf9258 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -46,7 +46,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
     [TestFixture, LongRunning]
     public class LSL_ApiTest
     {
-
         private const double ANGLE_ACCURACY_IN_RADIANS = 1E-6;
         private const double VECTOR_COMPONENT_ACCURACY = 0.0000005d;
         private const float FLOAT_ACCURACY = 0.00005f;
@@ -55,7 +54,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [SetUp]
         public void SetUp()
         {
-
             IConfigSource initConfigSource = new IniConfigSource();
             IConfig config = initConfigSource.AddConfig("XEngine");
             config.Set("Enabled", "true");
@@ -75,6 +73,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestllAngleBetween()
         {
+            TestHelpers.InMethod();
+
             CheckllAngleBetween(new Vector3(1, 0, 0), 0,   1, 1);
             CheckllAngleBetween(new Vector3(1, 0, 0), 90,  1, 1);
             CheckllAngleBetween(new Vector3(1, 0, 0), 180, 1, 1);
@@ -158,6 +158,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         // llRot2Euler test.
         public void TestllRot2Euler()
         {
+            TestHelpers.InMethod();
+
             // 180, 90 and zero degree rotations.
             CheckllRot2Euler(new LSL_Types.Quaternion(0.0f, 0.0f, 0.0f, 1.0f));
             CheckllRot2Euler(new LSL_Types.Quaternion(0.0f, 0.0f, 0.707107f, 0.707107f));
@@ -256,6 +258,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         // llSetPrimitiveParams and llGetPrimitiveParams test.
         public void TestllSetPrimitiveParams()
         {
+            TestHelpers.InMethod();
+
             // Create Prim1.
             Scene scene = SceneHelpers.SetupScene();
             string obj1Name = "Prim1";
@@ -486,9 +490,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         }
 
         [Test]
-        // llVecNorm test.
         public void TestllVecNorm()
         {
+            TestHelpers.InMethod();
+
             // Check special case for normalizing zero vector.
             CheckllVecNorm(new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), new LSL_Types.Vector3(0.0d, 0.0d, 0.0d));
             // Check various vectors.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
index 10b52cf..3ed2562 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
@@ -213,6 +213,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestConstructFromInt()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
 
             foreach (KeyValuePair<int, double> number in m_intDoubleSet)
@@ -228,6 +230,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestConstructFromDouble()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
 
             foreach (KeyValuePair<double, double> number in m_doubleDoubleSet)
@@ -243,6 +247,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestExplicitCastLSLFloatToInt()
         {
+            TestHelpers.InMethod();
+
             int testNumber;
 
             foreach (KeyValuePair<double, int> number in m_doubleIntSet)
@@ -258,6 +264,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestExplicitCastLSLFloatToUint()
         {
+            TestHelpers.InMethod();
+
             uint testNumber;
 
             foreach (KeyValuePair<double, int> number in m_doubleUintSet)
@@ -273,6 +281,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestImplicitCastLSLFloatToBooleanTrue()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
             bool testBool;
 
@@ -291,6 +301,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestImplicitCastLSLFloatToBooleanFalse()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat = new LSL_Types.LSLFloat(0.0);
             bool testBool = testFloat;
 
@@ -303,6 +315,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestImplicitCastIntToLSLFloat()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
 
             foreach (int number in m_intList)
@@ -318,6 +332,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestImplicitCastLSLIntegerToLSLFloat()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
 
             foreach (int number in m_intList)
@@ -333,6 +349,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestExplicitCastLSLIntegerToLSLFloat()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
 
             foreach (int number in m_intList)
@@ -348,6 +366,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestExplicitCastStringToLSLFloat()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
 
             foreach (KeyValuePair<string, double> number in m_stringDoubleSet)
@@ -363,6 +383,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestExplicitCastLSLStringToLSLFloat()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
 
             foreach (KeyValuePair<string, double> number in m_stringDoubleSet)
@@ -378,6 +400,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestImplicitCastDoubleToLSLFloat()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
 
             foreach (double number in m_doubleList)
@@ -393,6 +417,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestImplicitCastLSLFloatToDouble()
         {
+            TestHelpers.InMethod();
+
             double testNumber;
             LSL_Types.LSLFloat testFloat;
 
@@ -411,19 +437,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestExplicitCastLSLFloatToFloat()
         {
-          float testFloat;
-          float numberAsFloat;
-          LSL_Types.LSLFloat testLSLFloat;
-          foreach (double number in m_doubleList)
-          {
-            testLSLFloat = new LSL_Types.LSLFloat(number);
-            numberAsFloat = (float)number;
-            testFloat = (float)testLSLFloat;
-
-            Assert.That((double)testFloat, new DoubleToleranceConstraint((double)numberAsFloat, _lowPrecisionTolerance));
-          }
-        }
+            TestHelpers.InMethod();
+
+            float testFloat;
+            float numberAsFloat;
+            LSL_Types.LSLFloat testLSLFloat;
 
+            foreach (double number in m_doubleList)
+            {
+                testLSLFloat = new LSL_Types.LSLFloat(number);
+                numberAsFloat = (float)number;
+                testFloat = (float)testLSLFloat;
+
+                Assert.That((double)testFloat, new DoubleToleranceConstraint((double)numberAsFloat, _lowPrecisionTolerance));
+            }
+        }
 
         /// <summary>
         /// Tests the equality (==) operator.
@@ -431,6 +459,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestEqualsOperator()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloatA, testFloatB;
 
             foreach (double number in m_doubleList)
@@ -450,6 +480,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestNotEqualOperator()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloatA, testFloatB;
 
             foreach (double number in m_doubleList)
@@ -469,6 +501,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestIncrementOperator()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
             double testNumber;
 
@@ -493,6 +527,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestDecrementOperator()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
             double testNumber;
 
@@ -517,6 +553,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestToString()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
 
             foreach (KeyValuePair<double, string> number in m_doubleStringSet)
@@ -532,6 +570,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestAddTwoLSLFloats()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testResult;
 
             foreach (KeyValuePair<double, double> number in m_doubleDoubleSet)
@@ -547,6 +587,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestSubtractTwoLSLFloats()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testResult;
 
             foreach (KeyValuePair<double, double> number in m_doubleDoubleSet)
@@ -562,6 +604,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestMultiplyTwoLSLFloats()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testResult;
 
             foreach (KeyValuePair<double, double> number in m_doubleDoubleSet)
@@ -577,6 +621,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestDivideTwoLSLFloats()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testResult;
 
             foreach (KeyValuePair<double, double> number in m_doubleDoubleSet)
@@ -595,6 +641,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestImplicitCastBooleanToLSLFloat()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testFloat;
 
             testFloat = (1 == 0);
@@ -610,4 +658,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             Assert.That(testFloat.value, new DoubleToleranceConstraint(1.0, _lowPrecisionTolerance));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
index 3ad673b..8d1169a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
@@ -79,6 +79,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestExplicitCastLSLFloatToLSLInteger()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLInteger testInteger;
 
             foreach (KeyValuePair<double, int> number in m_doubleIntSet)
@@ -94,6 +96,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestExplicitCastStringToLSLInteger()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLInteger testInteger;
 
             foreach (KeyValuePair<string, int> number in m_stringIntSet)
@@ -109,6 +113,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestExplicitCastLSLStringToLSLInteger()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLInteger testInteger;
 
             foreach (KeyValuePair<string, int> number in m_stringIntSet)
@@ -124,6 +130,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestImplicitCastBooleanToLSLInteger()
         {
+            TestHelpers.InMethod();
+            
             LSL_Types.LSLInteger testInteger;
 
             testInteger = (1 == 0);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
index fa976ed..c4ca1a8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
@@ -71,6 +71,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestConstructFromLSLFloat()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLString testString;
 
             foreach (KeyValuePair<double, string> number in m_doubleStringSet)
@@ -86,6 +88,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestExplicitCastLSLFloatToLSLString()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLString testString;
 
             foreach (KeyValuePair<double, string> number in m_doubleStringSet)
@@ -101,6 +105,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestExplicitCastLSLStringToQuaternion()
         {
+            TestHelpers.InMethod();
+
             string quaternionString = "<0.00000, 0.70711, 0.00000, 0.70711>";
             LSL_Types.LSLString quaternionLSLString = new LSL_Types.LSLString(quaternionString);
 
@@ -118,6 +124,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestImplicitCastBooleanToLSLFloat()
         {
+            TestHelpers.InMethod();
+            
             LSL_Types.LSLString testString;
 
             testString = (LSL_Types.LSLString) (1 == 0);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs
index 66a7329..b81225f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs
@@ -44,6 +44,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestConcatenateString()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.list testList = new LSL_Types.list(new LSL_Types.LSLInteger(1), new LSL_Types.LSLInteger('a'), new LSL_Types.LSLString("test"));
             testList += new LSL_Types.LSLString("addition");
 
@@ -64,6 +66,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestConcatenateInteger()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.list testList = new LSL_Types.list(new LSL_Types.LSLInteger(1), new LSL_Types.LSLInteger('a'), new LSL_Types.LSLString("test"));
             testList += new LSL_Types.LSLInteger(20);
 
@@ -84,6 +88,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestConcatenateDouble()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.list testList = new LSL_Types.list(new LSL_Types.LSLInteger(1), new LSL_Types.LSLInteger('a'), new LSL_Types.LSLString("test"));
             testList += new LSL_Types.LSLFloat(2.0f);
 
@@ -104,6 +110,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestCastLSLIntegerItemToLSLInteger()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLInteger testValue = new LSL_Types.LSLInteger(123);
             LSL_Types.list testList = new LSL_Types.list(testValue);
 
@@ -116,6 +124,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestCastLSLFloatItemToLSLFloat()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testValue = new LSL_Types.LSLFloat(123.45678987);
             LSL_Types.list testList = new LSL_Types.list(testValue);
 
@@ -128,6 +138,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestCastLSLStringItemToLSLString()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLString testValue = new LSL_Types.LSLString("hello there");
             LSL_Types.list testList = new LSL_Types.list(testValue);
 
@@ -140,6 +152,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestCastVector3ItemToVector3()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.Vector3 testValue = new LSL_Types.Vector3(12.34, 56.987654, 0.00987);
             LSL_Types.list testList = new LSL_Types.list(testValue);
 
@@ -151,6 +165,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestCastQuaternionItemToQuaternion()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.Quaternion testValue = new LSL_Types.Quaternion(12.34, 56.44323, 765.983421, 0.00987);
             LSL_Types.list testList = new LSL_Types.list(testValue);
 
@@ -165,6 +181,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestGetLSLIntegerItemForLSLIntegerItem()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLInteger testValue = new LSL_Types.LSLInteger(999911);
             LSL_Types.list testList = new LSL_Types.list(testValue);
 
@@ -177,6 +195,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestGetLSLFloatItemForLSLFloatItem()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLFloat testValue = new LSL_Types.LSLFloat(321.45687876);
             LSL_Types.list testList = new LSL_Types.list(testValue);
 
@@ -189,11 +209,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestGetLSLFloatItemForLSLIntegerItem()
         {
-          LSL_Types.LSLInteger testValue = new LSL_Types.LSLInteger(3060987);
-          LSL_Types.LSLFloat testFloatValue = new LSL_Types.LSLFloat(testValue);
-          LSL_Types.list testList = new LSL_Types.list(testValue);
+            TestHelpers.InMethod();
+
+            LSL_Types.LSLInteger testValue = new LSL_Types.LSLInteger(3060987);
+            LSL_Types.LSLFloat testFloatValue = new LSL_Types.LSLFloat(testValue);
+            LSL_Types.list testList = new LSL_Types.list(testValue);
 
-          Assert.AreEqual(testFloatValue, testList.GetLSLFloatItem(0));
+            Assert.AreEqual(testFloatValue, testList.GetLSLFloatItem(0));
         }
 
         /// <summary>
@@ -202,6 +224,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestGetLSLStringItemForLSLStringItem()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.LSLString testValue = new LSL_Types.LSLString("hello all");
             LSL_Types.list testList = new LSL_Types.list(testValue);
 
@@ -214,6 +238,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestGetLSLStringItemForKeyItem()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.key testValue
                 = new LSL_Types.key("98000000-0000-2222-3333-100000001000");
             LSL_Types.LSLString testStringValue = new LSL_Types.LSLString(testValue);
@@ -228,6 +254,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestGetVector3ItemForVector3Item()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.Vector3 testValue = new LSL_Types.Vector3(92.34, 58.98754, -0.10987);
             LSL_Types.list testList = new LSL_Types.list(testValue);
 
@@ -239,6 +267,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestGetQuaternionItemForQuaternionItem()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.Quaternion testValue = new LSL_Types.Quaternion(12.64, 59.43723, 765.3421, 4.00987);
             LSL_Types.list testList = new LSL_Types.list(testValue);
 
@@ -251,6 +281,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         [Test]
         public void TestGetKeyItemForKeyItem()
         {
+            TestHelpers.InMethod();
+
             LSL_Types.key testValue
                 = new LSL_Types.key("00000000-0000-2222-3333-100000001012");
             LSL_Types.list testList = new LSL_Types.list(testValue);
@@ -258,4 +290,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             Assert.AreEqual(testValue, testList.GetKeyItem(0));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs
index 195af7f..ebf8001 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs
@@ -32,16 +32,17 @@ using OpenSim.Region.ScriptEngine.Shared;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Tests
 {
+    /// <summary>
+    /// Tests for Vector3
+    /// </summary>
     [TestFixture]
     public class LSL_TypesTestVector3
     {
-        /// <summary>
-        /// Tests for Vector3
-        /// </summary>
         [Test]
-
         public void TestDotProduct()
         {
+            TestHelpers.InMethod();
+
             // The numbers we test for.
             Dictionary<string, double> expectsSet = new Dictionary<string, double>();
             expectsSet.Add("<1, 2, 3> * <2, 3, 4>", 20.0);