diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/NPC')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 204 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs | 6 |
2 files changed, 105 insertions, 105 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index c1f5566..541ca18 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -28,8 +28,8 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | 30 | using System.Net; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | using libsecondlife.Packets; | 32 | using OpenMetaverse.Packets; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Environment.Scenes; | 34 | using OpenSim.Region.Environment.Scenes; |
35 | 35 | ||
@@ -39,12 +39,12 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
39 | { | 39 | { |
40 | private readonly string m_firstname; | 40 | private readonly string m_firstname; |
41 | private readonly string m_lastname; | 41 | private readonly string m_lastname; |
42 | private readonly LLVector3 m_startPos; | 42 | private readonly Vector3 m_startPos; |
43 | private readonly LLUUID m_uuid = LLUUID.Random(); | 43 | private readonly UUID m_uuid = UUID.Random(); |
44 | private readonly Scene m_scene; | 44 | private readonly Scene m_scene; |
45 | 45 | ||
46 | 46 | ||
47 | public NPCAvatar(string firstname, string lastname, LLVector3 position, Scene scene) | 47 | public NPCAvatar(string firstname, string lastname, Vector3 position, Scene scene) |
48 | { | 48 | { |
49 | m_firstname = firstname; | 49 | m_firstname = firstname; |
50 | m_lastname = lastname; | 50 | m_lastname = lastname; |
@@ -77,34 +77,34 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
77 | SendOnChatFromViewer(message, ChatTypeEnum.Broadcast); | 77 | SendOnChatFromViewer(message, ChatTypeEnum.Broadcast); |
78 | } | 78 | } |
79 | 79 | ||
80 | public void GiveMoney(LLUUID target, int amount) | 80 | public void GiveMoney(UUID target, int amount) |
81 | { | 81 | { |
82 | OnMoneyTransferRequest(m_uuid, target, amount, 1, "Payment"); | 82 | OnMoneyTransferRequest(m_uuid, target, amount, 1, "Payment"); |
83 | } | 83 | } |
84 | 84 | ||
85 | public void InstantMessage(LLUUID target, string message) | 85 | public void InstantMessage(UUID target, string message) |
86 | { | 86 | { |
87 | OnInstantMessage(this, m_uuid, SessionId, target, LLUUID.Combine(m_uuid, target), | 87 | OnInstantMessage(this, m_uuid, SessionId, target, UUID.Combine(m_uuid, target), |
88 | (uint) Util.UnixTimeSinceEpoch(), Name, message, 0, false, 0, 0, | 88 | (uint) Util.UnixTimeSinceEpoch(), Name, message, 0, false, 0, 0, |
89 | Position, m_scene.RegionInfo.RegionID, new byte[0]); | 89 | Position, m_scene.RegionInfo.RegionID, new byte[0]); |
90 | } | 90 | } |
91 | 91 | ||
92 | public void SendAgentOffline(LLUUID[] agentIDs) | 92 | public void SendAgentOffline(UUID[] agentIDs) |
93 | { | 93 | { |
94 | 94 | ||
95 | } | 95 | } |
96 | 96 | ||
97 | public void SendAgentOnline(LLUUID[] agentIDs) | 97 | public void SendAgentOnline(UUID[] agentIDs) |
98 | { | 98 | { |
99 | 99 | ||
100 | } | 100 | } |
101 | public void SendSitResponse(LLUUID TargetID, LLVector3 OffsetPos, LLQuaternion SitOrientation, bool autopilot, | 101 | public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, |
102 | LLVector3 CameraAtOffset, LLVector3 CameraEyeOffset, bool ForceMouseLook) | 102 | Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) |
103 | { | 103 | { |
104 | 104 | ||
105 | } | 105 | } |
106 | 106 | ||
107 | public void SendAdminResponse(LLUUID Token, uint AdminLevel) | 107 | public void SendAdminResponse(UUID Token, uint AdminLevel) |
108 | { | 108 | { |
109 | 109 | ||
110 | } | 110 | } |
@@ -114,12 +114,12 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
114 | 114 | ||
115 | } | 115 | } |
116 | 116 | ||
117 | public LLUUID GetDefaultAnimation(string name) | 117 | public UUID GetDefaultAnimation(string name) |
118 | { | 118 | { |
119 | return LLUUID.Zero; | 119 | return UUID.Zero; |
120 | } | 120 | } |
121 | 121 | ||
122 | public LLVector3 Position | 122 | public Vector3 Position |
123 | { | 123 | { |
124 | get { return m_scene.Entities[m_uuid].AbsolutePosition; } | 124 | get { return m_scene.Entities[m_uuid].AbsolutePosition; } |
125 | set { m_scene.Entities[m_uuid].AbsolutePosition = value; } | 125 | set { m_scene.Entities[m_uuid].AbsolutePosition = value; } |
@@ -222,7 +222,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
222 | public event UpdateVector OnUpdatePrimGroupScale; | 222 | public event UpdateVector OnUpdatePrimGroupScale; |
223 | public event StatusChange OnChildAgentStatus; | 223 | public event StatusChange OnChildAgentStatus; |
224 | public event GenericCall2 OnStopMovement; | 224 | public event GenericCall2 OnStopMovement; |
225 | public event Action<LLUUID> OnRemoveAvatar; | 225 | public event Action<UUID> OnRemoveAvatar; |
226 | 226 | ||
227 | public event CreateNewInventoryItem OnCreateNewInventoryItem; | 227 | public event CreateNewInventoryItem OnCreateNewInventoryItem; |
228 | public event CreateInventoryFolder OnCreateNewInventoryFolder; | 228 | public event CreateInventoryFolder OnCreateNewInventoryFolder; |
@@ -322,34 +322,34 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
322 | 322 | ||
323 | #endregion | 323 | #endregion |
324 | 324 | ||
325 | public void ActivateGesture(LLUUID assetId, LLUUID gestureId) | 325 | public void ActivateGesture(UUID assetId, UUID gestureId) |
326 | { | 326 | { |
327 | } | 327 | } |
328 | public void DeactivateGesture(LLUUID assetId, LLUUID gestureId) | 328 | public void DeactivateGesture(UUID assetId, UUID gestureId) |
329 | { | 329 | { |
330 | } | 330 | } |
331 | 331 | ||
332 | #region Overrriden Methods IGNORE | 332 | #region Overrriden Methods IGNORE |
333 | 333 | ||
334 | public virtual LLVector3 StartPos | 334 | public virtual Vector3 StartPos |
335 | { | 335 | { |
336 | get { return m_startPos; } | 336 | get { return m_startPos; } |
337 | set { } | 337 | set { } |
338 | } | 338 | } |
339 | 339 | ||
340 | public virtual LLUUID AgentId | 340 | public virtual UUID AgentId |
341 | { | 341 | { |
342 | get { return m_uuid; } | 342 | get { return m_uuid; } |
343 | } | 343 | } |
344 | 344 | ||
345 | public LLUUID SessionId | 345 | public UUID SessionId |
346 | { | 346 | { |
347 | get { return LLUUID.Zero; } | 347 | get { return UUID.Zero; } |
348 | } | 348 | } |
349 | 349 | ||
350 | public LLUUID SecureSessionId | 350 | public UUID SecureSessionId |
351 | { | 351 | { |
352 | get { return LLUUID.Zero; } | 352 | get { return UUID.Zero; } |
353 | } | 353 | } |
354 | 354 | ||
355 | public virtual string FirstName | 355 | public virtual string FirstName |
@@ -373,9 +373,9 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
373 | set { } | 373 | set { } |
374 | } | 374 | } |
375 | 375 | ||
376 | public LLUUID ActiveGroupId | 376 | public UUID ActiveGroupId |
377 | { | 377 | { |
378 | get { return LLUUID.Zero; } | 378 | get { return UUID.Zero; } |
379 | } | 379 | } |
380 | 380 | ||
381 | public string ActiveGroupName | 381 | public string ActiveGroupName |
@@ -388,10 +388,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
388 | get { return 0; } | 388 | get { return 0; } |
389 | } | 389 | } |
390 | 390 | ||
391 | public ulong GetGroupPowers(LLUUID groupID) | 391 | public ulong GetGroupPowers(UUID groupID) |
392 | { | 392 | { |
393 | return 0; | 393 | return 0; |
394 | } | 394 | } |
395 | 395 | ||
396 | public virtual int NextAnimationSequenceNumber | 396 | public virtual int NextAnimationSequenceNumber |
397 | { | 397 | { |
@@ -406,7 +406,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
406 | { | 406 | { |
407 | } | 407 | } |
408 | 408 | ||
409 | public virtual void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry) | 409 | public virtual void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) |
410 | { | 410 | { |
411 | } | 411 | } |
412 | 412 | ||
@@ -422,12 +422,12 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
422 | { | 422 | { |
423 | } | 423 | } |
424 | 424 | ||
425 | public virtual void SendAgentDataUpdate(LLUUID agentid, LLUUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) | 425 | public virtual void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) |
426 | { | 426 | { |
427 | 427 | ||
428 | } | 428 | } |
429 | 429 | ||
430 | public virtual void SendKillObject(ulong regionHandle, uint localID) | 430 | public virtual void SendKiPrimitive(ulong regionHandle, uint localID) |
431 | { | 431 | { |
432 | } | 432 | } |
433 | 433 | ||
@@ -440,27 +440,27 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
440 | } | 440 | } |
441 | 441 | ||
442 | 442 | ||
443 | public virtual void SendAnimations(LLUUID[] animations, int[] seqs, LLUUID sourceAgentId) | 443 | public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId) |
444 | { | 444 | { |
445 | } | 445 | } |
446 | 446 | ||
447 | public virtual void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, | 447 | public virtual void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, |
448 | LLUUID fromAgentID, byte source, byte audible) | 448 | UUID fromAgentID, byte source, byte audible) |
449 | { | 449 | { |
450 | } | 450 | } |
451 | 451 | ||
452 | public virtual void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, | 452 | public virtual void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, |
453 | LLUUID fromAgentID, byte source, byte audible) | 453 | UUID fromAgentID, byte source, byte audible) |
454 | { | 454 | { |
455 | } | 455 | } |
456 | 456 | ||
457 | public virtual void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, | 457 | public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, |
458 | LLUUID imSessionID, string fromName, byte dialog, uint timeStamp) | 458 | UUID imSessionID, string fromName, byte dialog, uint timeStamp) |
459 | { | 459 | { |
460 | } | 460 | } |
461 | 461 | ||
462 | public virtual void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, | 462 | public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, |
463 | LLUUID imSessionID, string fromName, byte dialog, uint timeStamp, | 463 | UUID imSessionID, string fromName, byte dialog, uint timeStamp, |
464 | byte[] binaryBucket) | 464 | byte[] binaryBucket) |
465 | { | 465 | { |
466 | } | 466 | } |
@@ -476,7 +476,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
476 | { | 476 | { |
477 | } | 477 | } |
478 | 478 | ||
479 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look) | 479 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) |
480 | { | 480 | { |
481 | } | 481 | } |
482 | 482 | ||
@@ -489,7 +489,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
489 | return new AgentCircuitData(); | 489 | return new AgentCircuitData(); |
490 | } | 490 | } |
491 | 491 | ||
492 | public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, | 492 | public virtual void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, |
493 | IPEndPoint newRegionExternalEndPoint, string capsURL) | 493 | IPEndPoint newRegionExternalEndPoint, string capsURL) |
494 | { | 494 | { |
495 | } | 495 | } |
@@ -498,7 +498,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
498 | { | 498 | { |
499 | } | 499 | } |
500 | 500 | ||
501 | public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags) | 501 | public virtual void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags) |
502 | { | 502 | { |
503 | } | 503 | } |
504 | 504 | ||
@@ -515,66 +515,66 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
515 | { | 515 | { |
516 | } | 516 | } |
517 | 517 | ||
518 | public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance) | 518 | public virtual void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance) |
519 | { | 519 | { |
520 | } | 520 | } |
521 | 521 | ||
522 | public virtual void SendPayPrice(LLUUID objectID, int[] payPrice) | 522 | public virtual void SendPayPrice(UUID objectID, int[] payPrice) |
523 | { | 523 | { |
524 | } | 524 | } |
525 | 525 | ||
526 | public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, | 526 | public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, UUID avatarID, |
527 | uint avatarLocalID, LLVector3 Pos, byte[] textureEntry, uint parentID, LLQuaternion rotation) | 527 | uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation) |
528 | { | 528 | { |
529 | } | 529 | } |
530 | 530 | ||
531 | public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, | 531 | public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, |
532 | LLVector3 position, LLVector3 velocity, LLQuaternion rotation) | 532 | Vector3 position, Vector3 velocity, Quaternion rotation) |
533 | { | 533 | { |
534 | } | 534 | } |
535 | 535 | ||
536 | public virtual void SendCoarseLocationUpdate(List<LLVector3> CoarseLocations) | 536 | public virtual void SendCoarseLocationUpdate(List<Vector3> CoarseLocations) |
537 | { | 537 | { |
538 | } | 538 | } |
539 | 539 | ||
540 | public virtual void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint) | 540 | public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint) |
541 | { | 541 | { |
542 | } | 542 | } |
543 | 543 | ||
544 | public virtual void SendDialog(string objectname, LLUUID objectID, LLUUID ownerID, string msg, LLUUID textureID, int ch, string[] buttonlabels) | 544 | public virtual void SendDialog(string objectname, UUID objectID, UUID ownerID, string msg, UUID textureID, int ch, string[] buttonlabels) |
545 | { | 545 | { |
546 | } | 546 | } |
547 | 547 | ||
548 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, | 548 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, |
549 | PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel, | 549 | PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, |
550 | LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, uint flags, | 550 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, |
551 | LLUUID objectID, LLUUID ownerID, string text, byte[] color, | 551 | UUID objectID, UUID ownerID, string text, byte[] color, |
552 | uint parentID, | 552 | uint parentID, |
553 | byte[] particleSystem, byte clickAction) | 553 | byte[] particleSystem, byte clickAction) |
554 | { | 554 | { |
555 | } | 555 | } |
556 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, | 556 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, |
557 | PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel, | 557 | PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, |
558 | LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, uint flags, | 558 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, |
559 | LLUUID objectID, LLUUID ownerID, string text, byte[] color, | 559 | UUID objectID, UUID ownerID, string text, byte[] color, |
560 | uint parentID, | 560 | uint parentID, |
561 | byte[] particleSystem, byte clickAction, byte[] textureanimation, | 561 | byte[] particleSystem, byte clickAction, byte[] textureanimation, |
562 | bool attachment, uint AttachmentPoint, LLUUID AssetId, LLUUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) | 562 | bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) |
563 | { | 563 | { |
564 | } | 564 | } |
565 | public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, | 565 | public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, |
566 | LLVector3 position, LLQuaternion rotation, LLVector3 velocity, | 566 | Vector3 position, Quaternion rotation, Vector3 velocity, |
567 | LLVector3 rotationalvelocity, byte state, LLUUID AssetId) | 567 | Vector3 rotationalvelocity, byte state, UUID AssetId) |
568 | { | 568 | { |
569 | } | 569 | } |
570 | 570 | ||
571 | public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, | 571 | public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, |
572 | LLVector3 position, LLQuaternion rotation, LLVector3 velocity, | 572 | Vector3 position, Quaternion rotation, Vector3 velocity, |
573 | LLVector3 rotationalvelocity) | 573 | Vector3 rotationalvelocity) |
574 | { | 574 | { |
575 | } | 575 | } |
576 | 576 | ||
577 | public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, | 577 | public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID, |
578 | List<InventoryItemBase> items, | 578 | List<InventoryItemBase> items, |
579 | List<InventoryFolderBase> folders, | 579 | List<InventoryFolderBase> folders, |
580 | bool fetchFolders, | 580 | bool fetchFolders, |
@@ -582,7 +582,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
582 | { | 582 | { |
583 | } | 583 | } |
584 | 584 | ||
585 | public virtual void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item) | 585 | public virtual void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item) |
586 | { | 586 | { |
587 | } | 587 | } |
588 | 588 | ||
@@ -590,7 +590,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
590 | { | 590 | { |
591 | } | 591 | } |
592 | 592 | ||
593 | public virtual void SendRemoveInventoryItem(LLUUID itemID) | 593 | public virtual void SendRemoveInventoryItem(UUID itemID) |
594 | { | 594 | { |
595 | } | 595 | } |
596 | 596 | ||
@@ -603,7 +603,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
603 | { | 603 | { |
604 | } | 604 | } |
605 | 605 | ||
606 | public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) | 606 | public virtual void SendTaskInventory(UUID taskID, short serial, byte[] fileName) |
607 | { | 607 | { |
608 | } | 608 | } |
609 | 609 | ||
@@ -618,24 +618,24 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
618 | { | 618 | { |
619 | 619 | ||
620 | } | 620 | } |
621 | public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname) | 621 | public virtual void SendNameReply(UUID profileId, string firstname, string lastname) |
622 | { | 622 | { |
623 | } | 623 | } |
624 | 624 | ||
625 | public virtual void SendPreLoadSound(LLUUID objectID, LLUUID ownerID, LLUUID soundID) | 625 | public virtual void SendPreLoadSound(UUID objectID, UUID ownerID, UUID soundID) |
626 | { | 626 | { |
627 | } | 627 | } |
628 | 628 | ||
629 | public virtual void SendPlayAttachedSound(LLUUID soundID, LLUUID objectID, LLUUID ownerID, float gain, | 629 | public virtual void SendPlayAttachedSound(UUID soundID, UUID objectID, UUID ownerID, float gain, |
630 | byte flags) | 630 | byte flags) |
631 | { | 631 | { |
632 | } | 632 | } |
633 | 633 | ||
634 | public void SendTriggeredSound(LLUUID soundID, LLUUID ownerID, LLUUID objectID, LLUUID parentID, ulong handle, LLVector3 position, float gain) | 634 | public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) |
635 | { | 635 | { |
636 | } | 636 | } |
637 | 637 | ||
638 | public void SendAttachedSoundGainChange(LLUUID objectID, float gain) | 638 | public void SendAttachedSoundGainChange(UUID objectID, float gain) |
639 | { | 639 | { |
640 | 640 | ||
641 | } | 641 | } |
@@ -652,7 +652,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
652 | { | 652 | { |
653 | } | 653 | } |
654 | 654 | ||
655 | public void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, | 655 | public void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, |
656 | string url) | 656 | string url) |
657 | { | 657 | { |
658 | } | 658 | } |
@@ -669,7 +669,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
669 | OnCompleteMovementToRegion(); | 669 | OnCompleteMovementToRegion(); |
670 | } | 670 | } |
671 | } | 671 | } |
672 | public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID) | 672 | public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) |
673 | { | 673 | { |
674 | } | 674 | } |
675 | 675 | ||
@@ -677,11 +677,11 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
677 | { | 677 | { |
678 | } | 678 | } |
679 | 679 | ||
680 | public void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName) | 680 | public void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName) |
681 | { | 681 | { |
682 | } | 682 | } |
683 | 683 | ||
684 | public void SendImagePart(ushort numParts, LLUUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) | 684 | public void SendImagePart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) |
685 | { | 685 | { |
686 | } | 686 | } |
687 | 687 | ||
@@ -693,16 +693,16 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
693 | { | 693 | { |
694 | } | 694 | } |
695 | 695 | ||
696 | public void SendObjectPropertiesFamilyData(uint RequestFlags, LLUUID ObjectUUID, LLUUID OwnerID, LLUUID GroupID, | 696 | public void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID, |
697 | uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, | 697 | uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, |
698 | uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice, uint Category, | 698 | uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice, uint Category, |
699 | LLUUID LastOwnerID, string ObjectName, string Description) | 699 | UUID LastOwnerID, string ObjectName, string Description) |
700 | { | 700 | { |
701 | } | 701 | } |
702 | 702 | ||
703 | public void SendObjectPropertiesReply(LLUUID ItemID, ulong CreationDate, LLUUID CreatorUUID, LLUUID FolderUUID, LLUUID FromTaskUUID, | 703 | public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID, |
704 | LLUUID GroupUUID, short InventorySerial, LLUUID LastOwnerUUID, LLUUID ObjectUUID, | 704 | UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID, |
705 | LLUUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, | 705 | UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, |
706 | string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, | 706 | string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, |
707 | uint BaseMask, byte saleType, int salePrice) | 707 | uint BaseMask, byte saleType, int salePrice) |
708 | { | 708 | { |
@@ -713,7 +713,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
713 | return false; | 713 | return false; |
714 | } | 714 | } |
715 | 715 | ||
716 | public void SendSunPos(LLVector3 sunPos, LLVector3 sunVel, ulong time, uint dlen, uint ylen, float phase) | 716 | public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong time, uint dlen, uint ylen, float phase) |
717 | { | 717 | { |
718 | } | 718 | } |
719 | 719 | ||
@@ -721,9 +721,9 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
721 | { | 721 | { |
722 | } | 722 | } |
723 | 723 | ||
724 | public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember, | 724 | public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, |
725 | string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, | 725 | string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, |
726 | LLUUID partnerID) | 726 | UUID partnerID) |
727 | { | 727 | { |
728 | } | 728 | } |
729 | 729 | ||
@@ -762,7 +762,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
762 | get { return m_circuitCode; } | 762 | get { return m_circuitCode; } |
763 | set { m_circuitCode = value; } | 763 | set { m_circuitCode = value; } |
764 | } | 764 | } |
765 | public void SendBlueBoxMessage(LLUUID FromAvatarID, LLUUID fromSessionID, String FromAvatarName, String Message) | 765 | public void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message) |
766 | { | 766 | { |
767 | 767 | ||
768 | } | 768 | } |
@@ -783,52 +783,52 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
783 | { | 783 | { |
784 | } | 784 | } |
785 | 785 | ||
786 | public void SendScriptQuestion(LLUUID objectID, string taskName, string ownerName, LLUUID itemID, int question) | 786 | public void SendScriptQuestion(UUID objectID, string taskName, string ownerName, UUID itemID, int question) |
787 | { | 787 | { |
788 | } | 788 | } |
789 | public void SendHealth(float health) | 789 | public void SendHealth(float health) |
790 | { | 790 | { |
791 | } | 791 | } |
792 | 792 | ||
793 | public void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) | 793 | public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) |
794 | { | 794 | { |
795 | } | 795 | } |
796 | 796 | ||
797 | public void SendBannedUserList(LLUUID invoice, EstateBan[] banlist, uint estateID) | 797 | public void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID) |
798 | { | 798 | { |
799 | } | 799 | } |
800 | 800 | ||
801 | public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) | 801 | public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) |
802 | { | 802 | { |
803 | } | 803 | } |
804 | public void SendEstateCovenantInformation(LLUUID covenant) | 804 | public void SendEstateCovenantInformation(UUID covenant) |
805 | { | 805 | { |
806 | } | 806 | } |
807 | public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant, string abuseEmail) | 807 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail) |
808 | { | 808 | { |
809 | } | 809 | } |
810 | 810 | ||
811 | 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) | 811 | 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) |
812 | { | 812 | { |
813 | } | 813 | } |
814 | public void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID) | 814 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) |
815 | { | 815 | { |
816 | } | 816 | } |
817 | public void SendForceClientSelectObjects(List<uint> objectIDs) | 817 | public void SendForceClientSelectObjects(List<uint> objectIDs) |
818 | { | 818 | { |
819 | } | 819 | } |
820 | public void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount) | 820 | public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount) |
821 | { | 821 | { |
822 | } | 822 | } |
823 | public void SendLandParcelOverlay(byte[] data, int sequence_id) | 823 | public void SendLandParcelOverlay(byte[] data, int sequence_id) |
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 | ||
831 | public void SendScriptRunningReply(LLUUID objectID, LLUUID itemID, bool running) | 831 | public void SendScriptRunningReply(UUID objectID, UUID itemID, bool running) |
832 | { | 832 | { |
833 | } | 833 | } |
834 | 834 | ||
@@ -842,25 +842,25 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
842 | { | 842 | { |
843 | } | 843 | } |
844 | 844 | ||
845 | public void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID, | 845 | public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, |
846 | byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, | 846 | byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, |
847 | byte mediaLoop) | 847 | byte mediaLoop) |
848 | { | 848 | { |
849 | } | 849 | } |
850 | 850 | ||
851 | public void SendSetFollowCamProperties (LLUUID objectID, SortedDictionary<int, float> parameters) | 851 | public void SendSetFollowCamProperties (UUID objectID, SortedDictionary<int, float> parameters) |
852 | { | 852 | { |
853 | } | 853 | } |
854 | 854 | ||
855 | public void SendClearFollowCamProperties (LLUUID objectID) | 855 | public void SendClearFollowCamProperties (UUID objectID) |
856 | { | 856 | { |
857 | } | 857 | } |
858 | 858 | ||
859 | public void SendRegionHandle (LLUUID regoinID, ulong handle) | 859 | public void SendRegionHandle (UUID regoinID, ulong handle) |
860 | { | 860 | { |
861 | } | 861 | } |
862 | 862 | ||
863 | public void SendParcelInfo (RegionInfo info, LandData land, LLUUID parcelID, uint x, uint y) | 863 | public void SendParcelInfo (RegionInfo info, LandData land, UUID parcelID, uint x, uint y) |
864 | { | 864 | { |
865 | } | 865 | } |
866 | 866 | ||
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs index 86472f6..7227cf0 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.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 | ||
28 | using libsecondlife; | 28 | using OpenMetaverse; |
29 | using Nini.Config; | 29 | using Nini.Config; |
30 | using OpenSim.Region.Environment.Interfaces; | 30 | using OpenSim.Region.Environment.Interfaces; |
31 | using OpenSim.Region.Environment.Scenes; | 31 | using OpenSim.Region.Environment.Scenes; |
@@ -40,8 +40,8 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
40 | { | 40 | { |
41 | // if (m_enabled) | 41 | // if (m_enabled) |
42 | // { | 42 | // { |
43 | // NPCAvatar testAvatar = new NPCAvatar("Jack", "NPC", new LLVector3(128, 128, 40), scene); | 43 | // NPCAvatar testAvatar = new NPCAvatar("Jack", "NPC", new Vector3(128, 128, 40), scene); |
44 | // NPCAvatar testAvatar2 = new NPCAvatar("Jill", "NPC", new LLVector3(136, 128, 40), scene); | 44 | // NPCAvatar testAvatar2 = new NPCAvatar("Jill", "NPC", new Vector3(136, 128, 40), scene); |
45 | // scene.AddNewClient(testAvatar, false); | 45 | // scene.AddNewClient(testAvatar, false); |
46 | // scene.AddNewClient(testAvatar2, false); | 46 | // scene.AddNewClient(testAvatar2, false); |
47 | // } | 47 | // } |