diff options
author | Charles Krinke | 2008-06-25 01:24:00 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-25 01:24:00 +0000 |
commit | c7edabd2d39dc65119bc20882d6cc660b39ded1a (patch) | |
tree | 3d349e48c4b4858df189dc4cbb826da5917b5070 /OpenSim/Region/ScriptEngine/Shared | |
parent | Mantis#1587. Thank you kindly, Melanie for a patch that: (diff) | |
download | opensim-SC-c7edabd2d39dc65119bc20882d6cc660b39ded1a.zip opensim-SC-c7edabd2d39dc65119bc20882d6cc660b39ded1a.tar.gz opensim-SC-c7edabd2d39dc65119bc20882d6cc660b39ded1a.tar.bz2 opensim-SC-c7edabd2d39dc65119bc20882d6cc660b39ded1a.tar.xz |
Mantis#1590. Thank you kindly, Melanie for a patch that:
Makes items appear in the item type folder, rather than in the root
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
3 files changed, 5 insertions, 8 deletions
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; | |||
36 | using libsecondlife; | 36 | using libsecondlife; |
37 | using OpenSim; | 37 | using OpenSim; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Communications.Cache; | ||
40 | using OpenSim.Region.Environment; | 39 | using OpenSim.Region.Environment; |
41 | using OpenSim.Region.Environment.Interfaces; | 40 | using OpenSim.Region.Environment.Interfaces; |
42 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; | 41 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; |
@@ -2575,9 +2574,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2575 | if (World.GetScenePresence(destId) != null) | 2574 | if (World.GetScenePresence(destId) != null) |
2576 | { | 2575 | { |
2577 | // destination is an avatar | 2576 | // destination is an avatar |
2578 | CachedUserInfo userInfo = | 2577 | World.MoveTaskInventoryItem(destId, null, m_host, objId); |
2579 | World.CommsManager.UserProfileCacheService.GetUserDetails(destId); | ||
2580 | World.MoveTaskInventoryItem(destId,userInfo.RootFolder.ID, m_host, objId); | ||
2581 | } | 2578 | } |
2582 | else | 2579 | else |
2583 | { | 2580 | { |
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 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>9.0.21022</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{21BC44EA-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{21BC44EA-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <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 @@ | |||
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
5 | <ReferencePath>C:\Data\OpenSim\bin\</ReferencePath> | 5 | <ReferencePath>C:\cfk2007\svnsugi\bin\</ReferencePath> |
6 | <LastOpenVersion>9.0.21022</LastOpenVersion> | 6 | <LastOpenVersion>8.0.50727</LastOpenVersion> |
7 | <ProjectView>ProjectFiles</ProjectView> | 7 | <ProjectView>ProjectFiles</ProjectView> |
8 | <ProjectTrust>0</ProjectTrust> | 8 | <ProjectTrust>0</ProjectTrust> |
9 | </PropertyGroup> | 9 | </PropertyGroup> |