diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index e3d0dac..ce7d97c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3864,9 +3864,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3864 | throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); | 3864 | throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); |
3865 | } | 3865 | } |
3866 | 3866 | ||
3867 | // check if destination is an avatar | 3867 | // check if destination is an object |
3868 | if (World.GetScenePresence(destId) != null) | 3868 | if (World.GetSceneObjectPart(destId) != null) |
3869 | { | 3869 | { |
3870 | // destination is an object | ||
3871 | World.MoveTaskInventoryItem(destId, m_host, objId); | ||
3872 | } | ||
3873 | else | ||
3874 | { | ||
3875 | ScenePresence presence = World.GetScenePresence(destId); | ||
3876 | |||
3877 | if (presence == null) | ||
3878 | { | ||
3879 | UserAccount account = | ||
3880 | World.UserAccountService.GetUserAccount( | ||
3881 | World.RegionInfo.ScopeID, | ||
3882 | destId); | ||
3883 | |||
3884 | if (account == null) | ||
3885 | { | ||
3886 | llSay(0, "Can't find destination "+destId.ToString()); | ||
3887 | return; | ||
3888 | } | ||
3889 | } | ||
3870 | // destination is an avatar | 3890 | // destination is an avatar |
3871 | InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); | 3891 | InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); |
3872 | 3892 | ||
@@ -3887,16 +3907,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3887 | m_host.AbsolutePosition.ToString(), | 3907 | m_host.AbsolutePosition.ToString(), |
3888 | agentItem.ID, true, m_host.AbsolutePosition, | 3908 | agentItem.ID, true, m_host.AbsolutePosition, |
3889 | bucket); | 3909 | bucket); |
3890 | |||
3891 | if (m_TransferModule != null) | 3910 | if (m_TransferModule != null) |
3892 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 3911 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
3912 | ScriptSleep(3000); | ||
3893 | } | 3913 | } |
3894 | else | ||
3895 | { | ||
3896 | // destination is an object | ||
3897 | World.MoveTaskInventoryItem(destId, m_host, objId); | ||
3898 | } | ||
3899 | ScriptSleep(3000); | ||
3900 | } | 3914 | } |
3901 | 3915 | ||
3902 | public void llRemoveInventory(string name) | 3916 | public void llRemoveInventory(string name) |