From 16b6738cdadc70966a93b6d025ae469738955dcb Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 26 Sep 2008 17:25:22 +0000
Subject: * Patch from JHurliman * Updates to libomv r2243, * Remove lots of
 unnecessary typecasts * Improves SendWindData() Thanks jhurliman. * Will
 update OpenSim-libs in 10 minutes..

---
 OpenSim/Region/Environment/Scenes/InnerScene.cs       | 2 +-
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs  | 4 ++--
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 50122f5..1c421b7 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Environment.Scenes
         protected internal void MakeObjectSearchable(IClientAPI remoteClient, bool IncludeInSearch, uint localID)
         {
             UUID user = remoteClient.AgentId;
-            UUID objid = null;
+            UUID objid = UUID.Zero;
             SceneObjectPart obj = null;
 
             List<EntityBase> EntityList = GetEntities();
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
                 taskItem.Flags = itemBase.Flags;
                 taskItem.PermsGranter = UUID.Zero;
                 taskItem.PermsMask = 0;
-                taskItem.AssetID = asset.ID;
+                taskItem.AssetID = asset.FullID;
 
                 part.AddInventoryItem(taskItem);
                 part.GetProperties(remoteClient);
@@ -1616,7 +1616,7 @@ namespace OpenSim.Region.Environment.Scenes
                 // FIXME: This needs to be fixed.
                 m_log.ErrorFormat(
                     "[AGENT INVENTORY]: Queued deletion of scene object to agent {0} {1} failed: {2}",
-                    (x != null ? x.remoteClient.Name : "unavailable"), (x != null ? x.remoteClient.AgentId : "unavailable"), e.ToString());
+                    (x != null ? x.remoteClient.Name : "unavailable"), (x != null ? x.remoteClient.AgentId.ToString() : "unavailable"), e.ToString());
             }
 
             m_log.Info("No objects left in inventory delete queue.");
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 08de087..f08f4a4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -915,7 +915,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 return part.UUID;
             }
-            return null;
+            return UUID.Zero;
         }
 
         public void ObjectGrabHandler(uint localId, Vector3 offsetPos, IClientAPI remoteClient)
-- 
cgit v1.1