diff options
author | Dr Scofield | 2009-05-25 10:40:09 +0000 |
---|---|---|
committer | Dr Scofield | 2009-05-25 10:40:09 +0000 |
commit | 79299702579b314513652f23c2ec08b6bf687dcd (patch) | |
tree | 3b133d9b5e9ba02d6eb264cc06968f959d8046f2 | |
parent | dropping attendee list keeping from Concierge, relying on (diff) | |
download | opensim-SC_OLD-79299702579b314513652f23c2ec08b6bf687dcd.zip opensim-SC_OLD-79299702579b314513652f23c2ec08b6bf687dcd.tar.gz opensim-SC_OLD-79299702579b314513652f23c2ec08b6bf687dcd.tar.bz2 opensim-SC_OLD-79299702579b314513652f23c2ec08b6bf687dcd.tar.xz |
letting TestClient implement IClientCore as well to fix test case
failure due to new NAT code
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 23 | ||||
-rw-r--r-- | prebuild.xml | 1 |
2 files changed, 23 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 00f7bb1..a028abe 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -36,10 +36,11 @@ using OpenMetaverse.Packets; | |||
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Framework.Client; | ||
39 | 40 | ||
40 | namespace OpenSim.Tests.Common.Mock | 41 | namespace OpenSim.Tests.Common.Mock |
41 | { | 42 | { |
42 | public class TestClient : IClientAPI | 43 | public class TestClient : IClientAPI, IClientCore |
43 | { | 44 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 46 | ||
@@ -1131,5 +1132,25 @@ namespace OpenSim.Tests.Common.Mock | |||
1131 | 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) | 1132 | 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) |
1132 | { | 1133 | { |
1133 | } | 1134 | } |
1135 | |||
1136 | public bool TryGet<T>(out T iface) | ||
1137 | { | ||
1138 | iface = default(T); | ||
1139 | return false; | ||
1140 | } | ||
1141 | |||
1142 | public T Get<T>() | ||
1143 | { | ||
1144 | return default(T); | ||
1145 | } | ||
1146 | |||
1147 | public void Disconnect(string reason) | ||
1148 | { | ||
1149 | } | ||
1150 | |||
1151 | public void Disconnect() | ||
1152 | { | ||
1153 | } | ||
1154 | |||
1134 | } | 1155 | } |
1135 | } | 1156 | } |
diff --git a/prebuild.xml b/prebuild.xml index 45cc13d..9523ff1 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -3212,6 +3212,7 @@ | |||
3212 | <Reference name="OpenMetaverse.dll"/> | 3212 | <Reference name="OpenMetaverse.dll"/> |
3213 | <Reference name="OpenMetaverseTypes.dll"/> | 3213 | <Reference name="OpenMetaverseTypes.dll"/> |
3214 | <Reference name="OpenSim.Framework"/> | 3214 | <Reference name="OpenSim.Framework"/> |
3215 | <Reference name="OpenSim.Framework.Client"/> | ||
3215 | <Reference name="OpenSim.Framework.Communications"/> | 3216 | <Reference name="OpenSim.Framework.Communications"/> |
3216 | <Reference name="OpenSim.Framework.Servers"/> | 3217 | <Reference name="OpenSim.Framework.Servers"/> |
3217 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3218 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |