Merge branch 'master' of git://opensimulator.org/git/opensim

14 files changed, 76 insertions, 43 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
index e43f7cf..4cb4aee 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -139,28 +139,43 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private void ProcessQueues()
         {
             // Process all the pending adds
-            OutgoingPacket pendingAdd;
-            while (m_pendingAdds.Dequeue(out pendingAdd))
-                m_packets[pendingAdd.SequenceNumber] = pendingAdd;
 
+            OutgoingPacket pendingAdd;
+            if (m_pendingAdds != null)
+            {
+                while (m_pendingAdds.TryDequeue(out pendingAdd))
+                {
+                    if (pendingAdd != null && m_packets != null)
+                    {
+                        m_packets[pendingAdd.SequenceNumber] = pendingAdd;
+                    }
+                }
+            }
+            
             // Process all the pending removes, including updating statistics and round-trip times
             PendingAck pendingRemove;
             OutgoingPacket ackedPacket;
-            while (m_pendingRemoves.Dequeue(out pendingRemove))
+            if (m_pendingRemoves != null)
             {
-                if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket))
+                while (m_pendingRemoves.TryDequeue(out pendingRemove))
                 {
-                    m_packets.Remove(pendingRemove.SequenceNumber);
-
-                    // Update stats
-                    System.Threading.Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength);
-
-                    if (!pendingRemove.FromResend)
+                    if (m_pendingRemoves != null && m_packets != null)
                     {
-                        // Calculate the round-trip time for this packet and its ACK
-                        int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount;
-                        if (rtt > 0)
-                            ackedPacket.Client.UpdateRoundTrip(rtt);
+                        if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket))
+                        {
+                            m_packets.Remove(pendingRemove.SequenceNumber);
+
+                            // Update stats
+                            System.Threading.Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength);
+
+                            if (!pendingRemove.FromResend)
+                            {
+                                // Calculate the round-trip time for this packet and its ACK
+                                int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount;
+                                if (rtt > 0)
+                                    ackedPacket.Client.UpdateRoundTrip(rtt);
+                            }
+                        }
                     }
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 9eaa758..6ed4867 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -252,7 +252,7 @@ namespace Flotsam.RegionModules.AssetCache
                 }
                 else
                 {
-                    m_MemoryCache.AddOrUpdate(key, asset, DateTime.MaxValue);
+                    m_MemoryCache.AddOrUpdate(key, asset, Double.MaxValue);
                 }
             }
         }
@@ -863,4 +863,4 @@ namespace Flotsam.RegionModules.AssetCache
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 28c50ab..457e0bb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// <param name="remoteClient"></param>
         /// <param name="itemID"></param>
         /// <param name="AttachmentPt"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         protected UUID ShowAttachInUserInventory(
             SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
         {
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 7a21d5e..b3f0a25 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -318,12 +318,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
                 UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, fromAgentID);
 
-                                PresenceInfo presence = null;
-                                PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid });
-                                if (presences != null && presences.Length > 0)
-                                        presence = presences[0];
-                                if (presence != null)
-                                        im.offline = 0;
+                PresenceInfo presence = null;
+                PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid });
+                if (presences != null && presences.Length > 0)
+                    presence = presences[0];
+                if (presence != null)
+                    im.offline = 0;
 
                 im.fromAgentID = fromAgentID.Guid;
                 im.fromAgentName = account.FirstName + " " + account.LastName;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 828c4e7..3791e1d 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -301,7 +301,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (currentAgentCircuit != null)
                 {
                     agentCircuit.ServiceURLs = currentAgentCircuit.ServiceURLs;
+                    agentCircuit.IPAddress = currentAgentCircuit.IPAddress;
                     agentCircuit.Viewer = currentAgentCircuit.Viewer;
+                    agentCircuit.Channel = currentAgentCircuit.Channel;
+                    agentCircuit.Mac = currentAgentCircuit.Mac;
+                    agentCircuit.Id0 = currentAgentCircuit.Id0;
                 }
 
                 if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY))
@@ -943,16 +947,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
 
             agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
-            m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count);
+            //m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count);
 
             if (!agent.ChildrenCapSeeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle))
                 agent.ChildrenCapSeeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath);
-            m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count);
+            //m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count);
 
             sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath);
-            foreach (ulong h in agent.ChildrenCapSeeds.Keys)
-                m_log.DebugFormat("[XXX] --> {0}", h);
-            m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle);
+            //foreach (ulong h in agent.ChildrenCapSeeds.Keys)
+            //    m_log.DebugFormat("[XXX] --> {0}", h);
+            //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle);
             agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath);
 
             if (sp.Scene.CapsModule != null)
@@ -963,7 +967,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (currentAgentCircuit != null)
             {
                 agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
+                agent.IPAddress = currentAgentCircuit.IPAddress;
                 agent.Viewer = currentAgentCircuit.Viewer;
+                agent.Channel = currentAgentCircuit.Channel;
+                agent.Mac = currentAgentCircuit.Mac;
+                agent.Id0 = currentAgentCircuit.Id0;
             }
 
             InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
@@ -1052,7 +1060,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     if (currentAgentCircuit != null)
                     {
                         agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
+                        agent.IPAddress = currentAgentCircuit.IPAddress;
                         agent.Viewer = currentAgentCircuit.Viewer;
+                        agent.Channel = currentAgentCircuit.Channel;
+                        agent.Mac = currentAgentCircuit.Mac;
+                        agent.Id0 = currentAgentCircuit.Id0;
                     }
 
                     if (newRegions.Contains(neighbour.RegionHandle))
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
index e6cab1d..412dbb6 100644
--- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
@@ -91,6 +91,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
                 m_scene.EventManager.OnMakeRootAgent += EventManager_OnMakeRootAgent;
                 m_scene.EventManager.OnSaveNewWindlightProfile += EventManager_OnSaveNewWindlightProfile;
                 m_scene.EventManager.OnSendNewWindlightProfileTargeted += EventManager_OnSendNewWindlightProfileTargeted;
+                m_scene.LoadWindlightProfile();
             }
 
             InstallCommands();
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index 7c12b8c..e7cfda1 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -53,9 +53,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         public void Cache(UUID userID, UserAccount account)
         {
             // Cache even null accounts
-            m_UUIDCache.AddOrUpdate(userID, account, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS));
+            m_UUIDCache.AddOrUpdate(userID, account, CACHE_EXPIRATION_SECONDS);
             if (account != null)
-                m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS));
+                m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_EXPIRATION_SECONDS);
 
             m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
         }
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
index a99b20c..49b4364 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
@@ -352,6 +352,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 Face face = renderMesh.Faces[i];
                 string meshName = primID + "-Face-" + i.ToString();
 
+                // Avoid adding duplicate meshes to the scene
+                if (renderer.Scene.objectData.ContainsKey(meshName))
+                {
+                    continue;
+                }
+
                 warp_Object faceObj = new warp_Object(face.Vertices.Count, face.Indices.Count / 3);
 
                 for (int j = 0; j < face.Vertices.Count; j++)
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a79dc98..f81c551 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1073,7 +1073,7 @@ namespace OpenSim.Region.Framework.Scenes
                 catch (Exception e)
                 {
                     // Catch it and move on. This includes situations where splist has inconsistent info
-                    m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.Message);
+                    m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.ToString());
                 }
             }
         }
@@ -1114,7 +1114,6 @@ namespace OpenSim.Region.Framework.Scenes
                 catch (Exception e)
                 {
                     m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString());
-                    m_log.Info("[BUG] Stack Trace: " + e.StackTrace);
                 }
             }
         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a8e76e3..8140d42 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2763,7 +2763,7 @@ namespace OpenSim.Region.Framework.Scenes
             UUID = UUID.Random();
             LinkNum = linkNum;
             LocalId = 0;
-                        Inventory.ResetInventoryIDs();
+            Inventory.ResetInventoryIDs();
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a4533fa..13d9964 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1523,7 +1523,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 // If the agent update does move the avatar, then calculate the force ready for the velocity update,
-                // which occurs later in the main scene loop                
+                // which occurs later in the main scene loop
                 if (update_movementflag || (update_rotation && DCFlagKeyPressed))
                 {
                     //                    m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index e6ff0c0..5616a4e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -210,7 +210,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
                     { Name = childPartName, UUID = childPartUuid };
 
-            SceneObjectGroup sog = new SceneObjectGroup(rootPart);            
+            SceneObjectGroup sog = new SceneObjectGroup(rootPart);
             sog.AddPart(linkPart);
             
             Assert.That(sog.UUID, Is.EqualTo(rootPartUuid));
@@ -221,7 +221,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             sog.UUID = newRootPartUuid;
                         
             Assert.That(sog.UUID, Is.EqualTo(newRootPartUuid));
-            Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid));            
+            Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid));
             Assert.That(sog.Parts.Length, Is.EqualTo(2));
         }
     }
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index e42dbf2..7e1b5ac 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -812,7 +812,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
             // gets the object data.   If the data sent by the client doesn't match the object, the viewer probably has an 
             // old idea of what the object properties are.   Viewer developer Hazim informed us that the base module 
             // didn't check the client sent data against the object do any.   Since the base modules are the 
-            // 'crowning glory' examples of good practice..    
+            // 'crowning glory' examples of good practice..
 
             // Validate that the object exists in the scene the user is in
             SceneObjectPart part = s.GetSceneObjectPart(localID);
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index c37c9bd..c91658e 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -188,7 +188,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size,
                        Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode)
         {
-            Name = primName;            
+            Name = primName;
             m_vehicle = new ODEDynamics();
             //gc = GCHandle.Alloc(prim_geom, GCHandleType.Pinned);
             ode = dode;
@@ -620,7 +620,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                             volume *= (1.0f - hollowVolume);
                             }
                         }
-                        break;                  
+                        break;
 
                 default:
                     break;
@@ -658,7 +658,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                 taperY = _pbs.PathTaperY * 0.01f;
                 if (taperY < 0.0f)
-                    taperY = -taperY;               
+                    taperY = -taperY;
                 taperY1 = 1.0f - taperY;
 
                 }
@@ -1059,7 +1059,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                             }
                             
                             foreach (OdePrim prm in childrenPrim)
-                            {                       
+                            {
                                 prm.m_collisionCategories |= CollisionCategories.Body;
                                 prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);