Merge branch 'switch' into Domme.

9 files changed, 50 insertions, 21 deletions

diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index a73a0b8..8379b0a 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -337,7 +337,7 @@ namespace OpenSim.Data.Null
 
         public void StoreTerrain(double[,] ter, UUID regionID)
         {
-            m_terrains[regionID] = new HeightmapTerrainData(ter);
+            m_terrains[regionID] = new TerrainData(ter);
         }
 
         public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
diff --git a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
index 9d426f6..237d7a5 100644
--- a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
+++ b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
@@ -109,6 +109,11 @@ namespace OpenSim.Tests.Common
             throw new System.NotImplementedException ();
         }
 
+        public void CancelScriptEvent(UUID itemID, string eventName)
+        {
+
+        }
+
         public bool PostScriptEvent(UUID itemID, string name, object[] args)
         {
 //            Console.WriteLine("Posting event {0} for {1}", name, itemID);
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 449716b..929fa4a 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -343,6 +343,8 @@ namespace OpenSim.Tests.Common
         public event GodlikeMessage onGodlikeMessage;
         public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
         public event GenericCall2 OnUpdateThrottles;
+        public event AgentFOV OnAgentFOV;
+
 #pragma warning restore 67
 
         /// <value>
@@ -352,6 +354,8 @@ namespace OpenSim.Tests.Common
 
         public ISceneAgent SceneAgent { get; set; }
 
+        public bool SupportObjectAnimations { get; set; }
+
         /// <value>
         /// The last caps seed url that this client was given.
         /// </value>
@@ -365,6 +369,8 @@ namespace OpenSim.Tests.Common
             set { }
         }
 
+        public float StartFar { get; set; }
+
         public virtual UUID AgentId
         {
             get { return m_agentId; }
@@ -439,6 +445,7 @@ namespace OpenSim.Tests.Common
         public virtual int NextAnimationSequenceNumber
         {
             get { return 1; }
+            set { }
         }
 
         public IScene Scene
@@ -446,6 +453,11 @@ namespace OpenSim.Tests.Common
             get { return m_scene; }
         }
 
+        public UUID ScopeId
+        {
+            get { return UUID.Zero; }
+        }
+
         public bool SendLogoutPacketWhenClosing
         {
             set { }
@@ -558,7 +570,7 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public virtual void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
+        public virtual void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry, float hover)
         {
         }
 
@@ -571,10 +583,6 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public virtual void SendStartPingCheck(byte seq)
-        {
-        }
-
         public virtual void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data)
         {
         }
@@ -648,14 +656,11 @@ namespace OpenSim.Tests.Common
             return false;
         }
 
-        public virtual void SendLayerData(float[] map)
+        public virtual void SendLayerData()
         {
         }
 
-        public virtual void SendLayerData(int px, int py, float[] map)
-        {
-        }
-        public virtual void SendLayerData(int px, int py, float[] map, bool track)
+        public void SendLayerData(int[] map)
         {
         }
 
@@ -819,7 +824,8 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
+        public virtual void SendXferPacket(ulong xferID, uint packet,
+                byte[] XferData, int XferDataOffset, int XferDatapktLen, bool isTaskInventory)
         {
         }
 
@@ -878,7 +884,7 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public virtual void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
+        public virtual void SendRegionHandshake()
         {
             if (OnRegionHandShakeReply != null)
             {
@@ -1399,5 +1405,11 @@ namespace OpenSim.Tests.Common
         public void SendPartPhysicsProprieties(ISceneEntity entity)
         {
         }
+
+        public uint GetViewerCaps()
+        {
+            return 0x1000;
+        }
+
     }
 }
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
index f2ce064..b17425a 100644
--- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
+++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
@@ -30,6 +30,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
+using System.Text;
 using System.Threading;
 using log4net;
 using Nini.Config;
@@ -167,7 +168,7 @@ namespace OpenSim.Tests.Common
             AddEvent(receiverAgent, "AgentGroupDataUpdate", data);
         }
 
-        public OSD ScriptRunningEvent (UUID objectID, UUID itemID, bool running, bool mono)
+        public void ScriptRunningEvent (UUID objectID, UUID itemID, bool running, UUID avatarID)
         {
             Console.WriteLine("ONE");
             throw new System.NotImplementedException ();
@@ -183,5 +184,15 @@ namespace OpenSim.Tests.Common
         {
             AddEvent(avatarID, "partPhysicsProperties", localID, physhapetype, density, friction, bounce, gravmod);
         }
-    }
+
+        public StringBuilder StartEvent(string eventName)
+        {
+            return null;
+        }
+
+        public string EndEvent(StringBuilder sb)
+        {
+            return "";
+        }
+}
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 05db03fe..b5227aa 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -42,6 +42,8 @@ namespace OpenSim.Tests.Common
         private Scene m_scene;
         private List<ILandObject> m_parcels;
 
+        public float BanLineSafeHeight { get { return 100f; } }
+
         public TestLandChannel(Scene scene)
         {
             m_scene = scene;
@@ -117,6 +119,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) { }
+        public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay) { }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs b/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs
index 2e17f1e..4577ca3 100644
--- a/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs
+++ b/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs
@@ -117,8 +117,6 @@ namespace OpenSim.Tests.Common
         /// </summary>
         public string StatusDescription { get; set; }
 
-        public bool ReuseContext { get; set; }
-
         /// <summary>
         /// Add a header field and content to the response.
         /// </summary>
diff --git a/OpenSim/Tests/ConfigurationLoaderTest.cs b/OpenSim/Tests/ConfigurationLoaderTest.cs
index a409a13..2a67b84 100644
--- a/OpenSim/Tests/ConfigurationLoaderTest.cs
+++ b/OpenSim/Tests/ConfigurationLoaderTest.cs
@@ -114,6 +114,7 @@ namespace OpenSim.Tests
             IConfigSource argvSource = new IniConfigSource();
             EnvConfigSource envConfigSource = new EnvConfigSource();
             argvSource.AddConfig("Startup").Set("inifile", mainIniFile);
+            argvSource.AddConfig("Network");
             ConfigSettings configSettings;
             NetworkServersInfo networkInfo;
 
diff --git a/OpenSim/Tests/Robust/Clients/InstantMessage/IMClient.cs b/OpenSim/Tests/Robust/Clients/InstantMessage/IMClient.cs
index 8f312eb..4eba7b9 100644
--- a/OpenSim/Tests/Robust/Clients/InstantMessage/IMClient.cs
+++ b/OpenSim/Tests/Robust/Clients/InstantMessage/IMClient.cs
@@ -50,7 +50,7 @@ namespace Robust.Tests
             im.message = "Hello";
             im.imSessionID = new Guid();
 
-            bool success = InstantMessageServiceConnector.SendInstantMessage(DemonServer.Address, im);
+            bool success = InstantMessageServiceConnector.SendInstantMessage(DemonServer.Address, im, String.Empty);
             Assert.IsFalse(success, "Sending of IM succeeded, but it should have failed");
         }
 
diff --git a/OpenSim/Tests/Robust/Server/DemonServer.cs b/OpenSim/Tests/Robust/Server/DemonServer.cs
index 41c2185..fa0c958 100644
--- a/OpenSim/Tests/Robust/Server/DemonServer.cs
+++ b/OpenSim/Tests/Robust/Server/DemonServer.cs
@@ -48,8 +48,8 @@ namespace Robust.Tests
         [SetUp]
         public void StartDemon()
         {
-            if (File.Exists("../../logs/Robust.Tests.log"))
-                File.Delete("../../logs/Robust.Tests.log");
+            if (File.Exists("../../var/log/Robust.Tests.log"))
+                File.Delete("../../var/log/Robust.Tests.log");
 
             Console.WriteLine("**** Starting demon Robust server ****");
             m_demon = new Thread( () => Main(new string[] {"-inifile=Robust.Tests.ini"}));