aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-03-31 15:54:16 +0000
committerMW2007-03-31 15:54:16 +0000
commitaf93263a3bf033188a18f0f49050393a612d2831 (patch)
tree74c0e035bd10d2dc5a0695038a7c329078c9c7d9
parent* fixed some Framework refs (diff)
downloadopensim-SC_OLD-af93263a3bf033188a18f0f49050393a612d2831.zip
opensim-SC_OLD-af93263a3bf033188a18f0f49050393a612d2831.tar.gz
opensim-SC_OLD-af93263a3bf033188a18f0f49050393a612d2831.tar.bz2
opensim-SC_OLD-af93263a3bf033188a18f0f49050393a612d2831.tar.xz
Can now Rez and DeRez objects (take to and from inventory).
Very much a work in progress and likely to be a number of bugs.
Diffstat
-rw-r--r--OpenSim.Framework/AgentInventory.cs21
-rw-r--r--OpenSim.Framework/PrimData.cs121
-rw-r--r--OpenSim.RegionServer/AgentAssetUpload.cs2
-rw-r--r--OpenSim.RegionServer/Assets/InventoryCache.cs20
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs2
-rw-r--r--OpenSim.RegionServer/SimClient.cs64
-rw-r--r--OpenSim.RegionServer/world/Primitive.cs103
-rw-r--r--OpenSim.RegionServer/world/World.cs122
8 files changed, 419 insertions, 36 deletions
diff --git a/OpenSim.Framework/AgentInventory.cs b/OpenSim.Framework/AgentInventory.cs
index f1f5847..5c57020 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim.Framework/AgentInventory.cs
@@ -157,6 +157,27 @@ namespace OpenSim.Framework.Inventory
157 return (null); 157 return (null);
158 } 158 }
159 } 159 }
160
161 public bool DeleteFromInventory(LLUUID itemID)
162 {
163 bool res = false;
164 if (this.InventoryItems.ContainsKey(itemID))
165 {
166 InventoryItem item = this.InventoryItems[itemID];
167 this.InventoryItems.Remove(itemID);
168 foreach (InventoryFolder fold in InventoryFolders.Values)
169 {
170 if (fold.Items.Contains(item))
171 {
172 fold.Items.Remove(item);
173 break;
174 }
175 }
176 res = true;
177
178 }
179 return res;
180 }
160 } 181 }
161 182
162 public class InventoryFolder 183 public class InventoryFolder
diff --git a/OpenSim.Framework/PrimData.cs b/OpenSim.Framework/PrimData.cs
index 175a014..ce53c28 100644
--- a/OpenSim.Framework/PrimData.cs
+++ b/OpenSim.Framework/PrimData.cs
@@ -7,6 +7,8 @@ namespace OpenSim.Framework.Assets
7{ 7{
8 public class PrimData 8 public class PrimData
9 { 9 {
10 private const uint FULL_MASK_PERMISSIONS = 2147483647;
11
10 public LLUUID OwnerID; 12 public LLUUID OwnerID;
11 public byte PCode; 13 public byte PCode;
12 public byte PathBegin; 14 public byte PathBegin;
@@ -30,10 +32,18 @@ namespace OpenSim.Framework.Assets
30 public sbyte PathTwist; 32 public sbyte PathTwist;
31 public sbyte PathTwistBegin; 33 public sbyte PathTwistBegin;
32 public byte[] Texture; 34 public byte[] Texture;
35
36
37 public Int32 CreationDate;
38 public uint OwnerMask = FULL_MASK_PERMISSIONS;
39 public uint NextOwnerMask = FULL_MASK_PERMISSIONS;
40 public uint GroupMask = FULL_MASK_PERMISSIONS;
41 public uint EveryoneMask = FULL_MASK_PERMISSIONS;
42 public uint BaseMask = FULL_MASK_PERMISSIONS;
33 43
34 //following only used during prim storage 44 //following only used during prim storage
35 public LLVector3 Position; 45 public LLVector3 Position;
36 public LLQuaternion Rotation; 46 public LLQuaternion Rotation = new LLQuaternion(0,1,0,0);
37 public uint LocalID; 47 public uint LocalID;
38 public LLUUID FullID; 48 public LLUUID FullID;
39 49
@@ -41,5 +51,114 @@ namespace OpenSim.Framework.Assets
41 { 51 {
42 52
43 } 53 }
54
55 public PrimData(byte[] data)
56 {
57 int i =0;
58
59 this.OwnerID = new LLUUID(data, i); i += 16;
60 this.PCode = data[i++];
61 this.PathBegin = data[i++];
62 this.PathEnd = data[i++];
63 this.PathScaleX = data[i++];
64 this.PathScaleY = data[i++];
65 this.PathShearX = data[i++];
66 this.PathShearY = data[i++];
67 this.PathSkew = (sbyte)data[i++];
68 this.ProfileBegin = data[i++];
69 this.ProfileEnd = data[i++];
70 this.Scale = new LLVector3(data, i); i += 12;
71 this.PathCurve = data[i++];
72 this.ProfileCurve = data[i++];
73 this.ParentID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
74 this.ProfileHollow = data[i++];
75 this.PathRadiusOffset = (sbyte)data[i++];
76 this.PathRevolutions = data[i++];
77 this.PathTaperX = (sbyte)data[i++];
78 this.PathTaperY =(sbyte) data[i++];
79 this.PathTwist = (sbyte) data[i++];
80 this.PathTwistBegin = (sbyte) data[i++];
81 ushort length = (ushort)(data[i++] + (data[i++] << 8));
82 this.Texture = new byte[length];
83 Array.Copy(data, i, Texture, 0, length); i += length;
84 this.CreationDate = (Int32)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
85 this.OwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
86 this.NextOwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
87 this.GroupMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
88 this.EveryoneMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
89 this.BaseMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
90 this.Position = new LLVector3(data, i); i += 12;
91 this.Rotation = new LLQuaternion(data,i, true); i += 12;
92 this.LocalID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
93 this.FullID = new LLUUID(data, i); i += 16;
94
95 }
96
97 public byte[] ToBytes()
98 {
99 int i = 0;
100 byte[] bytes = new byte[121 + Texture.Length];
101 Array.Copy(OwnerID.GetBytes(), 0, bytes, i, 16); i += 16;
102 bytes[i++] = this.PCode;
103 bytes[i++] = this.PathBegin;
104 bytes[i++] = this.PathEnd;
105 bytes[i++] = this.PathScaleX;
106 bytes[i++] = this.PathScaleY;
107 bytes[i++] = this.PathShearX;
108 bytes[i++] = this.PathShearY;
109 bytes[i++] = (byte)this.PathSkew;
110 bytes[i++] = this.ProfileBegin;
111 bytes[i++] = this.ProfileEnd;
112 Array.Copy(Scale.GetBytes(), 0, bytes, i, 12); i += 12;
113 bytes[i++] = this.PathCurve;
114 bytes[i++] = this.ProfileCurve;
115 bytes[i++] = (byte)(ParentID % 256);
116 bytes[i++] = (byte)((ParentID >> 8) % 256);
117 bytes[i++] = (byte)((ParentID >> 16) % 256);
118 bytes[i++] = (byte)((ParentID >> 24) % 256);
119 bytes[i++] = this.ProfileHollow;
120 bytes[i++] = ((byte)this.PathRadiusOffset);
121 bytes[i++] = this.PathRevolutions;
122 bytes[i++] = ((byte) this.PathTaperX);
123 bytes[i++] = ((byte) this.PathTaperY);
124 bytes[i++] = ((byte) this.PathTwist);
125 bytes[i++] = ((byte) this.PathTwistBegin);
126 bytes[i++] = (byte)(Texture.Length % 256);
127 bytes[i++] = (byte)((Texture.Length >> 8) % 256);
128 Array.Copy(Texture, 0, bytes, i, Texture.Length); i += Texture.Length;
129 bytes[i++] = (byte)(this.CreationDate % 256);
130 bytes[i++] = (byte)((this.CreationDate >> 8) % 256);
131 bytes[i++] = (byte)((this.CreationDate >> 16) % 256);
132 bytes[i++] = (byte)((this.CreationDate >> 24) % 256);
133 bytes[i++] = (byte)(this.OwnerMask % 256);
134 bytes[i++] = (byte)((this.OwnerMask >> 8) % 256);
135 bytes[i++] = (byte)((this.OwnerMask >> 16) % 256);
136 bytes[i++] = (byte)((this.OwnerMask >> 24) % 256);
137 bytes[i++] = (byte)(this.NextOwnerMask % 256);
138 bytes[i++] = (byte)((this.NextOwnerMask >> 8) % 256);
139 bytes[i++] = (byte)((this.NextOwnerMask >> 16) % 256);
140 bytes[i++] = (byte)((this.NextOwnerMask >> 24) % 256);
141 bytes[i++] = (byte)(this.GroupMask % 256);
142 bytes[i++] = (byte)((this.GroupMask >> 8) % 256);
143 bytes[i++] = (byte)((this.GroupMask >> 16) % 256);
144 bytes[i++] = (byte)((this.GroupMask >> 24) % 256);
145 bytes[i++] = (byte)(this.EveryoneMask % 256);
146 bytes[i++] = (byte)((this.EveryoneMask >> 8) % 256);
147 bytes[i++] = (byte)((this.EveryoneMask >> 16) % 256);
148 bytes[i++] = (byte)((this.EveryoneMask >> 24) % 256);
149 bytes[i++] = (byte)(this.BaseMask % 256);
150 bytes[i++] = (byte)((this.BaseMask >> 8) % 256);
151 bytes[i++] = (byte)((this.BaseMask >> 16) % 256);
152 bytes[i++] = (byte)((this.BaseMask >> 24) % 256);
153 Array.Copy(this.Position.GetBytes(), 0, bytes, i, 12); i += 12;
154 Array.Copy(this.Rotation.GetBytes(), 0, bytes, i, 12); i += 12;
155 bytes[i++] = (byte)(this.LocalID % 256);
156 bytes[i++] = (byte)((this.LocalID >> 8) % 256);
157 bytes[i++] = (byte)((this.LocalID >> 16) % 256);
158 bytes[i++] = (byte)((this.LocalID >> 24) % 256);
159 Array.Copy(FullID.GetBytes(), 0, bytes, i, 16); i += 16;
160
161 return bytes;
162 }
44 } 163 }
45} 164}
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs
index 491d50b..46585ca 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim.RegionServer/AgentAssetUpload.cs
@@ -70,7 +70,7 @@ namespace OpenSim
70 70
71 public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID) 71 public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID)
72 { 72 {
73 73 Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
74 AssetBase asset = null; 74 AssetBase asset = null;
75 if (pack.AssetBlock.Type == 0) 75 if (pack.AssetBlock.Type == 0)
76 { 76 {
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim.RegionServer/Assets/InventoryCache.cs
index c62975a..a50bb2b 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim.RegionServer/Assets/InventoryCache.cs
@@ -140,6 +140,26 @@ namespace OpenSim.Assets
140 140
141 return newItem; 141 return newItem;
142 } 142 }
143 public bool DeleteInventoryItem(SimClient remoteClient, LLUUID itemID)
144 {
145 bool res = false;
146 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
147 {
148 res = this._agentsInventory[remoteClient.AgentID].DeleteFromInventory(itemID);
149 if (res)
150 {
151 RemoveInventoryItemPacket remove = new RemoveInventoryItemPacket();
152 remove.AgentData.AgentID = remoteClient.AgentID;
153 remove.AgentData.SessionID = remoteClient.SessionID;
154 remove.InventoryData = new RemoveInventoryItemPacket.InventoryDataBlock[1];
155 remove.InventoryData[0] = new RemoveInventoryItemPacket.InventoryDataBlock();
156 remove.InventoryData[0].ItemID = itemID;
157 remoteClient.OutPacket(remove);
158 }
159 }
160
161 return res;
162 }
143 163
144 public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Assets.AssetBase asset) 164 public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Assets.AssetBase asset)
145 { 165 {
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index ffa64b5..b173088 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -128,6 +128,8 @@ namespace OpenSim
128 m_console.WriteLine("Initialising world"); 128 m_console.WriteLine("Initialising world");
129 LocalWorld = new World(ClientThreads, Cfg.RegionHandle, Cfg.RegionName, Cfg); 129 LocalWorld = new World(ClientThreads, Cfg.RegionHandle, Cfg.RegionName, Cfg);
130 LocalWorld.LandMap = Cfg.LoadWorld(); 130 LocalWorld.LandMap = Cfg.LoadWorld();
131 LocalWorld.InventoryCache = InventoryCache;
132 LocalWorld.AssetCache = AssetCache;
131 133
132 this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); 134 this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
133 this.physManager.LoadPlugins(); 135 this.physManager.LoadPlugins();
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index f8affb9..52cb067 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -112,6 +112,7 @@ namespace OpenSim
112 protected virtual void ProcessInPacket(Packet Pack) 112 protected virtual void ProcessInPacket(Packet Pack)
113 { 113 {
114 ack_pack(Pack); 114 ack_pack(Pack);
115 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
115 if (debug) 116 if (debug)
116 { 117 {
117 if (Pack.Type != PacketType.AgentUpdate) 118 if (Pack.Type != PacketType.AgentUpdate)
@@ -166,7 +167,6 @@ namespace OpenSim
166 cachedresp.WearableData[i].TextureID = LLUUID.Zero; 167 cachedresp.WearableData[i].TextureID = LLUUID.Zero;
167 cachedresp.WearableData[i].HostName = new byte[0]; 168 cachedresp.WearableData[i].HostName = new byte[0];
168 } 169 }
169
170 this.OutPacket(cachedresp); 170 this.OutPacket(cachedresp);
171 break; 171 break;
172 case PacketType.ObjectAdd: 172 case PacketType.ObjectAdd:
@@ -293,7 +293,7 @@ namespace OpenSim
293 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; 293 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
294 if (Helpers.FieldToString(inchatpack.ChatData.Message) == "") break; 294 if (Helpers.FieldToString(inchatpack.ChatData.Message) == "") break;
295 295
296 System.Text.Encoding _enc = System.Text.Encoding.ASCII; 296
297 libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket(); 297 libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
298 reply.ChatData.Audible = 1; 298 reply.ChatData.Audible = 1;
299 reply.ChatData.Message = inchatpack.ChatData.Message; 299 reply.ChatData.Message = inchatpack.ChatData.Message;
@@ -363,6 +363,7 @@ namespace OpenSim
363 } 363 }
364 else 364 else
365 { 365 {
366 Console.Write(Pack.ToString());
366 this.CreateInventoryItem(createItem); 367 this.CreateInventoryItem(createItem);
367 } 368 }
368 break; 369 break;
@@ -424,6 +425,10 @@ namespace OpenSim
424 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Received DeRezObject packet"); 425 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Received DeRezObject packet");
425 m_world.DeRezObject((DeRezObjectPacket)Pack, this); 426 m_world.DeRezObject((DeRezObjectPacket)Pack, this);
426 break; 427 break;
428 case PacketType.RezObject:
429 //Console.WriteLine(Pack.ToString());
430 m_world.RezObject(this, (RezObjectPacket)Pack);
431 break;
427 case PacketType.ModifyLand: 432 case PacketType.ModifyLand:
428 ModifyLandPacket modify = (ModifyLandPacket)Pack; 433 ModifyLandPacket modify = (ModifyLandPacket)Pack;
429 //Console.WriteLine("terraform: number of parcel data blocks" + modify.ParcelData.Length); 434 //Console.WriteLine("terraform: number of parcel data blocks" + modify.ParcelData.Length);
@@ -464,6 +469,61 @@ namespace OpenSim
464 break; 469 break;
465 } 470 }
466 break; 471 break;
472 case PacketType.RequestTaskInventory:
473 // Console.WriteLine(Pack.ToString());
474 RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
475 ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
476 bool foundent = false;
477 foreach (Entity ent in m_world.Entities.Values)
478 {
479 if (ent.localid == requesttask.InventoryData.LocalID)
480 {
481 replytask.InventoryData.TaskID = ent.uuid;
482 replytask.InventoryData.Serial = 0;
483 replytask.InventoryData.Filename = new byte[0];
484 foundent = true;
485 }
486 }
487 if (foundent)
488 {
489 this.OutPacket(replytask);
490 }
491 break;
492 case PacketType.UUIDNameRequest:
493 //System.Text.Encoding _enc = System.Text.Encoding.ASCII;
494 Console.WriteLine(Pack.ToString());
495 UUIDNameRequestPacket nameRequest = (UUIDNameRequestPacket)Pack;
496 UUIDNameReplyPacket nameReply = new UUIDNameReplyPacket();
497 nameReply.UUIDNameBlock = new UUIDNameReplyPacket.UUIDNameBlockBlock[nameRequest.UUIDNameBlock.Length];
498
499 for (int i = 0; i < nameRequest.UUIDNameBlock.Length; i++)
500 {
501 nameReply.UUIDNameBlock[i] = new UUIDNameReplyPacket.UUIDNameBlockBlock();
502 nameReply.UUIDNameBlock[i].ID = nameRequest.UUIDNameBlock[i].ID;
503 nameReply.UUIDNameBlock[i].FirstName = _enc.GetBytes("Who\0"); //for now send any name
504 nameReply.UUIDNameBlock[i].LastName = _enc.GetBytes("Knows\0"); //in future need to look it up
505 }
506 this.OutPacket(nameReply);
507 break;
508 case PacketType.AgentAnimation:
509 //Console.WriteLine(Pack.ToString());
510 break;
511 case PacketType.ObjectSelect:
512 ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
513 for (int i = 0; i < incomingselect.ObjectData.Length; i++)
514 {
515 foreach (Entity ent in m_world.Entities.Values)
516 {
517 if (ent.localid == incomingselect.ObjectData[i].ObjectLocalID)
518 {
519 ((OpenSim.world.Primitive)ent).GetProperites(this);
520 break;
521 }
522 }
523 }
524 break;
525
526
467 } 527 }
468 } 528 }
469 529
diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs
index 2f97053..2c55004 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim.RegionServer/world/Primitive.cs
@@ -27,6 +27,7 @@ namespace OpenSim.world
27 private Dictionary<uint, SimClient> m_clientThreads; 27 private Dictionary<uint, SimClient> m_clientThreads;
28 private ulong m_regionHandle; 28 private ulong m_regionHandle;
29 private World m_world; 29 private World m_world;
30 private const uint FULL_MASK_PERMISSIONS = 2147483647;
30 31
31 public bool PhysicsEnabled 32 public bool PhysicsEnabled
32 { 33 {
@@ -94,6 +95,40 @@ namespace OpenSim.world
94 return mesh; 95 return mesh;
95 } 96 }
96 97
98 public byte[] GetByteArray()
99 {
100 return this.primData.ToBytes();
101 }
102
103 public void GetProperites(SimClient client)
104 {
105 ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
106 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
107 proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
108 proper.ObjectData[0].ItemID = LLUUID.Zero; // this.uuid;
109 proper.ObjectData[0].CreationDate = (ulong) this.primData.CreationDate;
110 proper.ObjectData[0].CreatorID = this.primData.OwnerID;
111 proper.ObjectData[0].FolderID = LLUUID.Zero;
112 proper.ObjectData[0].FromTaskID = LLUUID.Zero;
113 proper.ObjectData[0].GroupID = LLUUID.Zero;
114 proper.ObjectData[0].InventorySerial = 0;
115 proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
116 proper.ObjectData[0].ObjectID = this.uuid;
117 proper.ObjectData[0].OwnerID = primData.OwnerID;
118 proper.ObjectData[0].TouchName = new byte[0];
119 proper.ObjectData[0].TextureID = new byte[0];
120 proper.ObjectData[0].SitName = new byte[0];
121 proper.ObjectData[0].Name = new byte[0];
122 proper.ObjectData[0].Description = new byte[0];
123 proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
124 proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
125 proper.ObjectData[0].GroupMask = this.primData.GroupMask;
126 proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
127 proper.ObjectData[0].BaseMask = this.primData.BaseMask;
128
129 client.OutPacket(proper);
130 }
131
97 public void UpdatePosition(LLVector3 pos) 132 public void UpdatePosition(LLVector3 pos)
98 { 133 {
99 this.position = pos; 134 this.position = pos;
@@ -125,9 +160,45 @@ namespace OpenSim.world
125 } 160 }
126 if (this.newPrimFlag) 161 if (this.newPrimFlag)
127 { 162 {
163 /* ObjectOwnerPacket objown = new ObjectOwnerPacket();
164 objown.HeaderData.GroupID = LLUUID.Zero;
165 objown.HeaderData.Override = false;
166 objown.HeaderData.OwnerID = LLUUID.Zero;
167 objown.ObjectData = new ObjectOwnerPacket.ObjectDataBlock[1];
168 objown.ObjectData[0] = new ObjectOwnerPacket.ObjectDataBlock();
169 objown.ObjectData[0].ObjectLocalID = this.localid;
170 ObjectGroupPacket objgroup = new ObjectGroupPacket();
171 objgroup.ObjectData = new ObjectGroupPacket.ObjectDataBlock[1];
172 objgroup.ObjectData[0] = new ObjectGroupPacket.ObjectDataBlock();
173 objgroup.ObjectData[0].ObjectLocalID = this.localid;
174 ObjectPermissionsPacket objper = new ObjectPermissionsPacket();
175 objper.HeaderData.Override = false;
176 objper.ObjectData = new ObjectPermissionsPacket.ObjectDataBlock[3];
177 for (int i = 0; i < 3; i++)
178 {
179 objper.ObjectData[i] = new ObjectPermissionsPacket.ObjectDataBlock();
180 objper.ObjectData[i].ObjectLocalID = this.localid;
181 objper.ObjectData[i].Set = 1;
182 objper.ObjectData[i].Field = 0;
183 }
184 objper.ObjectData[0].Mask = 8192;
185 objper.ObjectData[1].Mask = 16384;
186 objper.ObjectData[2].Mask = 32768;*/
187
128 foreach (SimClient client in m_clientThreads.Values) 188 foreach (SimClient client in m_clientThreads.Values)
129 { 189 {
130 client.OutPacket(OurPacket); 190 client.OutPacket(OurPacket);
191 /* objown.AgentData.AgentID = client.AgentID;
192 objown.AgentData.SessionID = client.SessionID;
193 objown.HeaderData.OwnerID = client.AgentID;
194 client.OutPacket(objown);
195 objgroup.AgentData.AgentID = client.AgentID;
196 objgroup.AgentData.GroupID = LLUUID.Zero;
197 objgroup.AgentData.SessionID = client.SessionID;
198 client.OutPacket(objgroup);
199 objper.AgentData.AgentID = client.AgentID;
200 objper.AgentData.SessionID = client.SessionID;
201 client.OutPacket(objper);*/
131 } 202 }
132 this.newPrimFlag = false; 203 this.newPrimFlag = false;
133 } 204 }
@@ -286,18 +357,18 @@ namespace OpenSim.world
286 { 357 {
287 ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); 358 ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
288 objupdate.RegionData.RegionHandle = m_regionHandle; 359 objupdate.RegionData.RegionHandle = m_regionHandle;
289 objupdate.RegionData.TimeDilation = 64096; 360 objupdate.RegionData.TimeDilation = 64096;
290 361
291 objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; 362 objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
292 PrimData PData = new PrimData(); 363 PrimData PData = new PrimData();
293 this.primData = PData; 364 this.primData = PData;
365 this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
366
294 objupdate.ObjectData[0] = new ObjectUpdatePacket.ObjectDataBlock(); 367 objupdate.ObjectData[0] = new ObjectUpdatePacket.ObjectDataBlock();
295 objupdate.ObjectData[0].PSBlock = new byte[0]; 368 objupdate.ObjectData[0].PSBlock = new byte[0];
296 objupdate.ObjectData[0].ExtraParams = new byte[1]; 369 objupdate.ObjectData[0].ExtraParams = new byte[1];
297 objupdate.ObjectData[0].MediaURL = new byte[0]; 370 objupdate.ObjectData[0].MediaURL = new byte[0];
298 objupdate.ObjectData[0].NameValue = new byte[2]; 371 objupdate.ObjectData[0].NameValue = new byte[0];
299 objupdate.ObjectData[0].NameValue[0] = (byte)'t';
300 objupdate.ObjectData[0].NameValue[1] = (byte)'o';
301 objupdate.ObjectData[0].Text = new byte[0]; 372 objupdate.ObjectData[0].Text = new byte[0];
302 objupdate.ObjectData[0].TextColor = new byte[4]; 373 objupdate.ObjectData[0].TextColor = new byte[4];
303 objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 0); 374 objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 0);
@@ -307,7 +378,7 @@ namespace OpenSim.world
307 objupdate.ObjectData[0].TextureAnim = new byte[0]; 378 objupdate.ObjectData[0].TextureAnim = new byte[0];
308 objupdate.ObjectData[0].Sound = LLUUID.Zero; 379 objupdate.ObjectData[0].Sound = LLUUID.Zero;
309 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); 380 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
310 objupdate.ObjectData[0].TextureEntry = ntex.ToBytes(); 381 this.primData.Texture = objupdate.ObjectData[0].TextureEntry = ntex.ToBytes();
311 objupdate.ObjectData[0].State = 0; 382 objupdate.ObjectData[0].State = 0;
312 objupdate.ObjectData[0].Data = new byte[0]; 383 objupdate.ObjectData[0].Data = new byte[0];
313 PData.OwnerID = objupdate.ObjectData[0].OwnerID = agentID; 384 PData.OwnerID = objupdate.ObjectData[0].OwnerID = agentID;
@@ -326,14 +397,12 @@ namespace OpenSim.world
326 PData.ProfileCurve = objupdate.ObjectData[0].ProfileCurve = addPacket.ObjectData.ProfileCurve; 397 PData.ProfileCurve = objupdate.ObjectData[0].ProfileCurve = addPacket.ObjectData.ProfileCurve;
327 PData.ParentID = objupdate.ObjectData[0].ParentID = 0; 398 PData.ParentID = objupdate.ObjectData[0].ParentID = 0;
328 PData.ProfileHollow = objupdate.ObjectData[0].ProfileHollow = addPacket.ObjectData.ProfileHollow; 399 PData.ProfileHollow = objupdate.ObjectData[0].ProfileHollow = addPacket.ObjectData.ProfileHollow;
329
330 PData.PathRadiusOffset = objupdate.ObjectData[0].PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset; 400 PData.PathRadiusOffset = objupdate.ObjectData[0].PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
331 PData.PathRevolutions = objupdate.ObjectData[0].PathRevolutions = addPacket.ObjectData.PathRevolutions; 401 PData.PathRevolutions = objupdate.ObjectData[0].PathRevolutions = addPacket.ObjectData.PathRevolutions;
332 PData.PathTaperX = objupdate.ObjectData[0].PathTaperX = addPacket.ObjectData.PathTaperX; 402 PData.PathTaperX = objupdate.ObjectData[0].PathTaperX = addPacket.ObjectData.PathTaperX;
333 PData.PathTaperY = objupdate.ObjectData[0].PathTaperY = addPacket.ObjectData.PathTaperY; 403 PData.PathTaperY = objupdate.ObjectData[0].PathTaperY = addPacket.ObjectData.PathTaperY;
334 PData.PathTwist = objupdate.ObjectData[0].PathTwist = addPacket.ObjectData.PathTwist; 404 PData.PathTwist = objupdate.ObjectData[0].PathTwist = addPacket.ObjectData.PathTwist;
335 PData.PathTwistBegin = objupdate.ObjectData[0].PathTwistBegin = addPacket.ObjectData.PathTwistBegin; 405 PData.PathTwistBegin = objupdate.ObjectData[0].PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
336
337 objupdate.ObjectData[0].ID = (uint)(localID); 406 objupdate.ObjectData[0].ID = (uint)(localID);
338 objupdate.ObjectData[0].FullID = new LLUUID("edba7151-5857-acc5-b30b-f01efef" + (localID - 702000).ToString("00000")); 407 objupdate.ObjectData[0].FullID = new LLUUID("edba7151-5857-acc5-b30b-f01efef" + (localID - 702000).ToString("00000"));
339 objupdate.ObjectData[0].ObjectData = new byte[60]; 408 objupdate.ObjectData[0].ObjectData = new byte[60];
@@ -343,16 +412,20 @@ namespace OpenSim.world
343 //update position 412 //update position
344 byte[] pb = pos1.GetBytes(); 413 byte[] pb = pos1.GetBytes();
345 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length); 414 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);
346
347 this.newPrimFlag = true; 415 this.newPrimFlag = true;
348 this.uuid = objupdate.ObjectData[0].FullID; 416 this.primData.FullID = this.uuid = objupdate.ObjectData[0].FullID;
349 this.localid = objupdate.ObjectData[0].ID; 417 this.localid = objupdate.ObjectData[0].ID;
350 this.position = pos1; 418 this.primData.Position = this.position = pos1;
351 this.OurPacket = objupdate; 419 this.OurPacket = objupdate;
352 } 420 }
353 421
354 public void CreateFromStorage(PrimData store) 422 public void CreateFromStorage(PrimData store)
355 { 423 {
424 this.CreateFromStorage(store, store.Position, store.LocalID, false);
425 }
426
427 public void CreateFromStorage(PrimData store, LLVector3 posi, uint localID, bool newprim)
428 {
356 //need to clean this up as it shares a lot of code with CreateFromPacket() 429 //need to clean this up as it shares a lot of code with CreateFromPacket()
357 ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); 430 ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
358 objupdate.RegionData.RegionHandle = m_regionHandle; 431 objupdate.RegionData.RegionHandle = m_regionHandle;
@@ -410,13 +483,13 @@ namespace OpenSim.world
410 objupdate.ObjectData[0].PathTwist = this.primData.PathTwist; 483 objupdate.ObjectData[0].PathTwist = this.primData.PathTwist;
411 objupdate.ObjectData[0].PathTwistBegin = this.primData.PathTwistBegin; 484 objupdate.ObjectData[0].PathTwistBegin = this.primData.PathTwistBegin;
412 485
413 objupdate.ObjectData[0].ID = (uint)store.LocalID; 486 objupdate.ObjectData[0].ID = localID; // (uint)store.LocalID;
414 objupdate.ObjectData[0].FullID = store.FullID; 487 objupdate.ObjectData[0].FullID = store.FullID;
415 488
416 objupdate.ObjectData[0].ObjectData = new byte[60]; 489 objupdate.ObjectData[0].ObjectData = new byte[60];
417 objupdate.ObjectData[0].ObjectData[46] = 128; 490 objupdate.ObjectData[0].ObjectData[46] = 128;
418 objupdate.ObjectData[0].ObjectData[47] = 63; 491 objupdate.ObjectData[0].ObjectData[47] = 63;
419 LLVector3 pos1 = store.Position; 492 LLVector3 pos1 = posi; // store.Position;
420 //update position 493 //update position
421 byte[] pb = pos1.GetBytes(); 494 byte[] pb = pos1.GetBytes();
422 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length); 495 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);
@@ -425,8 +498,12 @@ namespace OpenSim.world
425 this.localid = objupdate.ObjectData[0].ID; 498 this.localid = objupdate.ObjectData[0].ID;
426 this.position = pos1; 499 this.position = pos1;
427 this.OurPacket = objupdate; 500 this.OurPacket = objupdate;
428 501 if (newprim)
502 {
503 this.newPrimFlag = true;
504 }
429 } 505 }
506
430 public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock() 507 public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock()
431 { 508 {
432 uint ID = this.localid; 509 uint ID = this.localid;
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 446d37c..82e8b8d 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -9,6 +9,8 @@ using OpenSim.Physics.Manager;
9using OpenSim.Framework.Interfaces; 9using OpenSim.Framework.Interfaces;
10using OpenSim.Framework.Assets; 10using OpenSim.Framework.Assets;
11using OpenSim.Framework.Terrain; 11using OpenSim.Framework.Terrain;
12using OpenSim.Framework.Inventory;
13using OpenSim.Assets;
12 14
13namespace OpenSim.world 15namespace OpenSim.world
14{ 16{
@@ -30,6 +32,8 @@ namespace OpenSim.world
30 private ulong m_regionHandle; 32 private ulong m_regionHandle;
31 private string m_regionName; 33 private string m_regionName;
32 private SimConfig m_cfg; 34 private SimConfig m_cfg;
35 private InventoryCache _inventoryCache;
36 private AssetCache _assetCache;
33 37
34 public World(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, string regionName, SimConfig cfg) 38 public World(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, string regionName, SimConfig cfg)
35 { 39 {
@@ -50,6 +54,21 @@ namespace OpenSim.world
50 Avatar.LoadAnims(); 54 Avatar.LoadAnims();
51 } 55 }
52 56
57 public InventoryCache InventoryCache
58 {
59 set
60 {
61 this._inventoryCache = value;
62 }
63 }
64
65 public AssetCache AssetCache
66 {
67 set
68 {
69 this._assetCache = value;
70 }
71 }
53 public PhysicsScene PhysScene 72 public PhysicsScene PhysScene
54 { 73 {
55 set 74 set
@@ -291,44 +310,109 @@ namespace OpenSim.world
291 310
292 public void DeRezObject(DeRezObjectPacket DeRezPacket, SimClient AgentClient) 311 public void DeRezObject(DeRezObjectPacket DeRezPacket, SimClient AgentClient)
293 { 312 {
313 // Console.WriteLine(DeRezPacket);
294 //Needs to delete object from physics at a later date 314 //Needs to delete object from physics at a later date
315 if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero)
316 {
317 libsecondlife.LLUUID[] DeRezEnts;
318 DeRezEnts = new libsecondlife.LLUUID[DeRezPacket.ObjectData.Length];
319 int i = 0;
320 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
321 {
295 322
296 libsecondlife.LLUUID[] DeRezEnts; 323 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
297 DeRezEnts = new libsecondlife.LLUUID[DeRezPacket.ObjectData.Length]; 324 foreach (Entity ent in this.Entities.Values)
298 int i = 0; 325 {
299 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) 326 if (ent.localid == Data.ObjectLocalID)
327 {
328 DeRezEnts[i++] = ent.uuid;
329 this.localStorage.RemovePrim(ent.uuid);
330 KillObjectPacket kill = new KillObjectPacket();
331 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
332 kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
333 kill.ObjectData[0].ID = ent.localid;
334 foreach (SimClient client in m_clientThreads.Values)
335 {
336 client.OutPacket(kill);
337 }
338 //Uncommenting this means an old UUID will be re-used, thus crashing the asset server
339 //Uncomment when prim/object UUIDs are random or such
340 //2007-03-22 - Randomskk
341 //this._primCount--;
342 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Deleted UUID " + ent.uuid);
343 }
344 }
345 }
346 foreach (libsecondlife.LLUUID uuid in DeRezEnts)
347 {
348 lock (Entities)
349 {
350 Entities.Remove(uuid);
351 }
352 }
353 }
354 else
300 { 355 {
301 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString()); 356 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
302 foreach (Entity ent in this.Entities.Values)
303 { 357 {
304 if (ent.localid == Data.ObjectLocalID) 358 Entity selectedEnt = null;
359 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
360 foreach (Entity ent in this.Entities.Values)
361 {
362 if (ent.localid == Data.ObjectLocalID)
363 {
364 AssetBase primAsset = new AssetBase();
365 primAsset.FullID = LLUUID.Random();//DeRezPacket.AgentBlock.TransactionID.Combine(LLUUID.Zero); //should be combining with securesessionid
366 primAsset.InvType = 6;
367 primAsset.Type = 6;
368 primAsset.Name = "Prim";
369 primAsset.Description = "";
370 primAsset.Data = ((Primitive)ent).GetByteArray();
371 this._assetCache.AddAsset(primAsset);
372 this._inventoryCache.AddNewInventoryItem(AgentClient, DeRezPacket.AgentBlock.DestinationID, primAsset);
373 selectedEnt = ent;
374 break;
375 }
376 }
377 if (selectedEnt != null)
305 { 378 {
306 DeRezEnts[i++] = ent.uuid; 379 this.localStorage.RemovePrim(selectedEnt.uuid);
307 this.localStorage.RemovePrim(ent.uuid);
308 KillObjectPacket kill = new KillObjectPacket(); 380 KillObjectPacket kill = new KillObjectPacket();
309 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; 381 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
310 kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock(); 382 kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
311 kill.ObjectData[0].ID = ent.localid; 383 kill.ObjectData[0].ID = selectedEnt.localid;
312 foreach (SimClient client in m_clientThreads.Values) 384 foreach (SimClient client in m_clientThreads.Values)
313 { 385 {
314 client.OutPacket(kill); 386 client.OutPacket(kill);
315 } 387 }
316 //Uncommenting this means an old UUID will be re-used, thus crashing the asset server 388 lock (Entities)
317 //Uncomment when prim/object UUIDs are random or such 389 {
318 //2007-03-22 - Randomskk 390 Entities.Remove(selectedEnt.uuid);
319 //this._primCount--; 391 }
320 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Deleted UUID " + ent.uuid);
321 } 392 }
322 } 393 }
323 } 394 }
324 foreach (libsecondlife.LLUUID uuid in DeRezEnts) 395 }
396
397 public void RezObject(SimClient remoteClient, RezObjectPacket packet)
398 {
399 AgentInventory inven =this._inventoryCache.GetAgentsInventory(remoteClient.AgentID);
400 if(inven != null)
325 { 401 {
326 lock (Entities) 402 if (inven.InventoryItems.ContainsKey(packet.InventoryData.ItemID))
327 { 403 {
328 Entities.Remove(uuid); 404 AssetBase asset = this._assetCache.GetAsset(inven.InventoryItems[packet.InventoryData.ItemID].AssetID);
405 if (asset != null)
406 {
407 PrimData primd = new PrimData(asset.Data);
408 Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
409 nPrim.CreateFromStorage(primd, packet.RezData.RayEnd, this._primCount, true);
410 this.Entities.Add(nPrim.uuid, nPrim);
411 this._primCount++;
412 this._inventoryCache.DeleteInventoryItem(remoteClient, packet.InventoryData.ItemID);
413 }
329 } 414 }
330 } 415 }
331
332 } 416 }
333 417
334 public bool Backup() 418 public bool Backup()
generated by cgit v1.1 at 2024-11-11 20:24:41 +0000