aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
diff options
context:
space:
mode:
authorMW2007-05-27 18:52:42 +0000
committerMW2007-05-27 18:52:42 +0000
commitc746a2f9f4f0b1e7eea564effdae63472f79ab22 (patch)
tree54d23af3d168958bfec995cf2987cf5af79ac149 /OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
parentGoodbye World (diff)
downloadopensim-SC_OLD-c746a2f9f4f0b1e7eea564effdae63472f79ab22.zip
opensim-SC_OLD-c746a2f9f4f0b1e7eea564effdae63472f79ab22.tar.gz
opensim-SC_OLD-c746a2f9f4f0b1e7eea564effdae63472f79ab22.tar.bz2
opensim-SC_OLD-c746a2f9f4f0b1e7eea564effdae63472f79ab22.tar.xz
Should allow multiple worlds (and UDP servers) to be ran in one instance, just missing backend comms and working Avatar/primitives classes.
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs17
1 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index 6a33432..54cb662 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -13,15 +13,12 @@ using OpenSim.Framework.Interfaces;
13using OpenSim.Framework.Types; 13using OpenSim.Framework.Types;
14using OpenSim.Framework.Inventory; 14using OpenSim.Framework.Inventory;
15using OpenSim.Framework.Utilities; 15using OpenSim.Framework.Utilities;
16using OpenSim.world;
17using OpenSim.Assets; 16using OpenSim.Assets;
18 17
19namespace OpenSim 18namespace OpenSim
20{ 19{
21 public partial class ClientView 20 public partial class ClientView
22 { 21 {
23
24
25 protected override void ProcessInPacket(Packet Pack) 22 protected override void ProcessInPacket(Packet Pack)
26 { 23 {
27 ack_pack(Pack); 24 ack_pack(Pack);
@@ -65,10 +62,10 @@ namespace OpenSim
65 //empty message so don't bother with it 62 //empty message so don't bother with it
66 break; 63 break;
67 } 64 }
68 string fromName = ClientAvatar.firstname + " " + ClientAvatar.lastname; 65 string fromName = ""; //ClientAvatar.firstname + " " + ClientAvatar.lastname;
69 byte[] message = inchatpack.ChatData.Message; 66 byte[] message = inchatpack.ChatData.Message;
70 byte type = inchatpack.ChatData.Type; 67 byte type = inchatpack.ChatData.Type;
71 LLVector3 fromPos = ClientAvatar.Pos; 68 LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;
72 LLUUID fromAgentID = AgentID; 69 LLUUID fromAgentID = AgentID;
73 this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID); 70 this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID);
74 break; 71 break;
@@ -151,7 +148,7 @@ namespace OpenSim
151 OnLinkObjects(parentprimid, childrenprims); 148 OnLinkObjects(parentprimid, childrenprims);
152 break; 149 break;
153 case PacketType.ObjectAdd: 150 case PacketType.ObjectAdd:
154 m_world.AddNewPrim((ObjectAddPacket)Pack, this); 151 // m_world.AddNewPrim((ObjectAddPacket)Pack, this);
155 OnAddPrim(Pack, this); 152 OnAddPrim(Pack, this);
156 break; 153 break;
157 case PacketType.ObjectShape: 154 case PacketType.ObjectShape:
@@ -270,7 +267,7 @@ namespace OpenSim
270 RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; 267 RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
271 ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket(); 268 ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
272 bool foundent = false; 269 bool foundent = false;
273 foreach (Entity ent in m_world.Entities.Values) 270 /* foreach (Entity ent in m_world.Entities.Values)
274 { 271 {
275 if (ent.localid == requesttask.InventoryData.LocalID) 272 if (ent.localid == requesttask.InventoryData.LocalID)
276 { 273 {
@@ -283,13 +280,13 @@ namespace OpenSim
283 if (foundent) 280 if (foundent)
284 { 281 {
285 this.OutPacket(replytask); 282 this.OutPacket(replytask);
286 } 283 }*/
287 break; 284 break;
288 case PacketType.UpdateTaskInventory: 285 case PacketType.UpdateTaskInventory:
289 // Console.WriteLine(Pack.ToString()); 286 // Console.WriteLine(Pack.ToString());
290 UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack; 287 UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
291 AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID); 288 AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
292 if (myinventory != null) 289 /*if (myinventory != null)
293 { 290 {
294 if (updatetask.UpdateData.Key == 0) 291 if (updatetask.UpdateData.Key == 0)
295 { 292 {
@@ -315,7 +312,7 @@ namespace OpenSim
315 } 312 }
316 } 313 }
317 } 314 }
318 } 315 }*/
319 break; 316 break;
320 case PacketType.MapLayerRequest: 317 case PacketType.MapLayerRequest:
321 this.RequestMapLayer(); 318 this.RequestMapLayer();