From 50b03d08a8cdec9359adcece5b4645a6dc821d26 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 4 Oct 2010 00:04:42 +0200
Subject: Add linden prim renderer and update libOMV

---
 OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs       | 4 ++--
 OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs                 | 4 ++--
 .../CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
index c120a12..043e7d3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutgoingPacket pendingAdd;
             if (m_pendingAdds != null)
             {
-                while (m_pendingAdds.Dequeue(out pendingAdd))
+                while (m_pendingAdds.TryDequeue(out pendingAdd))
                 {
                     if (pendingAdd != null && m_packets != null)
                     {
@@ -157,7 +157,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutgoingPacket ackedPacket;
             if (m_pendingRemoves != null)
             {
-                while (m_pendingRemoves.Dequeue(out pendingRemove))
+                while (m_pendingRemoves.TryDequeue(out pendingRemove))
                 {
                     if (m_pendingRemoves != null && m_packets != null)
                     {
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 64788db..0da3f5f 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);
         }
-- 
cgit v1.1