diff options
author | Justin Clarke Casey | 2008-07-12 21:43:35 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-12 21:43:35 +0000 |
commit | 23c4a409b754e708cc36cd13108060e9569fb08d (patch) | |
tree | 61f8fbb31ef34733a59ea9d053da1c78675511bf | |
parent | * minor: thought up a better name for the last allocated local id (diff) | |
download | opensim-SC_OLD-23c4a409b754e708cc36cd13108060e9569fb08d.zip opensim-SC_OLD-23c4a409b754e708cc36cd13108060e9569fb08d.tar.gz opensim-SC_OLD-23c4a409b754e708cc36cd13108060e9569fb08d.tar.bz2 opensim-SC_OLD-23c4a409b754e708cc36cd13108060e9569fb08d.tar.xz |
minor: method documentation
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 21 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 180 |
3 files changed, 90 insertions, 117 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index d553f4b..6a2b2d9 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -747,6 +747,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
747 | return sp; | 747 | return sp; |
748 | } | 748 | } |
749 | 749 | ||
750 | /// <summary> | ||
751 | /// Get a scene object group that contains the prim with the given local id | ||
752 | /// </summary> | ||
753 | /// <param name="localID"></param> | ||
754 | /// <returns>null if no scene object group containing that prim is found</returns> | ||
750 | private SceneObjectGroup GetGroupByPrim(uint localID) | 755 | private SceneObjectGroup GetGroupByPrim(uint localID) |
751 | { | 756 | { |
752 | List<EntityBase> EntityList = GetEntities(); | 757 | List<EntityBase> EntityList = GetEntities(); |
@@ -762,6 +767,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
762 | return null; | 767 | return null; |
763 | } | 768 | } |
764 | 769 | ||
770 | /// <summary> | ||
771 | /// Get a scene object group that contains the prim with the given uuid | ||
772 | /// </summary> | ||
773 | /// <param name="fullID"></param> | ||
774 | /// <returns>null if no scene object group containing that prim is found</returns> | ||
765 | private SceneObjectGroup GetGroupByPrim(LLUUID fullID) | 775 | private SceneObjectGroup GetGroupByPrim(LLUUID fullID) |
766 | { | 776 | { |
767 | List<EntityBase> EntityList = GetEntities(); | 777 | List<EntityBase> EntityList = GetEntities(); |
@@ -802,15 +812,26 @@ namespace OpenSim.Region.Environment.Scenes | |||
802 | return returnResult; | 812 | return returnResult; |
803 | } | 813 | } |
804 | 814 | ||
815 | /// <summary> | ||
816 | /// Get a part contained in this scene. | ||
817 | /// </summary> | ||
818 | /// <param name="localID"></param> | ||
819 | /// <returns>null if the part was not found</returns> | ||
805 | protected internal SceneObjectPart GetSceneObjectPart(uint localID) | 820 | protected internal SceneObjectPart GetSceneObjectPart(uint localID) |
806 | { | 821 | { |
807 | SceneObjectGroup group = GetGroupByPrim(localID); | 822 | SceneObjectGroup group = GetGroupByPrim(localID); |
823 | |||
808 | if (group != null) | 824 | if (group != null) |
809 | return group.GetChildPart(localID); | 825 | return group.GetChildPart(localID); |
810 | else | 826 | else |
811 | return null; | 827 | return null; |
812 | } | 828 | } |
813 | 829 | ||
830 | /// <summary> | ||
831 | /// Get a part contained in this scene. | ||
832 | /// </summary> | ||
833 | /// <param name="fullID"></param> | ||
834 | /// <returns>null if the part was not found</returns> | ||
814 | protected internal SceneObjectPart GetSceneObjectPart(LLUUID fullID) | 835 | protected internal SceneObjectPart GetSceneObjectPart(LLUUID fullID) |
815 | { | 836 | { |
816 | SceneObjectGroup group = GetGroupByPrim(fullID); | 837 | SceneObjectGroup group = GetGroupByPrim(fullID); |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 1482f9a..1b3d942 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -442,12 +442,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
442 | } | 442 | } |
443 | more = !reader.EOF; | 443 | more = !reader.EOF; |
444 | } | 444 | } |
445 | |||
445 | reader.Close(); | 446 | reader.Close(); |
446 | sr.Close(); | 447 | sr.Close(); |
447 | 448 | ||
448 | UpdateParentIDs(); | 449 | UpdateParentIDs(); |
449 | } | 450 | } |
450 | |||
451 | 451 | ||
452 | /// <summary> | 452 | /// <summary> |
453 | /// | 453 | /// |
@@ -832,7 +832,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
832 | } | 832 | } |
833 | 833 | ||
834 | /// <summary> | 834 | /// <summary> |
835 | /// | 835 | /// Make sure that every non root part has the proper parent root part local id |
836 | /// </summary> | 836 | /// </summary> |
837 | public void UpdateParentIDs() | 837 | public void UpdateParentIDs() |
838 | { | 838 | { |
@@ -1663,6 +1663,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1663 | { | 1663 | { |
1664 | return true; | 1664 | return true; |
1665 | } | 1665 | } |
1666 | |||
1666 | return false; | 1667 | return false; |
1667 | } | 1668 | } |
1668 | 1669 | ||
@@ -1684,6 +1685,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1684 | } | 1685 | } |
1685 | } | 1686 | } |
1686 | } | 1687 | } |
1688 | |||
1687 | return false; | 1689 | return false; |
1688 | } | 1690 | } |
1689 | 1691 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 8bf8575..b71657d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -819,151 +819,101 @@ namespace OpenSim.Region.Environment.Scenes | |||
819 | } | 819 | } |
820 | } | 820 | } |
821 | 821 | ||
822 | public uint ParentID { | 822 | public uint ParentID |
823 | get { | 823 | { |
824 | return _parentID; | 824 | get { return _parentID; } |
825 | } | 825 | set { _parentID = value; } |
826 | set { | ||
827 | _parentID = value; | ||
828 | } | ||
829 | } | 826 | } |
830 | 827 | ||
831 | public int CreationDate { | 828 | public int CreationDate |
832 | get { | 829 | { |
833 | return _creationDate; | 830 | get { return _creationDate; } |
834 | } | 831 | set { _creationDate = value; } |
835 | set { | ||
836 | _creationDate = value; | ||
837 | } | ||
838 | } | 832 | } |
839 | 833 | ||
840 | public uint Category { | 834 | public uint Category |
841 | get { | 835 | { |
842 | return _category; | 836 | get { return _category; } |
843 | } | 837 | set { _category = value; } |
844 | set { | ||
845 | _category = value; | ||
846 | } | ||
847 | } | 838 | } |
848 | 839 | ||
849 | public int SalePrice { | 840 | public int SalePrice |
850 | get { | 841 | { |
851 | return _salePrice; | 842 | get { return _salePrice; } |
852 | } | 843 | set { _salePrice = value; } |
853 | set { | ||
854 | _salePrice = value; | ||
855 | } | ||
856 | } | 844 | } |
857 | 845 | ||
858 | public byte ObjectSaleType { | 846 | public byte ObjectSaleType |
859 | get { | 847 | { |
860 | return _objectSaleType; | 848 | get { return _objectSaleType; } |
861 | } | 849 | set { _objectSaleType = value; } |
862 | set { | ||
863 | _objectSaleType = value; | ||
864 | } | ||
865 | } | 850 | } |
866 | 851 | ||
867 | public int OwnershipCost { | 852 | public int OwnershipCost |
868 | get { | 853 | { |
869 | return _ownershipCost; | 854 | get { return _ownershipCost; } |
870 | } | 855 | set { _ownershipCost = value; } |
871 | set { | ||
872 | _ownershipCost = value; | ||
873 | } | ||
874 | } | 856 | } |
875 | 857 | ||
876 | public LLUUID GroupID { | 858 | public LLUUID GroupID |
877 | get { | 859 | { |
878 | return _groupID; | 860 | get { return _groupID; } |
879 | } | 861 | set { _groupID = value; } |
880 | set { | ||
881 | _groupID = value; | ||
882 | } | ||
883 | } | 862 | } |
884 | 863 | ||
885 | public LLUUID OwnerID { | 864 | public LLUUID OwnerID |
886 | get { | 865 | { |
887 | return _ownerID; | 866 | get { return _ownerID; } |
888 | } | 867 | set { _ownerID = value; } |
889 | set { | ||
890 | _ownerID = value; | ||
891 | } | ||
892 | } | 868 | } |
893 | 869 | ||
894 | public LLUUID LastOwnerID { | 870 | public LLUUID LastOwnerID |
895 | get { | 871 | { |
896 | return _lastOwnerID; | 872 | get { return _lastOwnerID; } |
897 | } | 873 | set { _lastOwnerID = value; } |
898 | set { | ||
899 | _lastOwnerID = value; | ||
900 | } | ||
901 | } | 874 | } |
902 | 875 | ||
903 | public uint BaseMask { | 876 | public uint BaseMask |
904 | get { | 877 | { |
905 | return _baseMask; | 878 | get { return _baseMask; } |
906 | } | 879 | set { _baseMask = value; } |
907 | set { | ||
908 | _baseMask = value; | ||
909 | } | ||
910 | } | 880 | } |
911 | 881 | ||
912 | public uint OwnerMask { | 882 | public uint OwnerMask |
913 | get { | 883 | { |
914 | return _ownerMask; | 884 | get { return _ownerMask; } |
915 | } | 885 | set { _ownerMask = value; } |
916 | set { | ||
917 | _ownerMask = value; | ||
918 | } | ||
919 | } | 886 | } |
920 | 887 | ||
921 | public uint GroupMask { | 888 | public uint GroupMask |
922 | get { | 889 | { |
923 | return _groupMask; | 890 | get { return _groupMask; } |
924 | } | 891 | set { _groupMask = value; } |
925 | set { | ||
926 | _groupMask = value; | ||
927 | } | ||
928 | } | 892 | } |
929 | 893 | ||
930 | public uint EveryoneMask { | 894 | public uint EveryoneMask |
931 | get { | 895 | { |
932 | return _everyoneMask; | 896 | get { return _everyoneMask; } |
933 | } | 897 | set { _everyoneMask = value; } |
934 | set { | ||
935 | _everyoneMask = value; | ||
936 | } | ||
937 | } | 898 | } |
938 | 899 | ||
939 | public uint NextOwnerMask { | 900 | public uint NextOwnerMask |
940 | get { | 901 | { |
941 | return _nextOwnerMask; | 902 | get { return _nextOwnerMask; } |
942 | } | 903 | set { _nextOwnerMask = value; } |
943 | set { | ||
944 | _nextOwnerMask = value; | ||
945 | } | ||
946 | } | 904 | } |
947 | 905 | ||
948 | public libsecondlife.LLObject.ObjectFlags Flags { | 906 | public libsecondlife.LLObject.ObjectFlags Flags |
949 | get { | 907 | { |
950 | return _flags; | 908 | get { return _flags; } |
951 | } | 909 | set { _flags = value; } |
952 | set { | ||
953 | _flags = value; | ||
954 | } | ||
955 | } | 910 | } |
956 | 911 | ||
957 | public LLUUID SitTargetAvatar { | 912 | public LLUUID SitTargetAvatar |
958 | get { | 913 | { |
959 | return m_sitTargetAvatar; | 914 | get { return m_sitTargetAvatar; } |
960 | } | 915 | set { m_sitTargetAvatar = value; } |
961 | set { | ||
962 | m_sitTargetAvatar = value; | ||
963 | } | ||
964 | } | 916 | } |
965 | |||
966 | |||
967 | 917 | ||
968 | #endregion Public Properties with only Get | 918 | #endregion Public Properties with only Get |
969 | 919 | ||
@@ -982,7 +932,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
982 | } | 932 | } |
983 | 933 | ||
984 | /// <summary> | 934 | /// <summary> |
985 | /// Clear all pending updates | 935 | /// Clear all pending updates of parts to clients |
986 | /// </summary> | 936 | /// </summary> |
987 | private void ClearUpdateSchedule() | 937 | private void ClearUpdateSchedule() |
988 | { | 938 | { |