fix merge

1 files changed, 53 insertions, 53 deletions

diff --git a/OpenSim/Framework/ICnmCache.cs b/OpenSim/Framework/ICnmCache.cs
index 27b9c56..69b5b42 100644
--- a/OpenSim/Framework/ICnmCache.cs
+++ b/OpenSim/Framework/ICnmCache.cs
@@ -34,10 +34,10 @@ namespace OpenSim.Framework
     /// Represent generic cache to store key/value pairs (elements) limited by time, size and count of elements.
     /// </summary>
     /// <typeparam name="TKey">
-    /// The type of keys in the cache. 
+    /// The type of keys in the cache.
     /// </typeparam>
     /// <typeparam name="TValue">
-    /// The type of values in the cache. 
+    /// The type of values in the cache.
     /// </typeparam>
     /// <remarks>
     /// <para>
@@ -51,8 +51,8 @@ namespace OpenSim.Framework
     /// <item>
     /// <term>Time</term>
     /// <description>
-    /// Element that is not accessed through <see cref="TryGetValue"/> or <see cref="Set"/> in last <see cref="ExpirationTime"/> are 
-    /// removed from the cache automatically. Depending on implementation of the cache some of elements may stay longer in cache. 
+    /// Element that is not accessed through <see cref="TryGetValue"/> or <see cref="Set"/> in last <see cref="ExpirationTime"/> are
+    /// removed from the cache automatically. Depending on implementation of the cache some of elements may stay longer in cache.
     /// <see cref="IsTimeLimited"/> returns <see langword="true"/>, if cache is limited by time.
     /// </description>
     /// </item>
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
     /// <term>Count</term>
     /// <description>
     /// When adding an new element to cache that already have <see cref="MaxCount"/> of elements, cache will remove less recently
-    /// used element(s) from the cache, until element fits to cache. 
+    /// used element(s) from the cache, until element fits to cache.
     /// <see cref="IsCountLimited"/> returns <see langword="true"/>, if cache is limiting element count.
     /// </description>
     /// </item>
@@ -69,8 +69,8 @@ namespace OpenSim.Framework
     /// <description>
     /// <description>
     /// When adding an new element to cache that already have <see cref="MaxSize"/> of elements, cache will remove less recently
-    /// used element(s) from the cache, until element fits to cache. 
-    /// <see cref="IsSizeLimited"/> returns <see langword="true"/>, if cache is limiting total size of elements. 
+    /// used element(s) from the cache, until element fits to cache.
+    /// <see cref="IsSizeLimited"/> returns <see langword="true"/>, if cache is limiting total size of elements.
     /// Normally size is bytes used by element in the cache. But it can be any other suitable unit of measure.
     /// </description>
     /// </description>
@@ -84,8 +84,8 @@ namespace OpenSim.Framework
         /// </summary>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="MaxCount"/>
@@ -102,13 +102,13 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ExpirationTime"/> 
-        /// and it is not accessed through <see cref="TryGetValue"/> method or element's value is 
-        /// not replaced by <see cref="Set"/> method, then it is automatically removed from the 
+        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ExpirationTime"/>
+        /// and it is not accessed through <see cref="TryGetValue"/> method or element's value is
+        /// not replaced by <see cref="Set"/> method, then it is automatically removed from the
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time, 
+        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time,
         /// because total size or count of elements stored to cache is larger than <see cref="MaxSize"/> or <see cref="MaxCount"/>.
         /// </para>
         /// <para>
@@ -135,12 +135,12 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether or not access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe).
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe); 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe);
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use
         /// <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> in <see cref="CnmSynchronizedCache{TKey,TValue}"/> class
         /// to retrieve synchronized wrapper for <see cref="ICnmCache{TKey,TValue}"/> object.
         /// </para>
@@ -153,17 +153,17 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting count of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="Count"/>
-        /// <seealso cref="MaxCount"/> 
+        /// <seealso cref="MaxCount"/>
         /// <seealso cref="IsSizeLimited"/>
         /// <seealso cref="IsTimeLimited"/>
         bool IsCountLimited { get; }
@@ -172,13 +172,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting size of elements.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="MaxElementSize"/>
@@ -192,13 +192,13 @@ namespace OpenSim.Framework
         /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
         /// </summary>
         /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
-        /// otherwise, <see langword="false"/>. 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements;
+        /// otherwise, <see langword="false"/>.
         /// </value>
         /// <remarks>
         /// If <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time and element is not accessed through <see cref="Set"/>
-        /// or <see cref="TryGetValue"/> methods in <see cref="ExpirationTime"/> , then element is automatically removed from 
-        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
+        /// or <see cref="TryGetValue"/> methods in <see cref="ExpirationTime"/> , then element is automatically removed from
+        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may
         /// stay longer in cache.
         /// </remarks>
         /// <seealso cref="ExpirationTime"/>
@@ -206,18 +206,18 @@ namespace OpenSim.Framework
         /// <seealso cref="IsCountLimited"/>
         /// <seealso cref="IsSizeLimited"/>
         bool IsTimeLimited { get; }
-        
+
         /// <summary>
         /// Gets or sets maximal allowed count of elements that can be stored to <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <value>
-        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements; 
+        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements;
         /// otherwise maximal allowed count of elements.
         /// </value>
         /// <remarks>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         int MaxCount { get; set; }
@@ -230,7 +230,7 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// If element's size is larger than <see cref="MaxElementSize"/>, then element is 
+        /// If element's size is larger than <see cref="MaxElementSize"/>, then element is
         /// not added to the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -251,8 +251,8 @@ namespace OpenSim.Framework
         /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <exception cref="ArgumentOutOfRangeException">value is less than 0.</exception>
@@ -272,11 +272,11 @@ namespace OpenSim.Framework
         /// Normally bytes, but can be any suitable unit of measure.
         /// </para>
         /// <para>
-        /// Element's size is given when element is added or replaced by <see cref="Set"/> method. 
+        /// Element's size is given when element is added or replaced by <see cref="Set"/> method.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="MaxElementSize"/>
@@ -294,8 +294,8 @@ namespace OpenSim.Framework
         /// </value>
         /// <remarks>
         /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
-        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/>
+        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// </remarks>
@@ -367,7 +367,7 @@ namespace OpenSim.Framework
         void RemoveRange(IEnumerable<TKey> keys);
 
         /// <summary>
-        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to 
+        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
         /// <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
         /// <param name="key">
@@ -380,7 +380,7 @@ namespace OpenSim.Framework
         /// The element's size. Normally bytes, but can be any suitable unit of measure.
         /// </param>
         /// <returns>
-        /// <see langword="true"/> if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>; 
+        /// <see langword="true"/> if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>;
         /// otherwise <see langword="false"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException">
@@ -391,17 +391,17 @@ namespace OpenSim.Framework
         /// </exception>
         /// <remarks>
         /// <para>
-        /// If element's <paramref name="size"/> is larger than <see cref="MaxElementSize"/>, then element is 
-        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is 
-        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>. 
+        /// If element's <paramref name="size"/> is larger than <see cref="MaxElementSize"/>, then element is
+        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is
+        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
         /// </para>
         /// </remarks>
         /// <seealso cref="IsSizeLimited"/>
@@ -417,15 +417,15 @@ namespace OpenSim.Framework
         /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
         /// </summary>
         /// <returns>
-        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
+        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with
         /// the specified key; otherwise, <see langword="false"/>.
         /// </returns>
         /// <param name="key">
         /// The key whose <paramref name="value"/> to get.
         /// </param>
         /// <param name="value">
-        /// When this method returns, the value associated with the specified <paramref name="key"/>, 
-        /// if the <paramref name="key"/> is found; otherwise, the 
+        /// When this method returns, the value associated with the specified <paramref name="key"/>,
+        /// if the <paramref name="key"/> is found; otherwise, the
         /// default value for the type of the <paramref name="value"/> parameter. This parameter is passed uninitialized.
         /// </param>
         /// <exception cref="ArgumentNullException">