diff options
author | lbsa71 | 2009-02-12 09:53:12 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-12 09:53:12 +0000 |
commit | 801da4346aeb3c08969c4845f5c595135a64470a (patch) | |
tree | 2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Data/MSSQL | |
parent | Thanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff) | |
download | opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.zip opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2 opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz |
* optimized usings.
Diffstat (limited to 'OpenSim/Data/MSSQL')
-rw-r--r-- | OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLAssetData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLEstateData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLGridData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLInventoryData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLManager.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLMigration.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLRegionData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserData.cs | 2 |
9 files changed, 12 insertions, 14 deletions
diff --git a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs index 9211747..f992c16 100644 --- a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs +++ b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs | |||
@@ -25,8 +25,8 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Data.SqlClient; | ||
29 | using System.Data; | 28 | using System.Data; |
29 | using System.Data.SqlClient; | ||
30 | 30 | ||
31 | namespace OpenSim.Data.MSSQL | 31 | namespace OpenSim.Data.MSSQL |
32 | { | 32 | { |
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index 425e233..27deef7 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs | |||
@@ -28,8 +28,8 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using OpenMetaverse; | ||
32 | using log4net; | 31 | using log4net; |
32 | using OpenMetaverse; | ||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | 34 | ||
35 | namespace OpenSim.Data.MSSQL | 35 | namespace OpenSim.Data.MSSQL |
@@ -71,7 +71,7 @@ namespace OpenSim.Data.MSSQL | |||
71 | /// <param name="connectionString">connect string</param> | 71 | /// <param name="connectionString">connect string</param> |
72 | override public void Initialise(string connectionString) | 72 | override public void Initialise(string connectionString) |
73 | { | 73 | { |
74 | TicksToEpoch = new System.DateTime(1970, 1, 1).Ticks; | 74 | TicksToEpoch = new DateTime(1970, 1, 1).Ticks; |
75 | 75 | ||
76 | if (!string.IsNullOrEmpty(connectionString)) | 76 | if (!string.IsNullOrEmpty(connectionString)) |
77 | { | 77 | { |
@@ -162,7 +162,7 @@ namespace OpenSim.Data.MSSQL | |||
162 | " VALUES " + | 162 | " VALUES " + |
163 | "(@id, @name, @description, @assetType, @local, @temporary, @create_time, @access_time, @data)")) | 163 | "(@id, @name, @description, @assetType, @local, @temporary, @create_time, @access_time, @data)")) |
164 | { | 164 | { |
165 | int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000); | 165 | int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000); |
166 | command.Parameters.Add(database.CreateParameter("id", asset.Metadata.FullID)); | 166 | command.Parameters.Add(database.CreateParameter("id", asset.Metadata.FullID)); |
167 | command.Parameters.Add(database.CreateParameter("name", asset.Metadata.Name)); | 167 | command.Parameters.Add(database.CreateParameter("name", asset.Metadata.Name)); |
168 | command.Parameters.Add(database.CreateParameter("description", asset.Metadata.Description)); | 168 | command.Parameters.Add(database.CreateParameter("description", asset.Metadata.Description)); |
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs index 8fd47a0..815e7ff 100644 --- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs +++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -30,8 +30,8 @@ using System.Collections.Generic; | |||
30 | using System.Data; | 30 | using System.Data; |
31 | using System.Data.SqlClient; | 31 | using System.Data.SqlClient; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenMetaverse; | ||
34 | using log4net; | 33 | using log4net; |
34 | using OpenMetaverse; | ||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | 37 | ||
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs index 7c7a886..eec2091 100644 --- a/OpenSim/Data/MSSQL/MSSQLGridData.cs +++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs | |||
@@ -30,8 +30,8 @@ using System.Collections.Generic; | |||
30 | using System.Data; | 30 | using System.Data; |
31 | using System.Data.SqlClient; | 31 | using System.Data.SqlClient; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenMetaverse; | ||
34 | using log4net; | 33 | using log4net; |
34 | using OpenMetaverse; | ||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | 36 | ||
37 | namespace OpenSim.Data.MSSQL | 37 | namespace OpenSim.Data.MSSQL |
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs index 764b89d..f367d78 100644 --- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs | |||
@@ -30,8 +30,8 @@ using System.Collections.Generic; | |||
30 | using System.Data; | 30 | using System.Data; |
31 | using System.Data.SqlClient; | 31 | using System.Data.SqlClient; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenMetaverse; | ||
34 | using log4net; | 33 | using log4net; |
34 | using OpenMetaverse; | ||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | 36 | ||
37 | namespace OpenSim.Data.MSSQL | 37 | namespace OpenSim.Data.MSSQL |
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs index 562fbad..c687c89 100644 --- a/OpenSim/Data/MSSQL/MSSQLManager.cs +++ b/OpenSim/Data/MSSQL/MSSQLManager.cs | |||
@@ -31,8 +31,8 @@ using System.Data; | |||
31 | using System.Data.SqlClient; | 31 | using System.Data.SqlClient; |
32 | using System.IO; | 32 | using System.IO; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenMetaverse; | ||
35 | using log4net; | 34 | using log4net; |
35 | using OpenMetaverse; | ||
36 | 36 | ||
37 | namespace OpenSim.Data.MSSQL | 37 | namespace OpenSim.Data.MSSQL |
38 | { | 38 | { |
@@ -219,7 +219,7 @@ namespace OpenSim.Data.MSSQL | |||
219 | { | 219 | { |
220 | return value.ToString(); | 220 | return value.ToString(); |
221 | } | 221 | } |
222 | if (valueType == typeof(OpenMetaverse.UUID)) | 222 | if (valueType == typeof(UUID)) |
223 | { | 223 | { |
224 | return value.ToString(); | 224 | return value.ToString(); |
225 | } | 225 | } |
diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/MSSQL/MSSQLMigration.cs index baa25d5..aea31c9 100644 --- a/OpenSim/Data/MSSQL/MSSQLMigration.cs +++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs | |||
@@ -26,11 +26,9 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using System.Data; | 29 | using System.Data; |
31 | using System.Data.Common; | 30 | using System.Data.Common; |
32 | using System.Reflection; | 31 | using System.Reflection; |
33 | using System.Text; | ||
34 | 32 | ||
35 | namespace OpenSim.Data.MSSQL | 33 | namespace OpenSim.Data.MSSQL |
36 | { | 34 | { |
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs index d77afc9..44b042e 100644 --- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs | |||
@@ -32,8 +32,8 @@ using System.Data.SqlClient; | |||
32 | using System.Drawing; | 32 | using System.Drawing; |
33 | using System.IO; | 33 | using System.IO; |
34 | using System.Reflection; | 34 | using System.Reflection; |
35 | using OpenMetaverse; | ||
36 | using log4net; | 35 | using log4net; |
36 | using OpenMetaverse; | ||
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index 4524736..453941f 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs | |||
@@ -31,8 +31,8 @@ using System.Collections.Generic; | |||
31 | using System.Data; | 31 | using System.Data; |
32 | using System.Data.SqlClient; | 32 | using System.Data.SqlClient; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenMetaverse; | ||
35 | using log4net; | 34 | using log4net; |
35 | using OpenMetaverse; | ||
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | 37 | ||
38 | namespace OpenSim.Data.MSSQL | 38 | namespace OpenSim.Data.MSSQL |