diff options
author | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
commit | 16b6738cdadc70966a93b6d025ae469738955dcb (patch) | |
tree | 7a3c0075e9ee5fd04d972bc52be38aec4d51f648 /OpenSim/Data/MySQL | |
parent | DNE code cleanups (diff) | |
download | opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.zip opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2 opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.xz |
* Patch from JHurliman
* Updates to libomv r2243,
* Remove lots of unnecessary typecasts
* Improves SendWindData()
Thanks jhurliman.
* Will update OpenSim-libs in 10 minutes..
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index c94e6a3..e6a9686 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
@@ -1329,10 +1329,10 @@ namespace OpenSim.Data.MySQL | |||
1329 | 1329 | ||
1330 | newData.Name = (String) row["Name"]; | 1330 | newData.Name = (String) row["Name"]; |
1331 | newData.Description = (String) row["Description"]; | 1331 | newData.Description = (String) row["Description"]; |
1332 | newData.OwnerID = (String) row["OwnerUUID"]; | 1332 | newData.OwnerID = (UUID)(String)row["OwnerUUID"]; |
1333 | newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]); | 1333 | newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]); |
1334 | newData.Area = Convert.ToInt32(row["Area"]); | 1334 | newData.Area = Convert.ToInt32(row["Area"]); |
1335 | newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented | 1335 | newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unimplemented |
1336 | newData.Category = (Parcel.ParcelCategory) Convert.ToInt32(row["Category"]); | 1336 | newData.Category = (Parcel.ParcelCategory) Convert.ToInt32(row["Category"]); |
1337 | //Enum libsecondlife.Parcel.ParcelCategory | 1337 | //Enum libsecondlife.Parcel.ParcelCategory |
1338 | newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]); | 1338 | newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]); |
@@ -1387,7 +1387,7 @@ namespace OpenSim.Data.MySQL | |||
1387 | { | 1387 | { |
1388 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 1388 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
1389 | entry.AgentID = new UUID((string) row["AccessUUID"]); | 1389 | entry.AgentID = new UUID((string) row["AccessUUID"]); |
1390 | entry.Flags = (ParcelManager.AccessList) Convert.ToInt32(row["Flags"]); | 1390 | entry.Flags = (AccessList) Convert.ToInt32(row["Flags"]); |
1391 | entry.Time = new DateTime(); | 1391 | entry.Time = new DateTime(); |
1392 | return entry; | 1392 | return entry; |
1393 | } | 1393 | } |