Add linden prim renderer and update libOMV

4 files changed, 38 insertions, 23 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
index e43f7cf..c19e6a2 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/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/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index ddd2322..9c150ee 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (account == null)
             {
                 // Store null responses too, to avoid repeated lookups for missing accounts
-                m_accountCache.AddOrUpdate(userID, null, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS));
+                m_accountCache.AddOrUpdate(userID, null, CACHE_EXPIRATION_SECONDS);
             }
 
             return account;
@@ -225,7 +225,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 if (success)
                 {
                     // Cache the user account info
-                    m_accountCache.AddOrUpdate(data.PrincipalID, data, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS));
+                    m_accountCache.AddOrUpdate(data.PrincipalID, data, CACHE_EXPIRATION_SECONDS);
                 }
                 else
                 {
@@ -290,7 +290,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             GetFirstLastName(response["Name"].AsString(), out account.FirstName, out account.LastName);
 
             // Cache the user account info
-            m_accountCache.AddOrUpdate(account.PrincipalID, account, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS));
+            m_accountCache.AddOrUpdate(account.PrincipalID, account, CACHE_EXPIRATION_SECONDS);
 
             return account;
         }