aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorMelanie2012-01-26 09:10:46 +0000
committerMelanie2012-01-26 09:10:46 +0000
commita537f7e1a30bece8302f69cd484b6b831c4b0ec7 (patch)
treee9826422fdd329423f5b2ee2022c5b705321e8e2 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentMerge branch 'master' into careminster (diff)
parentChange references from sop to sog and add protection from null ref (diff)
downloadopensim-SC-a537f7e1a30bece8302f69cd484b6b831c4b0ec7.zip
opensim-SC-a537f7e1a30bece8302f69cd484b6b831c4b0ec7.tar.gz
opensim-SC-a537f7e1a30bece8302f69cd484b6b831c4b0ec7.tar.bz2
opensim-SC-a537f7e1a30bece8302f69cd484b6b831c4b0ec7.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 31d9ce59..764bd2f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1658,10 +1658,21 @@ namespace OpenSim.Region.Framework.Scenes
1658 // The part ID is the folder ID! 1658 // The part ID is the folder ID!
1659 SceneObjectPart part = GetSceneObjectPart(itemBase.Folder); 1659 SceneObjectPart part = GetSceneObjectPart(itemBase.Folder);
1660 if (part == null) 1660 if (part == null)
1661 {
1662// m_log.DebugFormat(
1663// "[SCENE INVENTORY]: Could not find part with id {0} for {1} to rez new script",
1664// itemBase.Folder, agentID);
1665
1661 return null; 1666 return null;
1667 }
1662 1668
1663 if (!Permissions.CanCreateObjectInventory(itemBase.InvType, part.UUID, agentID)) 1669 if (!Permissions.CanCreateObjectInventory(itemBase.InvType, part.UUID, agentID))
1670 {
1671// m_log.DebugFormat(
1672// "[SCENE INVENTORY]: No permission to create new script in {0} for {1}", part.Name, agentID);
1673
1664 return null; 1674 return null;
1675 }
1665 1676
1666 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, 1677 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType,
1667 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n\n touch_start(integer num)\n {\n }\n}"), 1678 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n\n touch_start(integer num)\n {\n }\n}"),