diff options
author | Jeff Ames | 2008-05-17 00:06:35 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-17 00:06:35 +0000 |
commit | a5f08b430d644c7a4274db9fff3db0c63a6a7857 (patch) | |
tree | 4216400d14b587763167839344d61c0a6f6d8c85 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |
parent | * Committing patch from mantis 0001297: [PATCH] Fix behavior of child prim in... (diff) | |
download | opensim-SC-a5f08b430d644c7a4274db9fff3db0c63a6a7857.zip opensim-SC-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.gz opensim-SC-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.bz2 opensim-SC-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 0447631..88f0cb4 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -951,7 +951,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
951 | /// <param name="localID"></param> | 951 | /// <param name="localID"></param> |
952 | public void RezScript(IClientAPI remoteClient, InventoryItemBase itemBase, LLUUID transactionID, uint localID) | 952 | public void RezScript(IClientAPI remoteClient, InventoryItemBase itemBase, LLUUID transactionID, uint localID) |
953 | { | 953 | { |
954 | LLUUID itemID=itemBase.ID; | 954 | LLUUID itemID=itemBase.ID; |
955 | LLUUID copyID = LLUUID.Random(); | 955 | LLUUID copyID = LLUUID.Random(); |
956 | 956 | ||
957 | if (itemID != LLUUID.Zero) | 957 | if (itemID != LLUUID.Zero) |
@@ -1001,38 +1001,38 @@ namespace OpenSim.Region.Environment.Scenes | |||
1001 | } | 1001 | } |
1002 | else // If the itemID is zero then the script has been rezzed directly in an object's inventory | 1002 | else // If the itemID is zero then the script has been rezzed directly in an object's inventory |
1003 | { | 1003 | { |
1004 | SceneObjectPart part=GetSceneObjectPart(itemBase.Folder); | 1004 | SceneObjectPart part=GetSceneObjectPart(itemBase.Folder); |
1005 | if(part == null) | 1005 | if (part == null) |
1006 | return; | 1006 | return; |
1007 | 1007 | ||
1008 | AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.InvType, (sbyte)itemBase.AssetType, Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}")); | 1008 | AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.InvType, (sbyte)itemBase.AssetType, Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}")); |
1009 | AssetCache.AddAsset(asset); | 1009 | AssetCache.AddAsset(asset); |
1010 | 1010 | ||
1011 | TaskInventoryItem taskItem=new TaskInventoryItem(); | 1011 | TaskInventoryItem taskItem=new TaskInventoryItem(); |
1012 | 1012 | ||
1013 | taskItem.ResetIDs(itemBase.Folder); | 1013 | taskItem.ResetIDs(itemBase.Folder); |
1014 | taskItem.ParentID = itemBase.Folder; | 1014 | taskItem.ParentID = itemBase.Folder; |
1015 | taskItem.CreationDate = (uint)itemBase.CreationDate; | 1015 | taskItem.CreationDate = (uint)itemBase.CreationDate; |
1016 | taskItem.Name = itemBase.Name; | 1016 | taskItem.Name = itemBase.Name; |
1017 | taskItem.Description = itemBase.Description; | 1017 | taskItem.Description = itemBase.Description; |
1018 | taskItem.Type = itemBase.AssetType; | 1018 | taskItem.Type = itemBase.AssetType; |
1019 | taskItem.InvType = itemBase.InvType; | 1019 | taskItem.InvType = itemBase.InvType; |
1020 | taskItem.OwnerID = itemBase.Owner; | 1020 | taskItem.OwnerID = itemBase.Owner; |
1021 | taskItem.CreatorID = itemBase.Creator; | 1021 | taskItem.CreatorID = itemBase.Creator; |
1022 | taskItem.BaseMask = itemBase.BasePermissions; | 1022 | taskItem.BaseMask = itemBase.BasePermissions; |
1023 | taskItem.OwnerMask = itemBase.CurrentPermissions; | 1023 | taskItem.OwnerMask = itemBase.CurrentPermissions; |
1024 | taskItem.EveryoneMask = itemBase.EveryOnePermissions; | 1024 | taskItem.EveryoneMask = itemBase.EveryOnePermissions; |
1025 | taskItem.NextOwnerMask = itemBase.NextPermissions; | 1025 | taskItem.NextOwnerMask = itemBase.NextPermissions; |
1026 | taskItem.GroupID = itemBase.GroupID; | 1026 | taskItem.GroupID = itemBase.GroupID; |
1027 | taskItem.GroupMask = 0; | 1027 | taskItem.GroupMask = 0; |
1028 | taskItem.Flags = itemBase.Flags; | 1028 | taskItem.Flags = itemBase.Flags; |
1029 | taskItem.PermsGranter = LLUUID.Zero; | 1029 | taskItem.PermsGranter = LLUUID.Zero; |
1030 | taskItem.PermsMask = 0; | 1030 | taskItem.PermsMask = 0; |
1031 | taskItem.AssetID = asset.ID; | 1031 | taskItem.AssetID = asset.ID; |
1032 | 1032 | ||
1033 | part.AddInventoryItem(taskItem); | 1033 | part.AddInventoryItem(taskItem); |
1034 | part.GetProperties(remoteClient); | 1034 | part.GetProperties(remoteClient); |
1035 | part.StartScript(taskItem); | 1035 | part.StartScript(taskItem); |
1036 | } | 1036 | } |
1037 | } | 1037 | } |
1038 | 1038 | ||