From 0951f895ef07a784b094d5f8eb3825b65d5ad171 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sat, 24 Nov 2007 10:36:54 +0000
Subject: * Removed references to "new LLUUID()", replaced with LLUUID.Zero.

---
 OpenSim/Framework/AgentInventory.cs                      | 2 +-
 OpenSim/Framework/Communications/UserManagerBase.cs      | 4 ++--
 OpenSim/Framework/Data.MySQL/MySQLManager.cs             | 2 +-
 OpenSim/Framework/Data/ReservationData.cs                | 2 +-
 OpenSim/Framework/LandData.cs                            | 8 ++++----
 OpenSim/Framework/RegionInfo.cs                          | 4 ++--
 OpenSim/Region/Environment/LandManagement/LandManager.cs | 2 +-
 OpenSim/Region/Environment/Scenes/EntityBase.cs          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Framework/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs
index 7a1174a..c1dac34 100644
--- a/OpenSim/Framework/AgentInventory.cs
+++ b/OpenSim/Framework/AgentInventory.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Framework
             AgentID = newAgentID;
             InventoryRoot = new InventoryFolder();
             InventoryRoot.FolderID = LLUUID.Random();
-            InventoryRoot.ParentID = new LLUUID();
+            InventoryRoot.ParentID = LLUUID.Zero;
             InventoryRoot.Version = 1;
             InventoryRoot.DefaultType = 8;
             InventoryRoot.OwnerID = AgentID;
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index cab54fe..6916519 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -342,8 +342,8 @@ namespace OpenSim.Framework.UserManagement
             agent.logoutTime = 0;
 
             // Current location
-            agent.regionID = new LLUUID(); // Fill in later
-            agent.currentRegion = new LLUUID(); // Fill in later
+            agent.regionID = LLUUID.Zero; // Fill in later
+            agent.currentRegion = LLUUID.Zero; // Fill in later
 
             profile.currentAgent = agent;
         }
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 502b47c..3c31d37 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -329,7 +329,7 @@ namespace OpenSim.Framework.Data.MySQL
                 }
                 else
                 {
-                    retval.regionMapTextureID = new LLUUID();
+                    retval.regionMapTextureID = LLUUID.Zero;
                 }
             }
             else
diff --git a/OpenSim/Framework/Data/ReservationData.cs b/OpenSim/Framework/Data/ReservationData.cs
index 06adf04..acc45ed 100644
--- a/OpenSim/Framework/Data/ReservationData.cs
+++ b/OpenSim/Framework/Data/ReservationData.cs
@@ -31,7 +31,7 @@ namespace OpenSim.Framework.Data
 {
     public class ReservationData
     {
-        public LLUUID userUUID = new LLUUID();
+        public LLUUID userUUID = LLUUID.Zero;
         public int reservationMinX = 0;
         public int reservationMinY = 0;
         public int reservationMaxX = 65536;
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index ca948ef..a3f9196 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -34,17 +34,17 @@ namespace OpenSim.Framework
         public byte[] landBitmapByteArray = new byte[512];
         public string landName = "Your Parcel";
         public string landDesc = "";
-        public LLUUID ownerID = new LLUUID();
+        public LLUUID ownerID = LLUUID.Zero;
         public bool isGroupOwned = false;
         public LLVector3 AABBMin = new LLVector3();
         public LLVector3 AABBMax = new LLVector3();
         public int area = 0;
         public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
-        public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
+        public LLUUID authBuyerID = LLUUID.Zero; //Unemplemented. Authorized Buyer's UUID
         public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
         public int claimDate = 0; //Unemplemented
         public int claimPrice = 0; //Unemplemented
-        public LLUUID groupID = new LLUUID(); //Unemplemented
+        public LLUUID groupID = LLUUID.Zero; //Unemplemented
         public int groupPrims = 0;
         public int otherPrims = 0;
         public int ownerPrims = 0;
@@ -64,7 +64,7 @@ namespace OpenSim.Framework
         public byte mediaAutoScale = 0;
         public LLUUID mediaID = LLUUID.Zero;
         public int localID = 0;
-        public LLUUID globalID = new LLUUID();
+        public LLUUID globalID = LLUUID.Zero;
 
         public string mediaURL = "";
         public string musicURL = "";
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 7ef4205..75923ee 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework
             m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port);
         }
 
-        public LLUUID RegionID = new LLUUID();
+        public LLUUID RegionID = LLUUID.Zero;
 
         private uint m_remotingPort;
         public uint RemotingPort
@@ -191,7 +191,7 @@ namespace OpenSim.Framework
         public string DataStore = "";
         public bool isSandbox = false;
 
-        public LLUUID MasterAvatarAssignedUUID = new LLUUID();
+        public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero;
         public string MasterAvatarFirstName = "";
         public string MasterAvatarLastName = "";
         public string MasterAvatarSandboxPassword = "";
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs
index dd35a26..60924ce 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Region.Environment.LandManagement
         /// <returns></returns>
         public Land createBaseLand()
         {
-            return new Land(new LLUUID(), false, m_scene);
+            return new Land(LLUUID.Zero, false, m_scene);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 94e2337..4556c63 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public EntityBase()
         {
-            m_uuid = new LLUUID();
+            m_uuid = LLUUID.Zero;
 
             m_pos = new LLVector3();
             m_velocity = new LLVector3();
-- 
cgit v1.1