diff options
author | Adam Frisby | 2007-11-24 10:36:54 +0000 |
---|---|---|
committer | Adam Frisby | 2007-11-24 10:36:54 +0000 |
commit | 0951f895ef07a784b094d5f8eb3825b65d5ad171 (patch) | |
tree | 8332a8ac3c7b0e2a3455ec30e1e4972f5747b469 /OpenSim | |
parent | * Added some bounds checks to the sendLandUpdate packet to deal with agents c... (diff) | |
download | opensim-SC_OLD-0951f895ef07a784b094d5f8eb3825b65d5ad171.zip opensim-SC_OLD-0951f895ef07a784b094d5f8eb3825b65d5ad171.tar.gz opensim-SC_OLD-0951f895ef07a784b094d5f8eb3825b65d5ad171.tar.bz2 opensim-SC_OLD-0951f895ef07a784b094d5f8eb3825b65d5ad171.tar.xz |
* Removed references to "new LLUUID()", replaced with LLUUID.Zero.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AgentInventory.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLManager.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Data/ReservationData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/LandData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/LandManagement/LandManager.cs | 2 | ||||
-rw-r--r-- | 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 | |||
72 | AgentID = newAgentID; | 72 | AgentID = newAgentID; |
73 | InventoryRoot = new InventoryFolder(); | 73 | InventoryRoot = new InventoryFolder(); |
74 | InventoryRoot.FolderID = LLUUID.Random(); | 74 | InventoryRoot.FolderID = LLUUID.Random(); |
75 | InventoryRoot.ParentID = new LLUUID(); | 75 | InventoryRoot.ParentID = LLUUID.Zero; |
76 | InventoryRoot.Version = 1; | 76 | InventoryRoot.Version = 1; |
77 | InventoryRoot.DefaultType = 8; | 77 | InventoryRoot.DefaultType = 8; |
78 | InventoryRoot.OwnerID = AgentID; | 78 | 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 | |||
342 | agent.logoutTime = 0; | 342 | agent.logoutTime = 0; |
343 | 343 | ||
344 | // Current location | 344 | // Current location |
345 | agent.regionID = new LLUUID(); // Fill in later | 345 | agent.regionID = LLUUID.Zero; // Fill in later |
346 | agent.currentRegion = new LLUUID(); // Fill in later | 346 | agent.currentRegion = LLUUID.Zero; // Fill in later |
347 | 347 | ||
348 | profile.currentAgent = agent; | 348 | profile.currentAgent = agent; |
349 | } | 349 | } |
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 | |||
329 | } | 329 | } |
330 | else | 330 | else |
331 | { | 331 | { |
332 | retval.regionMapTextureID = new LLUUID(); | 332 | retval.regionMapTextureID = LLUUID.Zero; |
333 | } | 333 | } |
334 | } | 334 | } |
335 | else | 335 | 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 | |||
31 | { | 31 | { |
32 | public class ReservationData | 32 | public class ReservationData |
33 | { | 33 | { |
34 | public LLUUID userUUID = new LLUUID(); | 34 | public LLUUID userUUID = LLUUID.Zero; |
35 | public int reservationMinX = 0; | 35 | public int reservationMinX = 0; |
36 | public int reservationMinY = 0; | 36 | public int reservationMinY = 0; |
37 | public int reservationMaxX = 65536; | 37 | 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 | |||
34 | public byte[] landBitmapByteArray = new byte[512]; | 34 | public byte[] landBitmapByteArray = new byte[512]; |
35 | public string landName = "Your Parcel"; | 35 | public string landName = "Your Parcel"; |
36 | public string landDesc = ""; | 36 | public string landDesc = ""; |
37 | public LLUUID ownerID = new LLUUID(); | 37 | public LLUUID ownerID = LLUUID.Zero; |
38 | public bool isGroupOwned = false; | 38 | public bool isGroupOwned = false; |
39 | public LLVector3 AABBMin = new LLVector3(); | 39 | public LLVector3 AABBMin = new LLVector3(); |
40 | public LLVector3 AABBMax = new LLVector3(); | 40 | public LLVector3 AABBMax = new LLVector3(); |
41 | public int area = 0; | 41 | public int area = 0; |
42 | public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned | 42 | public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned |
43 | public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID | 43 | public LLUUID authBuyerID = LLUUID.Zero; //Unemplemented. Authorized Buyer's UUID |
44 | public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category | 44 | public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category |
45 | public int claimDate = 0; //Unemplemented | 45 | public int claimDate = 0; //Unemplemented |
46 | public int claimPrice = 0; //Unemplemented | 46 | public int claimPrice = 0; //Unemplemented |
47 | public LLUUID groupID = new LLUUID(); //Unemplemented | 47 | public LLUUID groupID = LLUUID.Zero; //Unemplemented |
48 | public int groupPrims = 0; | 48 | public int groupPrims = 0; |
49 | public int otherPrims = 0; | 49 | public int otherPrims = 0; |
50 | public int ownerPrims = 0; | 50 | public int ownerPrims = 0; |
@@ -64,7 +64,7 @@ namespace OpenSim.Framework | |||
64 | public byte mediaAutoScale = 0; | 64 | public byte mediaAutoScale = 0; |
65 | public LLUUID mediaID = LLUUID.Zero; | 65 | public LLUUID mediaID = LLUUID.Zero; |
66 | public int localID = 0; | 66 | public int localID = 0; |
67 | public LLUUID globalID = new LLUUID(); | 67 | public LLUUID globalID = LLUUID.Zero; |
68 | 68 | ||
69 | public string mediaURL = ""; | 69 | public string mediaURL = ""; |
70 | public string musicURL = ""; | 70 | 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 | |||
66 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port); | 66 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port); |
67 | } | 67 | } |
68 | 68 | ||
69 | public LLUUID RegionID = new LLUUID(); | 69 | public LLUUID RegionID = LLUUID.Zero; |
70 | 70 | ||
71 | private uint m_remotingPort; | 71 | private uint m_remotingPort; |
72 | public uint RemotingPort | 72 | public uint RemotingPort |
@@ -191,7 +191,7 @@ namespace OpenSim.Framework | |||
191 | public string DataStore = ""; | 191 | public string DataStore = ""; |
192 | public bool isSandbox = false; | 192 | public bool isSandbox = false; |
193 | 193 | ||
194 | public LLUUID MasterAvatarAssignedUUID = new LLUUID(); | 194 | public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; |
195 | public string MasterAvatarFirstName = ""; | 195 | public string MasterAvatarFirstName = ""; |
196 | public string MasterAvatarLastName = ""; | 196 | public string MasterAvatarLastName = ""; |
197 | public string MasterAvatarSandboxPassword = ""; | 197 | 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 | |||
129 | /// <returns></returns> | 129 | /// <returns></returns> |
130 | public Land createBaseLand() | 130 | public Land createBaseLand() |
131 | { | 131 | { |
132 | return new Land(new LLUUID(), false, m_scene); | 132 | return new Land(LLUUID.Zero, false, m_scene); |
133 | } | 133 | } |
134 | 134 | ||
135 | /// <summary> | 135 | /// <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 | |||
101 | /// </summary> | 101 | /// </summary> |
102 | public EntityBase() | 102 | public EntityBase() |
103 | { | 103 | { |
104 | m_uuid = new LLUUID(); | 104 | m_uuid = LLUUID.Zero; |
105 | 105 | ||
106 | m_pos = new LLVector3(); | 106 | m_pos = new LLVector3(); |
107 | m_velocity = new LLVector3(); | 107 | m_velocity = new LLVector3(); |