diff options
author | Teravus Ovares | 2007-11-25 04:52:14 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-25 04:52:14 +0000 |
commit | d263a044b1ebb13477b2b391637ccc2da4368838 (patch) | |
tree | 6288ef8e8f2a1c073705b23db8aba8603a28c34d /OpenSim/Region/ClientStack | |
parent | Ignore nullreferenceexception in removeclient. The avatar is already gone. (diff) | |
download | opensim-SC-d263a044b1ebb13477b2b391637ccc2da4368838.zip opensim-SC-d263a044b1ebb13477b2b391637ccc2da4368838.tar.gz opensim-SC-d263a044b1ebb13477b2b391637ccc2da4368838.tar.bz2 opensim-SC-d263a044b1ebb13477b2b391637ccc2da4368838.tar.xz |
* Added the ability to restart your individual sims from within them using the estate tools.
* The sims properly restart, however they don't yet notify the existing avatars that they are up. To see the sim again, you'll need to log-out and back in until I can figure out how to get the proper data to the sims and to the avatar so they reconnect again.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/UDPServer.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index 8314fc3..8f377c1 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs | |||
@@ -47,6 +47,7 @@ namespace OpenSim.Region.ClientStack | |||
47 | protected EndPoint epSender; | 47 | protected EndPoint epSender; |
48 | protected AsyncCallback ReceivedData; | 48 | protected AsyncCallback ReceivedData; |
49 | protected PacketServer m_packetServer; | 49 | protected PacketServer m_packetServer; |
50 | protected ulong m_regionHandle; | ||
50 | 51 | ||
51 | protected int listenPort; | 52 | protected int listenPort; |
52 | protected IScene m_localScene; | 53 | protected IScene m_localScene; |
@@ -66,6 +67,15 @@ namespace OpenSim.Region.ClientStack | |||
66 | { | 67 | { |
67 | m_localScene = value; | 68 | m_localScene = value; |
68 | m_packetServer.LocalScene = m_localScene; | 69 | m_packetServer.LocalScene = m_localScene; |
70 | m_regionHandle = m_localScene.RegionInfo.RegionHandle; | ||
71 | } | ||
72 | |||
73 | } | ||
74 | public ulong RegionHandle | ||
75 | { | ||
76 | get | ||
77 | { | ||
78 | return m_regionHandle; | ||
69 | } | 79 | } |
70 | } | 80 | } |
71 | 81 | ||
@@ -115,6 +125,10 @@ namespace OpenSim.Region.ClientStack | |||
115 | 125 | ||
116 | return; | 126 | return; |
117 | } | 127 | } |
128 | catch (System.ObjectDisposedException od) | ||
129 | { | ||
130 | return; | ||
131 | } | ||
118 | 132 | ||
119 | int packetEnd = numBytes - 1; | 133 | int packetEnd = numBytes - 1; |
120 | 134 | ||