diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index d779dd7..b076855 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -918,7 +918,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
918 | } | 918 | } |
919 | 919 | ||
920 | } | 920 | } |
921 | 921 | ||
922 | /// <summary> | 922 | /// <summary> |
923 | /// <see>ClientMoveTaskInventoryItem</see> | 923 | /// <see>ClientMoveTaskInventoryItem</see> |
924 | /// </summary> | 924 | /// </summary> |
@@ -927,7 +927,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
927 | /// <param name="primLocalID"></param> | 927 | /// <param name="primLocalID"></param> |
928 | /// <param name="itemID"></param> | 928 | /// <param name="itemID"></param> |
929 | public void ClientMoveTaskInventoryItem(IClientAPI remoteClient, LLUUID folderId, uint primLocalId, LLUUID itemId) | 929 | public void ClientMoveTaskInventoryItem(IClientAPI remoteClient, LLUUID folderId, uint primLocalId, LLUUID itemId) |
930 | { | 930 | { |
931 | SceneObjectPart part = GetSceneObjectPart(primLocalId); | 931 | SceneObjectPart part = GetSceneObjectPart(primLocalId); |
932 | 932 | ||
933 | if (null == part) | 933 | if (null == part) |
@@ -948,19 +948,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
948 | return; | 948 | return; |
949 | } | 949 | } |
950 | 950 | ||
951 | MoveTaskInventoryItem(remoteClient, folderId, part, itemId); | 951 | MoveTaskInventoryItem(remoteClient, folderId, part, itemId); |
952 | } | 952 | } |
953 | 953 | ||
954 | /// <summary> | 954 | /// <summary> |
955 | /// <see>MoveTaskInventoryItem</see> | 955 | /// <see>MoveTaskInventoryItem</see> |
956 | /// </summary> | 956 | /// </summary> |
957 | /// <param name="remoteClient"></param> | 957 | /// <param name="remoteClient"></param> |
958 | /// <param name="folderID"></param> | 958 | /// <param name="folderID"></param> |
959 | /// <param name="part"></param> | 959 | /// <param name="part"></param> |
960 | /// <param name="itemID"></param> | 960 | /// <param name="itemID"></param> |
961 | public void MoveTaskInventoryItem(LLUUID avatarId, LLUUID folderId, SceneObjectPart part, LLUUID itemId) | 961 | public void MoveTaskInventoryItem(LLUUID avatarId, LLUUID folderId, SceneObjectPart part, LLUUID itemId) |
962 | { | 962 | { |
963 | ScenePresence avatar; | 963 | ScenePresence avatar; |
964 | 964 | ||
965 | if (TryGetAvatar(avatarId, out avatar)) | 965 | if (TryGetAvatar(avatarId, out avatar)) |
966 | { | 966 | { |
@@ -973,53 +973,53 @@ namespace OpenSim.Region.Environment.Scenes | |||
973 | "Avatar {0} cannot be found to update its prim item asset", | 973 | "Avatar {0} cannot be found to update its prim item asset", |
974 | avatarId); | 974 | avatarId); |
975 | } | 975 | } |
976 | } | 976 | } |
977 | 977 | ||
978 | /// <summary> | 978 | /// <summary> |
979 | /// Copy a task (prim) inventory item to another task (prim) | 979 | /// Copy a task (prim) inventory item to another task (prim) |
980 | /// </summary> | 980 | /// </summary> |
981 | /// <param name="destId"></param> | 981 | /// <param name="destId"></param> |
982 | /// <param name="part"></param> | 982 | /// <param name="part"></param> |
983 | /// <param name="itemId"></param> | 983 | /// <param name="itemId"></param> |
984 | public void MoveTaskInventoryItem(LLUUID destId, SceneObjectPart part, LLUUID itemId) | 984 | public void MoveTaskInventoryItem(LLUUID destId, SceneObjectPart part, LLUUID itemId) |
985 | { | 985 | { |
986 | TaskInventoryItem srcTaskItem = part.GetInventoryItem(itemId); | 986 | TaskInventoryItem srcTaskItem = part.GetInventoryItem(itemId); |
987 | 987 | ||
988 | if(srcTaskItem == null) | 988 | if (srcTaskItem == null) |
989 | { | 989 | { |
990 | // error was already logged | 990 | // error was already logged |
991 | return; | 991 | return; |
992 | } | 992 | } |
993 | 993 | ||
994 | SceneObjectPart destPart = GetSceneObjectPart(destId); | 994 | SceneObjectPart destPart = GetSceneObjectPart(destId); |
995 | 995 | ||
996 | if(destPart == null) | 996 | if (destPart == null) |
997 | { | 997 | { |
998 | m_log.ErrorFormat( | 998 | m_log.ErrorFormat( |
999 | "[PRIM INVENTORY]: " + | 999 | "[PRIM INVENTORY]: " + |
1000 | "Could not find prim for ID {0}", | 1000 | "Could not find prim for ID {0}", |
1001 | destId); | 1001 | destId); |
1002 | return; | 1002 | return; |
1003 | } | 1003 | } |
1004 | 1004 | ||
1005 | TaskInventoryItem destTaskItem = new TaskInventoryItem(); | 1005 | TaskInventoryItem destTaskItem = new TaskInventoryItem(); |
1006 | 1006 | ||
1007 | destTaskItem.ItemID = LLUUID.Random(); | 1007 | destTaskItem.ItemID = LLUUID.Random(); |
1008 | destTaskItem.CreatorID = srcTaskItem.CreatorID; | 1008 | destTaskItem.CreatorID = srcTaskItem.CreatorID; |
1009 | destTaskItem.AssetID = srcTaskItem.AssetID; | 1009 | destTaskItem.AssetID = srcTaskItem.AssetID; |
1010 | destTaskItem.GroupID = destPart.GroupID; | 1010 | destTaskItem.GroupID = destPart.GroupID; |
1011 | destTaskItem.OwnerID = destPart.OwnerID; | 1011 | destTaskItem.OwnerID = destPart.OwnerID; |
1012 | destTaskItem.ParentID = destPart.UUID; | 1012 | destTaskItem.ParentID = destPart.UUID; |
1013 | destTaskItem.ParentPartID = destPart.UUID; | 1013 | destTaskItem.ParentPartID = destPart.UUID; |
1014 | 1014 | ||
1015 | destTaskItem.BaseMask = srcTaskItem.BaseMask; | 1015 | destTaskItem.BaseMask = srcTaskItem.BaseMask; |
1016 | destTaskItem.EveryoneMask = srcTaskItem.EveryoneMask; | 1016 | destTaskItem.EveryoneMask = srcTaskItem.EveryoneMask; |
1017 | destTaskItem.GroupMask = srcTaskItem.GroupMask; | 1017 | destTaskItem.GroupMask = srcTaskItem.GroupMask; |
1018 | destTaskItem.OwnerMask = srcTaskItem.OwnerMask; | 1018 | destTaskItem.OwnerMask = srcTaskItem.OwnerMask; |
1019 | destTaskItem.NextOwnerMask = srcTaskItem.NextOwnerMask; | 1019 | destTaskItem.NextOwnerMask = srcTaskItem.NextOwnerMask; |
1020 | destTaskItem.Flags = srcTaskItem.Flags; | 1020 | destTaskItem.Flags = srcTaskItem.Flags; |
1021 | 1021 | ||
1022 | if(destPart.OwnerID != part.OwnerID) | 1022 | if (destPart.OwnerID != part.OwnerID) |
1023 | { | 1023 | { |
1024 | if (ExternalChecks.ExternalChecksPropagatePermissions()) | 1024 | if (ExternalChecks.ExternalChecksPropagatePermissions()) |
1025 | { | 1025 | { |
@@ -1035,18 +1035,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
1035 | } | 1035 | } |
1036 | } | 1036 | } |
1037 | 1037 | ||
1038 | destTaskItem.Description = srcTaskItem.Description; | 1038 | destTaskItem.Description = srcTaskItem.Description; |
1039 | destTaskItem.Name = srcTaskItem.Name; | 1039 | destTaskItem.Name = srcTaskItem.Name; |
1040 | destTaskItem.InvType = srcTaskItem.InvType; | 1040 | destTaskItem.InvType = srcTaskItem.InvType; |
1041 | destTaskItem.Type = srcTaskItem.Type; | 1041 | destTaskItem.Type = srcTaskItem.Type; |
1042 | 1042 | ||
1043 | destPart.AddInventoryItem(destTaskItem); | 1043 | destPart.AddInventoryItem(destTaskItem); |
1044 | 1044 | ||
1045 | if((srcTaskItem.OwnerMask & (uint)PermissionMask.Copy) == 0) | 1045 | if ((srcTaskItem.OwnerMask & (uint)PermissionMask.Copy) == 0) |
1046 | part.RemoveInventoryItem(itemId); | 1046 | part.RemoveInventoryItem(itemId); |
1047 | 1047 | ||
1048 | } | 1048 | } |
1049 | 1049 | ||
1050 | /// <summary> | 1050 | /// <summary> |
1051 | /// Update an item in a prim (task) inventory. | 1051 | /// Update an item in a prim (task) inventory. |
1052 | /// This method does not handle scripts, <see>RezScript(IClientAPI, LLUUID, unit)</see> | 1052 | /// This method does not handle scripts, <see>RezScript(IClientAPI, LLUUID, unit)</see> |