Merge branch 'master' into diva-textures

1 files changed, 20 insertions, 20 deletions

diff --git a/OpenSim/Framework/CnmMemoryCache.cs b/OpenSim/Framework/CnmMemoryCache.cs
index db91801..92af331 100644
--- a/OpenSim/Framework/CnmMemoryCache.cs
+++ b/OpenSim/Framework/CnmMemoryCache.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// How many operations between time checks.
-        /// </summary>        
+        /// </summary>
         private const int DefaultOperationsBetweenTimeChecks = 40;
 
         /// <summary>
@@ -168,7 +168,7 @@ namespace OpenSim.Framework
         private int m_version;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.         
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
         /// </summary>
         public CnmMemoryCache()
             : this(DefaultMaxSize)
@@ -277,7 +277,7 @@ namespace OpenSim.Framework
         /// </param>
         protected virtual void AddToNewGeneration(int bucketIndex, TKey key, TValue value, long size)
         {
-            // Add to newest generation    
+            // Add to newest generation
             if (!m_newGeneration.Set(bucketIndex, key, value, size))
             {
                 // Failed to add new generation
@@ -311,7 +311,7 @@ namespace OpenSim.Framework
         /// Bucket index is remainder when element key's hash value is divided by bucket count.
         /// </para>
         /// <para>
-        /// For example: key's hash is 72, bucket count is 5, element's bucket index is 72 % 5 = 2.        
+        /// For example: key's hash is 72, bucket count is 5, element's bucket index is 72 % 5 = 2.
         /// </para>
         /// </remarks>
         protected virtual int GetBucketIndex(TKey key)
@@ -367,7 +367,7 @@ namespace OpenSim.Framework
         /// </summary>
         private void RecycleGenerations()
         {
-            // Rotate old generation to new generation, new generation to old generation            
+            // Rotate old generation to new generation, new generation to old generation
             IGeneration temp = m_newGeneration;
             m_newGeneration = m_oldGeneration;
             m_newGeneration.Clear();
@@ -522,7 +522,7 @@ namespace OpenSim.Framework
             /// <summary>
             /// Index of first element's in element chain.
             /// </summary>
-            /// <value>                        
+            /// <value>
             /// -1 if there is no element in bucket; otherwise first element's index in the element chain.
             /// </value>
             /// <remarks>
@@ -692,7 +692,7 @@ namespace OpenSim.Framework
                 /// </summary>
                 /// <value>
                 /// 0 if element is free; otherwise larger than 0.
-                /// </value>              
+                /// </value>
                 public long Size;
 
                 /// <summary>
@@ -771,7 +771,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
@@ -1405,10 +1405,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
@@ -1438,7 +1438,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; 
@@ -1449,7 +1449,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"/>
@@ -1503,7 +1503,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 { return m_maxElementSize; }
@@ -1517,7 +1517,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>
@@ -1562,10 +1562,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
@@ -1576,9 +1576,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}"/> 
@@ -1630,7 +1630,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"/>
@@ -1810,7 +1810,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.