aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorlbsa712007-08-03 18:45:42 +0000
committerlbsa712007-08-03 18:45:42 +0000
commite4196ee6b816a29b12734ac69cdeec98527f096f (patch)
tree83e7660135862c97ab2788846c2618a1aa6e2ce7 /OpenSim/Region/Environment/Scenes
parentATTENTION!!! Change to default to "sandbox" (did we come up with a better nam... (diff)
downloadopensim-SC_OLD-e4196ee6b816a29b12734ac69cdeec98527f096f.zip
opensim-SC_OLD-e4196ee6b816a29b12734ac69cdeec98527f096f.tar.gz
opensim-SC_OLD-e4196ee6b816a29b12734ac69cdeec98527f096f.tar.bz2
opensim-SC_OLD-e4196ee6b816a29b12734ac69cdeec98527f096f.tar.xz
* Changed some names
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs80
2 files changed, 42 insertions, 42 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
index d3b69b4..35b6fef 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Region.Environment.Scenes
166 { 166 {
167 foreach (AllNewSceneObjectPart2 part in this.m_parts.Values) 167 foreach (AllNewSceneObjectPart2 part in this.m_parts.Values)
168 { 168 {
169 part.SendTerseUpdateToALLClients(); 169 part.SendTerseUpdateToAllClients();
170 } 170 }
171 } 171 }
172 172
@@ -266,7 +266,7 @@ namespace OpenSim.Region.Environment.Scenes
266 public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient) 266 public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
267 { 267 {
268 this.Pos = pos; 268 this.Pos = pos;
269 this.m_rootPart.SendTerseUpdateToALLClients(); 269 this.m_rootPart.SendTerseUpdateToAllClients();
270 } 270 }
271 271
272 /// <summary> 272 /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index 93f2d0a..50bdb5d 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -27,7 +27,7 @@ namespace OpenSim.Region.Environment.Scenes
27 public uint EveryoneMask = FULL_MASK_PERMISSIONS; 27 public uint EveryoneMask = FULL_MASK_PERMISSIONS;
28 public uint BaseMask = FULL_MASK_PERMISSIONS; 28 public uint BaseMask = FULL_MASK_PERMISSIONS;
29 29
30 protected PrimitiveBaseShape m_Shape; 30 protected PrimitiveBaseShape m_shape;
31 protected byte[] m_particleSystem = new byte[0]; 31 protected byte[] m_particleSystem = new byte[0];
32 32
33 protected AllNewSceneObjectGroup2 m_parentGroup; 33 protected AllNewSceneObjectGroup2 m_parentGroup;
@@ -230,11 +230,11 @@ namespace OpenSim.Region.Environment.Scenes
230 { 230 {
231 get 231 get
232 { 232 {
233 return this.m_Shape; 233 return this.m_shape;
234 } 234 }
235 set 235 set
236 { 236 {
237 m_Shape = value; 237 m_shape = value;
238 } 238 }
239 } 239 }
240 240
@@ -242,11 +242,11 @@ namespace OpenSim.Region.Environment.Scenes
242 { 242 {
243 set 243 set
244 { 244 {
245 this.m_Shape.Scale = value; 245 this.m_shape.Scale = value;
246 } 246 }
247 get 247 get
248 { 248 {
249 return this.m_Shape.Scale; 249 return this.m_shape.Scale;
250 } 250 }
251 } 251 }
252 #endregion 252 #endregion
@@ -280,7 +280,7 @@ namespace OpenSim.Region.Environment.Scenes
280 this.LastOwnerID = LLUUID.Zero; 280 this.LastOwnerID = LLUUID.Zero;
281 this.UUID = LLUUID.Random(); 281 this.UUID = LLUUID.Random();
282 this.LocalID = (uint)(localID); 282 this.LocalID = (uint)(localID);
283 this.m_Shape = shape; 283 this.m_shape = shape;
284 284
285 this.OffsetPosition = position; 285 this.OffsetPosition = position;
286 this.RotationOffset = LLQuaternion.Identity; 286 this.RotationOffset = LLQuaternion.Identity;
@@ -315,7 +315,7 @@ namespace OpenSim.Region.Environment.Scenes
315 this.LastOwnerID = lastOwnerID; 315 this.LastOwnerID = lastOwnerID;
316 this.UUID = LLUUID.Random(); 316 this.UUID = LLUUID.Random();
317 this.LocalID = (uint)(localID); 317 this.LocalID = (uint)(localID);
318 this.m_Shape = shape; 318 this.m_shape = shape;
319 319
320 this.OffsetPosition = position; 320 this.OffsetPosition = position;
321 this.RotationOffset = rotation; 321 this.RotationOffset = rotation;
@@ -331,7 +331,7 @@ namespace OpenSim.Region.Environment.Scenes
331 public AllNewSceneObjectPart2 Copy(Scene scene) 331 public AllNewSceneObjectPart2 Copy(Scene scene)
332 { 332 {
333 AllNewSceneObjectPart2 dupe =(AllNewSceneObjectPart2) this.MemberwiseClone(); 333 AllNewSceneObjectPart2 dupe =(AllNewSceneObjectPart2) this.MemberwiseClone();
334 dupe.m_Shape = m_Shape.Copy(); 334 dupe.m_shape = m_shape.Copy();
335 dupe.m_regionHandle = m_regionHandle; 335 dupe.m_regionHandle = m_regionHandle;
336 uint newLocalID = scene.PrimIDAllocate(); 336 uint newLocalID = scene.PrimIDAllocate();
337 dupe.UUID = LLUUID.Random(); 337 dupe.UUID = LLUUID.Random();
@@ -381,7 +381,7 @@ namespace OpenSim.Region.Environment.Scenes
381 { 381 {
382 if (m_updateFlag == 1) //some change has been made so update the clients 382 if (m_updateFlag == 1) //some change has been made so update the clients
383 { 383 {
384 SendTerseUpdateToALLClients(); 384 SendTerseUpdateToAllClients();
385 ClearUpdateSchedule(); 385 ClearUpdateSchedule();
386 } 386 }
387 else 387 else
@@ -402,24 +402,24 @@ namespace OpenSim.Region.Environment.Scenes
402 /// <param name="shapeBlock"></param> 402 /// <param name="shapeBlock"></param>
403 public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock) 403 public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock)
404 { 404 {
405 this.m_Shape.PathBegin = shapeBlock.PathBegin; 405 this.m_shape.PathBegin = shapeBlock.PathBegin;
406 this.m_Shape.PathEnd = shapeBlock.PathEnd; 406 this.m_shape.PathEnd = shapeBlock.PathEnd;
407 this.m_Shape.PathScaleX = shapeBlock.PathScaleX; 407 this.m_shape.PathScaleX = shapeBlock.PathScaleX;
408 this.m_Shape.PathScaleY = shapeBlock.PathScaleY; 408 this.m_shape.PathScaleY = shapeBlock.PathScaleY;
409 this.m_Shape.PathShearX = shapeBlock.PathShearX; 409 this.m_shape.PathShearX = shapeBlock.PathShearX;
410 this.m_Shape.PathShearY = shapeBlock.PathShearY; 410 this.m_shape.PathShearY = shapeBlock.PathShearY;
411 this.m_Shape.PathSkew = shapeBlock.PathSkew; 411 this.m_shape.PathSkew = shapeBlock.PathSkew;
412 this.m_Shape.ProfileBegin = shapeBlock.ProfileBegin; 412 this.m_shape.ProfileBegin = shapeBlock.ProfileBegin;
413 this.m_Shape.ProfileEnd = shapeBlock.ProfileEnd; 413 this.m_shape.ProfileEnd = shapeBlock.ProfileEnd;
414 this.m_Shape.PathCurve = shapeBlock.PathCurve; 414 this.m_shape.PathCurve = shapeBlock.PathCurve;
415 this.m_Shape.ProfileCurve = shapeBlock.ProfileCurve; 415 this.m_shape.ProfileCurve = shapeBlock.ProfileCurve;
416 this.m_Shape.ProfileHollow = shapeBlock.ProfileHollow; 416 this.m_shape.ProfileHollow = shapeBlock.ProfileHollow;
417 this.m_Shape.PathRadiusOffset = shapeBlock.PathRadiusOffset; 417 this.m_shape.PathRadiusOffset = shapeBlock.PathRadiusOffset;
418 this.m_Shape.PathRevolutions = shapeBlock.PathRevolutions; 418 this.m_shape.PathRevolutions = shapeBlock.PathRevolutions;
419 this.m_Shape.PathTaperX = shapeBlock.PathTaperX; 419 this.m_shape.PathTaperX = shapeBlock.PathTaperX;
420 this.m_Shape.PathTaperY = shapeBlock.PathTaperY; 420 this.m_shape.PathTaperY = shapeBlock.PathTaperY;
421 this.m_Shape.PathTwist = shapeBlock.PathTwist; 421 this.m_shape.PathTwist = shapeBlock.PathTwist;
422 this.m_Shape.PathTwistBegin = shapeBlock.PathTwistBegin; 422 this.m_shape.PathTwistBegin = shapeBlock.PathTwistBegin;
423 } 423 }
424 #endregion 424 #endregion
425 425
@@ -436,18 +436,18 @@ namespace OpenSim.Region.Environment.Scenes
436 #region ExtraParams 436 #region ExtraParams
437 public void UpdateExtraParam(ushort type, bool inUse, byte[] data) 437 public void UpdateExtraParam(ushort type, bool inUse, byte[] data)
438 { 438 {
439 this.m_Shape.ExtraParams = new byte[data.Length + 7]; 439 this.m_shape.ExtraParams = new byte[data.Length + 7];
440 int i = 0; 440 int i = 0;
441 uint length = (uint)data.Length; 441 uint length = (uint)data.Length;
442 this.m_Shape.ExtraParams[i++] = 1; 442 this.m_shape.ExtraParams[i++] = 1;
443 this.m_Shape.ExtraParams[i++] = (byte)(type % 256); 443 this.m_shape.ExtraParams[i++] = (byte)(type % 256);
444 this.m_Shape.ExtraParams[i++] = (byte)((type >> 8) % 256); 444 this.m_shape.ExtraParams[i++] = (byte)((type >> 8) % 256);
445 445
446 this.m_Shape.ExtraParams[i++] = (byte)(length % 256); 446 this.m_shape.ExtraParams[i++] = (byte)(length % 256);
447 this.m_Shape.ExtraParams[i++] = (byte)((length >> 8) % 256); 447 this.m_shape.ExtraParams[i++] = (byte)((length >> 8) % 256);
448 this.m_Shape.ExtraParams[i++] = (byte)((length >> 16) % 256); 448 this.m_shape.ExtraParams[i++] = (byte)((length >> 16) % 256);
449 this.m_Shape.ExtraParams[i++] = (byte)((length >> 24) % 256); 449 this.m_shape.ExtraParams[i++] = (byte)((length >> 24) % 256);
450 Array.Copy(data, 0, this.m_Shape.ExtraParams, i, data.Length); 450 Array.Copy(data, 0, this.m_shape.ExtraParams, i, data.Length);
451 451
452 this.ScheduleFullUpdate(); 452 this.ScheduleFullUpdate();
453 } 453 }
@@ -460,7 +460,7 @@ namespace OpenSim.Region.Environment.Scenes
460 /// <param name="textureEntry"></param> 460 /// <param name="textureEntry"></param>
461 public void UpdateTextureEntry(byte[] textureEntry) 461 public void UpdateTextureEntry(byte[] textureEntry)
462 { 462 {
463 this.m_Shape.TextureEntry = textureEntry; 463 this.m_shape.TextureEntry = textureEntry;
464 } 464 }
465 #endregion 465 #endregion
466 466
@@ -497,7 +497,7 @@ namespace OpenSim.Region.Environment.Scenes
497 /// <param name="scale"></param> 497 /// <param name="scale"></param>
498 public void Resize(LLVector3 scale) 498 public void Resize(LLVector3 scale)
499 { 499 {
500 this.m_Shape.Scale = scale; 500 this.m_shape.Scale = scale;
501 } 501 }
502 #endregion 502 #endregion
503 503
@@ -525,14 +525,14 @@ namespace OpenSim.Region.Environment.Scenes
525 LLQuaternion lRot; 525 LLQuaternion lRot;
526 lRot = RotationOffset; 526 lRot = RotationOffset;
527 527
528 remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalID, m_Shape, lPos, lRot, this.ObjectFlags, m_uuid, 528 remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalID, m_shape, lPos, lRot, this.ObjectFlags, m_uuid,
529 OwnerID, m_text, ParentID, this.m_particleSystem); 529 OwnerID, m_text, ParentID, this.m_particleSystem);
530 } 530 }
531 531
532 /// <summary> 532 /// <summary>
533 /// 533 ///
534 /// </summary> 534 /// </summary>
535 public void SendTerseUpdateToALLClients() 535 public void SendTerseUpdateToAllClients()
536 { 536 {
537 List<ScenePresence> avatars = this.m_parentGroup.RequestSceneAvatars(); 537 List<ScenePresence> avatars = this.m_parentGroup.RequestSceneAvatars();
538 for (int i = 0; i < avatars.Count; i++) 538 for (int i = 0; i < avatars.Count; i++)