Merge branch 'master' into careminster

OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

@@ -489,19 +489,21 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     List<mapItemReply> mapitems = new List<mapItemReply>();
                     mapItemReply mapitem = new mapItemReply();
 
-                    SceneObjectPart sop = m_scene.GetSceneObjectPart(m_scene.RegionInfo.RegionSettings.TelehubObject);
+                    SceneObjectGroup sog = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
-
+                    if (sog != null)
+                    {
                         mapitem = new mapItemReply();
-                    mapitem.x = (uint)(xstart + sop.AbsolutePosition.X);
+                        mapitem.x = (uint)(xstart + sog.AbsolutePosition.X);
-                    mapitem.y = (uint)(ystart + sop.AbsolutePosition.Y);
+                        mapitem.y = (uint)(ystart + sog.AbsolutePosition.Y);
                         mapitem.id = UUID.Zero;
-                    mapitem.name = sop.Name;
+                        mapitem.name = sog.Name;
                         mapitem.Extra = 0; // color (not used)
                         mapitem.Extra2 = 0; // 0 = telehub / 1 = infohub
                         mapitems.Add(mapitem);
 
                         remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
                     }
+                }
                 else
                 {
                     // Remote Map Item Request

OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

@@ -1658,10 +1658,21 @@ namespace OpenSim.Region.Framework.Scenes
             // The part ID is the folder ID!
             SceneObjectPart part = GetSceneObjectPart(itemBase.Folder);
             if (part == null)
+            {
+//                m_log.DebugFormat(
+//                    "[SCENE INVENTORY]: Could not find part with id {0} for {1} to rez new script",
+//                    itemBase.Folder, agentID);
+
                 return null;
+            }
 
             if (!Permissions.CanCreateObjectInventory(itemBase.InvType, part.UUID, agentID))
+            {
+//                m_log.DebugFormat(
+//                    "[SCENE INVENTORY]: No permission to create new script in {0} for {1}", part.Name, agentID);
+
                 return null;
+            }
 
             AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType,
                 Encoding.ASCII.GetBytes("default\n{\n    state_entry()\n    {\n        llSay(0, \"Script running\");\n    }\n\n    touch_start(integer num)\n    {\n    }\n}"),

OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    [TestFixture]
+    public class SceneObjectScriptTests
+    {
+        [Test]
+        public void TestAddScript()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+            UUID itemId = TestHelpers.ParseTail(0x2);
+            string itemName = "Test Script Item";
+
+            Scene scene = SceneHelpers.SetupScene();
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
+            scene.AddNewSceneObject(so, true);
+
+            InventoryItemBase itemTemplate = new InventoryItemBase();
+            itemTemplate.Name = itemName;
+            itemTemplate.Folder = so.UUID;
+            itemTemplate.InvType = (int)InventoryType.LSL;
+
+            SceneObjectPart partWhereScriptAdded = scene.RezNewScript(userId, itemTemplate);
+
+            Assert.That(partWhereScriptAdded, Is.Not.Null);
+
+            IEntityInventory primInventory = partWhereScriptAdded.Inventory;
+            Assert.That(primInventory.GetInventoryList().Count, Is.EqualTo(1));
+            Assert.That(primInventory.ContainsScripts(), Is.True);
+
+            IList<TaskInventoryItem> primItems = primInventory.GetInventoryItems(itemName);
+            Assert.That(primItems.Count, Is.EqualTo(1));
+        }
+    }
+}