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/Grid/AssetServer/RestService.cs                    | 2 +-
 OpenSim/Grid/GridServer/GridManager.cs                     | 2 +-
 OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs | 2 +-
 OpenSim/Grid/MessagingServer/XMPPHTTPService.cs            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Grid')

diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index 457142f..e805001 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Grid.AssetServer
 
             if (p.Length > 0)
             {
-                UUID assetID = null;
+                UUID assetID = UUID.Zero;
 
                 if (!UUID.TryParse(p[0], out assetID))
                 {
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index b437f59..05e70db 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -614,7 +614,7 @@ namespace OpenSim.Grid.GridServer
             //
             // this particular section of the mod attempts to receive a value from the region's xml file by way of
             // OSG1GridServices for the region's owner
-            sim.owner_uuid = (string)requestData["master_avatar_uuid"];
+            sim.owner_uuid = (UUID)(string)requestData["master_avatar_uuid"];
 
             try
             {
diff --git a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
index 4d6f3de..7ea1ac7 100644
--- a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Grid.MessagingServer
 
         public UUID getitem(int index)
         {
-            UUID result = null;
+            UUID result = UUID.Zero;
             lock (AgentList)
             {
                 if (index > 0 && index < AgentList.Count)
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index 3b433ba..9d3f2bf 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Grid.MessagingServer
 
                 if (p.Length > 0)
                 {
-                    UUID assetID = null;
+                    UUID assetID = UUID.Zero;
 
                     if (!UUID.TryParse(p[0], out assetID))
                     {
-- 
cgit v1.1