From 598ab37b97fc1ff189f61c3416a8732b698a76af Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 26 Sep 2014 02:52:44 +0100
Subject: debug msg

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index e003a59..ac0b69c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -133,8 +133,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="item"></param>
         public bool AddInventoryItem(InventoryItemBase item)
         {
+            m_log.DebugFormat("[AGENT INVENTORY]: item {0}", item.Name);
+
             if (item.Folder != UUID.Zero && InventoryService.AddItem(item))
             {
+                 m_log.DebugFormat(
+                    "[AGENT INVENTORY]: added item {0}",item.Name);
+
                 int userlevel = 0;
                 if (Permissions.IsGod(item.Owner))
                 {
-- 
cgit v1.1


From d29a04fc20a7d8a72944ffe835c7e758aa2712ed Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 26 Sep 2014 03:52:10 +0100
Subject: remove debug msgs

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index ac0b69c..e003a59 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -133,13 +133,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="item"></param>
         public bool AddInventoryItem(InventoryItemBase item)
         {
-            m_log.DebugFormat("[AGENT INVENTORY]: item {0}", item.Name);
-
             if (item.Folder != UUID.Zero && InventoryService.AddItem(item))
             {
-                 m_log.DebugFormat(
-                    "[AGENT INVENTORY]: added item {0}",item.Name);
-
                 int userlevel = 0;
                 if (Permissions.IsGod(item.Owner))
                 {
-- 
cgit v1.1


From 09e05d48b9cb45c7211145bf325dc3ab144a03a1 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 26 Sep 2014 13:28:24 +0100
Subject:  refuse to do a inventory link if provided asset type is not a link
 or  folderlink

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index e003a59..5197f58 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1063,6 +1063,10 @@ namespace OpenSim.Region.Framework.Scenes
             if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId))
                 return;
 
+            if (type != (sbyte)AssetType.Link || type != (sbyte)AssetType.LinkFolder)
+                return;
+
+
             ScenePresence presence;
             if (TryGetScenePresence(remoteClient.AgentId, out presence))
             {
-- 
cgit v1.1