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/MSSQL | |
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/MSSQL')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLRegionData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserData.cs | 2 |
2 files changed, 3 insertions, 3 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); |