diff options
author | MW | 2007-06-15 10:29:49 +0000 |
---|---|---|
committer | MW | 2007-06-15 10:29:49 +0000 |
commit | 3697408fae0a4c9b6bedf441450b3e8bc8fdcd24 (patch) | |
tree | 12e367b4f4ca2028b227c09002fd322940685fa4 /OpenSim/OpenSim.RegionServer | |
parent | trying to clean up the namespaces. (diff) | |
download | opensim-SC-3697408fae0a4c9b6bedf441450b3e8bc8fdcd24.zip opensim-SC-3697408fae0a4c9b6bedf441450b3e8bc8fdcd24.tar.gz opensim-SC-3697408fae0a4c9b6bedf441450b3e8bc8fdcd24.tar.bz2 opensim-SC-3697408fae0a4c9b6bedf441450b3e8bc8fdcd24.tar.xz |
some more rearranging
Diffstat (limited to 'OpenSim/OpenSim.RegionServer')
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.API.cs | 2 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs | 42 |
2 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs index 3badec9..484ecc1 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs | |||
@@ -447,7 +447,7 @@ namespace OpenSim | |||
447 | /// <summary> | 447 | /// <summary> |
448 | /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive | 448 | /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive |
449 | /// or big changes to a existing primitive. | 449 | /// or big changes to a existing primitive. |
450 | /// uses default rotation | 450 | /// Uses default rotation |
451 | /// </summary> | 451 | /// </summary> |
452 | /// <param name="primData"></param> | 452 | /// <param name="primData"></param> |
453 | /// <param name="pos"></param> | 453 | /// <param name="pos"></param> |
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs index c6749a1..dbe0bd9 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim | |||
65 | else | 65 | else |
66 | { | 66 | { |
67 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; | 67 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; |
68 | 68 | ||
69 | switch (Pack.Type) | 69 | switch (Pack.Type) |
70 | { | 70 | { |
71 | case PacketType.ViewerEffect: | 71 | case PacketType.ViewerEffect: |
@@ -163,7 +163,7 @@ namespace OpenSim | |||
163 | { | 163 | { |
164 | OnCompleteMovementToRegion(); | 164 | OnCompleteMovementToRegion(); |
165 | } | 165 | } |
166 | // this.EnableNeighbours(); | 166 | // this.EnableNeighbours(); |
167 | break; | 167 | break; |
168 | case PacketType.AgentUpdate: | 168 | case PacketType.AgentUpdate: |
169 | if (OnAgentUpdate != null) | 169 | if (OnAgentUpdate != null) |
@@ -211,7 +211,7 @@ namespace OpenSim | |||
211 | } | 211 | } |
212 | break; | 212 | break; |
213 | case PacketType.ObjectAdd: | 213 | case PacketType.ObjectAdd: |
214 | // m_world.AddNewPrim((ObjectAddPacket)Pack, this); | 214 | // m_world.AddNewPrim((ObjectAddPacket)Pack, this); |
215 | if (OnAddPrim != null) | 215 | if (OnAddPrim != null) |
216 | { | 216 | { |
217 | OnAddPrim(Pack, this); | 217 | OnAddPrim(Pack, this); |
@@ -254,8 +254,8 @@ namespace OpenSim | |||
254 | } | 254 | } |
255 | } | 255 | } |
256 | break; | 256 | break; |
257 | #endregion | 257 | #endregion |
258 | 258 | ||
259 | #region Inventory/Asset/Other related packets | 259 | #region Inventory/Asset/Other related packets |
260 | case PacketType.RequestImage: | 260 | case PacketType.RequestImage: |
261 | RequestImagePacket imageRequest = (RequestImagePacket)Pack; | 261 | RequestImagePacket imageRequest = (RequestImagePacket)Pack; |
@@ -344,20 +344,20 @@ namespace OpenSim | |||
344 | RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; | 344 | RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; |
345 | ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket(); | 345 | ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket(); |
346 | bool foundent = false; | 346 | bool foundent = false; |
347 | /* foreach (Entity ent in m_world.Entities.Values) | 347 | /* foreach (Entity ent in m_world.Entities.Values) |
348 | { | 348 | { |
349 | if (ent.localid == requesttask.InventoryData.LocalID) | 349 | if (ent.localid == requesttask.InventoryData.LocalID) |
350 | { | 350 | { |
351 | replytask.InventoryData.TaskID = ent.uuid; | 351 | replytask.InventoryData.TaskID = ent.uuid; |
352 | replytask.InventoryData.Serial = 0; | 352 | replytask.InventoryData.Serial = 0; |
353 | replytask.InventoryData.Filename = new byte[0]; | 353 | replytask.InventoryData.Filename = new byte[0]; |
354 | foundent = true; | 354 | foundent = true; |
355 | } | 355 | } |
356 | } | 356 | } |
357 | if (foundent) | 357 | if (foundent) |
358 | { | 358 | { |
359 | this.OutPacket(replytask); | 359 | this.OutPacket(replytask); |
360 | }*/ | 360 | }*/ |
361 | break; | 361 | break; |
362 | case PacketType.UpdateTaskInventory: | 362 | case PacketType.UpdateTaskInventory: |
363 | // Console.WriteLine(Pack.ToString()); | 363 | // Console.WriteLine(Pack.ToString()); |
@@ -484,9 +484,9 @@ namespace OpenSim | |||
484 | #region Parcel related packets | 484 | #region Parcel related packets |
485 | case PacketType.ParcelPropertiesRequest: | 485 | case PacketType.ParcelPropertiesRequest: |
486 | ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack; | 486 | ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack; |
487 | if(OnParcelPropertiesRequest != null) | 487 | if (OnParcelPropertiesRequest != null) |
488 | { | 488 | { |
489 | OnParcelPropertiesRequest((int)Math.Round(propertiesRequest.ParcelData.West), (int)Math.Round(propertiesRequest.ParcelData.South), (int)Math.Round(propertiesRequest.ParcelData.East), (int)Math.Round(propertiesRequest.ParcelData.North), propertiesRequest.ParcelData.SequenceID, propertiesRequest.ParcelData.SnapSelection, this); | 489 | OnParcelPropertiesRequest((int)Math.Round(propertiesRequest.ParcelData.West), (int)Math.Round(propertiesRequest.ParcelData.South), (int)Math.Round(propertiesRequest.ParcelData.East), (int)Math.Round(propertiesRequest.ParcelData.North), propertiesRequest.ParcelData.SequenceID, propertiesRequest.ParcelData.SnapSelection, this); |
490 | } | 490 | } |
491 | break; | 491 | break; |
492 | case PacketType.ParcelDivide: | 492 | case PacketType.ParcelDivide: |