aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleModule
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Examples/SimpleModule')
-rw-r--r--OpenSim/Region/Examples/SimpleModule/ComplexObject.cs54
-rw-r--r--OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs6
-rw-r--r--OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs6
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs198
-rw-r--r--OpenSim/Region/Examples/SimpleModule/RegionModule.cs20
5 files changed, 142 insertions, 142 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index 16636e0..c8c4624 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using libsecondlife; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
31 31
@@ -33,7 +33,7 @@ namespace OpenSim.Region.Examples.SimpleModule
33{ 33{
34 public class ComplexObject : SceneObjectGroup 34 public class ComplexObject : SceneObjectGroup
35 { 35 {
36 private readonly LLQuaternion m_rotationDirection; 36 private readonly Quaternion m_rotationDirection;
37 37
38 protected override bool InSceneBackup 38 protected override bool InSceneBackup
39 { 39 {
@@ -45,21 +45,21 @@ namespace OpenSim.Region.Examples.SimpleModule
45 45
46 private class RotatingWheel : SceneObjectPart 46 private class RotatingWheel : SceneObjectPart
47 { 47 {
48 private readonly LLQuaternion m_rotationDirection; 48 private readonly Quaternion m_rotationDirection;
49 49
50 public RotatingWheel() 50 public RotatingWheel()
51 { 51 {
52 } 52 }
53 53
54 public RotatingWheel(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, 54 public RotatingWheel(ulong regionHandle, SceneObjectGroup parent, UUID ownerID, uint localID,
55 LLVector3 groupPosition, LLVector3 offsetPosition, LLQuaternion rotationDirection) 55 Vector3 groupPosition, Vector3 offsetPosition, Quaternion rotationDirection)
56 : base( 56 : base(
57 regionHandle, parent, ownerID, localID, PrimitiveBaseShape.Default, groupPosition, offsetPosition 57 regionHandle, parent, ownerID, localID, PrimitiveBaseShape.Default, groupPosition, offsetPosition
58 ) 58 )
59 { 59 {
60 m_rotationDirection = rotationDirection; 60 m_rotationDirection = rotationDirection;
61 61
62 Flags |= LLObject.ObjectFlags.Touch; 62 Flags |= PrimFlags.Touch;
63 } 63 }
64 64
65 public override void UpdateMovement() 65 public override void UpdateMovement()
@@ -79,55 +79,55 @@ namespace OpenSim.Region.Examples.SimpleModule
79 { 79 {
80 } 80 }
81 81
82 public ComplexObject(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos) 82 public ComplexObject(Scene scene, ulong regionHandle, UUID ownerID, uint localID, Vector3 pos)
83 : base(scene, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default) 83 : base(scene, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default)
84 { 84 {
85 m_rotationDirection = new LLQuaternion(0.05f, 0.1f, 0.15f); 85 m_rotationDirection = new Quaternion(0.05f, 0.1f, 0.15f);
86 86
87 AddPart( 87 AddPart(
88 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, 0.75f), 88 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, 0, 0.75f),
89 new LLQuaternion(0.05f, 0, 0))); 89 new Quaternion(0.05f, 0, 0)));
90 AddPart( 90 AddPart(
91 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, -0.75f), 91 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, 0, -0.75f),
92 new LLQuaternion(-0.05f, 0, 0))); 92 new Quaternion(-0.05f, 0, 0)));
93 93
94 AddPart( 94 AddPart(
95 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0.75f, 0), 95 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, 0.75f, 0),
96 new LLQuaternion(0.5f, 0, 0.05f))); 96 new Quaternion(0.5f, 0, 0.05f)));
97 AddPart( 97 AddPart(
98 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, -0.75f, 0), 98 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, -0.75f, 0),
99 new LLQuaternion(-0.5f, 0, -0.05f))); 99 new Quaternion(-0.5f, 0, -0.05f)));
100 100
101 AddPart( 101 AddPart(
102 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0.75f, 0, 0), 102 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0.75f, 0, 0),
103 new LLQuaternion(0, 0.5f, 0.05f))); 103 new Quaternion(0, 0.5f, 0.05f)));
104 AddPart( 104 AddPart(
105 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(-0.75f, 0, 0), 105 new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(-0.75f, 0, 0),
106 new LLQuaternion(0, -0.5f, -0.05f))); 106 new Quaternion(0, -0.5f, -0.05f)));
107 107
108 RootPart.Flags |= LLObject.ObjectFlags.Touch; 108 RootPart.Flags |= PrimFlags.Touch;
109 109
110 UpdateParentIDs(); 110 UpdateParentIDs();
111 } 111 }
112 112
113 public override void OnGrabPart(SceneObjectPart part, LLVector3 offsetPos, IClientAPI remoteClient) 113 public override void OnGrabPart(SceneObjectPart part, Vector3 offsetPos, IClientAPI remoteClient)
114 { 114 {
115 m_parts.Remove(part.UUID); 115 m_parts.Remove(part.UUID);
116 116
117 remoteClient.SendKillObject(m_regionHandle, part.LocalId); 117 remoteClient.SendKiPrimitive(m_regionHandle, part.LocalId);
118 remoteClient.AddMoney(1); 118 remoteClient.AddMoney(1);
119 remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); 119 remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully);
120 } 120 }
121 121
122 public override void OnGrabGroup(LLVector3 offsetPos, IClientAPI remoteClient) 122 public override void OnGrabGroup(Vector3 offsetPos, IClientAPI remoteClient)
123 { 123 {
124 if (m_parts.Count == 1) 124 if (m_parts.Count == 1)
125 { 125 {
126 m_parts.Remove(m_rootPart.UUID); 126 m_parts.Remove(m_rootPart.UUID);
127 m_scene.DeleteSceneObject(this); 127 m_scene.DeleteSceneObject(this);
128 remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId); 128 remoteClient.SendKiPrimitive(m_regionHandle, m_rootPart.LocalId);
129 remoteClient.AddMoney(50); 129 remoteClient.AddMoney(50);
130 remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); 130 remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully);
131 } 131 }
132 } 132 }
133 } 133 }
diff --git a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs
index e7d5db8..126ccd3 100644
--- a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Diagnostics; 29using System.Diagnostics;
30using libsecondlife; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Environment.Scenes;
33 33
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Examples.SimpleModule
45 45
46 private PerformanceCounter m_counter; 46 private PerformanceCounter m_counter;
47 47
48 public CpuCounterObject(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos) 48 public CpuCounterObject(Scene world, ulong regionHandle, UUID ownerID, uint localID, Vector3 pos)
49 : base(world, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default) 49 : base(world, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default)
50 { 50 {
51 String objectName = "Processor"; 51 String objectName = "Processor";
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Examples.SimpleModule
58 public override void UpdateMovement() 58 public override void UpdateMovement()
59 { 59 {
60 float cpu = m_counter.NextValue()/40f; 60 float cpu = m_counter.NextValue()/40f;
61 LLVector3 size = new LLVector3(cpu, cpu, cpu); 61 Vector3 size = new Vector3(cpu, cpu, cpu);
62 62
63 RootPart.Resize(size); 63 RootPart.Resize(size);
64 64
diff --git a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
index 34ed086..3b43c7a 100644
--- a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.IO; 28using System.IO;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
32 32
@@ -34,8 +34,8 @@ namespace OpenSim.Region.Examples.SimpleModule
34{ 34{
35 public class FileSystemObject : SceneObjectGroup 35 public class FileSystemObject : SceneObjectGroup
36 { 36 {
37 public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos) 37 public FileSystemObject(Scene world, FileInfo fileInfo, Vector3 pos)
38 : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, PrimitiveBaseShape.Default) 38 : base(world, world.RegionInfo.RegionHandle, UUID.Zero, world.NextLocalId, pos, PrimitiveBaseShape.Default)
39 { 39 {
40 Text = fileInfo.Name; 40 Text = fileInfo.Name;
41 } 41 }
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 3ea518f..8f579bd 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using libsecondlife; 31using OpenMetaverse;
32using libsecondlife.Packets; 32using OpenMetaverse.Packets;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Environment.Scenes;
35 35
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Examples.SimpleModule
39 { 39 {
40 private uint movementFlag = 0; 40 private uint movementFlag = 0;
41 private short flyState = 0; 41 private short flyState = 0;
42 private LLQuaternion bodyDirection = LLQuaternion.Identity; 42 private Quaternion bodyDirection = Quaternion.Identity;
43 private short count = 0; 43 private short count = 0;
44 private short frame = 0; 44 private short frame = 0;
45 private Scene m_scene; 45 private Scene m_scene;
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Examples.SimpleModule
117 public event UpdateVector OnUpdatePrimGroupScale; 117 public event UpdateVector OnUpdatePrimGroupScale;
118 public event StatusChange OnChildAgentStatus; 118 public event StatusChange OnChildAgentStatus;
119 public event GenericCall2 OnStopMovement; 119 public event GenericCall2 OnStopMovement;
120 public event Action<LLUUID> OnRemoveAvatar; 120 public event Action<UUID> OnRemoveAvatar;
121 121
122 public event CreateNewInventoryItem OnCreateNewInventoryItem; 122 public event CreateNewInventoryItem OnCreateNewInventoryItem;
123 public event CreateInventoryFolder OnCreateNewInventoryFolder; 123 public event CreateInventoryFolder OnCreateNewInventoryFolder;
@@ -216,37 +216,37 @@ namespace OpenSim.Region.Examples.SimpleModule
216 216
217#pragma warning restore 67 217#pragma warning restore 67
218 218
219 private LLUUID myID = LLUUID.Random(); 219 private UUID myID = UUID.Random();
220 220
221 public MyNpcCharacter(Scene scene) 221 public MyNpcCharacter(Scene scene)
222 { 222 {
223 223
224 // startPos = new LLVector3(128, (float)(Util.RandomClass.NextDouble()*100), 2); 224 // startPos = new Vector3(128, (float)(Util.RandomClass.NextDouble()*100), 2);
225 m_scene = scene; 225 m_scene = scene;
226 m_scene.EventManager.OnFrame += Update; 226 m_scene.EventManager.OnFrame += Update;
227 } 227 }
228 228
229 private LLVector3 startPos = new LLVector3(128, 128, 2); 229 private Vector3 startPos = new Vector3(128, 128, 2);
230 230
231 public virtual LLVector3 StartPos 231 public virtual Vector3 StartPos
232 { 232 {
233 get { return startPos; } 233 get { return startPos; }
234 set { } 234 set { }
235 } 235 }
236 236
237 public virtual LLUUID AgentId 237 public virtual UUID AgentId
238 { 238 {
239 get { return myID; } 239 get { return myID; }
240 } 240 }
241 241
242 public LLUUID SessionId 242 public UUID SessionId
243 { 243 {
244 get { return LLUUID.Zero; } 244 get { return UUID.Zero; }
245 } 245 }
246 246
247 public LLUUID SecureSessionId 247 public UUID SecureSessionId
248 { 248 {
249 get { return LLUUID.Zero; } 249 get { return UUID.Zero; }
250 } 250 }
251 251
252 public virtual string FirstName 252 public virtual string FirstName
@@ -272,9 +272,9 @@ namespace OpenSim.Region.Examples.SimpleModule
272 set { } 272 set { }
273 } 273 }
274 274
275 public LLUUID ActiveGroupId 275 public UUID ActiveGroupId
276 { 276 {
277 get { return LLUUID.Zero; } 277 get { return UUID.Zero; }
278 } 278 }
279 279
280 public string ActiveGroupName 280 public string ActiveGroupName
@@ -287,10 +287,10 @@ namespace OpenSim.Region.Examples.SimpleModule
287 get { return 0; } 287 get { return 0; }
288 } 288 }
289 289
290 public ulong GetGroupPowers(LLUUID groupID) 290 public ulong GetGroupPowers(UUID groupID)
291 { 291 {
292 return 0; 292 return 0;
293 } 293 }
294 294
295 public virtual int NextAnimationSequenceNumber 295 public virtual int NextAnimationSequenceNumber
296 { 296 {
@@ -307,7 +307,7 @@ namespace OpenSim.Region.Examples.SimpleModule
307 set { } 307 set { }
308 } 308 }
309 309
310 public virtual void ActivateGesture(LLUUID assetId, LLUUID gestureId) 310 public virtual void ActivateGesture(UUID assetId, UUID gestureId)
311 { 311 {
312 } 312 }
313 313
@@ -320,7 +320,7 @@ namespace OpenSim.Region.Examples.SimpleModule
320 { 320 {
321 } 321 }
322 322
323 public virtual void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry) 323 public virtual void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
324 { 324 {
325 } 325 }
326 326
@@ -336,12 +336,12 @@ namespace OpenSim.Region.Examples.SimpleModule
336 { 336 {
337 } 337 }
338 338
339 public virtual void SendAgentDataUpdate(LLUUID agentid, LLUUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) 339 public virtual void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle)
340 { 340 {
341 341
342 } 342 }
343 343
344 public virtual void SendKillObject(ulong regionHandle, uint localID) 344 public virtual void SendKiPrimitive(ulong regionHandle, uint localID)
345 { 345 {
346 } 346 }
347 347
@@ -354,27 +354,27 @@ namespace OpenSim.Region.Examples.SimpleModule
354 } 354 }
355 355
356 356
357 public virtual void SendAnimations(LLUUID[] animations, int[] seqs, LLUUID sourceAgentId) 357 public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId)
358 { 358 {
359 } 359 }
360 360
361 public virtual void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, 361 public virtual void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName,
362 LLUUID fromAgentID, byte source, byte audible) 362 UUID fromAgentID, byte source, byte audible)
363 { 363 {
364 } 364 }
365 365
366 public virtual void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, 366 public virtual void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName,
367 LLUUID fromAgentID, byte source, byte audible) 367 UUID fromAgentID, byte source, byte audible)
368 { 368 {
369 } 369 }
370 370
371 public virtual void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, 371 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
372 LLUUID imSessionID, string fromName, byte dialog, uint timeStamp) 372 UUID imSessionID, string fromName, byte dialog, uint timeStamp)
373 { 373 {
374 } 374 }
375 375
376 public virtual void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, 376 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
377 LLUUID imSessionID, string fromName, byte dialog, uint timeStamp, 377 UUID imSessionID, string fromName, byte dialog, uint timeStamp,
378 byte[] binaryBucket) 378 byte[] binaryBucket)
379 { 379 {
380 } 380 }
@@ -390,7 +390,7 @@ namespace OpenSim.Region.Examples.SimpleModule
390 { 390 {
391 } 391 }
392 392
393 public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look) 393 public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
394 { 394 {
395 } 395 }
396 396
@@ -403,7 +403,7 @@ namespace OpenSim.Region.Examples.SimpleModule
403 return new AgentCircuitData(); 403 return new AgentCircuitData();
404 } 404 }
405 405
406 public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, 406 public virtual void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt,
407 IPEndPoint newRegionExternalEndPoint, string capsURL) 407 IPEndPoint newRegionExternalEndPoint, string capsURL)
408 { 408 {
409 } 409 }
@@ -412,7 +412,7 @@ namespace OpenSim.Region.Examples.SimpleModule
412 { 412 {
413 } 413 }
414 414
415 public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags) 415 public virtual void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags)
416 { 416 {
417 } 417 }
418 418
@@ -429,66 +429,66 @@ namespace OpenSim.Region.Examples.SimpleModule
429 { 429 {
430 } 430 }
431 431
432 public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance) 432 public virtual void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
433 { 433 {
434 } 434 }
435 435
436 public virtual void SendPayPrice(LLUUID objectID, int[] payPrice) 436 public virtual void SendPayPrice(UUID objectID, int[] payPrice)
437 { 437 {
438 } 438 }
439 439
440 public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, 440 public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, UUID avatarID,
441 uint avatarLocalID, LLVector3 Pos, byte[] textureEntry, uint parentID, LLQuaternion rotation) 441 uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation)
442 { 442 {
443 } 443 }
444 444
445 public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, 445 public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
446 LLVector3 position, LLVector3 velocity, LLQuaternion rotation) 446 Vector3 position, Vector3 velocity, Quaternion rotation)
447 { 447 {
448 } 448 }
449 449
450 public virtual void SendCoarseLocationUpdate(List<LLVector3> CoarseLocations) 450 public virtual void SendCoarseLocationUpdate(List<Vector3> CoarseLocations)
451 { 451 {
452 } 452 }
453 453
454 public virtual void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint) 454 public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint)
455 { 455 {
456 } 456 }
457 457
458 public virtual void SendDialog(string objectname, LLUUID objectID, LLUUID ownerID, string msg, LLUUID textureID, int ch, string[] buttonlabels) 458 public virtual void SendDialog(string objectname, UUID objectID, UUID ownerID, string msg, UUID textureID, int ch, string[] buttonlabels)
459 { 459 {
460 } 460 }
461 461
462 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, 462 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
463 PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel, 463 PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel,
464 LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, uint flags, 464 Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
465 LLUUID objectID, LLUUID ownerID, string text, byte[] color, 465 UUID objectID, UUID ownerID, string text, byte[] color,
466 uint parentID, 466 uint parentID,
467 byte[] particleSystem, byte clickAction) 467 byte[] particleSystem, byte clickAction)
468 { 468 {
469 } 469 }
470 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, 470 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
471 PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel, 471 PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel,
472 LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, uint flags, 472 Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
473 LLUUID objectID, LLUUID ownerID, string text, byte[] color, 473 UUID objectID, UUID ownerID, string text, byte[] color,
474 uint parentID, 474 uint parentID,
475 byte[] particleSystem, byte clickAction, byte[] textureanimation, 475 byte[] particleSystem, byte clickAction, byte[] textureanimation,
476 bool attachment, uint AttachmentPoint, LLUUID AssetId, LLUUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) 476 bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
477 { 477 {
478 } 478 }
479 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, 479 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
480 LLVector3 position, LLQuaternion rotation, LLVector3 velocity, 480 Vector3 position, Quaternion rotation, Vector3 velocity,
481 LLVector3 rotationalvelocity, byte state, LLUUID AssetId) 481 Vector3 rotationalvelocity, byte state, UUID AssetId)
482 { 482 {
483 } 483 }
484 484
485 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, 485 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
486 LLVector3 position, LLQuaternion rotation, LLVector3 velocity, 486 Vector3 position, Quaternion rotation, Vector3 velocity,
487 LLVector3 rotationalvelocity) 487 Vector3 rotationalvelocity)
488 { 488 {
489 } 489 }
490 490
491 public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, 491 public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID,
492 List<InventoryItemBase> items, 492 List<InventoryItemBase> items,
493 List<InventoryFolderBase> folders, 493 List<InventoryFolderBase> folders,
494 bool fetchFolders, 494 bool fetchFolders,
@@ -496,7 +496,7 @@ namespace OpenSim.Region.Examples.SimpleModule
496 { 496 {
497 } 497 }
498 498
499 public virtual void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item) 499 public virtual void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item)
500 { 500 {
501 } 501 }
502 502
@@ -504,7 +504,7 @@ namespace OpenSim.Region.Examples.SimpleModule
504 { 504 {
505 } 505 }
506 506
507 public virtual void SendRemoveInventoryItem(LLUUID itemID) 507 public virtual void SendRemoveInventoryItem(UUID itemID)
508 { 508 {
509 } 509 }
510 510
@@ -513,16 +513,16 @@ namespace OpenSim.Region.Examples.SimpleModule
513 { 513 {
514 } 514 }
515 515
516 public LLUUID GetDefaultAnimation(string name) 516 public UUID GetDefaultAnimation(string name)
517 { 517 {
518 return LLUUID.Zero; 518 return UUID.Zero;
519 } 519 }
520 520
521 public void SendTakeControls(int controls, bool passToAgent, bool TakeControls) 521 public void SendTakeControls(int controls, bool passToAgent, bool TakeControls)
522 { 522 {
523 } 523 }
524 524
525 public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) 525 public virtual void SendTaskInventory(UUID taskID, short serial, byte[] fileName)
526 { 526 {
527 } 527 }
528 528
@@ -537,24 +537,24 @@ namespace OpenSim.Region.Examples.SimpleModule
537 { 537 {
538 538
539 } 539 }
540 public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname) 540 public virtual void SendNameReply(UUID profileId, string firstname, string lastname)
541 { 541 {
542 } 542 }
543 543
544 public virtual void SendPreLoadSound(LLUUID objectID, LLUUID ownerID, LLUUID soundID) 544 public virtual void SendPreLoadSound(UUID objectID, UUID ownerID, UUID soundID)
545 { 545 {
546 } 546 }
547 547
548 public virtual void SendPlayAttachedSound(LLUUID soundID, LLUUID objectID, LLUUID ownerID, float gain, 548 public virtual void SendPlayAttachedSound(UUID soundID, UUID objectID, UUID ownerID, float gain,
549 byte flags) 549 byte flags)
550 { 550 {
551 } 551 }
552 552
553 public void SendTriggeredSound(LLUUID soundID, LLUUID ownerID, LLUUID objectID, LLUUID parentID, ulong handle, LLVector3 position, float gain) 553 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
554 { 554 {
555 } 555 }
556 556
557 public void SendAttachedSoundGainChange(LLUUID objectID, float gain) 557 public void SendAttachedSoundGainChange(UUID objectID, float gain)
558 { 558 {
559 559
560 } 560 }
@@ -571,7 +571,7 @@ namespace OpenSim.Region.Examples.SimpleModule
571 { 571 {
572 } 572 }
573 573
574 public void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, 574 public void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message,
575 string url) 575 string url)
576 { 576 {
577 } 577 }
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Examples.SimpleModule
588 OnCompleteMovementToRegion(); 588 OnCompleteMovementToRegion();
589 } 589 }
590 } 590 }
591 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID) 591 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
592 { 592 {
593 } 593 }
594 594
@@ -596,11 +596,11 @@ namespace OpenSim.Region.Examples.SimpleModule
596 { 596 {
597 } 597 }
598 598
599 public void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName) 599 public void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName)
600 { 600 {
601 } 601 }
602 602
603 public void SendImagePart(ushort numParts, LLUUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) 603 public void SendImagePart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
604 { 604 {
605 } 605 }
606 606
@@ -612,37 +612,37 @@ namespace OpenSim.Region.Examples.SimpleModule
612 { 612 {
613 } 613 }
614 614
615 public void SendObjectPropertiesFamilyData(uint RequestFlags, LLUUID ObjectUUID, LLUUID OwnerID, LLUUID GroupID, 615 public void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID,
616 uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, 616 uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask,
617 uint NextOwnerMask, int OwnershipCost, byte SaleType,int SalePrice, uint Category, 617 uint NextOwnerMask, int OwnershipCost, byte SaleType,int SalePrice, uint Category,
618 LLUUID LastOwnerID, string ObjectName, string Description) 618 UUID LastOwnerID, string ObjectName, string Description)
619 { 619 {
620 } 620 }
621 621
622 public void SendObjectPropertiesReply(LLUUID ItemID, ulong CreationDate, LLUUID CreatorUUID, LLUUID FolderUUID, LLUUID FromTaskUUID, 622 public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID,
623 LLUUID GroupUUID, short InventorySerial, LLUUID LastOwnerUUID, LLUUID ObjectUUID, 623 UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID,
624 LLUUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, 624 UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName,
625 string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, 625 string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask,
626 uint BaseMask, byte saleType, int salePrice) 626 uint BaseMask, byte saleType, int salePrice)
627 { 627 {
628 } 628 }
629 629
630 public void SendAgentOffline(LLUUID[] agentIDs) 630 public void SendAgentOffline(UUID[] agentIDs)
631 { 631 {
632 632
633 } 633 }
634 634
635 public void SendAgentOnline(LLUUID[] agentIDs) 635 public void SendAgentOnline(UUID[] agentIDs)
636 { 636 {
637 637
638 } 638 }
639 639
640 public void SendSitResponse(LLUUID TargetID, LLVector3 OffsetPos, LLQuaternion SitOrientation, bool autopilot, 640 public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot,
641 LLVector3 CameraAtOffset, LLVector3 CameraEyeOffset, bool ForceMouseLook) 641 Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
642 { 642 {
643 } 643 }
644 644
645 public void SendAdminResponse(LLUUID Token, uint AdminLevel) 645 public void SendAdminResponse(UUID Token, uint AdminLevel)
646 { 646 {
647 647
648 } 648 }
@@ -692,7 +692,7 @@ namespace OpenSim.Region.Examples.SimpleModule
692 args.Message = "Hey You! Get out of my Home. This is my Region"; 692 args.Message = "Hey You! Get out of my Home. This is my Region";
693 args.Channel = 0; 693 args.Channel = 0;
694 args.From = FirstName + " " + LastName; 694 args.From = FirstName + " " + LastName;
695 args.Position = new LLVector3(128, 128, 26); 695 args.Position = new Vector3(128, 128, 26);
696 args.Sender = this; 696 args.Sender = this;
697 args.Type = ChatTypeEnum.Shout; 697 args.Type = ChatTypeEnum.Shout;
698 698
@@ -710,7 +710,7 @@ namespace OpenSim.Region.Examples.SimpleModule
710 return false; 710 return false;
711 } 711 }
712 712
713 public void SendSunPos(LLVector3 sunPos, LLVector3 sunVel, ulong time, uint dlen, uint ylen, float phase) 713 public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong time, uint dlen, uint ylen, float phase)
714 { 714 {
715 } 715 }
716 716
@@ -718,9 +718,9 @@ namespace OpenSim.Region.Examples.SimpleModule
718 { 718 {
719 } 719 }
720 720
721 public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember, 721 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
722 string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, 722 string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL,
723 LLUUID partnerID) 723 UUID partnerID)
724 { 724 {
725 } 725 }
726 726
@@ -751,7 +751,7 @@ namespace OpenSim.Region.Examples.SimpleModule
751 get { return m_circuitCode; } 751 get { return m_circuitCode; }
752 set { m_circuitCode = value; } 752 set { m_circuitCode = value; }
753 } 753 }
754 public void SendBlueBoxMessage(LLUUID FromAvatarID, LLUUID fromSessionID, String FromAvatarName, String Message) 754 public void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message)
755 { 755 {
756 756
757 } 757 }
@@ -772,41 +772,41 @@ namespace OpenSim.Region.Examples.SimpleModule
772 { 772 {
773 } 773 }
774 774
775 public void SendScriptQuestion(LLUUID objectID, string taskName, string ownerName, LLUUID itemID, int question) 775 public void SendScriptQuestion(UUID objectID, string taskName, string ownerName, UUID itemID, int question)
776 { 776 {
777 } 777 }
778 public void SendHealth(float health) 778 public void SendHealth(float health)
779 { 779 {
780 } 780 }
781 781
782 public void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) 782 public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID)
783 { 783 {
784 } 784 }
785 785
786 public void SendBannedUserList(LLUUID invoice, EstateBan[] banlist, uint estateID) 786 public void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID)
787 { 787 {
788 } 788 }
789 789
790 public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) 790 public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args)
791 { 791 {
792 } 792 }
793 public void SendEstateCovenantInformation(LLUUID covenant) 793 public void SendEstateCovenantInformation(UUID covenant)
794 { 794 {
795 } 795 }
796 public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant, string abuseEmail) 796 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail)
797 { 797 {
798 } 798 }
799 799
800 public void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) 800 public void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
801 { 801 {
802 } 802 }
803 public void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID) 803 public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
804 { 804 {
805 } 805 }
806 public void SendForceClientSelectObjects(List<uint> objectIDs) 806 public void SendForceClientSelectObjects(List<uint> objectIDs)
807 { 807 {
808 } 808 }
809 public void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount) 809 public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount)
810 { 810 {
811 } 811 }
812 public void SendLandParcelOverlay(byte[] data, int sequence_id) 812 public void SendLandParcelOverlay(byte[] data, int sequence_id)
@@ -818,13 +818,13 @@ namespace OpenSim.Region.Examples.SimpleModule
818 818
819 } 819 }
820 820
821 public void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID, byte autoScale, string mediaType, 821 public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, byte autoScale, string mediaType,
822 string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop) 822 string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop)
823 { 823 {
824 824
825 } 825 }
826 826
827 public void SendGroupNameReply(LLUUID groupLLUID, string GroupName) 827 public void SendGroupNameReply(UUID groupLLUID, string GroupName)
828 { 828 {
829 } 829 }
830 830
@@ -832,7 +832,7 @@ namespace OpenSim.Region.Examples.SimpleModule
832 { 832 {
833 } 833 }
834 834
835 public void SendScriptRunningReply(LLUUID objectID, LLUUID itemID, bool running) 835 public void SendScriptRunningReply(UUID objectID, UUID itemID, bool running)
836 { 836 {
837 } 837 }
838 838
@@ -845,19 +845,19 @@ namespace OpenSim.Region.Examples.SimpleModule
845 845
846 } 846 }
847 847
848 public void SendSetFollowCamProperties (LLUUID objectID, SortedDictionary<int, float> parameters) 848 public void SendSetFollowCamProperties (UUID objectID, SortedDictionary<int, float> parameters)
849 { 849 {
850 } 850 }
851 851
852 public void SendClearFollowCamProperties (LLUUID objectID) 852 public void SendClearFollowCamProperties (UUID objectID)
853 { 853 {
854 } 854 }
855 855
856 public void SendRegionHandle (LLUUID regoinID, ulong handle) 856 public void SendRegionHandle (UUID regoinID, ulong handle)
857 { 857 {
858 } 858 }
859 859
860 public void SendParcelInfo (RegionInfo info, LandData land, LLUUID parcelID, uint x, uint y) 860 public void SendParcelInfo (RegionInfo info, LandData land, UUID parcelID, uint x, uint y)
861 { 861 {
862 } 862 }
863 863
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
index 441c696..4fc0dbb 100644
--- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
+++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
@@ -27,7 +27,7 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.IO; 29using System.IO;
30using libsecondlife; 30using OpenMetaverse;
31using Nini.Config; 31using Nini.Config;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Environment.Interfaces;
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Examples.SimpleModule
50 { 50 {
51 // RegionInfo regionInfo = m_scene.RegionInfo; 51 // RegionInfo regionInfo = m_scene.RegionInfo;
52 52
53 // LLVector3 pos = new LLVector3(110, 129, 27); 53 // Vector3 pos = new Vector3(110, 129, 27);
54 54
55 //AddCpuCounter(regionInfo, pos); 55 //AddCpuCounter(regionInfo, pos);
56 // AddComplexObjects(regionInfo, pos); 56 // AddComplexObjects(regionInfo, pos);
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Examples.SimpleModule
67 67
68 // foreach (FileInfo fileInfo in dirInfo.GetFiles()) 68 // foreach (FileInfo fileInfo in dirInfo.GetFiles())
69 // { 69 // {
70 // LLVector3 filePos = new LLVector3(100 + x, 129, 27 + z); 70 // Vector3 filePos = new Vector3(100 + x, 129, 27 + z);
71 // x = x + 2; 71 // x = x + 2;
72 // if (x > 50) 72 // if (x > 50)
73 // { 73 // {
@@ -92,29 +92,29 @@ namespace OpenSim.Region.Examples.SimpleModule
92 foreach (ScenePresence avatar in avatars) 92 foreach (ScenePresence avatar in avatars)
93 { 93 {
94 avatar.AbsolutePosition = 94 avatar.AbsolutePosition =
95 new LLVector3((float)Util.RandomClass.Next(100, 200), (float)Util.RandomClass.Next(30, 200), 2); 95 new Vector3((float)Util.RandomClass.Next(100, 200), (float)Util.RandomClass.Next(30, 200), 2);
96 } 96 }
97 } 97 }
98 98
99 // private void AddComplexObjects(RegionInfo regionInfo, LLVector3 pos) 99 // private void AddComplexObjects(RegionInfo regionInfo, Vector3 pos)
100 // { 100 // {
101 // int objs = 3; 101 // int objs = 3;
102 102
103 // for (int i = 0; i < (objs*objs*objs); i++) 103 // for (int i = 0; i < (objs*objs*objs); i++)
104 // { 104 // {
105 // LLVector3 posOffset = new LLVector3((i % objs) * 4, ((i % (objs*objs)) / (objs)) * 4, (i / (objs*objs)) * 4); 105 // Vector3 posOffset = new Vector3((i % objs) * 4, ((i % (objs*objs)) / (objs)) * 4, (i / (objs*objs)) * 4);
106 // ComplexObject complexObject = 106 // ComplexObject complexObject =
107 // new ComplexObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), 107 // new ComplexObject(m_scene, regionInfo.RegionHandle, UUID.Zero, m_scene.PrimIDAllocate(),
108 // pos + posOffset); 108 // pos + posOffset);
109 // m_scene.AddNewSceneObject(complexObject, true); 109 // m_scene.AddNewSceneObject(complexObject, true);
110 // } 110 // }
111 // } 111 // }
112 112
113 // private void AddCpuCounter(RegionInfo regionInfo, LLVector3 pos) 113 // private void AddCpuCounter(RegionInfo regionInfo, Vector3 pos)
114 // { 114 // {
115 // SceneObjectGroup sceneObject = 115 // SceneObjectGroup sceneObject =
116 // new CpuCounterObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), 116 // new CpuCounterObject(m_scene, regionInfo.RegionHandle, UUID.Zero, m_scene.PrimIDAllocate(),
117 // pos + new LLVector3(1f, 1f, 1f)); 117 // pos + new Vector3(1f, 1f, 1f));
118 // m_scene.AddNewSceneObject(sceneObject, true); 118 // m_scene.AddNewSceneObject(sceneObject, true);
119 // } 119 // }
120 120