diff options
author | MW | 2007-08-22 17:40:26 +0000 |
---|---|---|
committer | MW | 2007-08-22 17:40:26 +0000 |
commit | 001d5a5c923899b036c8135f9031867f8a431d5b (patch) | |
tree | e1fe2653147cfa6283c029ccc28e0564bfd966fe /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
parent | A little bit of cleaning up. (diff) | |
download | opensim-SC_OLD-001d5a5c923899b036c8135f9031867f8a431d5b.zip opensim-SC_OLD-001d5a5c923899b036c8135f9031867f8a431d5b.tar.gz opensim-SC_OLD-001d5a5c923899b036c8135f9031867f8a431d5b.tar.bz2 opensim-SC_OLD-001d5a5c923899b036c8135f9031867f8a431d5b.tar.xz |
Made SceneObjectGroup.GetChildPrim() public, for now so that script engine can get ref to the SceneObjectPart/ IScriptHost.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 99bdda9..c50809f 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -362,7 +362,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
362 | /// </summary> | 362 | /// </summary> |
363 | /// <param name="primID"></param> | 363 | /// <param name="primID"></param> |
364 | /// <returns></returns> | 364 | /// <returns></returns> |
365 | private SceneObjectPart GetChildPrim(LLUUID primID) | 365 | public SceneObjectPart GetChildPart(LLUUID primID) |
366 | { | 366 | { |
367 | SceneObjectPart childPart = null; | 367 | SceneObjectPart childPart = null; |
368 | if (this.m_parts.ContainsKey(primID)) | 368 | if (this.m_parts.ContainsKey(primID)) |
@@ -377,7 +377,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
377 | /// </summary> | 377 | /// </summary> |
378 | /// <param name="localID"></param> | 378 | /// <param name="localID"></param> |
379 | /// <returns></returns> | 379 | /// <returns></returns> |
380 | private SceneObjectPart GetChildPrim(uint localID) | 380 | public SceneObjectPart GetChildPart(uint localID) |
381 | { | 381 | { |
382 | foreach (SceneObjectPart part in this.m_parts.Values) | 382 | foreach (SceneObjectPart part in this.m_parts.Values) |
383 | { | 383 | { |
@@ -543,7 +543,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
543 | /// <param name="name"></param> | 543 | /// <param name="name"></param> |
544 | public void SetPartName(string name, uint localID) | 544 | public void SetPartName(string name, uint localID) |
545 | { | 545 | { |
546 | SceneObjectPart part = this.GetChildPrim(localID); | 546 | SceneObjectPart part = this.GetChildPart(localID); |
547 | if (part != null) | 547 | if (part != null) |
548 | { | 548 | { |
549 | part.Name = name; | 549 | part.Name = name; |
@@ -552,7 +552,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
552 | 552 | ||
553 | public void SetPartDescription(string des, uint localID) | 553 | public void SetPartDescription(string des, uint localID) |
554 | { | 554 | { |
555 | SceneObjectPart part = this.GetChildPrim(localID); | 555 | SceneObjectPart part = this.GetChildPart(localID); |
556 | if (part != null) | 556 | if (part != null) |
557 | { | 557 | { |
558 | part.Description = des; | 558 | part.Description = des; |
@@ -561,7 +561,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
561 | 561 | ||
562 | public void SetPartText(string text, uint localID) | 562 | public void SetPartText(string text, uint localID) |
563 | { | 563 | { |
564 | SceneObjectPart part = this.GetChildPrim(localID); | 564 | SceneObjectPart part = this.GetChildPart(localID); |
565 | if (part != null) | 565 | if (part != null) |
566 | { | 566 | { |
567 | part.Text = text; | 567 | part.Text = text; |
@@ -570,7 +570,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
570 | 570 | ||
571 | public void SetPartText(string text, LLUUID partID) | 571 | public void SetPartText(string text, LLUUID partID) |
572 | { | 572 | { |
573 | SceneObjectPart part = this.GetChildPrim(partID); | 573 | SceneObjectPart part = this.GetChildPart(partID); |
574 | if (part != null) | 574 | if (part != null) |
575 | { | 575 | { |
576 | part.Text = text; | 576 | part.Text = text; |
@@ -579,7 +579,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
579 | 579 | ||
580 | public string GetPartName(uint localID) | 580 | public string GetPartName(uint localID) |
581 | { | 581 | { |
582 | SceneObjectPart part = this.GetChildPrim(localID); | 582 | SceneObjectPart part = this.GetChildPart(localID); |
583 | if (part != null) | 583 | if (part != null) |
584 | { | 584 | { |
585 | return part.Name; | 585 | return part.Name; |
@@ -589,7 +589,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
589 | 589 | ||
590 | public string GetPartDescription(uint localID) | 590 | public string GetPartDescription(uint localID) |
591 | { | 591 | { |
592 | SceneObjectPart part = this.GetChildPrim(localID); | 592 | SceneObjectPart part = this.GetChildPart(localID); |
593 | if (part != null) | 593 | if (part != null) |
594 | { | 594 | { |
595 | return part.Description; | 595 | return part.Description; |
@@ -604,7 +604,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
604 | /// <param name="localID"></param> | 604 | /// <param name="localID"></param> |
605 | public bool GetPartInventoryFileName(IClientAPI remoteClient, uint localID) | 605 | public bool GetPartInventoryFileName(IClientAPI remoteClient, uint localID) |
606 | { | 606 | { |
607 | SceneObjectPart part = this.GetChildPrim(localID); | 607 | SceneObjectPart part = this.GetChildPart(localID); |
608 | if (part != null) | 608 | if (part != null) |
609 | { | 609 | { |
610 | return part.GetInventoryFileName(remoteClient, localID); | 610 | return part.GetInventoryFileName(remoteClient, localID); |
@@ -614,7 +614,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
614 | 614 | ||
615 | public string RequestInventoryFile(uint localID, XferManager xferManager) | 615 | public string RequestInventoryFile(uint localID, XferManager xferManager) |
616 | { | 616 | { |
617 | SceneObjectPart part = this.GetChildPrim(localID); | 617 | SceneObjectPart part = this.GetChildPart(localID); |
618 | if (part != null) | 618 | if (part != null) |
619 | { | 619 | { |
620 | return part.RequestInventoryFile(xferManager); | 620 | return part.RequestInventoryFile(xferManager); |
@@ -624,7 +624,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
624 | 624 | ||
625 | public bool AddInventoryItem(IClientAPI remoteClient, uint localID, InventoryItemBase item) | 625 | public bool AddInventoryItem(IClientAPI remoteClient, uint localID, InventoryItemBase item) |
626 | { | 626 | { |
627 | SceneObjectPart part = this.GetChildPrim(localID); | 627 | SceneObjectPart part = this.GetChildPart(localID); |
628 | if (part != null) | 628 | if (part != null) |
629 | { | 629 | { |
630 | SceneObjectPart.TaskInventoryItem taskItem = new SceneObjectPart.TaskInventoryItem(); | 630 | SceneObjectPart.TaskInventoryItem taskItem = new SceneObjectPart.TaskInventoryItem(); |
@@ -652,7 +652,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
652 | /// <param name="data"></param> | 652 | /// <param name="data"></param> |
653 | public void UpdateExtraParam(uint localID, ushort type, bool inUse, byte[] data) | 653 | public void UpdateExtraParam(uint localID, ushort type, bool inUse, byte[] data) |
654 | { | 654 | { |
655 | SceneObjectPart part = this.GetChildPrim(localID); | 655 | SceneObjectPart part = this.GetChildPart(localID); |
656 | if (part != null) | 656 | if (part != null) |
657 | { | 657 | { |
658 | part.UpdateExtraParam(type, inUse, data); | 658 | part.UpdateExtraParam(type, inUse, data); |
@@ -666,7 +666,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
666 | /// <param name="textureEntry"></param> | 666 | /// <param name="textureEntry"></param> |
667 | public void UpdateTextureEntry(uint localID, byte[] textureEntry) | 667 | public void UpdateTextureEntry(uint localID, byte[] textureEntry) |
668 | { | 668 | { |
669 | SceneObjectPart part = this.GetChildPrim(localID); | 669 | SceneObjectPart part = this.GetChildPart(localID); |
670 | if (part != null) | 670 | if (part != null) |
671 | { | 671 | { |
672 | part.UpdateTextureEntry(textureEntry); | 672 | part.UpdateTextureEntry(textureEntry); |
@@ -681,7 +681,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
681 | /// <param name="shapeBlock"></param> | 681 | /// <param name="shapeBlock"></param> |
682 | public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock, uint localID) | 682 | public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock, uint localID) |
683 | { | 683 | { |
684 | SceneObjectPart part = this.GetChildPrim(localID); | 684 | SceneObjectPart part = this.GetChildPart(localID); |
685 | if (part != null) | 685 | if (part != null) |
686 | { | 686 | { |
687 | part.UpdateShape(shapeBlock); | 687 | part.UpdateShape(shapeBlock); |
@@ -697,7 +697,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
697 | /// <param name="localID"></param> | 697 | /// <param name="localID"></param> |
698 | public void Resize(LLVector3 scale, uint localID) | 698 | public void Resize(LLVector3 scale, uint localID) |
699 | { | 699 | { |
700 | SceneObjectPart part = this.GetChildPrim(localID); | 700 | SceneObjectPart part = this.GetChildPart(localID); |
701 | if (part != null) | 701 | if (part != null) |
702 | { | 702 | { |
703 | part.Resize(scale); | 703 | part.Resize(scale); |
@@ -723,7 +723,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
723 | /// <param name="localID"></param> | 723 | /// <param name="localID"></param> |
724 | public void UpdateSinglePosition(LLVector3 pos, uint localID) | 724 | public void UpdateSinglePosition(LLVector3 pos, uint localID) |
725 | { | 725 | { |
726 | SceneObjectPart part = this.GetChildPrim(localID); | 726 | SceneObjectPart part = this.GetChildPart(localID); |
727 | if (part != null) | 727 | if (part != null) |
728 | { | 728 | { |
729 | if (part.UUID == this.m_rootPart.UUID) | 729 | if (part.UUID == this.m_rootPart.UUID) |
@@ -795,7 +795,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
795 | /// <param name="localID"></param> | 795 | /// <param name="localID"></param> |
796 | public void UpdateSingleRotation(LLQuaternion rot, uint localID) | 796 | public void UpdateSingleRotation(LLQuaternion rot, uint localID) |
797 | { | 797 | { |
798 | SceneObjectPart part = this.GetChildPrim(localID); | 798 | SceneObjectPart part = this.GetChildPart(localID); |
799 | if (part != null) | 799 | if (part != null) |
800 | { | 800 | { |
801 | if (part.UUID == this.m_rootPart.UUID) | 801 | if (part.UUID == this.m_rootPart.UUID) |
@@ -987,7 +987,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
987 | 987 | ||
988 | public LLUUID GetPartsFullID(uint localID) | 988 | public LLUUID GetPartsFullID(uint localID) |
989 | { | 989 | { |
990 | SceneObjectPart part = this.GetChildPrim(localID); | 990 | SceneObjectPart part = this.GetChildPart(localID); |
991 | if (part != null) | 991 | if (part != null) |
992 | { | 992 | { |
993 | return part.UUID; | 993 | return part.UUID; |
@@ -1009,7 +1009,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1009 | } | 1009 | } |
1010 | else | 1010 | else |
1011 | { | 1011 | { |
1012 | SceneObjectPart part = GetChildPrim(localId); | 1012 | SceneObjectPart part = GetChildPart(localId); |
1013 | OnGrabPart(part, offsetPos, remoteClient); | 1013 | OnGrabPart(part, offsetPos, remoteClient); |
1014 | } | 1014 | } |
1015 | } | 1015 | } |