Merge branch 'SledjChisl'

16 files changed, 652 insertions, 180 deletions

diff --git a/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs b/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs
index cb4fb80..d0430ff 100644
--- a/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs
+++ b/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Tests.Common
     {
         protected Dictionary<UUID, AssetBase> Assets = new Dictionary<UUID, AssetBase>();
 
-        public AssetBase FetchAsset(UUID uuid) 
+        public AssetBase FetchAsset(UUID uuid)
         {
             if (AssetsExist(new[] { uuid })[0])
                 return Assets[uuid];
@@ -44,17 +44,17 @@ namespace OpenSim.Tests.Common
                 return null;
         }
 
-        public void CreateAsset(AssetBase asset) 
+        public void CreateAsset(AssetBase asset)
         {
             Assets[asset.FullID] = asset;
         }
 
-        public void UpdateAsset(AssetBase asset) 
+        public void UpdateAsset(AssetBase asset)
         {
             CreateAsset(asset);
         }
 
-        public bool[] AssetsExist(UUID[] uuids) 
+        public bool[] AssetsExist(UUID[] uuids)
         {
             return Array.ConvertAll(uuids, id => Assets.ContainsKey(id));
         }
diff --git a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
index dddf75d..aaf61e7 100644
--- a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
@@ -54,9 +54,10 @@ namespace OpenSim.Tests.Common
             return assets.Find(x=>x.FullID == uuid);
         }
 
-        public void StoreAsset(AssetBase asset)
+        public bool StoreAsset(AssetBase asset)
         {
             assets.Add(asset);
+            return true;
         }
 
         public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }
diff --git a/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs b/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs
index 7f530d0..e9deac7 100644
--- a/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs
+++ b/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs
@@ -85,8 +85,8 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public UUID CreateGroup(UUID requestingAgentID, string name, string charter, bool showInList, UUID insigniaID, 
-                                int membershipFee, bool openEnrollment, bool allowPublish, 
+        public UUID CreateGroup(UUID requestingAgentID, string name, string charter, bool showInList, UUID insigniaID,
+                                int membershipFee, bool openEnrollment, bool allowPublish,
                                 bool maturePublish, UUID founderID)
         {
             XGroup group = new XGroup()
@@ -118,13 +118,13 @@ namespace OpenSim.Tests.Common
             }
         }
 
-        public void UpdateGroup(UUID requestingAgentID, UUID groupID, string charter, bool showInList, 
-                                UUID insigniaID, int membershipFee, bool openEnrollment, 
+        public void UpdateGroup(UUID requestingAgentID, UUID groupID, string charter, bool showInList,
+                                UUID insigniaID, int membershipFee, bool openEnrollment,
                                 bool allowPublish, bool maturePublish)
         {
         }
 
-        public void AddGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, 
+        public void AddGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description,
                                  string title, ulong powers)
         {
         }
@@ -133,7 +133,7 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public void UpdateGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, 
+        public void UpdateGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description,
                                     string title, ulong powers)
         {
         }
@@ -144,7 +144,7 @@ namespace OpenSim.Tests.Common
 
 
             if (group == null)
-                m_log.DebugFormat("[MOCK GROUPS SERVICES CONNECTOR]: No group found with ID {0}", groupID);               
+                m_log.DebugFormat("[MOCK GROUPS SERVICES CONNECTOR]: No group found with ID {0}", groupID);
 
             return group;
         }
@@ -152,7 +152,7 @@ namespace OpenSim.Tests.Common
         public GroupRecord GetGroupRecord(UUID requestingAgentID, UUID groupID, string groupName)
         {
             m_log.DebugFormat(
-                "[MOCK GROUPS SERVICES CONNECTOR]: Processing GetGroupRecord() for groupID {0}, name {1}", 
+                "[MOCK GROUPS SERVICES CONNECTOR]: Processing GetGroupRecord() for groupID {0}, name {1}",
                 groupID, groupName);
 
             XGroup xg = GetXGroup(groupID, groupName);
@@ -194,7 +194,7 @@ namespace OpenSim.Tests.Common
         public void SetAgentGroupInfo(UUID requestingAgentID, UUID agentID, UUID groupID, bool acceptNotices, bool listInProfile)
         {
             m_log.DebugFormat(
-                "[MOCK GROUPS SERVICES CONNECTOR]: SetAgentGroupInfo, requestingAgentID {0}, agentID {1}, groupID {2}, acceptNotices {3}, listInProfile {4}", 
+                "[MOCK GROUPS SERVICES CONNECTOR]: SetAgentGroupInfo, requestingAgentID {0}, agentID {1}, groupID {2}, acceptNotices {3}, listInProfile {4}",
                 requestingAgentID, agentID, groupID, acceptNotices, listInProfile);
 
             XGroup group = GetXGroup(groupID, null);
@@ -228,7 +228,7 @@ namespace OpenSim.Tests.Common
         public void AddAgentToGroup(UUID requestingAgentID, UUID agentID, UUID groupID, UUID roleID)
         {
             m_log.DebugFormat(
-                "[MOCK GROUPS SERVICES CONNECTOR]: AddAgentToGroup, requestingAgentID {0}, agentID {1}, groupID {2}, roleID {3}", 
+                "[MOCK GROUPS SERVICES CONNECTOR]: AddAgentToGroup, requestingAgentID {0}, agentID {1}, groupID {2}, roleID {3}",
                 requestingAgentID, agentID, groupID, roleID);
 
             XGroup group = GetXGroup(groupID, null);
@@ -348,7 +348,7 @@ namespace OpenSim.Tests.Common
 
             return notices;
         }
-        
+
         public GroupNoticeInfo GetGroupNotice(UUID requestingAgentID, UUID noticeID)
         {
             m_log.DebugFormat(
@@ -378,14 +378,14 @@ namespace OpenSim.Tests.Common
                     return gni;
                 }
             }
-           
+
             return null;
         }
-        
+
         public void AddGroupNotice(UUID requestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket)
         {
             m_log.DebugFormat(
-                "[MOCK GROUPS SERVICES CONNECTOR]: AddGroupNotice, requestingAgentID {0}, groupID {1}, noticeID {2}, fromName {3}, subject {4}, message {5}, binaryBucket.Length {6}", 
+                "[MOCK GROUPS SERVICES CONNECTOR]: AddGroupNotice, requestingAgentID {0}, groupID {1}, noticeID {2}, fromName {3}, subject {4}, message {5}, binaryBucket.Length {6}",
                 requestingAgentID, groupID, noticeID, fromName, subject, message, binaryBucket.Length);
 
             XGroup group = GetXGroup(groupID, null);
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 5df8e04..a73a0b8 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -74,6 +74,11 @@ namespace OpenSim.Data.Null
             m_store.StoreTerrain(terrain, regionID);
         }
 
+        public void StoreBakedTerrain(TerrainData terrain, UUID regionID)
+        {
+            m_store.StoreBakedTerrain(terrain, regionID);
+        }
+
         public double[,] LoadTerrain(UUID regionID)
         {
             return m_store.LoadTerrain(regionID);
@@ -84,6 +89,11 @@ namespace OpenSim.Data.Null
             return m_store.LoadTerrain(regionID, pSizeX, pSizeY, pSizeZ);
         }
 
+        public TerrainData LoadBakedTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
+        {
+            return m_store.LoadBakedTerrain(regionID, pSizeX, pSizeY, pSizeZ);
+        }
+
         public void StoreLandObject(ILandObject Parcel)
         {
             m_store.StoreLandObject(Parcel);
@@ -138,6 +148,11 @@ namespace OpenSim.Data.Null
             m_store.RemoveRegionEnvironmentSettings(regionUUID);
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
@@ -159,14 +174,15 @@ namespace OpenSim.Data.Null
     public class NullDataStore : ISimulationDataStore
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Dictionary<UUID, RegionSettings> m_regionSettings = new Dictionary<UUID, RegionSettings>();
         protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>();
-        protected Dictionary<UUID, ICollection<TaskInventoryItem>> m_primItems 
+        protected Dictionary<UUID, ICollection<TaskInventoryItem>> m_primItems
             = new Dictionary<UUID, ICollection<TaskInventoryItem>>();
         protected Dictionary<UUID, TerrainData> m_terrains = new Dictionary<UUID, TerrainData>();
+        protected Dictionary<UUID, TerrainData> m_bakedterrains = new Dictionary<UUID, TerrainData>();
         protected Dictionary<UUID, LandData> m_landData = new Dictionary<UUID, LandData>();
-        
+
         public void Initialise(string dbfile)
         {
             return;
@@ -180,14 +196,14 @@ namespace OpenSim.Data.Null
         {
             m_regionSettings[rs.RegionUUID] = rs;
         }
-        
+
         public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
             //This connector doesn't support the windlight module yet
             //Return default LL windlight settings
             return new RegionLightShareData();
         }
-        
+
         public void RemoveRegionWindlightSettings(UUID regionID)
         {
         }
@@ -222,7 +238,7 @@ namespace OpenSim.Data.Null
 
             if (rs == null)
                 rs = new RegionSettings();
-            
+
             return rs;
         }
 
@@ -234,9 +250,9 @@ namespace OpenSim.Data.Null
             foreach (SceneObjectPart prim in obj.Parts)
             {
 //                m_log.DebugFormat(
-//                    "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}", 
+//                    "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}",
 //                    prim.Name, prim.UUID, obj.Name, obj.UUID, regionUUID);
-                            
+
                 m_sceneObjectParts[prim.UUID] = prim;
             }
         }
@@ -250,7 +266,7 @@ namespace OpenSim.Data.Null
                 if (part.ParentGroup.UUID == obj)
                 {
 //                    m_log.DebugFormat(
-//                        "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}", 
+//                        "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}",
 //                        part.Name, part.UUID, obj, regionUUID);
                     m_sceneObjectParts.Remove(part.UUID);
                 }
@@ -265,7 +281,7 @@ namespace OpenSim.Data.Null
         public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
         {
             Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
-            
+
             // Create all of the SOGs from the root prims first
             foreach (SceneObjectPart prim in m_sceneObjectParts.Values)
             {
@@ -302,10 +318,10 @@ namespace OpenSim.Data.Null
                     }
                 }
             }
-            
+
             // TODO: Load items.  This is assymetric - we store items as a separate method but don't retrieve them that
             // way!
-            
+
             return new List<SceneObjectGroup>(objects.Values);
         }
 
@@ -314,6 +330,11 @@ namespace OpenSim.Data.Null
             m_terrains[regionID] = ter;
         }
 
+        public void StoreBakedTerrain(TerrainData ter, UUID regionID)
+        {
+            m_bakedterrains[regionID] = ter;
+        }
+
         public void StoreTerrain(double[,] ter, UUID regionID)
         {
             m_terrains[regionID] = new HeightmapTerrainData(ter);
@@ -327,6 +348,14 @@ namespace OpenSim.Data.Null
                 return null;
         }
 
+        public TerrainData LoadBakedTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
+        {
+            if (m_bakedterrains.ContainsKey(regionID))
+                return m_bakedterrains[regionID];
+            else
+                return null;
+        }
+
         public double[,] LoadTerrain(UUID regionID)
         {
             if (m_terrains.ContainsKey(regionID))
@@ -355,6 +384,11 @@ namespace OpenSim.Data.Null
         {
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
diff --git a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
index d7a144c..9d426f6 100644
--- a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
+++ b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
@@ -40,7 +40,7 @@ using OpenSim.Region.ScriptEngine.Shared;
 namespace OpenSim.Tests.Common
 {
     public class MockScriptEngine : INonSharedRegionModule, IScriptModule, IScriptEngine
-    {      
+    {
         public IConfigSource ConfigSource { get; private set; }
 
         public IConfig Config { get; private set; }
@@ -89,7 +89,7 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public string Name { get { return "Mock Script Engine"; } }        
+        public string Name { get { return "Mock Script Engine"; } }
         public string ScriptEngineName { get { return Name; } }
 
         public Type ReplaceableInterface { get { return null; } }
@@ -200,7 +200,7 @@ namespace OpenSim.Tests.Common
         {
             throw new System.NotImplementedException ();
         }
-       
+
         public IScriptWorkItem QueueEventHandler(object parms)
         {
             throw new System.NotImplementedException ();
@@ -221,7 +221,7 @@ namespace OpenSim.Tests.Common
             throw new System.NotImplementedException ();
         }
 
-        public void SetScriptState(UUID itemID, bool state)
+        public void SetScriptState(UUID itemID, bool state, bool self)
         {
             throw new System.NotImplementedException ();
         }
@@ -258,7 +258,7 @@ namespace OpenSim.Tests.Common
 
         public string[] ScriptReferencedAssemblies { get { throw new System.NotImplementedException (); } }
 
-        public ParameterInfo[] ScriptBaseClassParameters { get { throw new System.NotImplementedException (); } }       
+        public ParameterInfo[] ScriptBaseClassParameters { get { throw new System.NotImplementedException (); } }
 
         public void ClearPostedEvents()
         {
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 0e1bc8f..449716b 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Tests.Common
         public event MoneyTransferRequest OnMoneyTransferRequest;
         public event ParcelBuy OnParcelBuy;
         public event Action<IClientAPI> OnConnectionClosed;
-
+        public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
         public event ImprovedInstantMessage OnInstantMessage;
         public event ChatMessage OnChatFromClient;
         public event TextureRequest OnRequestTexture;
@@ -105,6 +105,7 @@ namespace OpenSim.Tests.Common
         public event ObjectDrop OnObjectDrop;
         public event StartAnim OnStartAnim;
         public event StopAnim OnStopAnim;
+        public event ChangeAnim OnChangeAnim;
         public event LinkObjects OnLinkObjects;
         public event DelinkObjects OnDelinkObjects;
         public event RequestMapBlocks OnRequestMapBlocks;
@@ -117,6 +118,7 @@ namespace OpenSim.Tests.Common
         public event SetAlwaysRun OnSetAlwaysRun;
 
         public event DeRezObject OnDeRezObject;
+        public event RezRestoreToWorld OnRezRestoreToWorld;
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall1 OnRequestWearables;
         public event Action<IClientAPI, bool> OnCompleteMovementToRegion;
@@ -153,6 +155,7 @@ namespace OpenSim.Tests.Common
         public event GenericCall7 OnObjectMaterial;
         public event UpdatePrimFlags OnUpdatePrimFlags;
         public event UpdatePrimTexture OnUpdatePrimTexture;
+        public event ClientChangeObject onClientChangeObject;
         public event UpdateVector OnUpdatePrimGroupPosition;
         public event UpdateVector OnUpdatePrimSinglePosition;
         public event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -295,7 +298,7 @@ namespace OpenSim.Tests.Common
         public event ClassifiedInfoRequest OnClassifiedInfoRequest;
         public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
         public event ClassifiedDelete OnClassifiedDelete;
-        public event ClassifiedDelete OnClassifiedGodDelete;
+        public event ClassifiedGodDelete OnClassifiedGodDelete;
 
         public event EventNotificationAddRequest OnEventNotificationAddRequest;
         public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -318,7 +321,7 @@ namespace OpenSim.Tests.Common
         public event AvatarInterestUpdate OnAvatarInterestUpdate;
 
         public event PlacesQuery OnPlacesQuery;
-        
+
         public event FindAgentUpdate OnFindAgent;
         public event TrackAgentUpdate OnTrackAgent;
         public event NewUserReport OnUserReport;
@@ -334,11 +337,12 @@ namespace OpenSim.Tests.Common
         public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
         public event SimWideDeletesDelegate OnSimWideDeletes;
         public event SendPostcard OnSendPostcard;
+        public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
         public event MuteListEntryUpdate OnUpdateMuteListEntry;
         public event MuteListEntryRemove OnRemoveMuteListEntry;
         public event GodlikeMessage onGodlikeMessage;
         public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
-
+        public event GenericCall2 OnUpdateThrottles;
 #pragma warning restore 67
 
         /// <value>
@@ -387,6 +391,8 @@ namespace OpenSim.Tests.Common
             get { return FirstName + " " + LastName; }
         }
 
+        public int PingTimeMS { get { return 0; } }
+
         public bool IsActive
         {
             get { return true; }
@@ -398,16 +404,19 @@ namespace OpenSim.Tests.Common
         public UUID ActiveGroupId
         {
             get { return UUID.Zero; }
+            set { }
         }
 
         public string ActiveGroupName
         {
             get { return String.Empty; }
+            set { }
         }
 
         public ulong ActiveGroupPowers
         {
             get { return 0; }
+            set { }
         }
 
         public bool IsGroupMember(UUID groupID)
@@ -415,6 +424,13 @@ namespace OpenSim.Tests.Common
             return false;
         }
 
+        public Dictionary<UUID, ulong> GetGroupPowers()
+        {
+            return new Dictionary<UUID, ulong>();
+        }
+
+        public void SetGroupPowers(Dictionary<UUID, ulong> powers) { }
+
         public ulong GetGroupPowers(UUID groupID)
         {
             return 0;
@@ -448,6 +464,8 @@ namespace OpenSim.Tests.Common
             get { return new IPEndPoint(IPAddress.Loopback, (ushort)m_circuitCode); }
         }
 
+        public List<uint> SelectedObjects {get; private set;}
+
         /// <summary>
         /// Constructor
         /// </summary>
@@ -570,10 +588,27 @@ namespace OpenSim.Tests.Common
             ReceivedKills.AddRange(localID);
         }
 
+        public void SendPartFullUpdate(ISceneEntity ent, uint? parentID)
+        {
+        }
+
         public virtual void SetChildAgentThrottle(byte[] throttle)
         {
         }
 
+        public virtual void SetChildAgentThrottle(byte[] throttle, float factor)
+        {
+        }
+
+        public void SetAgentThrottleSilent(int throttle, int setting)
+        {
+        }
+
+        public int GetAgentThrottleSilent(int throttle)
+        {
+            return 0;
+        }
+
         public byte[] GetThrottlesPacked(float multiplier)
         {
             return new byte[0];
@@ -608,6 +643,11 @@ namespace OpenSim.Tests.Common
 
         }
 
+        public virtual bool CanSendLayerData()
+        {
+            return false;
+        }
+
         public virtual void SendLayerData(float[] map)
         {
         }
@@ -619,9 +659,9 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public virtual void SendWindData(Vector2[] windSpeeds) { }
+        public virtual void SendWindData(int version, Vector2[] windSpeeds) { }
 
-        public virtual void SendCloudData(float[] cloudCover) { }
+        public virtual void SendCloudData(int version, float[] cloudCover) { }
 
         public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
         {
@@ -633,7 +673,7 @@ namespace OpenSim.Tests.Common
         {
             AgentCircuitData agentData = new AgentCircuitData();
             agentData.AgentID = AgentId;
-            agentData.SessionID = SessionId; 
+            agentData.SessionID = SessionId;
             agentData.SecureSessionID = UUID.Zero;
             agentData.circuitcode = m_circuitCode;
             agentData.child = false;
@@ -673,7 +713,7 @@ namespace OpenSim.Tests.Common
         public virtual void SendTeleportFailed(string reason)
         {
             m_log.DebugFormat(
-                "[TEST CLIENT]: Teleport failed for {0} {1} on {2} with reason {3}", 
+                "[TEST CLIENT]: Teleport failed for {0} {1} on {2} with reason {3}",
                 m_firstName, m_lastName, m_scene.Name, reason);
         }
 
@@ -720,7 +760,11 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public void SendAvatarDataImmediate(ISceneEntity avatar)
+        public void SendEntityFullUpdateImmediate(ISceneEntity ent)
+        {
+        }
+
+        public void SendEntityTerseUpdateImmediate(ISceneEntity ent)
         {
         }
 
@@ -741,7 +785,7 @@ namespace OpenSim.Tests.Common
         public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID,
                                                        List<InventoryItemBase> items,
                                                        List<InventoryFolderBase> folders,
-                                                       int version, 
+                                                       int version,
                                                        bool fetchFolders,
                                                        bool fetchItems)
         {
@@ -755,6 +799,10 @@ namespace OpenSim.Tests.Common
         {
         }
 
+        public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
+        {
+        }
+
         public virtual void SendRemoveInventoryItem(UUID itemID)
         {
         }
@@ -771,7 +819,7 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data)
+        public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
         {
         }
 
@@ -817,6 +865,10 @@ namespace OpenSim.Tests.Common
         {
         }
 
+        public void SendAlertMessage(string message, string info)
+        {
+        }
+
         public void SendSystemAlertMessage(string message)
         {
         }
@@ -833,7 +885,7 @@ namespace OpenSim.Tests.Common
                 OnRegionHandShakeReply(this);
             }
         }
-        
+
         public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
         {
         }
@@ -910,8 +962,13 @@ namespace OpenSim.Tests.Common
             ReceivedOnlineNotifications.AddRange(agentIDs);
         }
 
-        public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot,
-                                        Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
+        public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY)
+        {
+        }
+
+        public void SendSitResponse(UUID TargetID, Vector3 OffsetPos,
+                        Quaternion SitOrientation, bool autopilot,
+                        Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
         {
         }
 
@@ -937,7 +994,7 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
+        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] membershipType,
                                          string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL,
                                          UUID partnerID)
         {
@@ -966,10 +1023,10 @@ namespace OpenSim.Tests.Common
 
         public void Close()
         {
-            Close(false);
+            Close(true, false);
         }
 
-        public void Close(bool force)
+        public void Close(bool sendStop, bool force)
         {
             // Fire the callback for this connection closing
             // This is necesary to get the presence detector to notice that a client has logged out.
@@ -1175,6 +1232,10 @@ namespace OpenSim.Tests.Common
         {
         }
 
+        public void SendAgentGroupDataUpdate(UUID avatarID, GroupMembershipData[] data)
+        {
+        }
+
         public void SendJoinGroupReply(UUID groupID, bool success)
         {
         }
@@ -1238,14 +1299,30 @@ namespace OpenSim.Tests.Common
         {
         }
 
+        public void UpdateGroupMembership(GroupMembershipData[] data)
+        {
+        }
+
+        public void GroupMembershipRemove(UUID GroupID)
+        {
+        }
+
+        public void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers)
+        {
+        }
+
         public void SendUseCachedMuteList()
         {
         }
 
+        public void SendEmpytMuteList()
+        {
+        }
+
         public void SendMuteListUpdate(string filename)
         {
         }
-        
+
         public void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled)
         {
         }
@@ -1265,7 +1342,7 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public void Disconnect() 
+        public void Disconnect()
         {
         }
 
@@ -1274,19 +1351,19 @@ namespace OpenSim.Tests.Common
             if (OnReceivedSendRebakeAvatarTextures != null)
                 OnReceivedSendRebakeAvatarTextures(textureID);
         }
-        
+
         public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
         {
         }
-        
+
         public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
         {
         }
-        
+
         public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
         {
         }
-        
+
         public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
         {
         }
@@ -1315,9 +1392,12 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public void SendPartPhysicsProprieties(ISceneEntity entity)
+        public void SendSelectedPartsProprieties(List<ISceneEntity> parts)
         {
         }
 
+        public void SendPartPhysicsProprieties(ISceneEntity entity)
+        {
+        }
     }
 }
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
index f2bae58..f2ce064 100644
--- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
+++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Tests.Common
 {
     public class TestEventQueueGetModule : IEventQueue, INonSharedRegionModule
     {
-        public class Event 
+        public class Event
         {
             public string Name { get; set; }
             public object[] Args { get; set; }
@@ -64,7 +64,7 @@ namespace OpenSim.Tests.Common
 
         public void Close() {}
 
-        public void AddRegion(Scene scene) 
+        public void AddRegion(Scene scene)
         {
             Events = new Dictionary<UUID, List<Event>>();
             scene.RegisterModuleInterface<IEventQueue>(this);
@@ -108,12 +108,12 @@ namespace OpenSim.Tests.Common
             AddEvent(avatarID, "Enqueue", o);
             return true;
         }
-
+/*
         public void DisableSimulator(ulong handle, UUID avatarID)
         {
             AddEvent(avatarID, "DisableSimulator", handle);
         }
-
+*/
         public void EnableSimulator (ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
         {
             AddEvent(avatarID, "EnableSimulator", handle);
@@ -138,18 +138,23 @@ namespace OpenSim.Tests.Common
         }
 
         public void ChatterboxInvitation(
-            UUID sessionID, string sessionName, UUID fromAgent, string message, UUID toAgent, string fromName, 
-            byte dialog, uint timeStamp, bool offline, int parentEstateID, Vector3 position, uint ttl, 
+            UUID sessionID, string sessionName, UUID fromAgent, string message, UUID toAgent, string fromName,
+            byte dialog, uint timeStamp, bool offline, int parentEstateID, Vector3 position, uint ttl,
             UUID transactionID, bool fromGroup, byte[] binaryBucket)
         {
             AddEvent(
-                toAgent, "ChatterboxInvitation", sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, 
+                toAgent, "ChatterboxInvitation", sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog,
                 timeStamp, offline, parentEstateID, position, ttl, transactionID, fromGroup, binaryBucket);
         }
 
-        public void ChatterBoxSessionAgentListUpdates (UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, bool isModerator, bool textMute)
+        public void ChatterBoxSessionAgentListUpdates (UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, bool isModerator, bool textMute , bool isEnterorLeave)
+        {
+            AddEvent(toAgent, "ChatterBoxSessionAgentListUpdates", sessionID, fromAgent, canVoiceChat, isModerator, textMute, isEnterorLeave);
+        }
+
+        public void ChatterBoxForceClose (UUID toAgent, UUID sessionID, string reason)
         {
-            AddEvent(toAgent, "ChatterBoxSessionAgentListUpdates", sessionID, fromAgent, canVoiceChat, isModerator, textMute);
+            AddEvent(toAgent, "ForceCloseChatterBoxSession", sessionID, reason);
         }
 
         public void ParcelProperties (OpenMetaverse.Messages.Linden.ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID)
@@ -157,9 +162,9 @@ namespace OpenSim.Tests.Common
             AddEvent(avatarID, "ParcelProperties", parcelPropertiesMessage);
         }
 
-        public void GroupMembership (OpenMetaverse.Packets.AgentGroupDataUpdatePacket groupUpdate, UUID avatarID)
+        public void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data)
         {
-            AddEvent(avatarID, "GroupMembership", groupUpdate);
+            AddEvent(receiverAgent, "AgentGroupDataUpdate", data);
         }
 
         public OSD ScriptRunningEvent (UUID objectID, UUID itemID, bool running, bool mono)
diff --git a/OpenSim/Tests/Common/Mock/TestGroupsDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestGroupsDataPlugin.cs
new file mode 100644
index 0000000..8e2d8e6
--- /dev/null
+++ b/OpenSim/Tests/Common/Mock/TestGroupsDataPlugin.cs
@@ -0,0 +1,339 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using OpenMetaverse;
+using OpenSim.Data;
+
+namespace OpenSim.Tests.Common.Mock
+{
+    public class TestGroupsDataPlugin : IGroupsData
+    {
+        class CompositeKey
+        {
+            private readonly string _key;
+            public string Key
+            {
+                get { return _key;  }
+            }
+
+            public CompositeKey(UUID _k1, string _k2)
+            {
+                _key = _k1.ToString() + _k2;
+            }
+
+            public CompositeKey(UUID _k1, string _k2, string _k3)
+            {
+                _key = _k1.ToString() + _k2 + _k3;
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (obj is CompositeKey)
+                {
+                    return Key == ((CompositeKey)obj).Key;
+                }
+                return false;
+            }
+
+            public override int GetHashCode()
+            {
+                return base.GetHashCode();
+            }
+
+            public override string ToString()
+            {
+                return Key;
+            }
+        }
+
+        private Dictionary<UUID, GroupData> m_Groups;
+        private Dictionary<CompositeKey, MembershipData> m_Membership;
+        private Dictionary<CompositeKey, RoleData> m_Roles;
+        private Dictionary<CompositeKey, RoleMembershipData> m_RoleMembership;
+        private Dictionary<UUID, InvitationData> m_Invites;
+        private Dictionary<UUID, NoticeData> m_Notices;
+        private Dictionary<string, PrincipalData> m_Principals;
+
+        public TestGroupsDataPlugin(string connectionString, string realm)
+        {
+            m_Groups = new Dictionary<UUID, GroupData>();
+            m_Membership = new Dictionary<CompositeKey, MembershipData>();
+            m_Roles = new Dictionary<CompositeKey, RoleData>();
+            m_RoleMembership = new Dictionary<CompositeKey, RoleMembershipData>();
+            m_Invites = new Dictionary<UUID, InvitationData>();
+            m_Notices = new Dictionary<UUID, NoticeData>();
+            m_Principals = new Dictionary<string, PrincipalData>();
+        }
+
+        #region groups table
+        public bool StoreGroup(GroupData data)
+        {
+            return false;
+        }
+
+        public GroupData RetrieveGroup(UUID groupID)
+        {
+            if (m_Groups.ContainsKey(groupID))
+                return m_Groups[groupID];
+
+            return null;
+        }
+
+        public GroupData RetrieveGroup(string name)
+        {
+            return m_Groups.Values.First(g => g.Data.ContainsKey("Name") && g.Data["Name"] == name);
+        }
+
+        public GroupData[] RetrieveGroups(string pattern)
+        {
+            if (string.IsNullOrEmpty(pattern))
+                pattern = "1";
+
+            IEnumerable<GroupData> groups = m_Groups.Values.Where(g => g.Data.ContainsKey("Name") && (g.Data["Name"].StartsWith(pattern) || g.Data["Name"].EndsWith(pattern)));
+
+            return (groups != null) ? groups.ToArray() : new GroupData[0];
+        }
+
+        public bool DeleteGroup(UUID groupID)
+        {
+            return m_Groups.Remove(groupID);
+        }
+
+        public int GroupsCount()
+        {
+            return m_Groups.Count;
+        }
+        #endregion
+
+        #region membership table
+        public MembershipData RetrieveMember(UUID groupID, string pricipalID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, pricipalID);
+            if (m_Membership.ContainsKey(dkey))
+                return m_Membership[dkey];
+
+            return null;
+        }
+
+        public MembershipData[] RetrieveMembers(UUID groupID)
+        {
+            IEnumerable<CompositeKey> keys = m_Membership.Keys.Where(k => k.Key.StartsWith(groupID.ToString()));
+            return keys.Where(m_Membership.ContainsKey).Select(x => m_Membership[x]).ToArray();
+        }
+
+        public MembershipData[] RetrieveMemberships(string principalID)
+        {
+            IEnumerable<CompositeKey> keys = m_Membership.Keys.Where(k => k.Key.EndsWith(principalID.ToString()));
+            return keys.Where(m_Membership.ContainsKey).Select(x => m_Membership[x]).ToArray();
+        }
+
+        public MembershipData[] RetrievePrincipalGroupMemberships(string principalID)
+        {
+            return RetrieveMemberships(principalID);
+        }
+
+        public MembershipData RetrievePrincipalGroupMembership(string principalID, UUID groupID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, principalID);
+            if (m_Membership.ContainsKey(dkey))
+                return m_Membership[dkey];
+            return null;
+        }
+
+        public bool StoreMember(MembershipData data)
+        {
+            CompositeKey dkey = new CompositeKey(data.GroupID, data.PrincipalID);
+            m_Membership[dkey] = data;
+            return true;
+        }
+
+        public bool DeleteMember(UUID groupID, string principalID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, principalID);
+            if (m_Membership.ContainsKey(dkey))
+                return m_Membership.Remove(dkey);
+
+            return false;
+        }
+
+        public int MemberCount(UUID groupID)
+        {
+            return m_Membership.Count;
+        }
+        #endregion
+
+        #region roles table
+        public bool StoreRole(RoleData data)
+        {
+            CompositeKey dkey = new CompositeKey(data.GroupID, data.RoleID.ToString());
+            m_Roles[dkey] = data;
+            return true;
+        }
+
+        public RoleData RetrieveRole(UUID groupID, UUID roleID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, roleID.ToString());
+            if (m_Roles.ContainsKey(dkey))
+                return m_Roles[dkey];
+
+            return null;
+        }
+
+        public RoleData[] RetrieveRoles(UUID groupID)
+        {
+            IEnumerable<CompositeKey> keys = m_Roles.Keys.Where(k => k.Key.StartsWith(groupID.ToString()));
+            return keys.Where(m_Roles.ContainsKey).Select(x => m_Roles[x]).ToArray();
+        }
+
+        public bool DeleteRole(UUID groupID, UUID roleID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, roleID.ToString());
+            if (m_Roles.ContainsKey(dkey))
+                return m_Roles.Remove(dkey);
+
+            return false;
+        }
+
+        public int RoleCount(UUID groupID)
+        {
+            return m_Roles.Count;
+        }
+        #endregion
+
+        #region rolememberhip table
+        public RoleMembershipData[] RetrieveRolesMembers(UUID groupID)
+        {
+            IEnumerable<CompositeKey> keys = m_Roles.Keys.Where(k => k.Key.StartsWith(groupID.ToString()));
+            return keys.Where(m_RoleMembership.ContainsKey).Select(x => m_RoleMembership[x]).ToArray();
+        }
+
+        public RoleMembershipData[] RetrieveRoleMembers(UUID groupID, UUID roleID)
+        {
+            IEnumerable<CompositeKey> keys = m_Roles.Keys.Where(k => k.Key.StartsWith(groupID.ToString() + roleID.ToString()));
+            return keys.Where(m_RoleMembership.ContainsKey).Select(x => m_RoleMembership[x]).ToArray();
+        }
+
+        public RoleMembershipData[] RetrieveMemberRoles(UUID groupID, string principalID)
+        {
+            IEnumerable<CompositeKey> keys = m_Roles.Keys.Where(k => k.Key.StartsWith(groupID.ToString()) && k.Key.EndsWith(principalID));
+            return keys.Where(m_RoleMembership.ContainsKey).Select(x => m_RoleMembership[x]).ToArray();
+        }
+
+        public RoleMembershipData RetrieveRoleMember(UUID groupID, UUID roleID, string principalID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, roleID.ToString(), principalID);
+            if (m_RoleMembership.ContainsKey(dkey))
+                return m_RoleMembership[dkey];
+
+            return null;
+        }
+
+        public int RoleMemberCount(UUID groupID, UUID roleID)
+        {
+            return m_RoleMembership.Count;
+        }
+
+        public bool StoreRoleMember(RoleMembershipData data)
+        {
+            CompositeKey dkey = new CompositeKey(data.GroupID, data.RoleID.ToString(), data.PrincipalID);
+            m_RoleMembership[dkey] = data;
+            return true;
+        }
+
+        public bool DeleteRoleMember(RoleMembershipData data)
+        {
+            CompositeKey dkey = new CompositeKey(data.GroupID, data.RoleID.ToString(), data.PrincipalID);
+            if (m_RoleMembership.ContainsKey(dkey))
+                return m_RoleMembership.Remove(dkey);
+
+            return false;
+        }
+
+        public bool DeleteMemberAllRoles(UUID groupID, string principalID)
+        {
+            List<CompositeKey> keys = m_RoleMembership.Keys.Where(k => k.Key.StartsWith(groupID.ToString()) && k.Key.EndsWith(principalID)).ToList();
+            foreach (CompositeKey k in keys)
+                m_RoleMembership.Remove(k);
+            return true;
+        }
+        #endregion
+
+        #region principals table
+        public bool StorePrincipal(PrincipalData data)
+        {
+            m_Principals[data.PrincipalID] = data;
+            return true;
+        }
+
+        public PrincipalData RetrievePrincipal(string principalID)
+        {
+            if (m_Principals.ContainsKey(principalID))
+                return m_Principals[principalID];
+
+            return null;
+        }
+
+        public bool DeletePrincipal(string principalID)
+        {
+            if (m_Principals.ContainsKey(principalID))
+                return m_Principals.Remove(principalID);
+            return false;
+        }
+        #endregion
+
+        #region invites table
+        public bool StoreInvitation(InvitationData data)
+        {
+            return false;
+        }
+
+        public InvitationData RetrieveInvitation(UUID inviteID)
+        {
+            return null;
+        }
+
+        public InvitationData RetrieveInvitation(UUID groupID, string principalID)
+        {
+            return null;
+        }
+
+        public bool DeleteInvite(UUID inviteID)
+        {
+            return false;
+        }
+
+        public void DeleteOldInvites()
+        {
+        }
+        #endregion
+
+        #region notices table
+        public bool StoreNotice(NoticeData data)
+        {
+            return false;
+        }
+
+        public NoticeData RetrieveNotice(UUID noticeID)
+        {
+            return null;
+        }
+
+        public NoticeData[] RetrieveNotices(UUID groupID)
+        {
+            return new NoticeData[0];
+        }
+
+        public bool DeleteNotice(UUID noticeID)
+        {
+            return false;
+        }
+
+        public void DeleteOldNotices()
+        {
+        }
+        #endregion
+
+    }
+}
diff --git a/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs b/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs
index 5a55b09..7b20b8c 100644
--- a/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs
+++ b/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs
@@ -36,13 +36,14 @@ using OpenSim.Framework;
 
 namespace OpenSim.Tests.Common
 {
+/*
     public class TestHttpClientContext: IHttpClientContext
     {
         /// <summary>
         /// Bodies of responses from the server.
         /// </summary>
         public string ResponseBody
-        { 
+        {
             get { return Encoding.UTF8.GetString(m_responseStream.ToArray()); }
         }
 
@@ -55,8 +56,8 @@ namespace OpenSim.Tests.Common
 
         public bool IsSecured { get; set; }
 
-        public bool Secured 
-        { 
+        public bool Secured
+        {
             get { return IsSecured; }
             set { IsSecured = value; }
         }
@@ -66,7 +67,7 @@ namespace OpenSim.Tests.Common
             Secured = secured;
         }
 
-        public void Disconnect(SocketError error) 
+        public void Disconnect(SocketError error)
         {
 //            Console.WriteLine("TestHttpClientContext.Disconnect Received disconnect with status {0}", error);
         }
@@ -75,18 +76,18 @@ namespace OpenSim.Tests.Common
         public void Respond(string httpVersion, HttpStatusCode statusCode, string reason) {Console.WriteLine("xx");}
         public void Respond(string body) { Console.WriteLine("xxx");}
 
-        public void Send(byte[] buffer) 
+        public void Send(byte[] buffer)
         {
             // Getting header data here
 //            Console.WriteLine("xxxx: Got {0}", Encoding.UTF8.GetString(buffer));
         }
 
-        public void Send(byte[] buffer, int offset, int size) 
+        public void Send(byte[] buffer, int offset, int size)
         {
 //            Util.PrintCallStack();
 //
 //            Console.WriteLine(
-//                "TestHttpClientContext.Send(byte[], int, int) got offset={0}, size={1}, buffer={2}", 
+//                "TestHttpClientContext.Send(byte[], int, int) got offset={0}, size={1}, buffer={2}",
 //                offset, size, Encoding.UTF8.GetString(buffer));
 
             m_responseStream.Write(buffer, offset, size);
@@ -107,4 +108,5 @@ namespace OpenSim.Tests.Common
         /// </summary>
         public event EventHandler<RequestEventArgs> RequestReceived = delegate { };
     }
+*/
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestHttpRequest.cs b/OpenSim/Tests/Common/Mock/TestHttpRequest.cs
index b868895..4c5ea4a 100644
--- a/OpenSim/Tests/Common/Mock/TestHttpRequest.cs
+++ b/OpenSim/Tests/Common/Mock/TestHttpRequest.cs
@@ -33,88 +33,89 @@ using HttpServer.FormDecoders;
 
 namespace OpenSim.Tests.Common
 {
+/*
     public class TestHttpRequest: IHttpRequest
     {
         private string _uriPath;
-        public bool BodyIsComplete 
-        { 
-            get { return true; } 
+        public bool BodyIsComplete
+        {
+            get { return true; }
         }
-        public string[] AcceptTypes 
-        { 
+        public string[] AcceptTypes
+        {
             get {return _acceptTypes; }
         }
         private string[] _acceptTypes;
-        public Stream Body 
-        { 
-            get { return _body; } 
-            set { _body = value;} 
+        public Stream Body
+        {
+            get { return _body; }
+            set { _body = value;}
         }
         private Stream _body;
-        public ConnectionType Connection 
-        { 
+        public ConnectionType Connection
+        {
             get { return _connection; }
             set { _connection = value; }
         }
         private ConnectionType _connection;
-        public int ContentLength 
-        { 
+        public int ContentLength
+        {
             get { return _contentLength; }
             set { _contentLength = value; }
         }
         private int _contentLength;
-        public NameValueCollection Headers 
-        { 
+        public NameValueCollection Headers
+        {
             get { return _headers; }
         }
         private NameValueCollection _headers = new NameValueCollection();
 
         public string HttpVersion { get; set; }
 
-        public string Method 
-        { 
+        public string Method
+        {
             get { return _method; }
             set { _method = value; }
         }
         private string _method = null;
-        public HttpInput QueryString 
-        { 
+        public HttpInput QueryString
+        {
             get { return _queryString;  }
         }
         private HttpInput _queryString = null;
-        public Uri Uri 
-        { 
+        public Uri Uri
+        {
             get { return _uri; }
-            set { _uri = value; } 
+            set { _uri = value; }
         }
         private Uri _uri = null;
-        public string[] UriParts 
-        { 
+        public string[] UriParts
+        {
             get { return _uri.Segments; }
         }
-        public HttpParam Param 
-        { 
-            get { return null; } 
+        public HttpParam Param
+        {
+            get { return null; }
         }
-        public HttpForm Form 
-        { 
-            get { return null; } 
+        public HttpForm Form
+        {
+            get { return null; }
         }
-        public bool IsAjax 
-        { 
-            get { return false; } 
+        public bool IsAjax
+        {
+            get { return false; }
         }
-        public RequestCookies Cookies 
-        { 
-            get { return null; } 
+        public RequestCookies Cookies
+        {
+            get { return null; }
         }
 
-        public TestHttpRequest() 
+        public TestHttpRequest()
         {
             HttpVersion = "HTTP/1.1";
         }
 
-        public TestHttpRequest(string contentEncoding, string contentType, string userAgent, 
+        public TestHttpRequest(string contentEncoding, string contentType, string userAgent,
                                string remoteAddr, string remotePort, string[] acceptTypes,
                                ConnectionType connectionType, int contentLength, Uri uri) : base()
         {
@@ -136,7 +137,7 @@ namespace OpenSim.Tests.Common
         {
             _headers.Add(name, value);
         }
-        public int AddToBody(byte[] bytes, int offset, int length) 
+        public int AddToBody(byte[] bytes, int offset, int length)
         {
             return 0;
         }
@@ -167,8 +168,9 @@ namespace OpenSim.Tests.Common
             set
             {
                 _uriPath = value;
-               
+
             }
         }
     }
+*/
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestHttpResponse.cs b/OpenSim/Tests/Common/Mock/TestHttpResponse.cs
index ff47c10..190f6d5 100644
--- a/OpenSim/Tests/Common/Mock/TestHttpResponse.cs
+++ b/OpenSim/Tests/Common/Mock/TestHttpResponse.cs
@@ -33,9 +33,10 @@ using HttpServer;
 
 namespace OpenSim.Tests.Common
 {
+/*
     public class TestHttpResponse: IHttpResponse
     {
-        public Stream Body 
+        public Stream Body
         {
             get { return _body; }
 
@@ -43,14 +44,14 @@ namespace OpenSim.Tests.Common
         }
         private Stream _body;
 
-        public string ProtocolVersion 
-        { 
+        public string ProtocolVersion
+        {
             get { return _protocolVersion; }
             set { _protocolVersion = value; }
         }
         private string _protocolVersion;
 
-        public bool Chunked 
+        public bool Chunked
         {
             get { return _chunked; }
 
@@ -58,7 +59,7 @@ namespace OpenSim.Tests.Common
         }
         private bool _chunked;
 
-        public ConnectionType Connection 
+        public ConnectionType Connection
         {
             get { return _connection; }
 
@@ -66,7 +67,7 @@ namespace OpenSim.Tests.Common
         }
         private ConnectionType _connection;
 
-        public Encoding Encoding 
+        public Encoding Encoding
         {
             get { return _encoding; }
 
@@ -74,7 +75,7 @@ namespace OpenSim.Tests.Common
         }
         private Encoding _encoding;
 
-        public int KeepAlive 
+        public int KeepAlive
         {
             get { return _keepAlive; }
 
@@ -82,7 +83,7 @@ namespace OpenSim.Tests.Common
         }
         private int _keepAlive;
 
-        public HttpStatusCode Status 
+        public HttpStatusCode Status
         {
             get { return _status; }
 
@@ -90,7 +91,7 @@ namespace OpenSim.Tests.Common
         }
         private HttpStatusCode _status;
 
-        public string Reason 
+        public string Reason
         {
             get { return _reason; }
 
@@ -98,7 +99,7 @@ namespace OpenSim.Tests.Common
         }
         private string _reason;
 
-        public long ContentLength 
+        public long ContentLength
         {
             get { return _contentLength; }
 
@@ -106,7 +107,7 @@ namespace OpenSim.Tests.Common
         }
         private long _contentLength;
 
-        public string ContentType 
+        public string ContentType
         {
             get { return _contentType; }
 
@@ -114,19 +115,19 @@ namespace OpenSim.Tests.Common
         }
         private string _contentType;
 
-        public bool HeadersSent 
+        public bool HeadersSent
         {
             get { return _headersSent; }
         }
         private bool _headersSent;
 
-        public bool Sent 
+        public bool Sent
         {
             get { return _sent; }
         }
         private bool _sent;
 
-        public ResponseCookies Cookies 
+        public ResponseCookies Cookies
         {
             get { return _cookies; }
         }
@@ -140,26 +141,26 @@ namespace OpenSim.Tests.Common
 
         public void AddHeader(string name, string value) {}
 
-        public void Send() 
+        public void Send()
         {
             if (!_headersSent) SendHeaders();
             if (_sent) throw new InvalidOperationException("stuff already sent");
             _sent = true;
         }
 
-        public void SendBody(byte[] buffer, int offset, int count) 
+        public void SendBody(byte[] buffer, int offset, int count)
         {
             if (!_headersSent) SendHeaders();
             _sent = true;
         }
 
-        public void SendBody(byte[] buffer) 
+        public void SendBody(byte[] buffer)
         {
             if (!_headersSent) SendHeaders();
             _sent = true;
         }
 
-        public void SendHeaders() 
+        public void SendHeaders()
         {
             if (_headersSent) throw new InvalidOperationException("headers already sent");
             _headersSent = true;
@@ -168,4 +169,5 @@ namespace OpenSim.Tests.Common
         public void Redirect(Uri uri) {}
         public void Redirect(string url) {}
     }
+*/
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index c97a765..0ff6f7f 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Tests.Common
     public class TestInventoryDataPlugin : IInventoryDataPlugin
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         /// <value>
         /// Inventory folders
         /// </value>
@@ -85,9 +85,9 @@ namespace OpenSim.Tests.Common
         public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
         {
 //            InventoryFolderBase folder = m_folders[folderID];
-            
+
 //            m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0} {1}", folder.Name, folder.ID);
-            
+
             List<InventoryItemBase> items = new List<InventoryItemBase>();
 
             foreach (InventoryItemBase item in m_items.Values)
@@ -98,7 +98,7 @@ namespace OpenSim.Tests.Common
                     items.Add(item);
                 }
             }
-            
+
             return items;
         }
 
@@ -107,7 +107,7 @@ namespace OpenSim.Tests.Common
         public InventoryFolderBase getUserRootFolder(UUID user)
         {
 //            m_log.DebugFormat("[MOCK INV DB]: Looking for root folder for {0}", user);
-            
+
             InventoryFolderBase folder = null;
             m_rootFolders.TryGetValue(user, out folder);
 
@@ -117,9 +117,9 @@ namespace OpenSim.Tests.Common
         public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
         {
 //            InventoryFolderBase parentFolder = m_folders[parentID];
-            
+
 //            m_log.DebugFormat("[MOCK INV DB]: Getting folders in folder {0} {1}", parentFolder.Name, parentFolder.ID);
-            
+
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
 
             foreach (InventoryFolderBase folder in m_folders.Values)
@@ -127,9 +127,9 @@ namespace OpenSim.Tests.Common
                 if (folder.ParentID == parentID)
                 {
 //                    m_log.DebugFormat(
-//                        "[MOCK INV DB]: Found folder {0} {1} in {2} {3}", 
+//                        "[MOCK INV DB]: Found folder {0} {1} in {2} {3}",
 //                        folder.Name, folder.ID, parentFolder.Name, parentFolder.ID);
-                    
+
                     folders.Add(folder);
                 }
             }
@@ -153,9 +153,9 @@ namespace OpenSim.Tests.Common
         public void addInventoryFolder(InventoryFolderBase folder)
         {
 //            m_log.DebugFormat(
-//                "[MOCK INV DB]: Adding inventory folder {0} {1} type {2}", 
+//                "[MOCK INV DB]: Adding inventory folder {0} {1} type {2}",
 //                folder.Name, folder.ID, (AssetType)folder.Type);
-            
+
             m_folders[folder.ID] = folder;
 
             if (folder.ParentID == UUID.Zero)
@@ -183,30 +183,30 @@ namespace OpenSim.Tests.Common
                 m_folders.Remove(folderId);
         }
 
-        public void addInventoryItem(InventoryItemBase item) 
+        public void addInventoryItem(InventoryItemBase item)
         {
             InventoryFolderBase folder = m_folders[item.Folder];
-            
+
 //            m_log.DebugFormat(
 //                "[MOCK INV DB]: Adding inventory item {0} {1} in {2} {3}", item.Name, item.ID, folder.Name, folder.ID);
-            
+
             m_items[item.ID] = item;
         }
-        
+
         public void updateInventoryItem(InventoryItemBase item) { addInventoryItem(item); }
-        
-        public void deleteInventoryItem(UUID itemId) 
+
+        public void deleteInventoryItem(UUID itemId)
         {
             if (m_items.ContainsKey(itemId))
                 m_items.Remove(itemId);
         }
-        
-        public InventoryItemBase getInventoryItem(UUID itemId) 
+
+        public InventoryItemBase getInventoryItem(UUID itemId)
         {
             if (m_items.ContainsKey(itemId))
                 return m_items[itemId];
             else
-                return null; 
+                return null;
         }
 
         public InventoryItemBase queryInventoryItem(UUID item)
diff --git a/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs b/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs
index 26887c9..388b56b 100644
--- a/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs
+++ b/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs
@@ -43,8 +43,8 @@ namespace OpenSim.Tests.Common
     {
         public List<Packet> PacketsSent { get; private set; }
 
-        public TestLLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager circuitManager)
-            : base(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager)
+        public TestLLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, IConfigSource configSource, AgentCircuitManager circuitManager)
+            : base(listenIP, ref port, proxyPortOffsetParm, configSource, circuitManager)
         {
             PacketsSent = new List<Packet>();
         }
@@ -73,7 +73,7 @@ namespace OpenSim.Tests.Common
 ////        /// The chunks of data to pass to the LLUDPServer when it calls EndReceive
 ////        /// </summary>
 ////        protected Queue<ChunkSenderTuple> m_chunksToLoad = new Queue<ChunkSenderTuple>();
-//        
+//
 ////        protected override void BeginReceive()
 ////        {
 ////            if (m_chunksToLoad.Count > 0 && m_chunksToLoad.Peek().BeginReceiveException)
@@ -83,29 +83,29 @@ namespace OpenSim.Tests.Common
 ////                throw new SocketException();
 ////            }
 ////        }
-//        
+//
 ////        protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender)
 ////        {
 ////            numBytes = 0;
 ////
 ////            //m_log.Debug("Queue size " + m_chunksToLoad.Count);
-////            
+////
 ////            if (m_chunksToLoad.Count <= 0)
 ////                return false;
-////            
+////
 ////            ChunkSenderTuple tuple = m_chunksToLoad.Dequeue();
 ////            RecvBuffer = tuple.Data;
 ////            numBytes   = tuple.Data.Length;
 ////            epSender   = tuple.Sender;
-////            
+////
 ////            return true;
 ////        }
-//        
+//
 ////        public override void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
 ////        {
 ////            // Don't do anything just yet
 ////        }
-//        
+//
 //        /// <summary>
 //        /// Signal that this chunk should throw an exception on Socket.BeginReceive()
 //        /// </summary>
@@ -116,7 +116,7 @@ namespace OpenSim.Tests.Common
 //            tuple.BeginReceiveException = true;
 //            m_chunksToLoad.Enqueue(tuple);
 //        }
-//        
+//
 //        /// <summary>
 //        /// Load some data to be received by the LLUDPServer on the next receive call
 //        /// </summary>
@@ -126,7 +126,7 @@ namespace OpenSim.Tests.Common
 //        {
 //            m_chunksToLoad.Enqueue(new ChunkSenderTuple(data, epSender));
 //        }
-//        
+//
 //        /// <summary>
 //        /// Load a packet to be received by the LLUDPServer on the next receive call
 //        /// </summary>
@@ -135,7 +135,7 @@ namespace OpenSim.Tests.Common
 //        {
 //            LoadReceive(packet.ToBytes(), epSender);
 //        }
-//        
+//
 //        /// <summary>
 //        /// Calls the protected asynchronous result method.  This fires out all data chunks currently queued for send
 //        /// </summary>
@@ -147,7 +147,7 @@ namespace OpenSim.Tests.Common
 ////                OnReceivedData(result);
 //        }
     }
-    
+
     /// <summary>
     /// Record the data and sender tuple
     /// </summary>
@@ -156,13 +156,13 @@ namespace OpenSim.Tests.Common
         public byte[] Data;
         public EndPoint Sender;
         public bool BeginReceiveException;
-        
+
         public ChunkSenderTuple(byte[] data, EndPoint sender)
         {
             Data = data;
             Sender = sender;
         }
-        
+
         public ChunkSenderTuple(EndPoint sender)
         {
             Sender = sender;
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 89ebcd5..05db03fe 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common
         {
             return m_parcels;
         }
-        
+
         public void Clear(bool setupDefaultParcel)
         {
             m_parcels.Clear();
@@ -96,6 +96,11 @@ namespace OpenSim.Tests.Common
             return GetNoLand();
         }
 
+        public ILandObject GetLandObject(UUID ID)
+        {
+            return GetNoLand();
+        }
+
         public ILandObject GetLandObject(float x, float y)
         {
             return GetNoLand();
@@ -104,6 +109,7 @@ namespace OpenSim.Tests.Common
         public bool IsLandPrimCountTainted() { return false; }
         public bool IsForcefulBansAllowed() { return false; }
         public void UpdateLandObject(int localID, LandData data) {}
+        public void SendParcelsOverlay(IClientAPI client) {}
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient) {}
         public void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel) {}
         public void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel) {}
@@ -111,5 +117,6 @@ namespace OpenSim.Tests.Common
 
         public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {}
         public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {}
+        public void sendClientInitialLandInfo(IClientAPI remoteClient) { }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 1a93c9f..0b3d446 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Tests.Common
     public class TestScene : Scene
     {
         public TestScene(
-            RegionInfo regInfo, AgentCircuitManager authen, 
+            RegionInfo regInfo, AgentCircuitManager authen,
             ISimulationDataService simDataService, IEstateDataService estateDataService,
             IConfigSource config, string simulatorVersion)
             : base(regInfo, authen, simDataService, estateDataService,
@@ -54,7 +54,7 @@ namespace OpenSim.Tests.Common
             //Console.WriteLine("TestScene destructor called for {0}", RegionInfo.RegionName);
             Console.WriteLine("TestScene destructor called");
         }
-        
+
         /// <summary>
         /// Temporarily override session authentication for tests (namely teleport).
         /// </summary>
@@ -68,7 +68,7 @@ namespace OpenSim.Tests.Common
             reason = String.Empty;
             return true;
         }
-            
+
         public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
         {
             get { return m_asyncSceneObjectDeleter; }
diff --git a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
index 2b272e6..77f1793 100644
--- a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Tests.Common
             m_allItems[item.inventoryID] = item.Clone();
 
 //            Console.WriteLine(
-//                "Added item {0} {1}, folder {2}, creator {3}, owner {4}", 
+//                "Added item {0} {1}, folder {2}, creator {3}, owner {4}",
 //                item.inventoryName, item.inventoryID, item.parentFolderID, item.creatorID, item.avatarID);
 
             return true;
@@ -123,8 +123,8 @@ namespace OpenSim.Tests.Common
 
         public bool MoveItem(string id, string newParent) { throw new NotImplementedException(); }
 
-        public bool MoveFolder(string id, string newParent) 
-        { 
+        public bool MoveFolder(string id, string newParent)
+        {
             // Don't use GetFolders() here - it takes a clone!
             XInventoryFolder folder = m_allFolders[new UUID(id)];
 
@@ -133,11 +133,11 @@ namespace OpenSim.Tests.Common
 
             folder.parentFolderID = new UUID(newParent);
 
-//            XInventoryFolder[] newParentFolders 
+//            XInventoryFolder[] newParentFolders
 //                = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() });
 
 //            Console.WriteLine(
-//                "Moved folder {0} {1}, to {2} {3}", 
+//                "Moved folder {0} {1}, to {2} {3}",
 //                folder.folderName, folder.folderID, newParentFolders[0].folderName, folder.parentFolderID);
 
             // TODO: Really need to implement folder version incrementing, though this should be common code anyway,