diff options
| author | BlueWall | 2012-11-25 17:03:14 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-25 17:03:14 -0500 |
| commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
| tree | dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Tests/Common/Mock/TestClient.cs | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to '')
| -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 bb8b935..dde37ab 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -528,13 +528,9 @@ namespace OpenSim.Tests.Common.Mock | |||
| 528 | { | 528 | { |
| 529 | } | 529 | } |
| 530 | 530 | ||
| 531 | public virtual void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, | 531 | public virtual void SendChatMessage( |
| 532 | UUID fromAgentID, byte source, byte audible) | 532 | string message, byte type, Vector3 fromPos, string fromName, |
| 533 | { | 533 | UUID fromAgentID, UUID ownerID, byte source, byte audible) |
| 534 | } | ||
| 535 | |||
| 536 | public virtual void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, | ||
| 537 | UUID fromAgentID, byte source, byte audible) | ||
| 538 | { | 534 | { |
| 539 | } | 535 | } |
| 540 | 536 | ||