diff options
| author | Melanie | 2012-08-23 01:41:47 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-23 01:41:47 +0100 |
| commit | f8603a215d142f3b83a5ff1dc022b716b3e48f99 (patch) | |
| tree | 49971f8e12efcfea18b4b2fdb6bd54c904d3f52c /OpenSim/Tests | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | this should be an if-else block in case the non-phys min/max are smaller than... (diff) | |
| download | opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.zip opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.gz opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.bz2 opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 6add130..4e3bc67 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -935,12 +935,12 @@ namespace OpenSim.Tests.Common.Mock | |||
| 935 | Close(); | 935 | Close(); |
| 936 | } | 936 | } |
| 937 | 937 | ||
| 938 | public void Close(bool c) | 938 | public void Close() |
| 939 | { | 939 | { |
| 940 | Close(); | 940 | Close(true, false); |
| 941 | } | 941 | } |
| 942 | 942 | ||
| 943 | public void Close() | 943 | public void Close(bool sendStop, bool force) |
| 944 | { | 944 | { |
| 945 | // Fire the callback for this connection closing | 945 | // Fire the callback for this connection closing |
| 946 | // This is necesary to get the presence detector to notice that a client has logged out. | 946 | // This is necesary to get the presence detector to notice that a client has logged out. |