aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests
diff options
context:
space:
mode:
authorUbitUmarov2017-12-12 22:19:31 +0000
committerUbitUmarov2017-12-12 22:19:31 +0000
commitab0f866087f1565863ac516820761cb48386f96e (patch)
treee15b415a9feee5f042f4ca7f8d9eb05f536fddad /OpenSim/Tests
parentMerge branch 'master' into httptests (diff)
parent commit what i did so far for core mutes module, befere i lose it (diff)
downloadopensim-SC-ab0f866087f1565863ac516820761cb48386f96e.zip
opensim-SC-ab0f866087f1565863ac516820761cb48386f96e.tar.gz
opensim-SC-ab0f866087f1565863ac516820761cb48386f96e.tar.bz2
opensim-SC-ab0f866087f1565863ac516820761cb48386f96e.tar.xz
Merge branch 'master' into httptests
# Conflicts: # prebuild.xml
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index a835925..449716b 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -1315,6 +1315,10 @@ namespace OpenSim.Tests.Common
1315 { 1315 {
1316 } 1316 }
1317 1317
1318 public void SendEmpytMuteList()
1319 {
1320 }
1321
1318 public void SendMuteListUpdate(string filename) 1322 public void SendMuteListUpdate(string filename)
1319 { 1323 {
1320 } 1324 }