From c7edabd2d39dc65119bc20882d6cc660b39ded1a Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Wed, 25 Jun 2008 01:24:00 +0000
Subject: Mantis#1590. Thank you kindly, Melanie for a patch that: Makes items
 appear in the item type folder, rather than in the root

---
 OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs           | 4 +---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs     | 5 +----
 .../Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj    | 4 ++--
 .../OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj.user       | 4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 6d40dff..08cf4a7 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2722,9 +2722,7 @@ namespace OpenSim.Region.ScriptEngine.Common
 			if (World.GetScenePresence(destId) != null)
 			{
 				// destination is an avatar
-				CachedUserInfo userInfo =
-                    World.CommsManager.UserProfileCacheService.GetUserDetails(destId);
-				World.MoveTaskInventoryItem(destId,userInfo.RootFolder.ID, m_host, objId);
+                World.MoveTaskInventoryItem(destId, null, m_host, objId);
 			}
 			else
 			{
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7c6bcf7..202fce7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -36,7 +36,6 @@ using Axiom.Math;
 using libsecondlife;
 using OpenSim;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
@@ -2575,9 +2574,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (World.GetScenePresence(destId) != null)
             {
                 // destination is an avatar
-                CachedUserInfo userInfo =
-                    World.CommsManager.UserProfileCacheService.GetUserDetails(destId);
-                World.MoveTaskInventoryItem(destId,userInfo.RootFolder.ID, m_host, objId);
+                World.MoveTaskInventoryItem(destId, null, m_host, objId);
             }
             else
             {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj
index 870da9f..442ad91 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj
@@ -1,7 +1,7 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{21BC44EA-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj.user b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj.user
index c28f556..5dca1bb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj.user
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj.user
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\Data\OpenSim\bin\</ReferencePath>
-    <LastOpenVersion>9.0.21022</LastOpenVersion>
+    <ReferencePath>C:\cfk2007\svnsugi\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
     <ProjectView>ProjectFiles</ProjectView>
     <ProjectTrust>0</ProjectTrust>
   </PropertyGroup>
-- 
cgit v1.1