aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-02-07 23:09:47 +0000
committerJustin Clark-Casey (justincc)2013-02-07 23:09:47 +0000
commit9e17dc3daa04644c1a565d819a614c02022bdeed (patch)
tree014eb8cec88c68b2dedde009a508dde3b5b52aca /OpenSim/Tests
parentFix a recent regression in e17392a where JsonSetValue() stopped working (prob... (diff)
parentPlumb the path from the client to the extra physics params and back (diff)
downloadopensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.zip
opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.gz
opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.bz2
opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r--OpenSim/Tests/Common/Mock/MockScriptEngine.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs5
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
index 51f2712..78bab5b 100644
--- a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
+++ b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Tests.Common
85 85
86 public bool PostScriptEvent(UUID itemID, string name, object[] args) 86 public bool PostScriptEvent(UUID itemID, string name, object[] args)
87 { 87 {
88 throw new System.NotImplementedException (); 88 return false;
89 } 89 }
90 90
91 public bool PostObjectEvent(UUID itemID, string name, object[] args) 91 public bool PostObjectEvent(UUID itemID, string name, object[] args)
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index dde37ab..182f4d9 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -1276,5 +1276,10 @@ namespace OpenSim.Tests.Common.Mock
1276 public void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data) 1276 public void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data)
1277 { 1277 {
1278 } 1278 }
1279
1280 public void SendPartPhysicsProprieties(ISceneEntity entity)
1281 {
1282 }
1283
1279 } 1284 }
1280} 1285}