diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 94b9d40..1e2e0c8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4179,8 +4179,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4179 | } | 4179 | } |
4180 | 4180 | ||
4181 | // destination is an avatar | 4181 | // destination is an avatar |
4182 | InventoryItemBase agentItem = | 4182 | InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); |
4183 | World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); | ||
4184 | 4183 | ||
4185 | if (agentItem == null) | 4184 | if (agentItem == null) |
4186 | return; | 4185 | return; |
@@ -4190,7 +4189,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4190 | byte[] objBytes = agentItem.ID.GetBytes(); | 4189 | byte[] objBytes = agentItem.ID.GetBytes(); |
4191 | Array.Copy(objBytes, 0, bucket, 1, 16); | 4190 | Array.Copy(objBytes, 0, bucket, 1, 16); |
4192 | 4191 | ||
4193 | Console.WriteLine("Giving inventory"); | ||
4194 | GridInstantMessage msg = new GridInstantMessage(World, | 4192 | GridInstantMessage msg = new GridInstantMessage(World, |
4195 | m_host.UUID, m_host.Name+", an object owned by "+ | 4193 | m_host.UUID, m_host.Name+", an object owned by "+ |
4196 | resolveName(m_host.OwnerID)+",", destId, | 4194 | resolveName(m_host.OwnerID)+",", destId, |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 0f274f3..e5e8a56 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -1373,7 +1373,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1373 | { | 1373 | { |
1374 | sdoc.LoadXml(xml); | 1374 | sdoc.LoadXml(xml); |
1375 | } | 1375 | } |
1376 | catch (System.Xml.XmlException e) | 1376 | catch (System.Xml.XmlException) |
1377 | { | 1377 | { |
1378 | loadedState = false; | 1378 | loadedState = false; |
1379 | } | 1379 | } |