Merge branch 'master' into diva-textures

1 files changed, 13 insertions, 13 deletions

diff --git a/OpenSim/Framework/CnmSynchronizedCache.cs b/OpenSim/Framework/CnmSynchronizedCache.cs
index c09900e..2bafbe9 100644
--- a/OpenSim/Framework/CnmSynchronizedCache.cs
+++ b/OpenSim/Framework/CnmSynchronizedCache.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Framework
             /// </returns>
             /// <exception cref="InvalidOperationException">
             /// The enumerator has reach end of collection or <see cref="MoveNext"/> is not called.
-            /// </exception>              
+            /// </exception>
             public KeyValuePair<TKey, TValue> Current
             {
                 get { return m_enumerator.Current; }
@@ -327,10 +327,10 @@ namespace OpenSim.Framework
         /// 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>        
+        /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
         public bool IsSizeLimited
@@ -366,7 +366,7 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.        
+        /// 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; 
@@ -377,7 +377,7 @@ namespace OpenSim.Framework
         /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.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>        
+        /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.PurgeExpired"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
@@ -440,7 +440,7 @@ namespace OpenSim.Framework
         /// <seealso cref="ICnmCache{TKey,TValue}.Set"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
         public long MaxElementSize
         {
             get
@@ -458,7 +458,7 @@ namespace OpenSim.Framework
         /// <value>
         /// Maximal allowed total size for elements stored to <see cref="ICnmCache{TKey,TValue}"/>.
         /// </value>
-        /// <remarks>        
+        /// <remarks>
         /// <para>
         /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
         /// </para>
@@ -507,10 +507,10 @@ namespace OpenSim.Framework
         /// 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>        
+        /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
         /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
         public long Size
@@ -527,9 +527,9 @@ namespace OpenSim.Framework
         /// <summary>
         /// Gets an object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
         /// </summary>
-        /// <value>        
+        /// <value>
         /// An object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
-        /// </value>        
+        /// </value>
         /// <remarks>
         /// <para>
         /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
@@ -584,7 +584,7 @@ namespace OpenSim.Framework
         /// </para>
         /// <para>
         /// Depending on <see cref="ICnmCache{TKey,TValue}"/> implementation, some of expired elements
-        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.        
+        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.
         /// </para>
         /// </remarks>
         /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
@@ -704,7 +704,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <returns>
         /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
-        /// the specified key; otherwise, <see langword="false"/>.        
+        /// the specified key; otherwise, <see langword="false"/>.
         /// </returns>
         /// <param name="key">
         /// The key whose <paramref name="value"/> to get.