diff options
author | MW | 2007-04-01 15:30:27 +0000 |
---|---|---|
committer | MW | 2007-04-01 15:30:27 +0000 |
commit | 86f6a33bc8cc88c2e883d6741e6c02810d655960 (patch) | |
tree | 5065223a9cef27225000867dce50e033fe22adbe /OpenSim.RegionServer/world | |
parent | Moved more packet types to handlers (diff) | |
download | opensim-SC_OLD-86f6a33bc8cc88c2e883d6741e6c02810d655960.zip opensim-SC_OLD-86f6a33bc8cc88c2e883d6741e6c02810d655960.tar.gz opensim-SC_OLD-86f6a33bc8cc88c2e883d6741e6c02810d655960.tar.bz2 opensim-SC_OLD-86f6a33bc8cc88c2e883d6741e6c02810d655960.tar.xz |
More cleaning up of SimClient and packet handling
Diffstat (limited to 'OpenSim.RegionServer/world')
-rw-r--r-- | OpenSim.RegionServer/world/Primitive.cs | 1 | ||||
-rw-r--r-- | OpenSim.RegionServer/world/World.cs | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs index 2c55004..cbffa7e 100644 --- a/OpenSim.RegionServer/world/Primitive.cs +++ b/OpenSim.RegionServer/world/Primitive.cs | |||
@@ -12,7 +12,6 @@ namespace OpenSim.world | |||
12 | { | 12 | { |
13 | public class Primitive : Entity | 13 | public class Primitive : Entity |
14 | { | 14 | { |
15 | //private static object physicsLock = new object(); | ||
16 | protected float mesh_cutbegin; | 15 | protected float mesh_cutbegin; |
17 | protected float mesh_cutend; | 16 | protected float mesh_cutend; |
18 | protected PrimData primData; | 17 | protected PrimData primData; |
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs index 7f4ecac..aea889d 100644 --- a/OpenSim.RegionServer/world/World.cs +++ b/OpenSim.RegionServer/world/World.cs | |||
@@ -308,7 +308,7 @@ namespace OpenSim.world | |||
308 | this._primCount++; | 308 | this._primCount++; |
309 | } | 309 | } |
310 | 310 | ||
311 | public void DeRezObject(SimClient simClient, Packet packet) | 311 | public bool DeRezObject(SimClient simClient, Packet packet) |
312 | { | 312 | { |
313 | DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet; | 313 | DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet; |
314 | // Console.WriteLine(DeRezPacket); | 314 | // Console.WriteLine(DeRezPacket); |
@@ -393,6 +393,7 @@ namespace OpenSim.world | |||
393 | } | 393 | } |
394 | } | 394 | } |
395 | } | 395 | } |
396 | return true; | ||
396 | } | 397 | } |
397 | 398 | ||
398 | public bool Backup() | 399 | public bool Backup() |