diff options
author | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
commit | 16b6738cdadc70966a93b6d025ae469738955dcb (patch) | |
tree | 7a3c0075e9ee5fd04d972bc52be38aec4d51f648 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |
parent | DNE code cleanups (diff) | |
download | opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.zip opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2 opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.xz |
* Patch from JHurliman
* Updates to libomv r2243,
* Remove lots of unnecessary typecasts
* Improves SendWindData()
Thanks jhurliman.
* Will update OpenSim-libs in 10 minutes..
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 186e13e..560e17e 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -1371,7 +1371,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1371 | taskItem.Flags = itemBase.Flags; | 1371 | taskItem.Flags = itemBase.Flags; |
1372 | taskItem.PermsGranter = UUID.Zero; | 1372 | taskItem.PermsGranter = UUID.Zero; |
1373 | taskItem.PermsMask = 0; | 1373 | taskItem.PermsMask = 0; |
1374 | taskItem.AssetID = asset.ID; | 1374 | taskItem.AssetID = asset.FullID; |
1375 | 1375 | ||
1376 | part.AddInventoryItem(taskItem); | 1376 | part.AddInventoryItem(taskItem); |
1377 | part.GetProperties(remoteClient); | 1377 | part.GetProperties(remoteClient); |
@@ -1616,7 +1616,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1616 | // FIXME: This needs to be fixed. | 1616 | // FIXME: This needs to be fixed. |
1617 | m_log.ErrorFormat( | 1617 | m_log.ErrorFormat( |
1618 | "[AGENT INVENTORY]: Queued deletion of scene object to agent {0} {1} failed: {2}", | 1618 | "[AGENT INVENTORY]: Queued deletion of scene object to agent {0} {1} failed: {2}", |
1619 | (x != null ? x.remoteClient.Name : "unavailable"), (x != null ? x.remoteClient.AgentId : "unavailable"), e.ToString()); | 1619 | (x != null ? x.remoteClient.Name : "unavailable"), (x != null ? x.remoteClient.AgentId.ToString() : "unavailable"), e.ToString()); |
1620 | } | 1620 | } |
1621 | 1621 | ||
1622 | m_log.Info("No objects left in inventory delete queue."); | 1622 | m_log.Info("No objects left in inventory delete queue."); |