67 files changed, 1362 insertions, 688 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
index 09dde5e..fef6978 100644
--- a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
@@ -89,5 +89,11 @@ namespace OpenSim.Data.MSSQL
                return DoQuery(cmd);
            }
        }
+        public FriendsData[] GetFriends(Guid principalID)
+        {
+            return GetFriends(principalID.ToString());
+        }
+ 
    }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 4d06377..961593f 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -813,7 +813,7 @@ namespace OpenSim.Data.MSSQL
        {
            try
            {
-                using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID", connection))
+                using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID and type=-1", connection))
                {
                    command.Parameters.Add(database.CreateParameter("folderID", folderID));
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index e58620a..d9dfe86 100644
--- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -675,7 +675,7 @@ VALUES
                cmd.ExecuteNonQuery();
            }
-            sql = "INSERT INTO [landaccesslist] ([LandUUID],[AccessUUID],[Flags]) VALUES (@LandUUID,@AccessUUID,@Flags)";
+            sql = "INSERT INTO [landaccesslist] ([LandUUID],[AccessUUID],[Flags],[Expires]) VALUES (@LandUUID,@AccessUUID,@Flags,@Expires)";
            using (SqlConnection conn = new SqlConnection(m_connectionString))
            using (SqlCommand cmd = new SqlCommand(sql, conn))
@@ -1215,6 +1215,8 @@ VALUES
            //Store new values
            StoreNewRegionSettings(regionSettings);
+            LoadSpawnPoints(regionSettings);
            return regionSettings;
        }
@@ -1252,7 +1254,7 @@ VALUES
 ,[elevation_1_ne] = @elevation_1_ne ,[elevation_2_ne] = @elevation_2_ne ,[elevation_1_se] = @elevation_1_se ,[elevation_2_se] = @elevation_2_se 
 ,[elevation_1_sw] = @elevation_1_sw ,[elevation_2_sw] = @elevation_2_sw ,[water_height] = @water_height ,[terrain_raise_limit] = @terrain_raise_limit 
 ,[terrain_lower_limit] = @terrain_lower_limit ,[use_estate_sun] = @use_estate_sun ,[fixed_sun] = @fixed_sun ,[sun_position] = @sun_position 
-,[covenant] = @covenant ,[covenant_datetime] = @covenant_datetime, [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz,  [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id
+,[covenant] = @covenant ,[covenant_datetime] = @covenant_datetime, [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz,  [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id, [map_tile_id] = @TerrainImageID, [telehubobject] = @telehubobject, [parcel_tile_id] = @ParcelImageID
 WHERE [regionUUID] = @regionUUID";
                using (SqlConnection conn = new SqlConnection(m_connectionString))
@@ -1263,6 +1265,7 @@ VALUES
                    cmd.ExecuteNonQuery();
                }
            }
+            SaveSpawnPoints(regionSettings);
        }
        public void Shutdown()
@@ -1367,7 +1370,7 @@ VALUES
            newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]);
            newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]);
            newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]);
-            newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
+            newSettings.Sandbox = Convert.ToBoolean(row["Sandbox"]);
            newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
            newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
            newSettings.SunVector = new Vector3(
@@ -1383,6 +1386,11 @@ VALUES
                newSettings.LoadedCreationID = "";
            else
                newSettings.LoadedCreationID = (String)row["loaded_creation_id"];
+            newSettings.TerrainImageID = new UUID((string)row["map_tile_ID"]);
+            newSettings.ParcelImageID = new UUID((Guid)row["parcel_tile_ID"]);
+            newSettings.TelehubObject = new UUID((Guid)row["TelehubObject"]);
            return newSettings;
        }
@@ -1454,6 +1462,13 @@ VALUES
            }
            newData.ParcelAccessList = new List<LandAccessEntry>();
+            newData.MediaDescription = (string)row["MediaDescription"];
+            newData.MediaType = (string)row["MediaType"];
+            newData.MediaWidth = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[0]);
+            newData.MediaHeight = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[1]);
+            newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]);
+            newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
+            newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
            return newData;
        }
@@ -1468,7 +1483,7 @@ VALUES
            LandAccessEntry entry = new LandAccessEntry();
            entry.AgentID = new UUID((Guid)row["AccessUUID"]);
            entry.Flags = (AccessList)Convert.ToInt32(row["Flags"]);
-            entry.Expires = 0;
+            entry.Expires = Convert.ToInt32(row["Expires"]);
            return entry;
        }
@@ -1497,7 +1512,8 @@ VALUES
            prim.TouchName = (string)primRow["TouchName"];
            // permissions
            prim.Flags = (PrimFlags)Convert.ToUInt32(primRow["ObjectFlags"]);
-            prim.CreatorID = new UUID((Guid)primRow["CreatorID"]);
+            //prim.CreatorID = new UUID((Guid)primRow["CreatorID"]);
+            prim.CreatorIdentification = (string)primRow["CreatorID"];
            prim.OwnerID = new UUID((Guid)primRow["OwnerID"]);
            prim.GroupID = new UUID((Guid)primRow["GroupID"]);
            prim.LastOwnerID = new UUID((Guid)primRow["LastOwnerID"]);
@@ -1691,7 +1707,8 @@ VALUES
            taskItem.Name = (string)inventoryRow["name"];
            taskItem.Description = (string)inventoryRow["description"];
            taskItem.CreationDate = Convert.ToUInt32(inventoryRow["creationDate"]);
-            taskItem.CreatorID = new UUID((Guid)inventoryRow["creatorID"]);
+            //taskItem.CreatorID = new UUID((Guid)inventoryRow["creatorID"]);
+            taskItem.CreatorIdentification = (string)inventoryRow["creatorID"];
            taskItem.OwnerID = new UUID((Guid)inventoryRow["ownerID"]);
            taskItem.LastOwnerID = new UUID((Guid)inventoryRow["lastOwnerID"]);
            taskItem.GroupID = new UUID((Guid)inventoryRow["groupID"]);
@@ -1782,7 +1799,7 @@ VALUES
            parameters.Add(_Database.CreateParameter("terrain_raise_limit", settings.TerrainRaiseLimit));
            parameters.Add(_Database.CreateParameter("terrain_lower_limit", settings.TerrainLowerLimit));
            parameters.Add(_Database.CreateParameter("use_estate_sun", settings.UseEstateSun));
-            parameters.Add(_Database.CreateParameter("sandbox", settings.Sandbox));
+            parameters.Add(_Database.CreateParameter("Sandbox", settings.Sandbox));
            parameters.Add(_Database.CreateParameter("fixed_sun", settings.FixedSun));
            parameters.Add(_Database.CreateParameter("sun_position", settings.SunPosition));
            parameters.Add(_Database.CreateParameter("sunvectorx", settings.SunVector.X));
@@ -1792,6 +1809,9 @@ VALUES
            parameters.Add(_Database.CreateParameter("covenant_datetime", settings.CovenantChangedDateTime));
            parameters.Add(_Database.CreateParameter("Loaded_Creation_DateTime", settings.LoadedCreationDateTime));
            parameters.Add(_Database.CreateParameter("Loaded_Creation_ID", settings.LoadedCreationID));
+            parameters.Add(_Database.CreateParameter("TerrainImageID", settings.TerrainImageID));
+            parameters.Add(_Database.CreateParameter("ParcelImageID", settings.ParcelImageID));
+            parameters.Add(_Database.CreateParameter("TelehubObject", settings.TelehubObject));
            return parameters.ToArray();
        }
@@ -1859,6 +1879,7 @@ VALUES
            parameters.Add(_Database.CreateParameter("LandUUID", parcelID));
            parameters.Add(_Database.CreateParameter("AccessUUID", parcelAccessEntry.AgentID));
            parameters.Add(_Database.CreateParameter("Flags", parcelAccessEntry.Flags));
+            parameters.Add(_Database.CreateParameter("Expires", parcelAccessEntry.Expires));
            return parameters.ToArray();
        }
@@ -2063,5 +2084,57 @@ VALUES
        #endregion
        #endregion
+        private void LoadSpawnPoints(RegionSettings rs)
+        {
+            rs.ClearSpawnPoints();
+            string sql = "SELECT Yaw, Pitch, Distance FROM spawn_points WHERE RegionUUID = @RegionUUID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID.ToString()));
+                conn.Open();
+                using (SqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        SpawnPoint sp = new SpawnPoint();
+                        sp.Yaw = (float)reader["Yaw"];
+                        sp.Pitch = (float)reader["Pitch"];
+                        sp.Distance = (float)reader["Distance"];
+                        rs.AddSpawnPoint(sp);
+                    }
+                }
+            }
+        }
+        private void SaveSpawnPoints(RegionSettings rs)
+        {
+            string sql = "DELETE FROM spawn_points WHERE RegionUUID = @RegionUUID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+            foreach (SpawnPoint p in rs.SpawnPoints())
+            {
+                sql = "INSERT INTO spawn_points (RegionUUID, Yaw, Pitch, Distance) VALUES (@RegionUUID, @Yaw, @Pitch, @Distance)";
+                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID));
+                    cmd.Parameters.Add(_Database.CreateParameter("@Yaw", p.Yaw));
+                    cmd.Parameters.Add(_Database.CreateParameter("@Pitch", p.Pitch));
+                    cmd.Parameters.Add(_Database.CreateParameter("@Distance", p.Distance));
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+                }
+            }
+        }
    }
 }
diff --git a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
index a98690a..d6a3be9 100644
--- a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
@@ -1044,10 +1044,93 @@ ALTER TABLE primitems ALTER COLUMN CreatorID uniqueidentifier NOT NULL
 COMMIT
-:VERSION 29         #---------------------
+:VERSION 29         #----------------- Region Covenant changed time
 BEGIN TRANSACTION
 ALTER TABLE regionsettings ADD covenant_datetime int NOT NULL default 0
 COMMIT
+:VERSION 30         #------------------Migrate creatorID storage to varchars instead of UUIDs for HG support
+BEGIN TRANSACTION
+EXECUTE sp_rename N'dbo.prims.creatorid', N'creatoridold', 'COLUMN'
+EXECUTE sp_rename N'dbo.primitems.creatorid', N'creatoridold', 'COLUMN'
+COMMIT
+:VERSION 31        #---------------------
+BEGIN TRANSACTION
+ALTER TABLE prims ADD CreatorID varchar(255)
+ALTER TABLE primitems ADD CreatorID varchar(255)
+COMMIT
+:VERSION 32        #---------------------
+BEGIN TRANSACTION
+UPDATE prims SET prims.CreatorID = CONVERT(varchar(255), creatoridold)
+UPDATE primitems SET primitems.CreatorID = CONVERT(varchar(255), creatoridold)
+COMMIT
+:VERSION 33       #---------------------
+BEGIN TRANSACTION
+ALTER TABLE prims 
+ADD CONSTRAINT DF_prims_CreatorIDNew 
+DEFAULT '00000000-0000-0000-0000-000000000000' 
+FOR CreatorID
+ALTER TABLE prims ALTER COLUMN CreatorID varchar(255) NOT NULL
+ALTER TABLE primitems
+ADD CONSTRAINT DF_primitems_CreatorIDNew
+DEFAULT '00000000-0000-0000-0000-000000000000' 
+FOR CreatorID
+ALTER TABLE primitems ALTER COLUMN CreatorID varchar(255) NOT NULL
+COMMIT
+:VERSION 34               #--------------- Telehub support
+BEGIN TRANSACTION
+CREATE TABLE [dbo].[Spawn_Points](
+        [RegionUUID] [uniqueidentifier] NOT NULL,
+        [Yaw] [float] NOT NULL,
+        [Pitch] [float] NOT NULL,
+        [Distance] [float] NOT NULL,
+        PRIMARY KEY CLUSTERED 
+        (
+                [RegionUUID] ASC
+        )WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+ALTER TABLE regionsettings ADD TelehubObject uniqueidentifier NOT NULL  DEFAULT '00000000-0000-0000-0000-000000000000';
+COMMIT
+:VERSION 35       #---------------- Parcels for sale
+BEGIN TRANSACTION
+ALTER TABLE regionsettings ADD parcel_tile_ID uniqueidentifier NOT NULL  DEFAULT '00000000-0000-0000-0000-000000000000';
+COMMIT
+:VERSION 36       #---------------- Timed bans/access
+BEGIN TRANSACTION
+ALTER TABLE landaccesslist ADD Expires integer NOT NULL  DEFAULT 0;
+COMMIT
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 5dafc0b..1197548 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1315,7 +1315,7 @@ namespace OpenSim.Data.MySQL
            newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]);
            newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]);
            newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]);
-            newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
+            newSettings.Sandbox = Convert.ToBoolean(row["Sandbox"]);
            newSettings.SunVector = new Vector3 (
                                                 Convert.ToSingle(row["sunvectorx"]),
                                                 Convert.ToSingle(row["sunvectory"]),
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 186a586..7e7c08a 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -2157,7 +2157,7 @@ namespace OpenSim.Data.SQLite
            row["terrain_raise_limit"] = settings.TerrainRaiseLimit;
            row["terrain_lower_limit"] = settings.TerrainLowerLimit;
            row["use_estate_sun"] = settings.UseEstateSun;
-            row["Sandbox"] = settings.Sandbox; // database uses upper case S for sandbox
+            row["sandbox"] = settings.Sandbox; // unlike other database modules, sqlite uses a lower case s for sandbox!
            row["sunvectorx"] = settings.SunVector.X;
            row["sunvectory"] = settings.SunVector.Y;
            row["sunvectorz"] = settings.SunVector.Z;
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs
index a29b370..4d8751f 100644
--- a/OpenSim/Framework/Console/MockConsole.cs
+++ b/OpenSim/Framework/Console/MockConsole.cs
@@ -29,6 +29,7 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 using System.Text;
+using System.Xml;
 namespace OpenSim.Framework.Console
 {
@@ -37,28 +38,42 @@ namespace OpenSim.Framework.Console
    /// Don't use this except for Unit Testing or you're in for a world of hurt when the 
    /// sim gets to ReadLine
    /// </summary>
-    public class MockConsole : CommandConsole
+    public class MockConsole : ICommandConsole
    {
-        public MockConsole(string defaultPrompt) : base(defaultPrompt)
+        private MockCommands m_commands = new MockCommands();
-        {
-        }
-        public override void Output(string text)
-        {
-        }
-        public override void Output(string text, string level)
-        {
-        }
-        public override string ReadLine(string p, bool isCommand, bool e)
+        public ICommands Commands { get { return m_commands; } }
-        {
-            //Thread.CurrentThread.Join(1000);
+        public void Prompt() {}
-            return string.Empty;
-        }
+        public void RunCommand(string cmd) {}
-        public override void UnlockOutput()
-        {
+        public string ReadLine(string p, bool isCommand, bool e) { return ""; }
-        }
-        public override void LockOutput()
+        public object ConsoleScene { get { return null; } }
-        {
-        }
+        public void Output(string text, string level) {}
+        public void Output(string text) {}
+        public void OutputFormat(string format, params object[] components) {}
+        public string CmdPrompt(string p) { return ""; }
+        public string CmdPrompt(string p, string def) { return ""; }
+        public string CmdPrompt(string p, List<char> excludedCharacters) { return ""; }
+        public string CmdPrompt(string p, string def, List<char> excludedCharacters) { return ""; }
+        public string CmdPrompt(string prompt, string defaultresponse, List<string> options) { return ""; }
+        public string PasswdPrompt(string p) { return ""; }
+    }
+    public class MockCommands : ICommands
+    {
+        public void FromXml(XmlElement root, CommandDelegate fn) {}
+        public List<string> GetHelp(string[] cmd) { return null; }
+        public void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn) {}
+        public void AddCommand(string module, bool shared, string command, string help, string longhelp, string descriptivehelp, CommandDelegate fn) {}
+        public string[] FindNextOption(string[] cmd, bool term) { return null; }
+        public string[] Resolve(string[] cmd) { return null; }
+        public XmlElement GetXml(XmlDocument doc) { return null; }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 586cde6..daddd1f 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -247,7 +247,7 @@ namespace OpenSim.Framework.Servers
            string reportFormat = "{0,6}   {1,35}   {2,16}   {3,13}   {4,10}   {5,30}";
            StringBuilder sb = new StringBuilder();
-            Watchdog.ThreadWatchdogInfo[] threads = Watchdog.GetThreads();
+            Watchdog.ThreadWatchdogInfo[] threads = Watchdog.GetThreadsInfo();
            sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine);
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 2206feb..0062d4e 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        String.Format("PollServiceWorkerThread{0}", i),
                        ThreadPriority.Normal,
                        false,
+                        true,
                        int.MaxValue);
            }
@@ -73,6 +74,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                "PollServiceWatcherThread",
                ThreadPriority.Normal,
                false,
+                true,
                1000 * 60 * 10);
        }
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index b2bb962..63ec257 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
 {
    public class VersionInfo
    {
-        private const string VERSION_NUMBER = "0.7.3CM";
+        private const string VERSION_NUMBER = "0.7.4CM";
        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
        public enum Flavour
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs
index fa94109..881b6aa 100644
--- a/OpenSim/Framework/Watchdog.cs
+++ b/OpenSim/Framework/Watchdog.cs
@@ -72,6 +72,11 @@ namespace OpenSim.Framework
            /// </summary>
            public bool IsTimedOut { get; set; }
+            /// <summary>
+            /// Will this thread trigger the alarm function if it has timed out?
+            /// </summary>
+            public bool AlarmIfTimeout { get; set; }
            public ThreadWatchdogInfo(Thread thread, int timeout)
            {
                Thread = thread;
@@ -112,12 +117,13 @@ namespace OpenSim.Framework
        /// <param name="start">The method that will be executed in a new thread</param>
        /// <param name="name">A name to give to the new thread</param>
        /// <param name="priority">Priority to run the thread at</param>
-        /// <param name="isBackground">True to run this thread as a background
+        /// <param name="isBackground">True to run this thread as a background thread, otherwise false</param>
-        /// thread, otherwise false</param>
+        /// <param name="alarmIfTimeout">Trigger an alarm function is we have timed out</param>
        /// <returns>The newly created Thread object</returns>
-        public static Thread StartThread(ThreadStart start, string name, ThreadPriority priority, bool isBackground)
+        public static Thread StartThread(
+            ThreadStart start, string name, ThreadPriority priority, bool isBackground, bool alarmIfTimeout)
        {
-            return StartThread(start, name, priority, isBackground, WATCHDOG_TIMEOUT_MS);
+            return StartThread(start, name, priority, isBackground, alarmIfTimeout, WATCHDOG_TIMEOUT_MS);
        }
        /// <summary>
@@ -128,21 +134,21 @@ namespace OpenSim.Framework
        /// <param name="priority">Priority to run the thread at</param>
        /// <param name="isBackground">True to run this thread as a background
        /// thread, otherwise false</param>
-        /// <param name="timeout">
+        /// <param name="alarmIfTimeout">Trigger an alarm function is we have timed out</param>
-        /// Number of milliseconds to wait until we issue a warning about timeout.
+        /// <param name="timeout">Number of milliseconds to wait until we issue a warning about timeout.</param>
-        /// </para>
        /// <returns>The newly created Thread object</returns>
        public static Thread StartThread(
-            ThreadStart start, string name, ThreadPriority priority, bool isBackground, int timeout)
+            ThreadStart start, string name, ThreadPriority priority, bool isBackground, bool alarmIfTimeout, int timeout)
        {
            Thread thread = new Thread(start);
            thread.Name = name;
            thread.Priority = priority;
            thread.IsBackground = isBackground;
            
-            ThreadWatchdogInfo twi = new ThreadWatchdogInfo(thread, timeout);
+            ThreadWatchdogInfo twi = new ThreadWatchdogInfo(thread, timeout) { AlarmIfTimeout = alarmIfTimeout };
-            m_log.Debug("[WATCHDOG]: Started tracking thread \"" + twi.Thread.Name + "\" (ID " + twi.Thread.ManagedThreadId + ")");
+            m_log.DebugFormat(
+                "[WATCHDOG]: Started tracking thread {0}, ID {1}", twi.Thread.Name, twi.Thread.ManagedThreadId);
            lock (m_threads)
                m_threads.Add(twi.Thread.ManagedThreadId, twi);
@@ -224,19 +230,39 @@ namespace OpenSim.Framework
        /// Get currently watched threads for diagnostic purposes
        /// </summary>
        /// <returns></returns>
-        public static ThreadWatchdogInfo[] GetThreads()
+        public static ThreadWatchdogInfo[] GetThreadsInfo()
        {
            lock (m_threads)
                return m_threads.Values.ToArray();
        }
+        /// <summary>
+        /// Return the current thread's watchdog info.
+        /// </summary>
+        /// <returns>The watchdog info.  null if the thread isn't being monitored.</returns>
+        public static ThreadWatchdogInfo GetCurrentThreadInfo()
+        {
+            lock (m_threads)
+            {
+                if (m_threads.ContainsKey(Thread.CurrentThread.ManagedThreadId))
+                    return m_threads[Thread.CurrentThread.ManagedThreadId];
+            }
+            return null;
+        }
+        /// <summary>
+        /// Check watched threads.  Fire alarm if appropriate.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
        private static void WatchdogTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
        {
            WatchdogTimeout callback = OnWatchdogTimeout;
            if (callback != null)
            {
-                ThreadWatchdogInfo timedOut = null;
+                List<ThreadWatchdogInfo> callbackInfos = null;
                lock (m_threads)
                {
@@ -246,21 +272,31 @@ namespace OpenSim.Framework
                    {
                        if (threadInfo.Thread.ThreadState == ThreadState.Stopped)
                        {
-                            timedOut = threadInfo;
                            RemoveThread(threadInfo.Thread.ManagedThreadId);
-                            break;
+                            if (callbackInfos == null)
+                                callbackInfos = new List<ThreadWatchdogInfo>();
+                            callbackInfos.Add(threadInfo);
                        }
                        else if (!threadInfo.IsTimedOut && now - threadInfo.LastTick >= threadInfo.Timeout)
                        {
                            threadInfo.IsTimedOut = true;
-                            timedOut = threadInfo;
-                            break;
+                            if (threadInfo.AlarmIfTimeout)
+                            {
+                                if (callbackInfos == null)
+                                    callbackInfos = new List<ThreadWatchdogInfo>();
+                                callbackInfos.Add(threadInfo);
+                            }
                        }
                    }
                }
-                if (timedOut != null)
+                if (callbackInfos != null)
-                    callback(timedOut.Thread, timedOut.LastTick);
+                    foreach (ThreadWatchdogInfo callbackInfo in callbackInfos)
+                        callback(callbackInfo.Thread, callbackInfo.LastTick);
            }
            m_watchdogTimer.Start();
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 854f310..f90df12 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -63,77 +63,7 @@ namespace OpenSim.Framework
        // a "long" call for warning & debugging purposes
        public const int LongCallTime = 500;
-//        /// <summary>
+        #region JSONRequest
-//        /// Send LLSD to an HTTP client in application/llsd+json form
-//        /// </summary>
-//        /// <param name="response">HTTP response to send the data in</param>
-//        /// <param name="body">LLSD to send to the client</param>
-//        public static void SendJSONResponse(OSHttpResponse response, OSDMap body)
-//        {
-//            byte[] responseData = Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(body));
-//
-//            response.ContentEncoding = Encoding.UTF8;
-//            response.ContentLength = responseData.Length;
-//            response.ContentType = "application/llsd+json";
-//            response.Body.Write(responseData, 0, responseData.Length);
-//        }
-//
-//        /// <summary>
-//        /// Send LLSD to an HTTP client in application/llsd+xml form
-//        /// </summary>
-//        /// <param name="response">HTTP response to send the data in</param>
-//        /// <param name="body">LLSD to send to the client</param>
-//        public static void SendXMLResponse(OSHttpResponse response, OSDMap body)
-//        {
-//            byte[] responseData = OSDParser.SerializeLLSDXmlBytes(body);
-//
-//            response.ContentEncoding = Encoding.UTF8;
-//            response.ContentLength = responseData.Length;
-//            response.ContentType = "application/llsd+xml";
-//            response.Body.Write(responseData, 0, responseData.Length);
-//        }
-        /// <summary>
-        /// Make a GET or GET-like request to a web service that returns LLSD
-        /// or JSON data
-        /// </summary>
-        public static OSDMap ServiceRequest(string url, string httpVerb)
-        {
-            string errorMessage;
-            try
-            {
-                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
-                request.Method = httpVerb;
-                using (WebResponse response = request.GetResponse())
-                {
-                    using (Stream responseStream = response.GetResponseStream())
-                    {
-                        try
-                        {
-                            string responseStr = responseStream.GetStreamString();
-                            OSD responseOSD = OSDParser.Deserialize(responseStr);
-                            if (responseOSD.Type == OSDType.Map)
-                                return (OSDMap)responseOSD;
-                            else
-                                errorMessage = "Response format was invalid.";
-                        }
-                        catch
-                        {
-                            errorMessage = "Failed to parse the response.";
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                m_log.Warn(httpVerb + " on URL " + url + " failed: " + ex.Message);
-                errorMessage = ex.Message;
-            }
-            return new OSDMap { { "Message", OSD.FromString("Service request failed. " + errorMessage) } };
-        }
        /// <summary>
        /// PUT JSON-encoded data to a web service that returns LLSD or
@@ -304,6 +234,10 @@ namespace OpenSim.Framework
            return result;
        }
        
+        #endregion JSONRequest
+        #region FormRequest
        /// <summary>
        /// POST URL-encoded form data to a web service that returns LLSD or
        /// JSON data
@@ -398,6 +332,8 @@ namespace OpenSim.Framework
            result["Message"] = OSD.FromString("Service request failed: " + msg);
            return result;
        }
+        #endregion FormRequest
        
        #region Uri
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index be699db..35cb575 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Region.ClientStack.Linden
        {
            try
            {
-                m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName);
+//                m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName);
                //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param);
                Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index a79b387..75f783b 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -244,8 +244,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            base.Start(m_recvBufferSize, m_asyncPacketHandling);
            // Start the packet processing threads
-            Watchdog.StartThread(IncomingPacketHandler, "Incoming Packets (" + m_scene.RegionInfo.RegionName + ")", ThreadPriority.Normal, false);
+            Watchdog.StartThread(
-            Watchdog.StartThread(OutgoingPacketHandler, "Outgoing Packets (" + m_scene.RegionInfo.RegionName + ")", ThreadPriority.Normal, false);
+                IncomingPacketHandler, "Incoming Packets (" + m_scene.RegionInfo.RegionName + ")", ThreadPriority.Normal, false, true);
+            Watchdog.StartThread(
+                OutgoingPacketHandler, "Outgoing Packets (" + m_scene.RegionInfo.RegionName + ")", ThreadPriority.Normal, false, true);
            m_elapsedMSSinceLastStatReport = Environment.TickCount;
        }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index a81f36c..650069a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -349,8 +349,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        {
            try
            {
-                m_log.Info("[INVENTORY ARCHIVER]: PLEASE NOTE THAT THIS FACILITY IS EXPERIMENTAL.  BUG REPORTS WELCOME.");
-                
                Dictionary<string, object> options = new Dictionary<string, object>();
                OptionSet optionSet = new OptionSet().Add("m|merge", delegate (string v) { options["merge"] = v != null; });
                
@@ -412,7 +410,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                    return;
                }
    
-                m_log.Info("[INVENTORY ARCHIVER]: PLEASE NOTE THAT THIS FACILITY IS EXPERIMENTAL.  BUG REPORTS WELCOME.");
                if (options.ContainsKey("home"))
                    m_log.WarnFormat("[INVENTORY ARCHIVER]: Please be aware that inventory archives with creator information are not compatible with OpenSim 0.7.0.2 and earlier.  Do not use the -home option if you want to produce a compatible IAR");
diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
index eb1e4b5..8101ca2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
@@ -150,7 +150,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
            string skillsText = String.Empty;
            string languages = String.Empty;
-            Byte[] charterMember = Utils.StringToBytes("Avatar");
+            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, avatarID);
+            string name = "Avatar";
+            int created = 0;
+            if (account != null)
+            {
+                name = account.FirstName + " " + account.LastName;
+                created = account.Created;
+            }
+            Byte[] charterMember = Utils.StringToBytes(name);
            profileUrl = "No profile data";
            aboutText = string.Empty;
@@ -160,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
            partner = UUID.Zero;
            remoteClient.SendAvatarProperties(avatarID, aboutText,
-                        Util.ToDateTime(0).ToString(
+                        Util.ToDateTime(created).ToString(
                                "M/d/yyyy", CultureInfo.InvariantCulture),
                        charterMember, firstLifeAboutText,
                        (uint)(0 & 0xff),
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 0c4ff7f..d2fe388 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            string userAssetServer = string.Empty;
            if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission)
            {
-                Util.FireAndForget(delegate { m_assMapper.Post(assetID, avatarID, userAssetServer); });
+                m_assMapper.Post(assetID, avatarID, userAssetServer);
            }
        }
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index f367739..a6e2548 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -1210,7 +1210,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
            if (homeScene.TryGetScenePresence(avatarId,out avatar))
            {
                KillAUser ku = new KillAUser(avatar,mod);
-                Watchdog.StartThread(ku.ShutdownNoLogout, "OGPShutdown", ThreadPriority.Normal, true);
+                Watchdog.StartThread(ku.ShutdownNoLogout, "OGPShutdown", ThreadPriority.Normal, true, true);
            }
        }
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 640a60b..ef9b4e0 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -151,6 +151,14 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
        #region IWorldComm Members
+        public int ListenerCount
+        {
+            get
+            {
+                return m_listenerManager.ListenerCount;
+            }
+        }
        /// <summary>
        /// Create a listen event callback with the specified filters.
        /// The parameters localID,itemID are needed to uniquely identify
@@ -438,6 +446,18 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
        private int m_maxhandles;
        private int m_curlisteners;
+        /// <summary>
+        /// Total number of listeners
+        /// </summary>
+        public int ListenerCount
+        {
+            get
+            {
+                lock (m_listeners)
+                    return m_listeners.Count;
+            }
+        }
        public ListenerManager(int maxlisteners, int maxhandles)
        {
            m_maxlisteners = maxlisteners;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 3c36799..4f0363a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -48,8 +48,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                LogManager.GetLogger(
                MethodBase.GetCurrentMethod().DeclaringType);
-        private static LocalGridServicesConnector m_MainInstance;
        private IGridService m_GridService;
        private Dictionary<UUID, RegionCache> m_LocalCache = new Dictionary<UUID, RegionCache>();
@@ -62,7 +60,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
        public LocalGridServicesConnector(IConfigSource source)
        {
            m_log.Debug("[LOCAL GRID CONNECTOR]: LocalGridServicesConnector instantiated");
-            m_MainInstance = this;
            InitialiseService(source);
        }
@@ -87,7 +84,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                if (name == Name)
                {
                    InitialiseService(source);
-                    m_MainInstance = this;
                    m_Enabled = true;
                    m_log.Info("[LOCAL GRID CONNECTOR]: Local grid connector enabled");
                }
@@ -126,12 +122,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
        public void PostInitialise()
        {
-            if (m_MainInstance == this)
+            MainConsole.Instance.Commands.AddCommand("LocalGridConnector", false, "show neighbours",
-            {
+                "show neighbours",
-                MainConsole.Instance.Commands.AddCommand("LocalGridConnector", false, "show neighbours",
+                "Shows the local regions' neighbours", NeighboursCommand);
-                    "show neighbours",
-                    "Shows the local regions' neighbours", NeighboursCommand);
-            }
        }
        public void Close()
@@ -143,22 +136,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
            if (m_Enabled)
                scene.RegisterModuleInterface<IGridService>(this);
-            if (m_MainInstance == this)
+            if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID))
-            {
+                m_log.ErrorFormat("[LOCAL GRID CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!");
-                if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID))
+            else
-                    m_log.ErrorFormat("[LOCAL GRID CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!");
+                m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene));
-                else
-                    m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene));
-            }
        }
        public void RemoveRegion(Scene scene)
        {
-            if (m_MainInstance == this)
+            m_LocalCache[scene.RegionInfo.RegionID].Clear();
-            {
+            m_LocalCache.Remove(scene.RegionInfo.RegionID);
-                m_LocalCache[scene.RegionInfo.RegionID].Clear();
-                m_LocalCache.Remove(scene.RegionInfo.RegionID);
-            }
        }
        public void RegionLoaded(Scene scene)
@@ -259,6 +246,5 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
            MainConsole.Instance.Output(caps.ToString());
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 4ebfb21..0cbe1e1 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
        {
        }
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
        {
            get { return null; }
        }
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            // There is a major hack going on in this method. The viewer doesn't request
            // map blocks (RequestMapBlocks) above 2048. That means that if we don't hack,
            // grids above that cell don't have a map at all. So, here's the hack: we wait
-            // for this CAP request to come, and we inject the map blocks at this point. 
+            // for this CAP request to come, and we inject the map blocks at this point.
            // In a normal scenario, this request simply sends back the MapLayer (the blue color).
            // In the hacked scenario, it also sends the map blocks via UDP.
            //
@@ -351,6 +351,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                process,
                string.Format("MapItemRequestThread ({0})", m_scene.RegionInfo.RegionName),
                ThreadPriority.BelowNormal,
+                true,
                true);
        }
@@ -750,7 +751,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            {
                uint x = 0, y = 0;
                Utils.LongToUInts(regionhandle, out x, out y);
-                GridRegion mreg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y); 
+                GridRegion mreg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y);
                if (mreg != null)
                {
@@ -856,7 +857,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            finally
            {
                if (os != null)
-                    os.Close();                    
+                    os.Close();
            }
            string response_mapItems_reply = null;
@@ -959,16 +960,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                // on an unloaded square.
                // But make sure: Look whether the one we requested is in there
                List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                    minX * (int)Constants.RegionSize, 
+                    minX * (int)Constants.RegionSize,
-                    maxX * (int)Constants.RegionSize, 
+                    maxX * (int)Constants.RegionSize,
-                    minY * (int)Constants.RegionSize, 
+                    minY * (int)Constants.RegionSize,
                    maxY * (int)Constants.RegionSize);
                if (regions != null)
                {
                    foreach (GridRegion r in regions)
                    {
-                        if ((r.RegionLocX == minX * (int)Constants.RegionSize) && 
+                        if ((r.RegionLocX == minX * (int)Constants.RegionSize) &&
                            (r.RegionLocY == minY * (int)Constants.RegionSize))
                        {
                            // found it => add it to response
@@ -1003,7 +1004,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
        {
            List<MapBlockData> mapBlocks = new List<MapBlockData>();
            List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                (minX - 4) * (int)Constants.RegionSize, 
+                (minX - 4) * (int)Constants.RegionSize,
                (maxX + 4) * (int)Constants.RegionSize,
                (minY - 4) * (int)Constants.RegionSize,
                (maxY + 4) * (int)Constants.RegionSize);
@@ -1335,7 +1336,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            // Cannot create a map for a nonexistant heightmap
            if (m_scene.Heightmap == null)
                return;
-            
            //create a texture asset of the terrain
            IMapImageGenerator terrain = m_scene.RequestModuleInterface<IMapImageGenerator>();
            if (terrain == null)
@@ -1344,7 +1345,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            byte[] data = terrain.WriteJpeg2000Image();
            if (data == null)
                return;
-            
            byte[] overlay = GenerateOverlay();
            m_log.Debug("[WORLDMAP]: STORING MAPTILE IMAGE");
@@ -1365,7 +1366,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            // Store the new one
            m_log.DebugFormat("[WORLDMAP]: Storing map tile {0}", asset.ID);
            m_scene.AssetService.Store(asset);
-            
            if (overlay != null)
            {
                parcelImageID = UUID.Random();
@@ -1389,7 +1390,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID;
            m_scene.RegionInfo.RegionSettings.ParcelImageID = parcelImageID;
            m_scene.RegionInfo.RegionSettings.Save();
-            
            // Delete the old one
            // m_log.DebugFormat("[WORLDMAP]: Deleting old map tile {0}", lastTerrainImageID);
            m_scene.AssetService.Delete(lastTerrainImageID.ToString());
@@ -1510,11 +1511,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            if (!landForSale)
            {
-                m_log.DebugFormat("[WORLD MAP]: Region {0} has no parcels for sale, not geenrating overlay", m_scene.RegionInfo.RegionName);
+                m_log.DebugFormat("[WORLD MAP]: Region {0} has no parcels for sale, not generating overlay", m_scene.RegionInfo.RegionName);
                return null;
            }
-            m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, genrating overlay", m_scene.RegionInfo.RegionName);
+            m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, generating overlay", m_scene.RegionInfo.RegionName);
            try
            {
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index dafbf30..e8e375e 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -50,6 +50,11 @@ namespace OpenSim.Region.Framework.Interfaces
    public interface IWorldComm
    {
        /// <summary>
+        /// Total number of listeners
+        /// </summary>
+        int ListenerCount { get; }
+        /// <summary>
        /// Create a listen event callback with the specified filters.
        /// The parameters localID,itemID are needed to uniquely identify
        /// the script during 'peek' time. Parameter hostID is needed to
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 9fcd5fe..605ee32 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -142,8 +142,11 @@ namespace OpenSim.Region.Framework.Scenes
        public event OnPermissionErrorDelegate OnPermissionError;
        /// <summary>
-        /// Fired when a new script is created.
+        /// Fired when a script is run.
        /// </summary>
+        /// <remarks>
+        /// Occurs after OnNewScript.
+        /// </remarks>
        public event NewRezScript OnRezScript;
        public delegate void NewRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource);
@@ -191,10 +194,16 @@ namespace OpenSim.Region.Framework.Scenes
        public event ClientClosed OnClientClosed;
-        // Fired when a script is created
-        // The indication that a new script exists in this region.
        public delegate void NewScript(UUID clientID, SceneObjectPart part, UUID itemID);
+        /// <summary>
+        /// Fired when a script is created.
+        /// </summary>
+        /// <remarks>
+        /// Occurs before OnRezScript
+        /// </remarks>
        public event NewScript OnNewScript;
        public virtual void TriggerNewScript(UUID clientID, SceneObjectPart part, UUID itemID)
        {
            NewScript handlerNewScript = OnNewScript;
@@ -216,10 +225,16 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
-        //TriggerUpdateScript: triggered after Scene receives client's upload of updated script and stores it as asset
-        // An indication that the script has changed.
        public delegate void UpdateScript(UUID clientID, UUID itemId, UUID primId, bool isScriptRunning, UUID newAssetID);
+        /// <summary>
+        /// An indication that the script has changed.
+        /// </summary>
+        /// <remarks>
+        /// Triggered after the scene receives a client's upload of an updated script and has stored it in an asset.
+        /// </remarks>
        public event UpdateScript OnUpdateScript;
+        
        public virtual void TriggerUpdateScript(UUID clientId, UUID itemId, UUID primId, bool isScriptRunning, UUID newAssetID)
        {
            UpdateScript handlerUpdateScript = OnUpdateScript;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5d27d86..d016887 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -651,101 +651,104 @@ namespace OpenSim.Region.Framework.Scenes
            #region Region Config
+            // Region config overrides global config
+            //
            try
            {
-                // Region config overrides global config
+                if (m_config.Configs["Startup"] != null)
-                //
+                {
-                IConfig startupConfig = m_config.Configs["Startup"];
+                    IConfig startupConfig = m_config.Configs["Startup"];
-                m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance);
+                    m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance);
-                m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup);
+                    m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup);
-                if (!m_useBackup)
+                    if (!m_useBackup)
-                    m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName);
+                        m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName);
-                
+                    
-                //Animation states
+                    //Animation states
-                m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
+                    m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
-                PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
+                    PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
-                CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
+                    CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
-                m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys);
+                    m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys);
-                if (RegionInfo.NonphysPrimMax > 0)
+                    if (RegionInfo.NonphysPrimMax > 0)
-                {
+                    {
-                    m_maxNonphys = RegionInfo.NonphysPrimMax;
+                        m_maxNonphys = RegionInfo.NonphysPrimMax;
-                }
+                    }
-                m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys);
+                    m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys);
-                if (RegionInfo.PhysPrimMax > 0)
+                    if (RegionInfo.PhysPrimMax > 0)
-                {
+                    {
-                    m_maxPhys = RegionInfo.PhysPrimMax;
+                        m_maxPhys = RegionInfo.PhysPrimMax;
-                }
+                    }
-                // Here, if clamping is requested in either global or
+                    // Here, if clamping is requested in either global or
-                // local config, it will be used
+                    // local config, it will be used
-                //
+                    //
-                m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize);
+                    m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize);
-                if (RegionInfo.ClampPrimSize)
+                    if (RegionInfo.ClampPrimSize)
-                {
+                    {
-                    m_clampPrimSize = true;
+                        m_clampPrimSize = true;
-                }
+                    }
-                m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
+                    m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
-                m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
+                    m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
-                m_dontPersistBefore =
+                    m_dontPersistBefore =
-                  startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE);
+                      startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE);
-                m_dontPersistBefore *= 10000000;
+                    m_dontPersistBefore *= 10000000;
-                m_persistAfter =
+                    m_persistAfter =
-                  startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE);
+                      startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE);
-                m_persistAfter *= 10000000;
+                    m_persistAfter *= 10000000;
-                m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
+                    m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
-                m_log.InfoFormat("[SCENE]: Default script engine {0}", m_defaultScriptEngine);
+                    m_log.InfoFormat("[SCENE]: Default script engine {0}", m_defaultScriptEngine);
-                IConfig packetConfig = m_config.Configs["PacketPool"];
+                    IConfig packetConfig = m_config.Configs["PacketPool"];
-                if (packetConfig != null)
+                    if (packetConfig != null)
-                {
+                    {
-                    PacketPool.Instance.RecyclePackets = packetConfig.GetBoolean("RecyclePackets", true);
+                        PacketPool.Instance.RecyclePackets = packetConfig.GetBoolean("RecyclePackets", true);
-                    PacketPool.Instance.RecycleDataBlocks = packetConfig.GetBoolean("RecycleDataBlocks", true);
+                        PacketPool.Instance.RecycleDataBlocks = packetConfig.GetBoolean("RecycleDataBlocks", true);
-                }
+                    }
-                m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
+                    m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
-                m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion);
+                    m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion);
-                CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
+                    CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
-                m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true);
+                    m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true);
-                if (m_generateMaptiles)
+                    if (m_generateMaptiles)
-                {
-                    int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0);
-                    if (maptileRefresh != 0)
                    {
-                        m_mapGenerationTimer.Interval = maptileRefresh * 1000;
+                        int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0);
-                        m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister;
+                        if (maptileRefresh != 0)
-                        m_mapGenerationTimer.AutoReset = true;
+                        {
-                        m_mapGenerationTimer.Start();
+                            m_mapGenerationTimer.Interval = maptileRefresh * 1000;
+                            m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister;
+                            m_mapGenerationTimer.AutoReset = true;
+                            m_mapGenerationTimer.Start();
+                        }
                    }
-                }
+                    else
-                else
-                {
-                    string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
-                    UUID tileID;
-                    if (UUID.TryParse(tile, out tileID))
                    {
-                        RegionInfo.RegionSettings.TerrainImageID = tileID;
+                        string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
+                        UUID tileID;
+                        if (UUID.TryParse(tile, out tileID))
+                        {
+                            RegionInfo.RegionSettings.TerrainImageID = tileID;
+                        }
                    }
-                }
-                MinFrameTime              = startupConfig.GetFloat( "MinFrameTime",                      MinFrameTime);
+                    MinFrameTime              = startupConfig.GetFloat( "MinFrameTime",                      MinFrameTime);
-                m_update_backup           = startupConfig.GetInt(   "UpdateStorageEveryNFrames",         m_update_backup);
+                    m_update_backup           = startupConfig.GetInt(   "UpdateStorageEveryNFrames",         m_update_backup);
-                m_update_coarse_locations = startupConfig.GetInt(   "UpdateCoarseLocationsEveryNFrames", m_update_coarse_locations);
+                    m_update_coarse_locations = startupConfig.GetInt(   "UpdateCoarseLocationsEveryNFrames", m_update_coarse_locations);
-                m_update_entitymovement   = startupConfig.GetInt(   "UpdateEntityMovementEveryNFrames",  m_update_entitymovement);
+                    m_update_entitymovement   = startupConfig.GetInt(   "UpdateEntityMovementEveryNFrames",  m_update_entitymovement);
-                m_update_events           = startupConfig.GetInt(   "UpdateEventsEveryNFrames",          m_update_events);
+                    m_update_events           = startupConfig.GetInt(   "UpdateEventsEveryNFrames",          m_update_events);
-                m_update_objects          = startupConfig.GetInt(   "UpdateObjectsEveryNFrames",         m_update_objects);
+                    m_update_objects          = startupConfig.GetInt(   "UpdateObjectsEveryNFrames",         m_update_objects);
-                m_update_physics          = startupConfig.GetInt(   "UpdatePhysicsEveryNFrames",         m_update_physics);
+                    m_update_physics          = startupConfig.GetInt(   "UpdatePhysicsEveryNFrames",         m_update_physics);
-                m_update_presences        = startupConfig.GetInt(   "UpdateAgentsEveryNFrames",          m_update_presences);
+                    m_update_presences        = startupConfig.GetInt(   "UpdateAgentsEveryNFrames",          m_update_presences);
-                m_update_terrain          = startupConfig.GetInt(   "UpdateTerrainEveryNFrames",         m_update_terrain);
+                    m_update_terrain          = startupConfig.GetInt(   "UpdateTerrainEveryNFrames",         m_update_terrain);
-                m_update_temp_cleaning    = startupConfig.GetInt(   "UpdateTempCleaningEveryNFrames",    m_update_temp_cleaning);
+                    m_update_temp_cleaning    = startupConfig.GetInt(   "UpdateTempCleaningEveryNFrames",    m_update_temp_cleaning);
+                }
            }
            catch (Exception e)
            {
@@ -756,37 +759,34 @@ namespace OpenSim.Region.Framework.Scenes
            #region Interest Management
-            if (m_config != null)
+            IConfig interestConfig = m_config.Configs["InterestManagement"];
+            if (interestConfig != null)
            {
-                IConfig interestConfig = m_config.Configs["InterestManagement"];
+                string update_prioritization_scheme = interestConfig.GetString("UpdatePrioritizationScheme", "Time").Trim().ToLower();
-                if (interestConfig != null)
-                {
-                    string update_prioritization_scheme = interestConfig.GetString("UpdatePrioritizationScheme", "Time").Trim().ToLower();
-                    try
-                    {
-                        m_priorityScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true);
-                    }
-                    catch (Exception)
-                    {
-                        m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time");
-                        m_priorityScheme = UpdatePrioritizationSchemes.Time;
-                    }
-                    m_reprioritizationEnabled = interestConfig.GetBoolean("ReprioritizationEnabled", true);
+                try
-                    m_reprioritizationInterval = interestConfig.GetDouble("ReprioritizationInterval", 5000.0);
+                {
-                    m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0);
+                    m_priorityScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true);
-                    m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0);
                }
+                catch (Exception)
+                {
+                    m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time");
+                    m_priorityScheme = UpdatePrioritizationSchemes.Time;
+                }
+                m_reprioritizationEnabled = interestConfig.GetBoolean("ReprioritizationEnabled", true);
+                m_reprioritizationInterval = interestConfig.GetDouble("ReprioritizationInterval", 5000.0);
+                m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0);
+                m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0);
            }
-            m_log.InfoFormat("[SCENE]: Using the {0} prioritization scheme", m_priorityScheme);
+            m_log.DebugFormat("[SCENE]: Using the {0} prioritization scheme", m_priorityScheme);
            #endregion Interest Management
            StatsReporter = new SimStatsReporter(this);
            StatsReporter.OnSendStatsResult += SendSimStatsPackets;
-            StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;            
+            StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
        }
        /// <summary>
@@ -1102,6 +1102,8 @@ namespace OpenSim.Region.Framework.Scenes
        {
            m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName);
+            StatsReporter.Close();
            m_restartTimer.Stop();
            m_restartTimer.Close();
@@ -1181,7 +1183,7 @@ namespace OpenSim.Region.Framework.Scenes
            HeartbeatThread
                = Watchdog.StartThread(
-                    Heartbeat, string.Format("Heartbeat ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false);
+                    Heartbeat, string.Format("Heartbeat ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, false);
        }
        /// <summary>
@@ -1219,6 +1221,13 @@ namespace OpenSim.Region.Framework.Scenes
            try
            {
                m_eventManager.TriggerOnRegionStarted(this);
+                // The first frame can take a very long time due to physics actors being added on startup.  Therefore,
+                // don't turn on the watchdog alarm for this thread until the second frame, in order to prevent false
+                // alarms for scenes with many objects.
+                Update();
+                Watchdog.GetCurrentThreadInfo().AlarmIfTimeout = true;
                while (!shuttingdown)
                    Update();
            }
@@ -1244,7 +1253,7 @@ namespace OpenSim.Region.Framework.Scenes
            ++Frame;
-//            m_log.DebugFormat("[SCENE]: Processing frame {0}", Frame);
+//            m_log.DebugFormat("[SCENE]: Processing frame {0} in {1}", Frame, RegionInfo.RegionName);
            try
            {
@@ -1406,26 +1415,10 @@ namespace OpenSim.Region.Framework.Scenes
            {
                throw;
            }
-            catch (AccessViolationException e)
-            {
-                m_log.ErrorFormat(
-                    "[REGION]: Failed on region {0} with exception {1}{2}",
-                    RegionInfo.RegionName, e.Message, e.StackTrace);
-            }
-            //catch (NullReferenceException e)
-            //{
-            //   m_log.Error("[REGION]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
-            //}
-            catch (InvalidOperationException e)
-            {
-                m_log.ErrorFormat(
-                    "[REGION]: Failed on region {0} with exception {1}{2}",
-                    RegionInfo.RegionName, e.Message, e.StackTrace);
-            }
            catch (Exception e)
            {
                m_log.ErrorFormat(
-                    "[REGION]: Failed on region {0} with exception {1}{2}",
+                    "[SCENE]: Failed on region {0} with exception {1}{2}",
                    RegionInfo.RegionName, e.Message, e.StackTrace);
            }
@@ -1467,7 +1460,6 @@ namespace OpenSim.Region.Framework.Scenes
                entry.checkAtTargets();
        }
        /// <summary>
        /// Send out simstats data to all clients
        /// </summary>
@@ -4342,16 +4334,11 @@ namespace OpenSim.Region.Framework.Scenes
        public bool PipeEventsForScript(uint localID)
        {
            SceneObjectPart part = GetSceneObjectPart(localID);
            if (part != null)
            {
-                // Changed so that child prims of attachments return ScriptDanger for their parent, so that
-                //  their scripts will actually run.
-                //      -- Leaf, Tue Aug 12 14:17:05 EDT 2008
                SceneObjectPart parent = part.ParentGroup.RootPart;
-                if (part.ParentGroup.IsAttachment)
+                return ScriptDanger(parent, parent.GetWorldPosition());
-                    return ScriptDanger(parent, parent.GetWorldPosition());
-                else
-                    return ScriptDanger(part, part.GetWorldPosition());
            }
            else
            {
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 65ffe92..b806d91 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -156,8 +156,8 @@ namespace OpenSim.Region.Framework.Scenes
                        // that the region position is cached or performance will degrade
                        Utils.LongToUInts(regionHandle, out x, out y);
                        GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
-                        bool v = true;
+//                        bool v = true;
-                        if (! simulatorList.Contains(dest.ServerURI))
+                        if (!simulatorList.Contains(dest.ServerURI))
                        {
                            // we havent seen this simulator before, add it to the list
                            // and send it an update
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8dd2c76..cce606a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1691,8 +1691,6 @@ namespace OpenSim.Region.Framework.Scenes
            if (userExposed)
                dupe.UUID = UUID.Random();
-            // The PhysActor cannot be valid on a copy because the copy is not in the scene yet.
-            // Null it, the caller has to create a new one once the object is added to a scene
            dupe.PhysActor = null;
            dupe.OwnerID = AgentID;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 8a7c06a..4190cf6 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -349,13 +349,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        protected Vector3 m_lastCameraPosition;
-        protected Vector3 m_CameraPosition;
+        public Vector3 CameraPosition { get; set; }
-        public Vector3 CameraPosition
-        {
-            get { return m_CameraPosition; }
-            private set { m_CameraPosition = value; }
-        }
        public Quaternion CameraRotation
        {
@@ -365,28 +359,9 @@ namespace OpenSim.Region.Framework.Scenes
        // Use these three vectors to figure out what the agent is looking at
        // Convert it to a Matrix and/or Quaternion
        //
-        protected Vector3 m_CameraAtAxis;
+        public Vector3 CameraAtAxis { get; set; }
-        protected Vector3 m_CameraLeftAxis;
+        public Vector3 CameraLeftAxis { get; set; }
-        protected Vector3 m_CameraUpAxis;
+        public Vector3 CameraUpAxis { get; set; }
-        public Vector3 CameraAtAxis
-        {
-            get { return m_CameraAtAxis; }
-            private set { m_CameraAtAxis = value; }
-        }
-        public Vector3 CameraLeftAxis
-        {
-            get { return m_CameraLeftAxis; }
-            private set { m_CameraLeftAxis = value; }
-        }
-        public Vector3 CameraUpAxis
-        {
-            get { return m_CameraUpAxis; }
-            private set { m_CameraUpAxis = value; }
-        }
        public Vector3 Lookat
        {
@@ -402,33 +377,15 @@ namespace OpenSim.Region.Framework.Scenes
        }
        #endregion        
-        public readonly string Firstname;
+        public string Firstname { get; private set; }
-        public readonly string Lastname;
+        public string Lastname { get; private set; }
-        private string m_grouptitle;
+        public string Grouptitle { get; set; }
-        public string Grouptitle
-        {
-            get { return m_grouptitle; }
-            set { m_grouptitle = value; }
-        }
        // Agent's Draw distance.
-        protected float m_DrawDistance;
+        public float DrawDistance { get; set; }
-        public float DrawDistance
-        {
-            get { return m_DrawDistance; }
-            private set { m_DrawDistance = value; }
-        }
-        protected bool m_allowMovement = true;
-        public bool AllowMovement
+        public bool AllowMovement { get; set; }
-        {
-            get { return m_allowMovement; }
-            set { m_allowMovement = value; }
-        }
        private bool m_setAlwaysRun;
        
@@ -455,13 +412,7 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
-        private byte m_state;
+        public byte State { get; set; }
-        public byte State
-        {
-            get { return m_state; }
-            set { m_state = value; }
-        }
        private AgentManager.ControlFlags m_AgentControlFlags;
@@ -471,29 +422,14 @@ namespace OpenSim.Region.Framework.Scenes
            set { m_AgentControlFlags = (AgentManager.ControlFlags)value; }
        }
-        /// <summary>
+        public IClientAPI ControllingClient { get; set; }
-        /// This works out to be the ClientView object associated with this avatar, or it's client connection manager
-        /// </summary>
-        private IClientAPI m_controllingClient;
-        public IClientAPI ControllingClient
-        {
-            get { return m_controllingClient; }
-            private set { m_controllingClient = value; }
-        }
        public IClientCore ClientView
        {
-            get { return (IClientCore) m_controllingClient; }
+            get { return (IClientCore)ControllingClient; }
        }
-        protected Vector3 m_parentPosition;
+        public Vector3 ParentPosition { get; set; }
-        public Vector3 ParentPosition
-        {
-            get { return m_parentPosition; }
-            set { m_parentPosition = value; }
-        }
        /// <summary>
        /// Position of this avatar relative to the region the avatar is in
@@ -760,7 +696,7 @@ namespace OpenSim.Region.Framework.Scenes
            IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type)
        {
            AttachmentsSyncLock = new Object();
+            AllowMovement = true;
            IsChildAgent = true;
            m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
            Animator = new ScenePresenceAnimator(this);
@@ -839,17 +775,17 @@ namespace OpenSim.Region.Framework.Scenes
        private Vector3[] GetWalkDirectionVectors()
        {
            Vector3[] vector = new Vector3[11];
-            vector[0] = new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z); //FORWARD
+            vector[0] = new Vector3(CameraUpAxis.Z, 0f, -CameraAtAxis.Z); //FORWARD
-            vector[1] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK
+            vector[1] = new Vector3(-CameraUpAxis.Z, 0f, CameraAtAxis.Z); //BACK
            vector[2] = Vector3.UnitY; //LEFT
            vector[3] = -Vector3.UnitY; //RIGHT
-            vector[4] = new Vector3(m_CameraAtAxis.Z, 0f, m_CameraUpAxis.Z); //UP
+            vector[4] = new Vector3(CameraAtAxis.Z, 0f, CameraUpAxis.Z); //UP
-            vector[5] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN
+            vector[5] = new Vector3(-CameraAtAxis.Z, 0f, -CameraUpAxis.Z); //DOWN
-            vector[6] = new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z); //FORWARD_NUDGE
+            vector[6] = new Vector3(CameraUpAxis.Z, 0f, -CameraAtAxis.Z); //FORWARD_NUDGE
-            vector[7] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK_NUDGE
+            vector[7] = new Vector3(-CameraUpAxis.Z, 0f, CameraAtAxis.Z); //BACK_NUDGE
            vector[8] = Vector3.UnitY; //LEFT_NUDGE
            vector[9] = -Vector3.UnitY; //RIGHT_NUDGE
-            vector[10] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN_NUDGE
+            vector[10] = new Vector3(-CameraAtAxis.Z, 0f, -CameraUpAxis.Z); //DOWN_NUDGE
            return vector;
        }
@@ -1381,7 +1317,7 @@ namespace OpenSim.Region.Framework.Scenes
            // Convert it to a Matrix and/or Quaternion
            CameraAtAxis = agentData.CameraAtAxis;
            CameraLeftAxis = agentData.CameraLeftAxis;
-            m_CameraUpAxis = agentData.CameraUpAxis;
+            CameraUpAxis = agentData.CameraUpAxis;
            // The Agent's Draw distance setting
            // When we get to the point of re-computing neighbors everytime this
@@ -1393,7 +1329,7 @@ namespace OpenSim.Region.Framework.Scenes
            // Check if Client has camera in 'follow cam' or 'build' mode.
            Vector3 camdif = (Vector3.One * Rotation - Vector3.One * CameraRotation);
-            m_followCamAuto = ((m_CameraUpAxis.Z > 0.959f && m_CameraUpAxis.Z < 0.98f)
+            m_followCamAuto = ((CameraUpAxis.Z > 0.959f && CameraUpAxis.Z < 0.98f)
               && (Math.Abs(camdif.X) < 0.4f && Math.Abs(camdif.Y) < 0.4f)) ? true : false;
            m_mouseLook = (flags & AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0;
@@ -3161,7 +3097,7 @@ namespace OpenSim.Region.Framework.Scenes
            cAgent.Center = CameraPosition;
            cAgent.AtAxis = CameraAtAxis;
            cAgent.LeftAxis = CameraLeftAxis;
-            cAgent.UpAxis = m_CameraUpAxis;
+            cAgent.UpAxis = CameraUpAxis;
            cAgent.Far = DrawDistance;
@@ -3250,7 +3186,7 @@ namespace OpenSim.Region.Framework.Scenes
            CameraPosition = cAgent.Center;
            CameraAtAxis = cAgent.AtAxis;
            CameraLeftAxis = cAgent.LeftAxis;
-            m_CameraUpAxis = cAgent.UpAxis;
+            CameraUpAxis = cAgent.UpAxis;
            ParentUUID = cAgent.ParentPart;
            m_prevSitOffset = cAgent.SitOffset;
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 35cd025..5c56264 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -178,13 +178,19 @@ namespace OpenSim.Region.Framework.Scenes
            m_objectCapacity = scene.RegionInfo.ObjectCapacity;
            m_report.AutoReset = true;
            m_report.Interval = statsUpdatesEveryMS;
-            m_report.Elapsed += new ElapsedEventHandler(statsHeartBeat);
+            m_report.Elapsed += statsHeartBeat;
            m_report.Enabled = true;
            if (StatsManager.SimExtraStats != null)
                OnSendStatsResult += StatsManager.SimExtraStats.ReceiveClassicSimStatsPacket;
        }
+        public void Close()
+        {
+            m_report.Elapsed -= statsHeartBeat;
+            m_report.Close();
+        }
        public void SetUpdateMS(int ms)
        {
            statsUpdatesEveryMS = ms;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index e4b607d..e16903c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -65,8 +65,7 @@ namespace OpenSim.Region.Framework.Tests
            // Create an object embedded inside the first
            UUID taskSceneObjectItemId = UUID.Parse("00000000-0000-0000-0000-100000000000");
-            TaskInventoryItem taskSceneObjectItem
+            TaskInventoryHelpers.AddSceneObject(scene, sop1, "tso", taskSceneObjectItemId, user1.PrincipalID);
-                = TaskInventoryHelpers.AddSceneObject(scene, sop1, "tso", taskSceneObjectItemId, user1.PrincipalID);
            TaskInventoryItem addedItem = sop1.Inventory.GetInventoryItem(taskSceneObjectItemId);
            Assert.That(addedItem.ItemID, Is.EqualTo(taskSceneObjectItemId));
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 7d7c5c5..0f62b2a 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
            m_client = client;
            m_scene = scene;
-            Watchdog.StartThread(InternalLoop, "IRCClientView", ThreadPriority.Normal, false);
+            Watchdog.StartThread(InternalLoop, "IRCClientView", ThreadPriority.Normal, false, true);
        }
        private void SendServerCommand(string command)
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
index eb39026..a7c5020 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
            m_listener.Start(50);
-            Watchdog.StartThread(ListenLoop, "IRCServer", ThreadPriority.Normal, false);
+            Watchdog.StartThread(ListenLoop, "IRCServer", ThreadPriority.Normal, false, true);
            m_baseScene = baseScene;
        }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 78e9b29..68f21c8 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -88,25 +88,26 @@ namespace OpenSim.Region.OptionalModules.World.NPC
        public bool SetNPCAppearance(UUID agentId, AvatarAppearance appearance, Scene scene)
        {
-            ScenePresence sp = scene.GetScenePresence(agentId);
+            ScenePresence npc = scene.GetScenePresence(agentId);
-            if (sp == null || sp.IsChildAgent)
+            if (npc == null || npc.IsChildAgent)
                return false;
            lock (m_avatars)
                if (!m_avatars.ContainsKey(agentId))
                    return false;
-            // Delete existing sp attachments
+            // Delete existing npc attachments
-            scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, false);
+            scene.AttachmentsModule.DeleteAttachmentsFromScene(npc, false);
-            AvatarAppearance app = new AvatarAppearance(appearance, true);
-            sp.Appearance = app;
-            // Set new sp appearance. Also sends to clients.
+            // XXX: We can't just use IAvatarFactoryModule.SetAppearance() yet since it doesn't transfer attachments
-            scene.RequestModuleInterface<IAvatarFactoryModule>().SetAppearance(sp, app);
+            AvatarAppearance npcAppearance = new AvatarAppearance(appearance, true);
+            npc.Appearance = npcAppearance;
            
-            // Rez needed sp attachments
+            // Rez needed npc attachments
-            scene.AttachmentsModule.RezAttachments(sp);
+            scene.AttachmentsModule.RezAttachments(npc);
+            IAvatarFactoryModule module = scene.RequestModuleInterface<IAvatarFactoryModule>();
+            module.SendAppearance(npc.UUID);
            
            return true;
        }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index d507822..9a7e9e8 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -50,10 +50,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
    [TestFixture]
    public class NPCModuleTests
    {
-        private TestScene scene;
+        private TestScene m_scene;
-        private AvatarFactoryModule afm;
+        private AvatarFactoryModule m_afMod;
-        private UserManagementModule umm;
+        private UserManagementModule m_umMod;
-        private AttachmentsModule am;
+        private AttachmentsModule m_attMod;
+        private NPCModule m_npcMod;
        [TestFixtureSetUp]
        public void FixtureInit()
@@ -79,12 +80,13 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
            config.AddConfig("Modules");
            config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
-            afm = new AvatarFactoryModule();
+            m_afMod = new AvatarFactoryModule();
-            umm = new UserManagementModule();
+            m_umMod = new UserManagementModule();
-            am = new AttachmentsModule();
+            m_attMod = new AttachmentsModule();
+            m_npcMod = new NPCModule();
-            scene = SceneHelpers.SetupScene();
+            m_scene = SceneHelpers.SetupScene();
-            SceneHelpers.SetupSceneModules(scene, config, afm, umm, am, new BasicInventoryAccessModule(), new NPCModule());
+            SceneHelpers.SetupSceneModules(m_scene, config, m_afMod, m_umMod, m_attMod, m_npcMod, new BasicInventoryAccessModule());
        }
        [Test]
@@ -93,7 +95,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
 //            ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId);
            // 8 is the index of the first baked texture in AvatarAppearance
@@ -104,18 +106,17 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
            // We also need to add the texture to the asset service, otherwise the AvatarFactoryModule will tell
            // ScenePresence.SendInitialData() to reset our entire appearance.
-            scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
+            m_scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
-            afm.SetAppearance(sp, originalTe, null);
+            m_afMod.SetAppearance(sp, originalTe, null);
-            INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
+            UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance);
-            UUID npcId = npcModule.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, scene, sp.Appearance);
-            ScenePresence npc = scene.GetScenePresence(npcId);
+            ScenePresence npc = m_scene.GetScenePresence(npcId);
            Assert.That(npc, Is.Not.Null);
            Assert.That(npc.Appearance.Texture.FaceTextures[8].TextureID, Is.EqualTo(originalFace8TextureId));
-            Assert.That(umm.GetUserName(npc.UUID), Is.EqualTo(string.Format("{0} {1}", npc.Firstname, npc.Lastname)));
+            Assert.That(m_umMod.GetUserName(npc.UUID), Is.EqualTo(string.Format("{0} {1}", npc.Firstname, npc.Lastname)));
        }
        [Test]
@@ -124,42 +125,83 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
 //            ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId);
            Vector3 startPos = new Vector3(128, 128, 30);
-            INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
+            UUID npcId = m_npcMod.CreateNPC("John", "Smith", startPos, UUID.Zero, true, m_scene, sp.Appearance);
-            UUID npcId = npcModule.CreateNPC("John", "Smith", startPos, UUID.Zero, true, scene, sp.Appearance);
-            npcModule.DeleteNPC(npcId, scene);
+            m_npcMod.DeleteNPC(npcId, m_scene);
-            ScenePresence deletedNpc = scene.GetScenePresence(npcId);
+            ScenePresence deletedNpc = m_scene.GetScenePresence(npcId);
            Assert.That(deletedNpc, Is.Null);
        }
        [Test]
-        public void TestAttachments()
+        public void TestCreateWithAttachments()
        {
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
            UUID userId = TestHelpers.ParseTail(0x1);
-            UserAccountHelpers.CreateUserWithInventory(scene, userId);
+            UserAccountHelpers.CreateUserWithInventory(m_scene, userId);
-            ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
            UUID attItemId = TestHelpers.ParseTail(0x2);
            UUID attAssetId = TestHelpers.ParseTail(0x3);
            string attName = "att";
-            UserInventoryHelpers.CreateInventoryItem(scene, attName, attItemId, attAssetId, sp.UUID, InventoryType.Object);
+            UserInventoryHelpers.CreateInventoryItem(m_scene, attName, attItemId, attAssetId, sp.UUID, InventoryType.Object);
-            am.RezSingleAttachmentFromInventory(sp, attItemId, (uint)AttachmentPoint.Chest);
+            m_attMod.RezSingleAttachmentFromInventory(sp, attItemId, (uint)AttachmentPoint.Chest);
-            INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
+            UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance);
-            UUID npcId = npcModule.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, scene, sp.Appearance);
-            ScenePresence npc = scene.GetScenePresence(npcId);
+            ScenePresence npc = m_scene.GetScenePresence(npcId);
+            // Check scene presence status
+            Assert.That(npc.HasAttachments(), Is.True);
+            List<SceneObjectGroup> attachments = npc.GetAttachments();
+            Assert.That(attachments.Count, Is.EqualTo(1));
+            SceneObjectGroup attSo = attachments[0];
+            // Just for now, we won't test the name since this is (wrongly) the asset part name rather than the item
+            // name.  TODO: Do need to fix ultimately since the item may be renamed before being passed on to an NPC.
+//            Assert.That(attSo.Name, Is.EqualTo(attName));
+            Assert.That(attSo.AttachmentPoint, Is.EqualTo((byte)AttachmentPoint.Chest));
+            Assert.That(attSo.IsAttachment);
+            Assert.That(attSo.UsesPhysics, Is.False);
+            Assert.That(attSo.IsTemporary, Is.False);
+            Assert.That(attSo.OwnerID, Is.EqualTo(npc.UUID));
+        }
+        [Test]
+        public void TestLoadAppearance()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+            UUID userId = TestHelpers.ParseTail(0x1);
+            UserAccountHelpers.CreateUserWithInventory(m_scene, userId);
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
+            UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance);
+            // Now add the attachment to the original avatar and use that to load a new appearance
+            // TODO: Could also run tests loading from a notecard though this isn't much different for our purposes here
+            UUID attItemId = TestHelpers.ParseTail(0x2);
+            UUID attAssetId = TestHelpers.ParseTail(0x3);
+            string attName = "att";
+            UserInventoryHelpers.CreateInventoryItem(m_scene, attName, attItemId, attAssetId, sp.UUID, InventoryType.Object);
+            m_attMod.RezSingleAttachmentFromInventory(sp, attItemId, (uint)AttachmentPoint.Chest);
+            m_npcMod.SetNPCAppearance(npcId, sp.Appearance, m_scene);
+            ScenePresence npc = m_scene.GetScenePresence(npcId);
            // Check scene presence status
            Assert.That(npc.HasAttachments(), Is.True);
@@ -184,31 +226,30 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
 //            ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId);
            Vector3 startPos = new Vector3(128, 128, 30);
-            INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
+            UUID npcId = m_npcMod.CreateNPC("John", "Smith", startPos, UUID.Zero, true, m_scene, sp.Appearance);
-            UUID npcId = npcModule.CreateNPC("John", "Smith", startPos, UUID.Zero, true, scene, sp.Appearance);
-            ScenePresence npc = scene.GetScenePresence(npcId);
+            ScenePresence npc = m_scene.GetScenePresence(npcId);
            Assert.That(npc.AbsolutePosition, Is.EqualTo(startPos));
            // For now, we'll make the scene presence fly to simplify this test, but this needs to change.
            npc.Flying = true;
-            scene.Update();
+            m_scene.Update();
            Assert.That(npc.AbsolutePosition, Is.EqualTo(startPos));
            Vector3 targetPos = startPos + new Vector3(0, 10, 0);
-            npcModule.MoveToTarget(npc.UUID, scene, targetPos, false, false);
+            m_npcMod.MoveToTarget(npc.UUID, m_scene, targetPos, false, false);
            Assert.That(npc.AbsolutePosition, Is.EqualTo(startPos));
            //Assert.That(npc.Rotation, Is.EqualTo(new Quaternion(0, 0, 0.7071068f, 0.7071068f)));
            Assert.That(
                npc.Rotation, new QuaternionToleranceConstraint(new Quaternion(0, 0, 0.7071068f, 0.7071068f), 0.000001));
-            scene.Update();
+            m_scene.Update();
            // We should really check the exact figure.
            Assert.That(npc.AbsolutePosition.X, Is.EqualTo(startPos.X));
@@ -217,7 +258,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
            Assert.That(npc.AbsolutePosition.Z, Is.LessThan(targetPos.X));
            for (int i = 0; i < 10; i++)
-                scene.Update();
+                m_scene.Update();
            double distanceToTarget = Util.GetDistanceTo(npc.AbsolutePosition, targetPos);
            Assert.That(distanceToTarget, Is.LessThan(1), "NPC not within 1 unit of target position on first move");
@@ -227,14 +268,14 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
            // Try a second movement
            startPos = npc.AbsolutePosition;
            targetPos = startPos + new Vector3(10, 0, 0);
-            npcModule.MoveToTarget(npc.UUID, scene, targetPos, false, false);
+            m_npcMod.MoveToTarget(npc.UUID, m_scene, targetPos, false, false);
            Assert.That(npc.AbsolutePosition, Is.EqualTo(startPos));
 //            Assert.That(npc.Rotation, Is.EqualTo(new Quaternion(0, 0, 0, 1)));
            Assert.That(
                npc.Rotation, new QuaternionToleranceConstraint(new Quaternion(0, 0, 0, 1), 0.000001));
-            scene.Update();
+            m_scene.Update();
            // We should really check the exact figure.
            Assert.That(npc.AbsolutePosition.X, Is.GreaterThan(startPos.X));
@@ -243,7 +284,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
            Assert.That(npc.AbsolutePosition.Z, Is.EqualTo(startPos.Z));
            for (int i = 0; i < 10; i++)
-                scene.Update();
+                m_scene.Update();
            distanceToTarget = Util.GetDistanceTo(npc.AbsolutePosition, targetPos);
            Assert.That(distanceToTarget, Is.LessThan(1), "NPC not within 1 unit of target position on second move");
@@ -256,17 +297,16 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
            Vector3 startPos = new Vector3(128, 128, 30);
-            INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
+            UUID npcId = m_npcMod.CreateNPC("John", "Smith", startPos, UUID.Zero, true, m_scene, sp.Appearance);
-            UUID npcId = npcModule.CreateNPC("John", "Smith", startPos, UUID.Zero, true, scene, sp.Appearance);
-            ScenePresence npc = scene.GetScenePresence(npcId);
+            ScenePresence npc = m_scene.GetScenePresence(npcId);
-            SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
+            SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene);
            part.SitTargetPosition = new Vector3(0, 0, 1);
-            npcModule.Sit(npc.UUID, part.UUID, scene);
+            m_npcMod.Sit(npc.UUID, part.UUID, m_scene);
            Assert.That(part.SitTargetAvatar, Is.EqualTo(npcId));
            Assert.That(npc.ParentID, Is.EqualTo(part.LocalId));
@@ -274,7 +314,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
                npc.AbsolutePosition,
                Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition + ScenePresence.SIT_TARGET_ADJUSTMENT));
-            npcModule.Stand(npc.UUID, scene);
+            m_npcMod.Stand(npc.UUID, m_scene);
            Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
            Assert.That(npc.ParentID, Is.EqualTo(0));
@@ -286,19 +326,18 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
            // FIXME: To get this to work for now, we are going to place the npc right next to the target so that
            // the autopilot doesn't trigger
            Vector3 startPos = new Vector3(1, 1, 1);
-            INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
+            UUID npcId = m_npcMod.CreateNPC("John", "Smith", startPos, UUID.Zero, true, m_scene, sp.Appearance);
-            UUID npcId = npcModule.CreateNPC("John", "Smith", startPos, UUID.Zero, true, scene, sp.Appearance);
-            ScenePresence npc = scene.GetScenePresence(npcId);
+            ScenePresence npc = m_scene.GetScenePresence(npcId);
-            SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
+            SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene);
-            npcModule.Sit(npc.UUID, part.UUID, scene);
+            m_npcMod.Sit(npc.UUID, part.UUID, m_scene);
            Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
            Assert.That(npc.ParentID, Is.EqualTo(part.LocalId));
@@ -311,7 +350,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
                npc.AbsolutePosition,
                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.845499337f)));
-            npcModule.Stand(npc.UUID, scene);
+            m_npcMod.Stand(npc.UUID, m_scene);
            Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
            Assert.That(npc.ParentID, Is.EqualTo(0));
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 62e3763..254d578 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1474,6 +1474,8 @@ Console.WriteLine("CreateGeom:");
        /// </summary>
        private void changeadd()
        {
+//            m_log.DebugFormat("[ODE PRIM]: Adding prim {0}", Name);
+            
            int[] iprimspaceArrItem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
            IntPtr targetspace = _parent_scene.calculateSpaceForGeom(_position);
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..6d4072c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4450,7 +4450,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();
        }
@@ -6866,16 +6866,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);
+            part.SitTargetPosition = new Vector3((float)offset.x, (float)offset.y, (float)offset.z);
-            m_host.SitTargetOrientation = Rot2Quaternion(rot);
+            part.SitTargetOrientation = Rot2Quaternion(rot);
-            m_host.ParentGroup.HasGroupChanged = true;
+            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 +7582,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            shapeBlock.PathScaleX = 100;
            shapeBlock.PathScaleY = 150;
-            if ((type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER) == 0 &&
+            int flag = type & (ScriptBaseClass.PRIM_SCULPT_FLAG_INVERT | ScriptBaseClass.PRIM_SCULPT_FLAG_MIRROR);
-                (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE) == 0 &&
-                (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE) == 0 &&
+            if (type != (ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER | flag) &&
-                (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) == 0)
+                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 +8875,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 +8990,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
+        public LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules)
-            // Assuming silently fail means sending back LSL_STATUS_OK.  Ideally, need to check this.
+        {
-            // Don't perform the media check directly
+            m_host.AddScriptLPS(1);
-            if (face < 0 || face > m_host.GetNumberOfSides() - 1)
+            ScriptSleep(1000);
-                return ScriptBaseClass.LSL_STATUS_OK;
+            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 +9114,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 +9128,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)
+            if (face < 0 || face > part.GetNumberOfSides() - 1)
-                return ScriptBaseClass.LSL_STATUS_OK;
+                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 m_commsPlugin.GetSerializationData(itemID);
-            return comms.GetSerializationData(itemID);
        }
        public void CreateFromData(uint localID, UUID itemID, UUID hostID,
                Object[] data)
        {
-            IWorldComm comms = m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
+            m_commsPlugin.CreateFromData(localID, itemID, hostID, data);
-            comms.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);
+                Assert.AreEqual("(5,4) syntax error", e.Message);
-                throw;
+                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)
+                // The syntax error is on line 4, char 13 (Syntax error)
-                Assert.AreEqual("(3,13) syntax error", e.Message);
+                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;
+            TestHelpers.InMethod();
-          float numberAsFloat;
-          LSL_Types.LSLFloat testLSLFloat;
+            float testFloat;
-          foreach (double number in m_doubleList)
+            float numberAsFloat;
-          {
+            LSL_Types.LSLFloat testLSLFloat;
-            testLSLFloat = new LSL_Types.LSLFloat(number);
-            numberAsFloat = (float)number;
-            testFloat = (float)testLSLFloat;
-            Assert.That((double)testFloat, new DoubleToleranceConstraint((double)numberAsFloat, _lowPrecisionTolerance));
-          }
-        }
+            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);
+            TestHelpers.InMethod();
-          LSL_Types.LSLFloat testFloatValue = new LSL_Types.LSLFloat(testValue);
-          LSL_Types.list testList = new LSL_Types.list(testValue);
+            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);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 02d47bd..211e313 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -50,7 +50,10 @@ using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Region.ScriptEngine.Shared.CodeTools;
 using OpenSim.Region.ScriptEngine.Shared.Instance;
+using OpenSim.Region.ScriptEngine.Shared.Api;
+using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
 using OpenSim.Region.ScriptEngine.Interfaces;
+using Timer = OpenSim.Region.ScriptEngine.Shared.Api.Plugins.Timer;
 using ScriptCompileQueue = OpenSim.Framework.LocklessQueue<object[]>;
@@ -454,6 +457,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            sb.AppendFormat("Work items waiting         : {0}\n", m_ThreadPool.WaitingCallbacks);
 //            sb.AppendFormat("Assemblies loaded          : {0}\n", m_Assemblies.Count);
+            SensorRepeat sr = AsyncCommandManager.GetSensorRepeatPlugin(this);
+            sb.AppendFormat("Sensors                    : {0}\n", sr.SensorsCount);
+            Dataserver ds = AsyncCommandManager.GetDataserverPlugin(this);
+            sb.AppendFormat("Dataserver requests        : {0}\n", ds.DataserverRequestsCount);
+            Timer t = AsyncCommandManager.GetTimerPlugin(this);
+            sb.AppendFormat("Timers                     : {0}\n", t.TimersCount);
+            Listener l = AsyncCommandManager.GetListenerPlugin(this);
+            sb.AppendFormat("Listeners                  : {0}\n", l.ListenerCount);
            MainConsole.Instance.OutputFormat(sb.ToString());
        }
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index f627e37..b9ba4bc 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -83,6 +83,9 @@ namespace OpenSim.Region.UserStatistics
            {
                if (m_scenes.Count == 0)
                {
+                    if (Util.IsWindows())
+                        Util.LoadArchSpecificWindowsDll("sqlite3.dll");
+                    
                    //IConfig startupConfig = config.Configs["Startup"];
                    dbConn = new SqliteConnection("URI=file:LocalUserStatistics.db,version=3");
@@ -221,13 +224,11 @@ namespace OpenSim.Region.UserStatistics
                concurrencyCounter--;
                
                response_code = 200;
            }
            else
            {
                strOut = MainServer.Instance.GetHTTP404("");
            }
-            
            responsedata["int_response_code"] = response_code;
            responsedata["content_type"] = contenttype;
@@ -244,43 +245,44 @@ namespace OpenSim.Region.UserStatistics
                // TODO: FIXME: implement stats migrations
                const string SQL = @"SELECT * FROM migrations LIMIT 1";
-                SqliteCommand cmd = new SqliteCommand(SQL, db);
+                using (SqliteCommand cmd = new SqliteCommand(SQL, db))
-                try
-                {
-                    cmd.ExecuteNonQuery();
-                }
-                catch (SqliteSyntaxException)
                {
-                    CreateTables(db);
+                    try
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                    catch (SqliteSyntaxException)
+                    {
+                        CreateTables(db);
+                    }
                }
            }
        }
        public void CreateTables(SqliteConnection db)
        {
-            SqliteCommand createcmd = new SqliteCommand(SQL_STATS_TABLE_CREATE, db);
+            using (SqliteCommand createcmd = new SqliteCommand(SQL_STATS_TABLE_CREATE, db))
-            createcmd.ExecuteNonQuery();
+            {
+                createcmd.ExecuteNonQuery();
-            createcmd.CommandText = SQL_MIGRA_TABLE_CREATE;
+                createcmd.CommandText = SQL_MIGRA_TABLE_CREATE;
-            createcmd.ExecuteNonQuery();
+                createcmd.ExecuteNonQuery();
+            }
        }
        public virtual void PostInitialise()
        {
            if (!enabled)
-            {
                return;
-            }
            AddHandlers();
        }
        public virtual void Close()
        {
            if (!enabled)
-            {
                return;
-            }
            dbConn.Close();
            dbConn.Dispose();
            m_sessions.Clear();
@@ -301,7 +303,8 @@ namespace OpenSim.Region.UserStatistics
        public void OnRegisterCaps(UUID agentID, Caps caps)
        {
-            m_log.DebugFormat("[WEB STATS MODULE]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
+//            m_log.DebugFormat("[WEB STATS MODULE]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
            string capsPath = "/CAPS/VS/" + UUID.Random();
            caps.RegisterHandler("ViewerStats",
                                 new RestStreamHandler("POST", capsPath,
@@ -315,7 +318,6 @@ namespace OpenSim.Region.UserStatistics
        public void OnDeRegisterCaps(UUID agentID, Caps caps)
        {
-            
        }
        protected virtual void AddHandlers()
@@ -365,7 +367,6 @@ namespace OpenSim.Region.UserStatistics
        public void OnMakeChildAgent(ScenePresence agent)
        {
-            
        }
        public void OnClientClosed(UUID agentID, Scene scene)
@@ -427,6 +428,7 @@ namespace OpenSim.Region.UserStatistics
                        return scene.RegionInfo.RegionID;
                }
            }
            return UUID.Zero;
        }
@@ -455,14 +457,14 @@ namespace OpenSim.Region.UserStatistics
            UserSessionData usd;
            OSD message = OSDParser.DeserializeLLSDXml(request);
            OSDMap mmap;
            lock (m_sessions)
            {
                if (agentID != UUID.Zero)
                {
-                
                    if (!m_sessions.ContainsKey(agentID))
                    {
-                        m_log.Warn("[WEB STATS MODULE]: no session for stat disclosure");
+                        m_log.WarnFormat("[WEB STATS MODULE]: no session for stat disclosure for agent {0}", agentID);
                        return new UserSessionID();
                    }
                    uid = m_sessions[agentID];
@@ -582,8 +584,6 @@ namespace OpenSim.Region.UserStatistics
                        usd.n_out_kb = (float)net_out["kbytes"].AsReal();
                        usd.n_out_pk = net_out["packets"].AsInteger();
                    }
                }
            }
@@ -599,83 +599,85 @@ namespace OpenSim.Region.UserStatistics
            lock (db)
            {
-                SqliteCommand updatecmd = new SqliteCommand(SQL_STATS_TABLE_UPDATE, db);
+                using (SqliteCommand updatecmd = new SqliteCommand(SQL_STATS_TABLE_UPDATE, db))
-                updatecmd.Parameters.Add(new SqliteParameter(":session_id", uid.session_data.session_id.ToString()));
-                updatecmd.Parameters.Add(new SqliteParameter(":agent_id", uid.session_data.agent_id.ToString()));
-                updatecmd.Parameters.Add(new SqliteParameter(":region_id", uid.session_data.region_id.ToString()));
-                updatecmd.Parameters.Add(new SqliteParameter(":last_updated", (int) uid.session_data.last_updated));
-                updatecmd.Parameters.Add(new SqliteParameter(":remote_ip", uid.session_data.remote_ip));
-                updatecmd.Parameters.Add(new SqliteParameter(":name_f", uid.session_data.name_f));
-                updatecmd.Parameters.Add(new SqliteParameter(":name_l", uid.session_data.name_l));
-                updatecmd.Parameters.Add(new SqliteParameter(":avg_agents_in_view", uid.session_data.avg_agents_in_view));
-                updatecmd.Parameters.Add(new SqliteParameter(":min_agents_in_view",
-                                                             (int) uid.session_data.min_agents_in_view));
-                updatecmd.Parameters.Add(new SqliteParameter(":max_agents_in_view",
-                                                             (int) uid.session_data.max_agents_in_view));
-                updatecmd.Parameters.Add(new SqliteParameter(":mode_agents_in_view",
-                                                             (int) uid.session_data.mode_agents_in_view));
-                updatecmd.Parameters.Add(new SqliteParameter(":avg_fps", uid.session_data.avg_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":min_fps", uid.session_data.min_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":max_fps", uid.session_data.max_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":mode_fps", uid.session_data.mode_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":a_language", uid.session_data.a_language));
-                updatecmd.Parameters.Add(new SqliteParameter(":mem_use", uid.session_data.mem_use));
-                updatecmd.Parameters.Add(new SqliteParameter(":meters_traveled", uid.session_data.meters_traveled));
-                updatecmd.Parameters.Add(new SqliteParameter(":avg_ping", uid.session_data.avg_ping));
-                updatecmd.Parameters.Add(new SqliteParameter(":min_ping", uid.session_data.min_ping));
-                updatecmd.Parameters.Add(new SqliteParameter(":max_ping", uid.session_data.max_ping));
-                updatecmd.Parameters.Add(new SqliteParameter(":mode_ping", uid.session_data.mode_ping));
-                updatecmd.Parameters.Add(new SqliteParameter(":regions_visited", uid.session_data.regions_visited));
-                updatecmd.Parameters.Add(new SqliteParameter(":run_time", uid.session_data.run_time));
-                updatecmd.Parameters.Add(new SqliteParameter(":avg_sim_fps", uid.session_data.avg_sim_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":min_sim_fps", uid.session_data.min_sim_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":max_sim_fps", uid.session_data.max_sim_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":mode_sim_fps", uid.session_data.mode_sim_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":start_time", uid.session_data.start_time));
-                updatecmd.Parameters.Add(new SqliteParameter(":client_version", uid.session_data.client_version));
-                updatecmd.Parameters.Add(new SqliteParameter(":s_cpu", uid.session_data.s_cpu));
-                updatecmd.Parameters.Add(new SqliteParameter(":s_gpu", uid.session_data.s_gpu));
-                updatecmd.Parameters.Add(new SqliteParameter(":s_os", uid.session_data.s_os));
-                updatecmd.Parameters.Add(new SqliteParameter(":s_ram", uid.session_data.s_ram));
-                updatecmd.Parameters.Add(new SqliteParameter(":d_object_kb", uid.session_data.d_object_kb));
-                updatecmd.Parameters.Add(new SqliteParameter(":d_texture_kb", uid.session_data.d_texture_kb));
-                updatecmd.Parameters.Add(new SqliteParameter(":d_world_kb", uid.session_data.d_world_kb));
-                updatecmd.Parameters.Add(new SqliteParameter(":n_in_kb", uid.session_data.n_in_kb));
-                updatecmd.Parameters.Add(new SqliteParameter(":n_in_pk", uid.session_data.n_in_pk));
-                updatecmd.Parameters.Add(new SqliteParameter(":n_out_kb", uid.session_data.n_out_kb));
-                updatecmd.Parameters.Add(new SqliteParameter(":n_out_pk", uid.session_data.n_out_pk));
-                updatecmd.Parameters.Add(new SqliteParameter(":f_dropped", uid.session_data.f_dropped));
-                updatecmd.Parameters.Add(new SqliteParameter(":f_failed_resends", uid.session_data.f_failed_resends));
-                updatecmd.Parameters.Add(new SqliteParameter(":f_invalid", uid.session_data.f_invalid));
-                updatecmd.Parameters.Add(new SqliteParameter(":f_off_circuit", uid.session_data.f_off_circuit));
-                updatecmd.Parameters.Add(new SqliteParameter(":f_resent", uid.session_data.f_resent));
-                updatecmd.Parameters.Add(new SqliteParameter(":f_send_packet", uid.session_data.f_send_packet));
-                updatecmd.Parameters.Add(new SqliteParameter(":session_key", uid.session_data.session_id.ToString()));
-                updatecmd.Parameters.Add(new SqliteParameter(":agent_key", uid.session_data.agent_id.ToString()));
-                updatecmd.Parameters.Add(new SqliteParameter(":region_key", uid.session_data.region_id.ToString()));
-//                m_log.Debug("UPDATE");
-                int result = updatecmd.ExecuteNonQuery();
-                if (result == 0)
                {
-//                    m_log.Debug("INSERT");
+                    updatecmd.Parameters.Add(new SqliteParameter(":session_id", uid.session_data.session_id.ToString()));
-                    updatecmd.CommandText = SQL_STATS_TABLE_INSERT;
+                    updatecmd.Parameters.Add(new SqliteParameter(":agent_id", uid.session_data.agent_id.ToString()));
-                    try
+                    updatecmd.Parameters.Add(new SqliteParameter(":region_id", uid.session_data.region_id.ToString()));
-                    {
+                    updatecmd.Parameters.Add(new SqliteParameter(":last_updated", (int) uid.session_data.last_updated));
-                        updatecmd.ExecuteNonQuery();
+                    updatecmd.Parameters.Add(new SqliteParameter(":remote_ip", uid.session_data.remote_ip));
-                    }
+                    updatecmd.Parameters.Add(new SqliteParameter(":name_f", uid.session_data.name_f));
-                    catch (SqliteExecutionException)
+                    updatecmd.Parameters.Add(new SqliteParameter(":name_l", uid.session_data.name_l));
+                    updatecmd.Parameters.Add(new SqliteParameter(":avg_agents_in_view", uid.session_data.avg_agents_in_view));
+                    updatecmd.Parameters.Add(new SqliteParameter(":min_agents_in_view",
+                                                                 (int) uid.session_data.min_agents_in_view));
+                    updatecmd.Parameters.Add(new SqliteParameter(":max_agents_in_view",
+                                                                 (int) uid.session_data.max_agents_in_view));
+                    updatecmd.Parameters.Add(new SqliteParameter(":mode_agents_in_view",
+                                                                 (int) uid.session_data.mode_agents_in_view));
+                    updatecmd.Parameters.Add(new SqliteParameter(":avg_fps", uid.session_data.avg_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":min_fps", uid.session_data.min_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":max_fps", uid.session_data.max_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":mode_fps", uid.session_data.mode_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":a_language", uid.session_data.a_language));
+                    updatecmd.Parameters.Add(new SqliteParameter(":mem_use", uid.session_data.mem_use));
+                    updatecmd.Parameters.Add(new SqliteParameter(":meters_traveled", uid.session_data.meters_traveled));
+                    updatecmd.Parameters.Add(new SqliteParameter(":avg_ping", uid.session_data.avg_ping));
+                    updatecmd.Parameters.Add(new SqliteParameter(":min_ping", uid.session_data.min_ping));
+                    updatecmd.Parameters.Add(new SqliteParameter(":max_ping", uid.session_data.max_ping));
+                    updatecmd.Parameters.Add(new SqliteParameter(":mode_ping", uid.session_data.mode_ping));
+                    updatecmd.Parameters.Add(new SqliteParameter(":regions_visited", uid.session_data.regions_visited));
+                    updatecmd.Parameters.Add(new SqliteParameter(":run_time", uid.session_data.run_time));
+                    updatecmd.Parameters.Add(new SqliteParameter(":avg_sim_fps", uid.session_data.avg_sim_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":min_sim_fps", uid.session_data.min_sim_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":max_sim_fps", uid.session_data.max_sim_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":mode_sim_fps", uid.session_data.mode_sim_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":start_time", uid.session_data.start_time));
+                    updatecmd.Parameters.Add(new SqliteParameter(":client_version", uid.session_data.client_version));
+                    updatecmd.Parameters.Add(new SqliteParameter(":s_cpu", uid.session_data.s_cpu));
+                    updatecmd.Parameters.Add(new SqliteParameter(":s_gpu", uid.session_data.s_gpu));
+                    updatecmd.Parameters.Add(new SqliteParameter(":s_os", uid.session_data.s_os));
+                    updatecmd.Parameters.Add(new SqliteParameter(":s_ram", uid.session_data.s_ram));
+                    updatecmd.Parameters.Add(new SqliteParameter(":d_object_kb", uid.session_data.d_object_kb));
+                    updatecmd.Parameters.Add(new SqliteParameter(":d_texture_kb", uid.session_data.d_texture_kb));
+                    updatecmd.Parameters.Add(new SqliteParameter(":d_world_kb", uid.session_data.d_world_kb));
+                    updatecmd.Parameters.Add(new SqliteParameter(":n_in_kb", uid.session_data.n_in_kb));
+                    updatecmd.Parameters.Add(new SqliteParameter(":n_in_pk", uid.session_data.n_in_pk));
+                    updatecmd.Parameters.Add(new SqliteParameter(":n_out_kb", uid.session_data.n_out_kb));
+                    updatecmd.Parameters.Add(new SqliteParameter(":n_out_pk", uid.session_data.n_out_pk));
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_dropped", uid.session_data.f_dropped));
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_failed_resends", uid.session_data.f_failed_resends));
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_invalid", uid.session_data.f_invalid));
+    
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_off_circuit", uid.session_data.f_off_circuit));
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_resent", uid.session_data.f_resent));
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_send_packet", uid.session_data.f_send_packet));
+    
+                    updatecmd.Parameters.Add(new SqliteParameter(":session_key", uid.session_data.session_id.ToString()));
+                    updatecmd.Parameters.Add(new SqliteParameter(":agent_key", uid.session_data.agent_id.ToString()));
+                    updatecmd.Parameters.Add(new SqliteParameter(":region_key", uid.session_data.region_id.ToString()));
+//                    m_log.DebugFormat("[WEB STATS MODULE]: Database stats update for {0}", uid.session_data.agent_id);
+                    int result = updatecmd.ExecuteNonQuery();
+                    if (result == 0)
                    {
-                        m_log.Warn("[WEB STATS MODULE]: failed to write stats to storage Execution Exception");
+//                        m_log.DebugFormat("[WEB STATS MODULE]: Database stats insert for {0}", uid.session_data.agent_id);
-                    }
-                    catch (SqliteSyntaxException)
+                        updatecmd.CommandText = SQL_STATS_TABLE_INSERT;
-                    {
-                        m_log.Warn("[WEB STATS MODULE]: failed to write stats to storage SQL Syntax Exception");
-                    }
+                        try
+                        {
+                            updatecmd.ExecuteNonQuery();
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.WarnFormat(
+                                "[WEB STATS MODULE]: failed to write stats for {0}, storage Execution Exception {1}{2}",
+                                uid.session_data.agent_id, e.Message, e.StackTrace);
+                        }
+                    }
                }
            }
        }
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
index 440b898..dfed761 100644
--- a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
@@ -248,7 +248,7 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
                            if (passwordValues != null && passwordValues.Length == 1)
                            {
                                if (account != null && 
-                                    (m_authenticationService.Authenticate(account.PrincipalID, passwordValues[0], 30) != string.Empty))
+                                    (m_authenticationService.Authenticate(account.PrincipalID,Util.Md5Hash(passwordValues[0]), 30) != string.Empty))
                                    authRequest.IsAuthenticated = true;
                                else
                                    authRequest.IsAuthenticated = false;
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index de05f28..079bcb1 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -173,6 +173,12 @@ namespace OpenSim.Services.LLLoginService
        // Web map
        private string mapTileURL;
+        // Web Profiles
+        private string profileURL;
+        // OpenID
+        private string openIDURL;
        private string searchURL;
        // Error Flags
@@ -225,7 +231,7 @@ namespace OpenSim.Services.LLLoginService
        public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
            GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
            string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
-            GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency)
+            GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency)
            : this()
        {
            FillOutInventoryData(invSkel, libService);
@@ -242,6 +248,9 @@ namespace OpenSim.Services.LLLoginService
            BuddList = ConvertFriendListItem(friendsList);
            StartLocation = where;
            MapTileURL = mapTileURL;
+            ProfileURL = profileURL;
+            OpenIDURL = openIDURL;
            SearchURL = searchURL;
            Currency = currency;
@@ -390,6 +399,8 @@ namespace OpenSim.Services.LLLoginService
            InitialOutfitHash["gender"] = "female";
            initialOutfit.Add(InitialOutfitHash);
            mapTileURL = String.Empty;
+            profileURL = String.Empty;
+            openIDURL = String.Empty;
            searchURL = String.Empty;
            currency = String.Empty;
@@ -462,6 +473,13 @@ namespace OpenSim.Services.LLLoginService
                if (mapTileURL != String.Empty)
                    responseData["map-server-url"] = mapTileURL;
+                if (profileURL != String.Empty)
+                    responseData["profile-server-url"] = profileURL;
+                // We need to send an openid_token back in the response too
+                if (openIDURL != String.Empty)
+                    responseData["openid_url"] = openIDURL;
                if (m_buddyList != null)
                {
                    responseData["buddy-list"] = m_buddyList.ToArray();
@@ -567,6 +585,12 @@ namespace OpenSim.Services.LLLoginService
                if (mapTileURL != String.Empty)
                    map["map-server-url"] = OSD.FromString(mapTileURL);
+                if (profileURL != String.Empty)
+                    map["profile-server-url"] = OSD.FromString(profileURL);
+                if (openIDURL != String.Empty)
+                    map["openid_url"] = OSD.FromString(openIDURL);
                if (searchURL != String.Empty)
                    map["search"] = OSD.FromString(searchURL);
@@ -939,6 +963,18 @@ namespace OpenSim.Services.LLLoginService
            set { mapTileURL = value; }
        }
+        public string ProfileURL
+        {
+            get { return profileURL; }
+            set { profileURL = value; }
+        }
+        public string OpenIDURL
+        {
+            get { return openIDURL; }
+            set { openIDURL = value; }
+        }
        public string SearchURL
        {
            get { return searchURL; }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 6a9b8c6..c9a1154 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -74,6 +74,8 @@ namespace OpenSim.Services.LLLoginService
        protected string m_GatekeeperURL;
        protected bool m_AllowRemoteSetLoginLevel;
        protected string m_MapTileURL;
+        protected string m_ProfileURL;
+        protected string m_OpenIDURL;
        protected string m_SearchURL;
        protected string m_Currency;
@@ -108,6 +110,8 @@ namespace OpenSim.Services.LLLoginService
            m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
            m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
            m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
+            m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
+            m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
            m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
            m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
@@ -420,7 +424,7 @@ namespace OpenSim.Services.LLLoginService
                // Finally, fill out the response and return it
                //
                LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
-                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency);
+                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency);
                m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
                return response;
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index aa904aa..7bf08ae 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Tests.Common
            Console.WriteLine("Setting up test scene {0}", name);
            // We must set up a console otherwise setup of some modules may fail
-            MainConsole.Instance = new MockConsole("TEST PROMPT");
+            MainConsole.Instance = new MockConsole();
            
            RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1");
            regInfo.RegionName = name;
@@ -136,7 +136,7 @@ namespace OpenSim.Tests.Common
                                                                   StartAuthenticationService(testScene);
            LocalInventoryServicesConnector   inventoryService   = StartInventoryService(testScene);
                                                                   StartGridService(testScene);
-            LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);            
+            LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);
            LocalPresenceServicesConnector    presenceService    = StartPresenceService(testScene);
            inventoryService.PostInitialise();
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 79bb9c2..295e868 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -177,9 +177,9 @@ namespace OpenSim.Data.Null
            // Therefore, we need to store parts rather than groups.
            foreach (SceneObjectPart prim in obj.Parts)
            {
-                m_log.DebugFormat(
+//                m_log.DebugFormat(
-                    "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}", 
+//                    "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}", 
-                    prim.Name, prim.UUID, obj.Name, obj.UUID, regionUUID);
+//                    prim.Name, prim.UUID, obj.Name, obj.UUID, regionUUID);
                            
                m_sceneObjectParts[prim.UUID] = prim;
            }
@@ -193,9 +193,9 @@ namespace OpenSim.Data.Null
            {
                if (part.ParentGroup.UUID == obj)
                {
-                    m_log.DebugFormat(
+//                    m_log.DebugFormat(
-                        "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}", 
+//                        "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}", 
-                        part.Name, part.UUID, obj, regionUUID);
+//                        part.Name, part.UUID, obj, regionUUID);
                    m_sceneObjectParts.Remove(part.UUID);
                }
            }
@@ -215,8 +215,8 @@ namespace OpenSim.Data.Null
            {
                if (prim.IsRoot)
                {
-                    m_log.DebugFormat(
+//                    m_log.DebugFormat(
-                        "[MOCK REGION DATA PLUGIN]: Loading root part {0} {1} in {2}", prim.Name, prim.UUID, regionUUID);
+//                        "[MOCK REGION DATA PLUGIN]: Loading root part {0} {1} in {2}", prim.Name, prim.UUID, regionUUID);
                    objects[prim.UUID] = new SceneObjectGroup(prim);
                }
            }
@@ -240,9 +240,9 @@ namespace OpenSim.Data.Null
                    }
                    else
                    {
-                        m_log.WarnFormat(
+//                        m_log.WarnFormat(
-                            "[MOCK REGION DATA PLUGIN]: Database contains an orphan child prim {0} {1} in region {2} pointing to missing parent {3}.  This prim will not be loaded.",
+//                            "[MOCK REGION DATA PLUGIN]: Database contains an orphan child prim {0} {1} in region {2} pointing to missing parent {3}.  This prim will not be loaded.",
-                            prim.Name, prim.UUID, regionUUID, prim.ParentUUID);
+//                            prim.Name, prim.UUID, regionUUID, prim.ParentUUID);
                    }
                }
            }
diff --git a/OpenSim/Tests/Torture/NPCTortureTests.cs b/OpenSim/Tests/Torture/NPCTortureTests.cs
index 8078d9d..0224505 100644
--- a/OpenSim/Tests/Torture/NPCTortureTests.cs
+++ b/OpenSim/Tests/Torture/NPCTortureTests.cs
@@ -75,6 +75,11 @@ namespace OpenSim.Tests.Torture
        [TestFixtureTearDown]
        public void TearDown()
        {
+            scene.Close();
+            scene = null;
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
            // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
            // threads.  Possibly, later tests should be rewritten not to worry about such things.
            Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
@@ -98,7 +103,7 @@ namespace OpenSim.Tests.Torture
        }
        [Test]
-        public void TestAddRemove100NPCs()
+        public void Test_0001_AddRemove100NPCs()
        {
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -107,7 +112,7 @@ namespace OpenSim.Tests.Torture
        }
        [Test]
-        public void TestAddRemove1000NPCs()
+        public void Test_0002_AddRemove1000NPCs()
        {
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -116,7 +121,7 @@ namespace OpenSim.Tests.Torture
        }
        [Test]
-        public void TestAddRemove2000NPCs()
+        public void Test_0003_AddRemove2000NPCs()
        {
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
diff --git a/OpenSim/Tests/Torture/ObjectTortureTests.cs b/OpenSim/Tests/Torture/ObjectTortureTests.cs
index e83186a..978a308 100644
--- a/OpenSim/Tests/Torture/ObjectTortureTests.cs
+++ b/OpenSim/Tests/Torture/ObjectTortureTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Tests.Torture
 //        }
        [Test]
-        public void Test0001_10K_1PrimObjects()
+        public void Test_0001_10K_1PrimObjects()
        {
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -75,7 +75,7 @@ namespace OpenSim.Tests.Torture
        }
        [Test]
-        public void Test0002_100K_1PrimObjects()
+        public void Test_0002_100K_1PrimObjects()
        {
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -84,7 +84,7 @@ namespace OpenSim.Tests.Torture
        }
        [Test]
-        public void Test0003_200K_1PrimObjects()
+        public void Test_0003_200K_1PrimObjects()
        {
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -93,7 +93,7 @@ namespace OpenSim.Tests.Torture
        }
        [Test]
-        public void Test0011_100_100PrimObjects()
+        public void Test_0011_100_100PrimObjects()
        {
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -102,7 +102,7 @@ namespace OpenSim.Tests.Torture
        }
        [Test]
-        public void Test0012_1K_100PrimObjects()
+        public void Test_0012_1K_100PrimObjects()
        {
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -111,7 +111,7 @@ namespace OpenSim.Tests.Torture
        }
        [Test]
-        public void Test0013_2K_100PrimObjects()
+        public void Test_0013_2K_100PrimObjects()
        {
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -123,6 +123,9 @@ namespace OpenSim.Tests.Torture
        {
            UUID ownerId = new UUID("F0000000-0000-0000-0000-000000000000");
+            // Using a local variable for scene, at least on mono 2.6.7, means that it's much more likely to be garbage
+            // collected when we teardown this test.  If it's done in a member variable, even if that is subsequently
+            // nulled out, the garbage collect can be delayed.
            TestScene scene = SceneHelpers.SetupScene();
 //            Process process = Process.GetCurrentProcess();
@@ -156,11 +159,6 @@ namespace OpenSim.Tests.Torture
            // objects will be clean up by the garbage collector before the next stress test is run.
            scene.Update();
-            // Currently, we need to do this in order to garbage collect the scene objects ready for the next test run.
-            // However, what we really need to do is find out why the entire scene is not garbage collected in
-            // teardown.
-            scene.DeleteAllSceneObjects();
            Console.WriteLine(
                "Took {0}ms, {1}MB ({2} - {3}) to create {4} objects each containing {5} prim(s)",
                Math.Round(elapsed.TotalMilliseconds),
@@ -170,7 +168,8 @@ namespace OpenSim.Tests.Torture
                objectsToAdd,
                primsInEachObject);
-            scene = null;
+            scene.Close();
+//            scene = null;
        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Tests/Torture/ScriptTortureTests.cs b/OpenSim/Tests/Torture/ScriptTortureTests.cs
index d94bbde..2ef55b3 100644
--- a/OpenSim/Tests/Torture/ScriptTortureTests.cs
+++ b/OpenSim/Tests/Torture/ScriptTortureTests.cs
@@ -91,6 +91,15 @@ namespace OpenSim.Tests.Torture
            m_scene.StartScripts();
        }
+        [TearDown]
+        public void TearDown()
+        {
+            m_scene.Close();
+            m_scene = null;
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+        }
        [Test]
        public void TestCompileAndStart100Scripts()
        {
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 0bd0bcc..da090dd 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -420,6 +420,8 @@ namespace pCampBot
        public void Network_LoginProgress(object sender, LoginProgressEventArgs args)
        {
+            m_log.DebugFormat("[BOT]: Bot {0} {1} in Network_LoginProcess", Name, args.Status);
            if (args.Status == LoginStatus.Success)
            {
                if (OnConnected != null)
@@ -431,10 +433,15 @@ namespace pCampBot
        public void Network_SimConnected(object sender, SimConnectedEventArgs args)
        {
+            m_log.DebugFormat(
+                "[BOT]: Bot {0} connected to {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint);
        }
        public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
        {
+            m_log.DebugFormat(
+                "[BOT]: Bot {0} disconnected reason {1}, message {2}", Name, args.Reason, args.Message);
 //            m_log.ErrorFormat("Fired Network_OnDisconnected");
 //           if (
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 6481e97..0f501b7 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -266,7 +266,7 @@ namespace pCampBot
        /// <returns></returns>
        protected CommandConsole CreateConsole()
        {
-            return new LocalConsole("Region");
+            return new LocalConsole("pCampbot");
        }
        private void HandleShutdown(string module, string[] cmd)
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index a73fcbe..ec5ad04 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -56,6 +56,10 @@ namespace pCampBot
            {
                Help();
            }
+            else if (config.Get("firstname") == null ||  config.Get("lastname") == null || config.Get("password") == null)
+            {
+                Console.WriteLine("ERROR: You must supply a firstname, lastname and password for the bots.");
+            }
            else
            {
                int botcount = config.GetInt("botcount", 1);