diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 245f258..83990b1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -319,11 +319,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
319 | // Passing something to another avatar or a an object will already | 319 | // Passing something to another avatar or a an object will already |
320 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); | 320 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); |
321 | item = InventoryService.GetItem(item); | 321 | item = InventoryService.GetItem(item); |
322 | if (item.Owner != remoteClient.AgentId) | ||
323 | return; | ||
324 | 322 | ||
325 | if (item != null) | 323 | if (item != null) |
326 | { | 324 | { |
325 | if (item.Owner != remoteClient.AgentId) | ||
326 | return; | ||
327 | |||
327 | if (UUID.Zero == transactionID) | 328 | if (UUID.Zero == transactionID) |
328 | { | 329 | { |
329 | item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255); | 330 | item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255); |
@@ -371,8 +372,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
371 | } | 372 | } |
372 | else | 373 | else |
373 | { | 374 | { |
374 | m_log.Error( | 375 | m_log.ErrorFormat( |
375 | "[AGENTINVENTORY]: Item ID " + itemID + " not found for an inventory item update."); | 376 | "[AGENTINVENTORY]: Item id {0} not found for an inventory item update for {1}.", |
377 | itemID, remoteClient.Name); | ||
376 | } | 378 | } |
377 | } | 379 | } |
378 | 380 | ||
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 21e3d3f..e2c6a08 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -182,10 +182,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
182 | 182 | ||
183 | private const int LAND_VELOCITYMAG_MAX = 12; | 183 | private const int LAND_VELOCITYMAG_MAX = 12; |
184 | 184 | ||
185 | public bool IsRestrictedToRegion; | ||
186 | |||
187 | public string JID = String.Empty; | ||
188 | |||
189 | private float m_health = 100f; | 185 | private float m_health = 100f; |
190 | 186 | ||
191 | protected ulong crossingFromRegion; | 187 | protected ulong crossingFromRegion; |