diff options
| author | Melanie | 2012-06-12 03:09:52 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-12 03:09:52 +0100 |
| commit | dfafb5ca1451a407eafa6fbdc0246d6bdb962531 (patch) | |
| tree | 62a3ba18f0ea09be7ec0bcbc3afdc701f592c7e6 /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove accidental timeout left in during earlier debugging. Has been in sinc... (diff) | |
| download | opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.zip opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.tar.gz opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.tar.bz2 opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 18d8045..b40eeed 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -515,6 +515,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 515 | /// </summary> | 515 | /// </summary> |
| 516 | public void Close(bool sendStop) | 516 | public void Close(bool sendStop) |
| 517 | { | 517 | { |
| 518 | IsActive = false; | ||
| 519 | |||
| 518 | m_log.DebugFormat( | 520 | m_log.DebugFormat( |
| 519 | "[CLIENT]: Close has been called for {0} attached to scene {1}", | 521 | "[CLIENT]: Close has been called for {0} attached to scene {1}", |
| 520 | Name, m_scene.RegionInfo.RegionName); | 522 | Name, m_scene.RegionInfo.RegionName); |