diff options
author | meta7 | 2010-08-18 02:53:27 -0700 |
---|---|---|
committer | meta7 | 2010-08-18 02:53:27 -0700 |
commit | ca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch) | |
tree | 2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/Tests/Common | |
parent | Fix a nullref exception in the prioritizer (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.zip opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.gz opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.bz2 opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 6 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 1e4bc2a..1c860a7 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -614,7 +614,11 @@ namespace OpenSim.Tests.Common.Mock | |||
614 | { | 614 | { |
615 | } | 615 | } |
616 | 616 | ||
617 | public virtual void SendTeleportLocationStart() | 617 | public virtual void SendTeleportStart(uint flags) |
618 | { | ||
619 | } | ||
620 | |||
621 | public void SendTeleportProgress(uint flags, string message) | ||
618 | { | 622 | { |
619 | } | 623 | } |
620 | 624 | ||
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs index fecb73f..7c4f689 100644 --- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common.Mock | |||
42 | /// </summary> | 42 | /// </summary> |
43 | public class TestInventoryDataPlugin : IInventoryDataPlugin | 43 | public class TestInventoryDataPlugin : IInventoryDataPlugin |
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | /// <value> | 47 | /// <value> |
48 | /// Inventory folders | 48 | /// Inventory folders |