aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Mock
diff options
context:
space:
mode:
authorMelanie2013-05-30 21:48:09 +0100
committerMelanie2013-05-30 21:48:09 +0100
commit669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch)
tree6ea7f58cc6365595281f823f3994d2d22299ee40 /OpenSim/Tests/Common/Mock
parentMerge branch 'master' into careminster (diff)
parentTry caching the user name for a new agent earlier on in the process of establ... (diff)
downloadopensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip
opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz
opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2
opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
Diffstat (limited to 'OpenSim/Tests/Common/Mock')
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 26479be..179a91f 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -658,7 +658,7 @@ namespace OpenSim.Tests.Common.Mock
658 { 658 {
659 } 659 }
660 660
661 public virtual void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance) 661 public virtual void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item)
662 { 662 {
663 } 663 }
664 664
@@ -886,11 +886,6 @@ namespace OpenSim.Tests.Common.Mock
886 886
887 } 887 }
888 888
889 public bool AddMoney(int debit)
890 {
891 return false;
892 }
893
894 public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong time, uint dlen, uint ylen, float phase) 889 public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong time, uint dlen, uint ylen, float phase)
895 { 890 {
896 } 891 }