diff options
author | Dr Scofield | 2008-06-27 23:03:39 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-27 23:03:39 +0000 |
commit | 748f72326d9a295958bc9ba63bbb1a5d39030ef7 (patch) | |
tree | 58f2c9a5f6b8ffab5ad3621070aa17cb1c1e3e6b /OpenSim/Data/MSSQL | |
parent | more warnings to go. (diff) | |
download | opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.zip opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.gz opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.bz2 opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.xz |
last round of warning squashing. calling it a day now.
Diffstat (limited to 'OpenSim/Data/MSSQL')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLDataStore.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLGridData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLManager.cs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs index 42eab8e..17a52a8 100644 --- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs | |||
@@ -370,7 +370,7 @@ namespace OpenSim.Data.MSSQL | |||
370 | int revision = Util.UnixTimeSinceEpoch(); | 370 | int revision = Util.UnixTimeSinceEpoch(); |
371 | m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString()); | 371 | m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString()); |
372 | 372 | ||
373 | DataTable terrain = m_dataSet.Tables["terrain"]; | 373 | // DataTable terrain = m_dataSet.Tables["terrain"]; |
374 | lock (m_dataSet) | 374 | lock (m_dataSet) |
375 | { | 375 | { |
376 | SqlCommand cmd = new SqlCommand("insert into terrain(RegionUUID, Revision, Heightfield)" + | 376 | SqlCommand cmd = new SqlCommand("insert into terrain(RegionUUID, Revision, Heightfield)" + |
@@ -400,7 +400,7 @@ namespace OpenSim.Data.MSSQL | |||
400 | where RegionUUID=@RegionUUID order by Revision desc" | 400 | where RegionUUID=@RegionUUID order by Revision desc" |
401 | , m_connection); | 401 | , m_connection); |
402 | 402 | ||
403 | SqlParameter param = new SqlParameter(); | 403 | // SqlParameter param = new SqlParameter(); |
404 | cmd.Parameters.Add(new SqlParameter("@RegionUUID", regionID.UUID)); | 404 | cmd.Parameters.Add(new SqlParameter("@RegionUUID", regionID.UUID)); |
405 | 405 | ||
406 | if (m_connection.State != ConnectionState.Open) | 406 | if (m_connection.State != ConnectionState.Open) |
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs index d67e463..e2b0dd6 100644 --- a/OpenSim/Data/MSSQL/MSSQLGridData.cs +++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs | |||
@@ -434,11 +434,11 @@ namespace OpenSim.Data.MSSQL | |||
434 | /// <returns></returns> | 434 | /// <returns></returns> |
435 | public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) | 435 | public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) |
436 | { | 436 | { |
437 | SHA512Managed HashProvider = new SHA512Managed(); | 437 | // SHA512Managed HashProvider = new SHA512Managed(); |
438 | Encoding TextProvider = new UTF8Encoding(); | 438 | // Encoding TextProvider = new UTF8Encoding(); |
439 | 439 | ||
440 | byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); | 440 | // byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); |
441 | byte[] hash = HashProvider.ComputeHash(stream); | 441 | // byte[] hash = HashProvider.ComputeHash(stream); |
442 | return false; | 442 | return false; |
443 | } | 443 | } |
444 | 444 | ||
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs index a170a87..bea02fe 100644 --- a/OpenSim/Data/MSSQL/MSSQLManager.cs +++ b/OpenSim/Data/MSSQL/MSSQLManager.cs | |||
@@ -544,7 +544,7 @@ namespace OpenSim.Data.MSSQL | |||
544 | public string getVersion() | 544 | public string getVersion() |
545 | { | 545 | { |
546 | Module module = GetType().Module; | 546 | Module module = GetType().Module; |
547 | string dllName = module.Assembly.ManifestModule.Name; | 547 | // string dllName = module.Assembly.ManifestModule.Name; |
548 | Version dllVersion = module.Assembly.GetName().Version; | 548 | Version dllVersion = module.Assembly.GetName().Version; |
549 | 549 | ||
550 | 550 | ||