aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-01-24 20:36:16 +0000
committerJustin Clark-Casey (justincc)2012-01-24 20:36:16 +0000
commita704d444f2f1a4887598cd9eb2f59c0b4c595f2b (patch)
tree066a47464322b9e73687f60d8308e34efbb45568 /OpenSim/Tests/Common
parentRestrict accessible of ODECharacter Shell and Body. Add method doc and some ... (diff)
parentTeleport routing, part 1 (diff)
downloadopensim-SC-a704d444f2f1a4887598cd9eb2f59c0b4c595f2b.zip
opensim-SC-a704d444f2f1a4887598cd9eb2f59c0b4c595f2b.tar.gz
opensim-SC-a704d444f2f1a4887598cd9eb2f59c0b4c595f2b.tar.bz2
opensim-SC-a704d444f2f1a4887598cd9eb2f59c0b4c595f2b.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index fad757a..ab89fe0 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -194,6 +194,7 @@ namespace OpenSim.Tests.Common.Mock
194 public event RegionInfoRequest OnRegionInfoRequest; 194 public event RegionInfoRequest OnRegionInfoRequest;
195 public event EstateCovenantRequest OnEstateCovenantRequest; 195 public event EstateCovenantRequest OnEstateCovenantRequest;
196 public event EstateChangeInfo OnEstateChangeInfo; 196 public event EstateChangeInfo OnEstateChangeInfo;
197 public event EstateManageTelehub OnEstateManageTelehub;
197 198
198 public event ObjectDuplicateOnRay OnObjectDuplicateOnRay; 199 public event ObjectDuplicateOnRay OnObjectDuplicateOnRay;
199 200
@@ -951,6 +952,10 @@ namespace OpenSim.Tests.Common.Mock
951 { 952 {
952 } 953 }
953 954
955 public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint)
956 {
957 }
958
954 public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID) 959 public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
955 { 960 {
956 } 961 }