Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 298ede9..a555eae 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -314,7 +314,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 );
             }
-        }        
+        }
 
         private void RestoreSavedScriptState(UUID oldID, UUID newID)
         {
@@ -579,7 +579,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_items.TryGetValue(itemId, out item);
 
             return item;
-        }    
+        }
 
         /// <summary>
         /// Get inventory items by name.
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>
         /// A list of inventory items with that name.
         /// If no inventory item has that name then an empty list is returned.
-        /// </returns>        
+        /// </returns>
         public IList<TaskInventoryItem> GetInventoryItems(string name)
         {
             IList<TaskInventoryItem> items = new List<TaskInventoryItem>();