diff options
Diffstat (limited to 'OpenSim/OpenSim.Region')
-rw-r--r-- | OpenSim/OpenSim.Region/World/Primitive.cs | 90 |
1 files changed, 87 insertions, 3 deletions
diff --git a/OpenSim/OpenSim.Region/World/Primitive.cs b/OpenSim/OpenSim.Region/World/Primitive.cs index d540a3b..c800f21 100644 --- a/OpenSim/OpenSim.Region/World/Primitive.cs +++ b/OpenSim/OpenSim.Region/World/Primitive.cs | |||
@@ -45,6 +45,7 @@ namespace OpenSim.Region | |||
45 | this._physActor = value; | 45 | this._physActor = value; |
46 | } | 46 | } |
47 | } | 47 | } |
48 | |||
48 | public override LLVector3 Pos | 49 | public override LLVector3 Pos |
49 | { | 50 | { |
50 | get | 51 | get |
@@ -58,6 +59,12 @@ namespace OpenSim.Region | |||
58 | } | 59 | } |
59 | #endregion | 60 | #endregion |
60 | 61 | ||
62 | /// <summary> | ||
63 | /// | ||
64 | /// </summary> | ||
65 | /// <param name="clientThreads"></param> | ||
66 | /// <param name="regionHandle"></param> | ||
67 | /// <param name="world"></param> | ||
61 | public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world) | 68 | public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world) |
62 | { | 69 | { |
63 | m_clientThreads = clientThreads; | 70 | m_clientThreads = clientThreads; |
@@ -66,6 +73,15 @@ namespace OpenSim.Region | |||
66 | inventoryItems = new Dictionary<LLUUID, InventoryItem>(); | 73 | inventoryItems = new Dictionary<LLUUID, InventoryItem>(); |
67 | } | 74 | } |
68 | 75 | ||
76 | /// <summary> | ||
77 | /// | ||
78 | /// </summary> | ||
79 | /// <param name="clientThreads"></param> | ||
80 | /// <param name="regionHandle"></param> | ||
81 | /// <param name="world"></param> | ||
82 | /// <param name="owner"></param> | ||
83 | /// <param name="fullID"></param> | ||
84 | /// <param name="localID"></param> | ||
69 | public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID) | 85 | public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID) |
70 | { | 86 | { |
71 | m_clientThreads = clientThreads; | 87 | m_clientThreads = clientThreads; |
@@ -102,7 +118,10 @@ namespace OpenSim.Region | |||
102 | this.updateFlag = 1; | 118 | this.updateFlag = 1; |
103 | } | 119 | } |
104 | 120 | ||
105 | 121 | /// <summary> | |
122 | /// | ||
123 | /// </summary> | ||
124 | /// <returns></returns> | ||
106 | public byte[] GetByteArray() | 125 | public byte[] GetByteArray() |
107 | { | 126 | { |
108 | byte[] result = null; | 127 | byte[] result = null; |
@@ -139,6 +158,9 @@ namespace OpenSim.Region | |||
139 | 158 | ||
140 | #region Overridden Methods | 159 | #region Overridden Methods |
141 | 160 | ||
161 | /// <summary> | ||
162 | /// | ||
163 | /// </summary> | ||
142 | public override void update() | 164 | public override void update() |
143 | { | 165 | { |
144 | if (this.updateFlag == 1) | 166 | if (this.updateFlag == 1) |
@@ -148,6 +170,9 @@ namespace OpenSim.Region | |||
148 | } | 170 | } |
149 | } | 171 | } |
150 | 172 | ||
173 | /// <summary> | ||
174 | /// | ||
175 | /// </summary> | ||
151 | public override void BackUp() | 176 | public override void BackUp() |
152 | { | 177 | { |
153 | 178 | ||
@@ -157,11 +182,19 @@ namespace OpenSim.Region | |||
157 | 182 | ||
158 | #region Packet handlers | 183 | #region Packet handlers |
159 | 184 | ||
185 | /// <summary> | ||
186 | /// | ||
187 | /// </summary> | ||
188 | /// <param name="pos"></param> | ||
160 | public void UpdatePosition(LLVector3 pos) | 189 | public void UpdatePosition(LLVector3 pos) |
161 | { | 190 | { |
162 | 191 | ||
163 | } | 192 | } |
164 | 193 | ||
194 | /// <summary> | ||
195 | /// | ||
196 | /// </summary> | ||
197 | /// <param name="addPacket"></param> | ||
165 | public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket) | 198 | public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket) |
166 | { | 199 | { |
167 | this.primData.PathBegin = addPacket.PathBegin; | 200 | this.primData.PathBegin = addPacket.PathBegin; |
@@ -184,22 +217,38 @@ namespace OpenSim.Region | |||
184 | this.primData.PathTwistBegin = addPacket.PathTwistBegin; | 217 | this.primData.PathTwistBegin = addPacket.PathTwistBegin; |
185 | } | 218 | } |
186 | 219 | ||
220 | /// <summary> | ||
221 | /// | ||
222 | /// </summary> | ||
223 | /// <param name="tex"></param> | ||
187 | public void UpdateTexture(byte[] tex) | 224 | public void UpdateTexture(byte[] tex) |
188 | { | 225 | { |
189 | this.primData.Texture = tex; | 226 | this.primData.Texture = tex; |
190 | //this.dirtyFlag = true; | 227 | //this.dirtyFlag = true; |
191 | } | 228 | } |
192 | 229 | ||
230 | /// <summary> | ||
231 | /// | ||
232 | /// </summary> | ||
233 | /// <param name="pack"></param> | ||
193 | public void UpdateObjectFlags(ObjectFlagUpdatePacket pack) | 234 | public void UpdateObjectFlags(ObjectFlagUpdatePacket pack) |
194 | { | 235 | { |
195 | 236 | ||
196 | } | 237 | } |
197 | 238 | ||
239 | /// <summary> | ||
240 | /// | ||
241 | /// </summary> | ||
242 | /// <param name="prim"></param> | ||
198 | public void AssignToParent(Primitive prim) | 243 | public void AssignToParent(Primitive prim) |
199 | { | 244 | { |
200 | 245 | ||
201 | } | 246 | } |
202 | 247 | ||
248 | /// <summary> | ||
249 | /// | ||
250 | /// </summary> | ||
251 | /// <param name="client"></param> | ||
203 | public void GetProperites(IClientAPI client) | 252 | public void GetProperites(IClientAPI client) |
204 | { | 253 | { |
205 | ObjectPropertiesPacket proper = new ObjectPropertiesPacket(); | 254 | ObjectPropertiesPacket proper = new ObjectPropertiesPacket(); |
@@ -286,7 +335,11 @@ namespace OpenSim.Region | |||
286 | 335 | ||
287 | #region Update viewers Methods | 336 | #region Update viewers Methods |
288 | 337 | ||
289 | //should change these mehtods, so that outgoing packets are sent through the avatar class | 338 | //should change these mehtods, so that outgoing packets are sent through the avatar class? |
339 | /// <summary> | ||
340 | /// | ||
341 | /// </summary> | ||
342 | /// <param name="remoteClient"></param> | ||
290 | public void SendFullUpdateToClient(IClientAPI remoteClient) | 343 | public void SendFullUpdateToClient(IClientAPI remoteClient) |
291 | { | 344 | { |
292 | LLVector3 lPos; | 345 | LLVector3 lPos; |
@@ -303,6 +356,9 @@ namespace OpenSim.Region | |||
303 | remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.localid, this.primData, lPos, new LLUUID("00000000-0000-0000-5005-000000000005")); | 356 | remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.localid, this.primData, lPos, new LLUUID("00000000-0000-0000-5005-000000000005")); |
304 | } | 357 | } |
305 | 358 | ||
359 | /// <summary> | ||
360 | /// | ||
361 | /// </summary> | ||
306 | public void SendFullUpdateToAllClients() | 362 | public void SendFullUpdateToAllClients() |
307 | { | 363 | { |
308 | List<Avatar> avatars = this.m_world.RequestAvatarList(); | 364 | List<Avatar> avatars = this.m_world.RequestAvatarList(); |
@@ -312,6 +368,10 @@ namespace OpenSim.Region | |||
312 | } | 368 | } |
313 | } | 369 | } |
314 | 370 | ||
371 | /// <summary> | ||
372 | /// | ||
373 | /// </summary> | ||
374 | /// <param name="RemoteClient"></param> | ||
315 | public void SendTerseUpdateToClient(IClientAPI RemoteClient) | 375 | public void SendTerseUpdateToClient(IClientAPI RemoteClient) |
316 | { | 376 | { |
317 | LLVector3 lPos; | 377 | LLVector3 lPos; |
@@ -331,6 +391,9 @@ namespace OpenSim.Region | |||
331 | 391 | ||
332 | } | 392 | } |
333 | 393 | ||
394 | /// <summary> | ||
395 | /// | ||
396 | /// </summary> | ||
334 | public void SendTerseUpdateToALLClients() | 397 | public void SendTerseUpdateToALLClients() |
335 | { | 398 | { |
336 | List<Avatar> avatars = this.m_world.RequestAvatarList(); | 399 | List<Avatar> avatars = this.m_world.RequestAvatarList(); |
@@ -344,6 +407,12 @@ namespace OpenSim.Region | |||
344 | 407 | ||
345 | #region Create Methods | 408 | #region Create Methods |
346 | 409 | ||
410 | /// <summary> | ||
411 | /// | ||
412 | /// </summary> | ||
413 | /// <param name="addPacket"></param> | ||
414 | /// <param name="ownerID"></param> | ||
415 | /// <param name="localID"></param> | ||
347 | public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID) | 416 | public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID) |
348 | { | 417 | { |
349 | PrimData PData = new PrimData(); | 418 | PrimData PData = new PrimData(); |
@@ -380,16 +449,31 @@ namespace OpenSim.Region | |||
380 | this.updateFlag = 1; | 449 | this.updateFlag = 1; |
381 | } | 450 | } |
382 | 451 | ||
452 | /// <summary> | ||
453 | /// | ||
454 | /// </summary> | ||
455 | /// <param name="data"></param> | ||
383 | public void CreateFromBytes(byte[] data) | 456 | public void CreateFromBytes(byte[] data) |
384 | { | 457 | { |
385 | 458 | ||
386 | } | 459 | } |
387 | 460 | ||
461 | /// <summary> | ||
462 | /// | ||
463 | /// </summary> | ||
464 | /// <param name="primData"></param> | ||
388 | public void CreateFromPrimData(PrimData primData) | 465 | public void CreateFromPrimData(PrimData primData) |
389 | { | 466 | { |
390 | this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false); | 467 | this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false); |
391 | } | 468 | } |
392 | 469 | ||
470 | /// <summary> | ||
471 | /// | ||
472 | /// </summary> | ||
473 | /// <param name="primData"></param> | ||
474 | /// <param name="posi"></param> | ||
475 | /// <param name="localID"></param> | ||
476 | /// <param name="newprim"></param> | ||
393 | public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim) | 477 | public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim) |
394 | { | 478 | { |
395 | 479 | ||