Merge branch 'master' into careminster

OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs

@@ -55,7 +55,7 @@ namespace OpenSim.Client.MXP.PacketHandler
         private readonly Dictionary<UUID, Scene> m_scenes;
         private readonly Transmitter m_transmitter;
 
-        private readonly Thread m_clientThread;
+//        private readonly Thread m_clientThread;
 
         private readonly IList<Session> m_sessions = new List<Session>();
         private readonly IList<Session> m_sessionsToClient = new List<Session>();

OpenSim/Data/SQLite/SQLiteAssetData.cs

@@ -41,7 +41,7 @@ namespace OpenSim.Data.SQLite
     /// </summary>
     public class SQLiteAssetData : AssetDataBase
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private const string SelectAssetSQL = "select * from assets where UUID=:UUID";
         private const string SelectAssetMetadataSQL = "select Name, Description, Type, Temporary, UUID from assets limit :start, :count";

OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs

@@ -39,9 +39,7 @@ namespace OpenSim.Data.SQLite
 {
     public class SQLiteGenericTableHandler<T> : SQLiteFramework where T: class, new()
     {
-        private static readonly ILog m_log =
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
 
         protected Dictionary<string, FieldInfo> m_Fields =
                 new Dictionary<string, FieldInfo>();

OpenSim/Data/SQLite/SQLiteXInventoryData.cs

@@ -41,8 +41,7 @@ namespace OpenSim.Data.SQLite
     /// </summary>
     public class SQLiteXInventoryData : IXInventoryData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-                MethodBase.GetCurrentMethod().DeclaringType);
 
         private SQLiteGenericTableHandler<XInventoryFolder> m_Folders;
         private SqliteItemHandler m_Items;

OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs

@@ -174,18 +174,16 @@ namespace OpenSim.Region.CoreModules.Framework.Library
                 {
                     m_log.DebugFormat("[LIBRARY MODULE]: Exception when processing archive {0}: {1}", iarFileName, e.Message);
                 }
-
             }
-
-        }
-
-        private void DumpLibrary()
-        {
-            InventoryFolderImpl lib = m_Scene.CommsManager.UserProfileCacheService.LibraryRoot;
-
-            m_log.DebugFormat(" - folder {0}", lib.Name);
-            DumpFolder(lib);
         }
+//
+//        private void DumpLibrary()
+//        {
+//            InventoryFolderImpl lib = m_Scene.CommsManager.UserProfileCacheService.LibraryRoot;
+//
+//            m_log.DebugFormat(" - folder {0}", lib.Name);
+//            DumpFolder(lib);
+//        }
 
         private void DumpFolder(InventoryFolderImpl folder)
         {

OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs

@@ -262,44 +262,34 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 {
                     case ChatTypeEnum.Whisper:
                         if (dis < m_whisperdistance)
-                        {
+                            QueueMessage(new ListenerInfo(li, name, id, msg));
-                            lock (m_pending.SyncRoot)
-                            {
-                                m_pending.Enqueue(new ListenerInfo(li,name,id,msg));
-                            }
-                        }
                         break;
 
                     case ChatTypeEnum.Say:
                         if (dis < m_saydistance)
-                        {
+                            QueueMessage(new ListenerInfo(li, name, id, msg));
-                            lock (m_pending.SyncRoot)
-                            {
-                                m_pending.Enqueue(new ListenerInfo(li,name,id,msg));
-                            }
-                        }
                         break;
 
                     case ChatTypeEnum.Shout:
                         if (dis < m_shoutdistance)
-                        {
+                            QueueMessage(new ListenerInfo(li, name, id, msg));
-                            lock (m_pending.SyncRoot)
-                            {
-                                m_pending.Enqueue(new ListenerInfo(li,name,id,msg));
-                            }
-                        }
                         break;
 
                     case ChatTypeEnum.Region:
-                        lock (m_pending.SyncRoot)
+                        QueueMessage(new ListenerInfo(li, name, id, msg));
-                        {
-                            m_pending.Enqueue(new ListenerInfo(li,name,id,msg));
-                        }
                         break;
                 }
             }
         }
 
+        protected void QueueMessage(ListenerInfo li)
+        {
+            lock (m_pending.SyncRoot)
+            {
+                m_pending.Enqueue(li);
+            }
+        }
+
         /// <summary>
         /// Are there any listen events ready to be dispatched?
         /// </summary>
@@ -319,7 +309,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
             lock (m_pending.SyncRoot)
             {
-                li = (ListenerInfo) m_pending.Dequeue();
+                li = (ListenerInfo)m_pending.Dequeue();
             }
 
             return li;

OpenSim/Region/CoreModules/World/Access/AccessModule.cs

@@ -42,9 +42,7 @@ namespace OpenSim.Region.CoreModules.World
 {
     public class AccessModule : ISharedRegionModule
     {
-        private static readonly ILog m_log =
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
                 
         private List<Scene> m_SceneList = new List<Scene>();
 

OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

@@ -113,6 +113,15 @@ namespace OpenSim.Region.Framework.Scenes
         
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <value>
+        /// Is this sop a root part?
+        /// </value>
+        [XmlIgnore]
+        public bool IsRoot 
+        {
+           get { return ParentGroup.RootPart == this; } 
+        }
+
         // use only one serializer to give the runtime a chance to optimize it (it won't do that if you
         // use a new instance every time)
         private static XmlSerializer serializer = new XmlSerializer(typeof (SceneObjectPart));

OpenSim/Region/Framework/Scenes/ScenePresence.cs

@@ -2979,11 +2979,10 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_scene.CrossAgentToNewRegion(this, m_physicsActor.Flying);
             }
-            catch(Exception ex)
+            catch
             {
                 m_scene.CrossAgentToNewRegion(this, false);
             }
-
         }
 
         public void InTransit()
@@ -3061,7 +3060,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 RemoveNeighbourRegion(handle);
             }
-
         }
 
         #endregion
@@ -3222,7 +3220,7 @@ namespace OpenSim.Region.Framework.Scenes
             List<int> attPoints = m_appearance.GetAttachedPoints();
             if (attPoints != null)
             {
-                m_log.DebugFormat("[SCENE PRESENCE]: attachments {0}", attPoints.Count);
+                //m_log.DebugFormat("[SCENE PRESENCE]: attachments {0}", attPoints.Count);
                 int i = 0;
                 AttachmentData[] attachs = new AttachmentData[attPoints.Count];
                 foreach (int point in attPoints)
@@ -3494,9 +3492,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 if (m_health <= 0)
                     m_scene.EventManager.TriggerAvatarKill(killerObj, this);
-            }
+            }            
-
-            
         }
 
         public void setHealthWithUpdate(float health)