diff options
author | Oren Hurvitz | 2014-04-22 20:04:12 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-23 16:37:36 +0300 |
commit | 998d7009a65def0a4debc9369d35b63611db5b55 (patch) | |
tree | d1303dc0387ae9ce4ddb076d5ccc856f3d5844e0 /OpenSim/Data/SQLite/SQLiteSimulationData.cs | |
parent | Workaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff) | |
download | opensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.zip opensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz opensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2 opensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz |
Eliminated many warnings
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteSimulationData.cs')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 9466e99..a12004e 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -1605,7 +1605,7 @@ namespace OpenSim.Data.SQLite | |||
1605 | prim.SitName = (String)row["SitName"]; | 1605 | prim.SitName = (String)row["SitName"]; |
1606 | prim.TouchName = (String)row["TouchName"]; | 1606 | prim.TouchName = (String)row["TouchName"]; |
1607 | // permissions | 1607 | // permissions |
1608 | prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]); | 1608 | prim.Flags = (PrimFlags)Convert.ToUInt32(row["ObjectFlags"]); |
1609 | prim.CreatorIdentification = (String)row["CreatorID"]; | 1609 | prim.CreatorIdentification = (String)row["CreatorID"]; |
1610 | prim.OwnerID = new UUID((String)row["OwnerID"]); | 1610 | prim.OwnerID = new UUID((String)row["OwnerID"]); |
1611 | prim.GroupID = new UUID((String)row["GroupID"]); | 1611 | prim.GroupID = new UUID((String)row["GroupID"]); |
@@ -2034,7 +2034,7 @@ namespace OpenSim.Data.SQLite | |||
2034 | row["SitName"] = prim.SitName; | 2034 | row["SitName"] = prim.SitName; |
2035 | row["TouchName"] = prim.TouchName; | 2035 | row["TouchName"] = prim.TouchName; |
2036 | // permissions | 2036 | // permissions |
2037 | row["ObjectFlags"] = prim.ObjectFlags; | 2037 | row["ObjectFlags"] = (uint)prim.Flags; |
2038 | row["CreatorID"] = prim.CreatorIdentification.ToString(); | 2038 | row["CreatorID"] = prim.CreatorIdentification.ToString(); |
2039 | row["OwnerID"] = prim.OwnerID.ToString(); | 2039 | row["OwnerID"] = prim.OwnerID.ToString(); |
2040 | row["GroupID"] = prim.GroupID.ToString(); | 2040 | row["GroupID"] = prim.GroupID.ToString(); |