diff options
author | Melanie | 2012-10-26 21:13:01 +0100 |
---|---|---|
committer | Melanie | 2012-10-26 21:13:01 +0100 |
commit | 26cc57b6cafda5168baab49cabe34d96f01dbd6d (patch) | |
tree | 94e078a75ab68825e64b15498f67d82988858dc9 /OpenSim/Tests/Common | |
parent | Merge branch 'master' into careminster (diff) | |
parent | minor: Make the error thrown logged when a simulator in grid mode is trying t... (diff) | |
download | opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.zip opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.gz opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.bz2 opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 87ca944..ebdfb4f 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -531,13 +531,9 @@ namespace OpenSim.Tests.Common.Mock | |||
531 | { | 531 | { |
532 | } | 532 | } |
533 | 533 | ||
534 | public virtual void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, | 534 | public virtual void SendChatMessage( |
535 | UUID fromAgentID, byte source, byte audible) | 535 | string message, byte type, Vector3 fromPos, string fromName, |
536 | { | 536 | UUID fromAgentID, UUID ownerID, byte source, byte audible) |
537 | } | ||
538 | |||
539 | public virtual void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, | ||
540 | UUID fromAgentID, byte source, byte audible) | ||
541 | { | 537 | { |
542 | } | 538 | } |
543 | 539 | ||