* Committing patch from mantis 0001297: [PATCH] Fix behavior of child prim inventories. Also enables 'New Script' button. from Melanie. Thanks Melanie!

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
                         RezScriptPacket rezScriptx = (RezScriptPacket)Pack;
 
                         handlerRezScript = OnRezScript;
+                                                InventoryItemBase item=new InventoryItemBase();
+                                                item.ID=rezScriptx.InventoryBlock.ItemID;
+                                                item.Folder=rezScriptx.InventoryBlock.FolderID;
+                                                item.Creator=rezScriptx.InventoryBlock.CreatorID;
+                                                item.Owner=rezScriptx.InventoryBlock.OwnerID;
+                                                item.BasePermissions=rezScriptx.InventoryBlock.BaseMask;
+                                                item.CurrentPermissions=rezScriptx.InventoryBlock.OwnerMask;
+                                                item.EveryOnePermissions=rezScriptx.InventoryBlock.EveryoneMask;
+                                                item.NextPermissions=rezScriptx.InventoryBlock.NextOwnerMask;
+                                                item.GroupOwned=rezScriptx.InventoryBlock.GroupOwned;
+                                                item.GroupID=rezScriptx.InventoryBlock.GroupID;
+                                                item.AssetType=rezScriptx.InventoryBlock.Type;
+                                                item.InvType=rezScriptx.InventoryBlock.InvType;
+                                                item.Flags=rezScriptx.InventoryBlock.Flags;
+                                                item.SaleType=rezScriptx.InventoryBlock.SaleType;
+                                                item.SalePrice=rezScriptx.InventoryBlock.SalePrice;
+                                                item.Name=Util.FieldToString(rezScriptx.InventoryBlock.Name);
+                                                item.Description=Util.FieldToString(rezScriptx.InventoryBlock.Description);
+                                                item.CreationDate=(int)rezScriptx.InventoryBlock.CreationDate;
 
                         if (handlerRezScript != null)
                         {
-                            handlerRezScript(this, rezScriptx.InventoryBlock.ItemID, rezScriptx.UpdateBlock.ObjectLocalID);
+                            handlerRezScript(this, item, rezScriptx.InventoryBlock.TransactionID, rezScriptx.UpdateBlock.ObjectLocalID);
                         }
                         break;