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 | |
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 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLRegionData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 12 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 10 |
5 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs index ae94252..65f301f 100644 --- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs | |||
@@ -850,7 +850,7 @@ VALUES | |||
850 | 850 | ||
851 | newData.Name = (String)row["Name"]; | 851 | newData.Name = (String)row["Name"]; |
852 | newData.Description = (String)row["Description"]; | 852 | newData.Description = (String)row["Description"]; |
853 | newData.OwnerID = (String)row["OwnerUUID"]; | 853 | newData.OwnerID = (UUID)(String)row["OwnerUUID"]; |
854 | newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]); | 854 | newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]); |
855 | newData.Area = Convert.ToInt32(row["Area"]); | 855 | newData.Area = Convert.ToInt32(row["Area"]); |
856 | newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented | 856 | newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented |
@@ -910,7 +910,7 @@ VALUES | |||
910 | { | 910 | { |
911 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 911 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
912 | entry.AgentID = new UUID((string)row["AccessUUID"]); | 912 | entry.AgentID = new UUID((string)row["AccessUUID"]); |
913 | entry.Flags = (ParcelManager.AccessList)Convert.ToInt32(row["Flags"]); | 913 | entry.Flags = (AccessList)Convert.ToInt32(row["Flags"]); |
914 | entry.Time = new DateTime(); | 914 | entry.Time = new DateTime(); |
915 | return entry; | 915 | return entry; |
916 | } | 916 | } |
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index 6352cce..cbb7368 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs | |||
@@ -1052,7 +1052,7 @@ ELSE | |||
1052 | retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString()); | 1052 | retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString()); |
1053 | 1053 | ||
1054 | // Current position | 1054 | // Current position |
1055 | retval.Region = (string)reader["currentRegion"]; | 1055 | retval.Region = (UUID)(string)reader["currentRegion"]; |
1056 | retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString()); | 1056 | retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString()); |
1057 | Vector3 tmp_v; | 1057 | Vector3 tmp_v; |
1058 | Vector3.TryParse((string)reader["currentPos"], out tmp_v); | 1058 | Vector3.TryParse((string)reader["currentPos"], out tmp_v); |
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 | } |
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index b9fda04..fe1edde 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs | |||
@@ -422,7 +422,7 @@ namespace OpenSim.Data.SQLite | |||
422 | public List<InventoryFolderBase> getInventoryFolders(UUID parentID) | 422 | public List<InventoryFolderBase> getInventoryFolders(UUID parentID) |
423 | { | 423 | { |
424 | List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); | 424 | List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); |
425 | getInventoryFolders(ref folders, Util.ToRawUuidString(parentID)); | 425 | getInventoryFolders(ref folders, parentID); |
426 | return folders; | 426 | return folders; |
427 | } | 427 | } |
428 | 428 | ||
@@ -623,10 +623,10 @@ namespace OpenSim.Data.SQLite | |||
623 | /// <todo>this is horribly inefficient, but I don't want to ruin the overall structure of this implementation</todo> | 623 | /// <todo>this is horribly inefficient, but I don't want to ruin the overall structure of this implementation</todo> |
624 | private void deleteItemsInFolder(UUID folderId) | 624 | private void deleteItemsInFolder(UUID folderId) |
625 | { | 625 | { |
626 | List<InventoryItemBase> items = getInventoryInFolder(Util.ToRawUuidString(folderId)); | 626 | List<InventoryItemBase> items = getInventoryInFolder(folderId); |
627 | 627 | ||
628 | foreach (InventoryItemBase i in items) | 628 | foreach (InventoryItemBase i in items) |
629 | deleteInventoryItem(Util.ToRawUuidString(i.ID)); | 629 | deleteInventoryItem(i.ID); |
630 | } | 630 | } |
631 | 631 | ||
632 | /// <summary> | 632 | /// <summary> |
@@ -667,7 +667,7 @@ namespace OpenSim.Data.SQLite | |||
667 | { | 667 | { |
668 | lock (ds) | 668 | lock (ds) |
669 | { | 669 | { |
670 | List<InventoryFolderBase> subFolders = getFolderHierarchy(Util.ToRawUuidString(folderID)); | 670 | List<InventoryFolderBase> subFolders = getFolderHierarchy(folderID); |
671 | 671 | ||
672 | DataTable inventoryFolderTable = ds.Tables["inventoryfolders"]; | 672 | DataTable inventoryFolderTable = ds.Tables["inventoryfolders"]; |
673 | DataRow inventoryRow; | 673 | DataRow inventoryRow; |
@@ -678,7 +678,7 @@ namespace OpenSim.Data.SQLite | |||
678 | inventoryRow = inventoryFolderTable.Rows.Find(Util.ToRawUuidString(f.ID)); | 678 | inventoryRow = inventoryFolderTable.Rows.Find(Util.ToRawUuidString(f.ID)); |
679 | if (inventoryRow != null) | 679 | if (inventoryRow != null) |
680 | { | 680 | { |
681 | deleteItemsInFolder(Util.ToRawUuidString(f.ID)); | 681 | deleteItemsInFolder(f.ID); |
682 | inventoryRow.Delete(); | 682 | inventoryRow.Delete(); |
683 | } | 683 | } |
684 | } | 684 | } |
@@ -687,7 +687,7 @@ namespace OpenSim.Data.SQLite | |||
687 | inventoryRow = inventoryFolderTable.Rows.Find(Util.ToRawUuidString(folderID)); | 687 | inventoryRow = inventoryFolderTable.Rows.Find(Util.ToRawUuidString(folderID)); |
688 | if (inventoryRow != null) | 688 | if (inventoryRow != null) |
689 | { | 689 | { |
690 | deleteItemsInFolder(Util.ToRawUuidString(folderID)); | 690 | deleteItemsInFolder(folderID); |
691 | inventoryRow.Delete(); | 691 | inventoryRow.Delete(); |
692 | } | 692 | } |
693 | 693 | ||
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 | } |