diff options
| author | Melanie | 2012-06-14 00:10:52 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-14 00:10:52 +0100 |
| commit | d893e54f4b4d3b4a8f6bfa3c8744487527a194a0 (patch) | |
| tree | 1601e04322dba9c6c4ae2412c92821f93aca5c7b /OpenSim/Tests/Common | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: refactor part of LLClientView.ProcessEntityUpdates() to remove duplica... (diff) | |
| download | opensim-SC_OLD-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.zip opensim-SC_OLD-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.gz opensim-SC_OLD-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.bz2 opensim-SC_OLD-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Tests/Common')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 8cea476f..fb70904 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -1131,10 +1131,6 @@ namespace OpenSim.Tests.Common.Mock | |||
| 1131 | { | 1131 | { |
| 1132 | } | 1132 | } |
| 1133 | 1133 | ||
| 1134 | public void KillEndDone() | ||
| 1135 | { | ||
| 1136 | } | ||
| 1137 | |||
| 1138 | public void SendEventInfoReply (EventData info) | 1134 | public void SendEventInfoReply (EventData info) |
| 1139 | { | 1135 | { |
| 1140 | } | 1136 | } |