Merge branch 'master' into diva-textures

6 files changed, 13 insertions, 15 deletions

diff --git a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
index 3981fe9..20ea18f 100644
--- a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Tests.Common.Mock
     /// tests are single threaded.
     /// </summary>
     public class TestAssetDataPlugin : BaseAssetRepository, IAssetDataPlugin
-    {        
+    {
         public string Version { get { return "0"; } }
         public string Name { get { return "TestAssetDataPlugin"; } }
 
@@ -59,6 +59,6 @@ namespace OpenSim.Tests.Common.Mock
             assets.Add(asset);
         }
 
-        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }        
+        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestAssetService.cs b/OpenSim/Tests/Common/Mock/TestAssetService.cs
index 81f123a..317ec06 100644
--- a/OpenSim/Tests/Common/Mock/TestAssetService.cs
+++ b/OpenSim/Tests/Common/Mock/TestAssetService.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Tests.Common.Mock
             if (Assets.ContainsKey(id))
                 asset = Assets[id];
             else
-                asset = null;            
+                asset = null;
             
             return asset;
         }
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common.Mock
         }
 
         public bool Get(string id, object sender, AssetRetrieved handler)
-        {            
+        {
             handler(id, sender, Get(id));
             
             return true;
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index 4313c96..013462e 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Tests.Common.Mock
 
         public TestCommunicationsManager(NetworkServersInfo serversInfo)
             : base(serversInfo, null)
-        {                        
+        {
 
             LocalUserServices lus = new LocalUserServices(991, 992, this);
             lus.AddPlugin(new TemporaryUserProfilePlugin());
@@ -65,8 +65,6 @@ namespace OpenSim.Tests.Common.Mock
             m_userService = lus;
             m_userAdminService = lus;
 
-            LocalBackEndServices gs = new LocalBackEndServices();
-            m_gridService = gs;
         }
     }
 }
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index daef38b..0c7ebca 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Tests.Common.Mock
         //// <value>
         /// Inventory items
         /// </value>
-        private Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>();        
+        private Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>();
 
         /// <value>
         /// User root folders
@@ -120,7 +120,7 @@ namespace OpenSim.Tests.Common.Mock
             }
 
             return folders;
-        }        
+        }
 
         public InventoryFolderBase getInventoryFolder(UUID folderId)
         {
@@ -191,7 +191,7 @@ namespace OpenSim.Tests.Common.Mock
         public InventoryItemBase queryInventoryItem(UUID item)
         {
             return null;
-        }        
+        }
 
         public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) { return null; }
     }
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index f7eda68..01b5203 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -31,7 +31,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Tests.Common.Mock
-{       
+{
     /// <summary>
     /// Land channel for test purposes
     /// </summary>
@@ -40,7 +40,7 @@ namespace OpenSim.Tests.Common.Mock
         public List<ILandObject> ParcelsNearPoint(Vector3 position) { return null; }
         public List<ILandObject> AllParcels() { return null; }
         public ILandObject GetLandObject(int x, int y) { return null; }
-        public ILandObject GetLandObject(int localID) { return null; }        
+        public ILandObject GetLandObject(int localID) { return null; }
         public ILandObject GetLandObject(float x, float y) { return null; }
         public bool IsLandPrimCountTainted() { return false; }
         public bool IsForcefulBansAllowed() { return false; }
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 3fc22ba..22cfa2c 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -35,9 +35,9 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Tests.Common.Mock
-{        
+{
     public class TestScene : Scene
-    {        
+    {
         public TestScene(
             RegionInfo regInfo, AgentCircuitManager authen,
             CommunicationsManager commsMan, SceneCommunicationService sceneGridService, StorageManager storeManager,
@@ -60,7 +60,7 @@ namespace OpenSim.Tests.Common.Mock
         {
             reason = String.Empty;
             return true;
-        }        
+        }
             
         public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
         {