aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-16 23:11:00 +0000
committerTeravus Ovares2008-05-16 23:11:00 +0000
commitaa5197304e2bb8c6b2f7bf3c8e86256042cf23b8 (patch)
treec55e7c94e4978bbc073947da44b383c692d8f5c6 /OpenSim/Region/ClientStack/LindenUDP
parentminor change to justin's previous fix that should still (diff)
downloadopensim-SC_OLD-aa5197304e2bb8c6b2f7bf3c8e86256042cf23b8.zip
opensim-SC_OLD-aa5197304e2bb8c6b2f7bf3c8e86256042cf23b8.tar.gz
opensim-SC_OLD-aa5197304e2bb8c6b2f7bf3c8e86256042cf23b8.tar.bz2
opensim-SC_OLD-aa5197304e2bb8c6b2f7bf3c8e86256042cf23b8.tar.xz
* Committing patch from mantis 0001297: [PATCH] Fix behavior of child prim inventories. Also enables 'New Script' button. from Melanie. Thanks Melanie!
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs21
1 files changed, 20 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index d6329ce..4d27a0c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5007,10 +5007,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5007 RezScriptPacket rezScriptx = (RezScriptPacket)Pack; 5007 RezScriptPacket rezScriptx = (RezScriptPacket)Pack;
5008 5008
5009 handlerRezScript = OnRezScript; 5009 handlerRezScript = OnRezScript;
5010 InventoryItemBase item=new InventoryItemBase();
5011 item.ID=rezScriptx.InventoryBlock.ItemID;
5012 item.Folder=rezScriptx.InventoryBlock.FolderID;
5013 item.Creator=rezScriptx.InventoryBlock.CreatorID;
5014 item.Owner=rezScriptx.InventoryBlock.OwnerID;
5015 item.BasePermissions=rezScriptx.InventoryBlock.BaseMask;
5016 item.CurrentPermissions=rezScriptx.InventoryBlock.OwnerMask;
5017 item.EveryOnePermissions=rezScriptx.InventoryBlock.EveryoneMask;
5018 item.NextPermissions=rezScriptx.InventoryBlock.NextOwnerMask;
5019 item.GroupOwned=rezScriptx.InventoryBlock.GroupOwned;
5020 item.GroupID=rezScriptx.InventoryBlock.GroupID;
5021 item.AssetType=rezScriptx.InventoryBlock.Type;
5022 item.InvType=rezScriptx.InventoryBlock.InvType;
5023 item.Flags=rezScriptx.InventoryBlock.Flags;
5024 item.SaleType=rezScriptx.InventoryBlock.SaleType;
5025 item.SalePrice=rezScriptx.InventoryBlock.SalePrice;
5026 item.Name=Util.FieldToString(rezScriptx.InventoryBlock.Name);
5027 item.Description=Util.FieldToString(rezScriptx.InventoryBlock.Description);
5028 item.CreationDate=(int)rezScriptx.InventoryBlock.CreationDate;
5010 5029
5011 if (handlerRezScript != null) 5030 if (handlerRezScript != null)
5012 { 5031 {
5013 handlerRezScript(this, rezScriptx.InventoryBlock.ItemID, rezScriptx.UpdateBlock.ObjectLocalID); 5032 handlerRezScript(this, item, rezScriptx.InventoryBlock.TransactionID, rezScriptx.UpdateBlock.ObjectLocalID);
5014 } 5033 }
5015 break; 5034 break;
5016 5035