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/SQLite/SQLiteRegionData.cs | |
parent | DNE code cleanups (diff) | |
download | opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.zip opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 7eeefbd..157a4b8 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -258,7 +258,7 @@ namespace OpenSim.Data.SQLite | |||
258 | { | 258 | { |
259 | DataTable regionsettings = ds.Tables["regionsettings"]; | 259 | DataTable regionsettings = ds.Tables["regionsettings"]; |
260 | 260 | ||
261 | DataRow settingsRow = regionsettings.Rows.Find(rs.RegionUUID.ToString()); | 261 | DataRow settingsRow = regionsettings.Rows.Find(Util.ToRawUuidString(rs.RegionUUID)); |
262 | if (settingsRow == null) | 262 | if (settingsRow == null) |
263 | { | 263 | { |
264 | settingsRow = regionsettings.NewRow(); | 264 | settingsRow = regionsettings.NewRow(); |
@@ -439,7 +439,7 @@ namespace OpenSim.Data.SQLite | |||
439 | group.AddPart(prim); | 439 | group.AddPart(prim); |
440 | group.RootPart = prim; | 440 | group.RootPart = prim; |
441 | 441 | ||
442 | createdObjects.Add(Util.ToRawUuidString(group.UUID), group); | 442 | createdObjects.Add(group.UUID, group); |
443 | retvals.Add(group); | 443 | retvals.Add(group); |
444 | } | 444 | } |
445 | else | 445 | else |
@@ -1268,7 +1268,7 @@ namespace OpenSim.Data.SQLite | |||
1268 | 1268 | ||
1269 | newData.Name = (String) row["Name"]; | 1269 | newData.Name = (String) row["Name"]; |
1270 | newData.Description = (String) row["Desc"]; | 1270 | newData.Description = (String) row["Desc"]; |
1271 | newData.OwnerID = (String) row["OwnerUUID"]; | 1271 | newData.OwnerID = (UUID)(String) row["OwnerUUID"]; |
1272 | newData.IsGroupOwned = (Boolean) row["IsGroupOwned"]; | 1272 | newData.IsGroupOwned = (Boolean) row["IsGroupOwned"]; |
1273 | newData.Area = Convert.ToInt32(row["Area"]); | 1273 | newData.Area = Convert.ToInt32(row["Area"]); |
1274 | newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented | 1274 | newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented |
@@ -1288,7 +1288,7 @@ namespace OpenSim.Data.SQLite | |||
1288 | newData.MusicURL = (String) row["MusicURL"]; | 1288 | newData.MusicURL = (String) row["MusicURL"]; |
1289 | newData.PassHours = Convert.ToSingle(row["PassHours"]); | 1289 | newData.PassHours = Convert.ToSingle(row["PassHours"]); |
1290 | newData.PassPrice = Convert.ToInt32(row["PassPrice"]); | 1290 | newData.PassPrice = Convert.ToInt32(row["PassPrice"]); |
1291 | newData.SnapshotID = (String) row["SnapshotUUID"]; | 1291 | newData.SnapshotID = (UUID)(String) row["SnapshotUUID"]; |
1292 | try | 1292 | try |
1293 | { | 1293 | { |
1294 | 1294 | ||
@@ -1365,7 +1365,7 @@ namespace OpenSim.Data.SQLite | |||
1365 | { | 1365 | { |
1366 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 1366 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
1367 | entry.AgentID = new UUID((string) row["AccessUUID"]); | 1367 | entry.AgentID = new UUID((string) row["AccessUUID"]); |
1368 | entry.Flags = (ParcelManager.AccessList) row["Flags"]; | 1368 | entry.Flags = (AccessList) row["Flags"]; |
1369 | entry.Time = new DateTime(); | 1369 | entry.Time = new DateTime(); |
1370 | return entry; | 1370 | return entry; |
1371 | } | 1371 | } |