diff options
author | Jeff Ames | 2008-08-18 00:39:10 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-18 00:39:10 +0000 |
commit | 6ef9d4da901a346c232458317cca6268da888e2e (patch) | |
tree | dd1d935b10f34f261839da9f9879c02322e8ede7 /OpenSim/Data/MSSQL | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.zip opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.gz opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.bz2 opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Data/MSSQL')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLAssetData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLGridData.cs | 12 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLLogData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLManager.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserData.cs | 18 |
5 files changed, 25 insertions, 25 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index 443907f..e10e3aa 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Data.MSSQL | |||
63 | database.ExecuteResourceSql("CreateAssetsTable.sql"); | 63 | database.ExecuteResourceSql("CreateAssetsTable.sql"); |
64 | return; | 64 | return; |
65 | } | 65 | } |
66 | 66 | ||
67 | } | 67 | } |
68 | 68 | ||
69 | /// <summary> | 69 | /// <summary> |
@@ -230,7 +230,7 @@ namespace OpenSim.Data.MSSQL | |||
230 | } | 230 | } |
231 | 231 | ||
232 | /// <summary> | 232 | /// <summary> |
233 | /// Database provider version. | 233 | /// Database provider version. |
234 | /// </summary> | 234 | /// </summary> |
235 | override public string Version | 235 | override public string Version |
236 | { | 236 | { |
@@ -238,7 +238,7 @@ namespace OpenSim.Data.MSSQL | |||
238 | } | 238 | } |
239 | 239 | ||
240 | /// <summary> | 240 | /// <summary> |
241 | /// The name of this DB provider. | 241 | /// The name of this DB provider. |
242 | /// </summary> | 242 | /// </summary> |
243 | override public string Name | 243 | override public string Name |
244 | { | 244 | { |
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs index e1de297..423d4aa 100644 --- a/OpenSim/Data/MSSQL/MSSQLGridData.cs +++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs | |||
@@ -51,8 +51,8 @@ namespace OpenSim.Data.MSSQL | |||
51 | 51 | ||
52 | private string m_regionsTableName; | 52 | private string m_regionsTableName; |
53 | 53 | ||
54 | override public void Initialise() | 54 | override public void Initialise() |
55 | { | 55 | { |
56 | m_log.Info("[MSSQLGridData]: " + Name + " cannot be default-initialized!"); | 56 | m_log.Info("[MSSQLGridData]: " + Name + " cannot be default-initialized!"); |
57 | throw new PluginNotInitialisedException (Name); | 57 | throw new PluginNotInitialisedException (Name); |
58 | } | 58 | } |
@@ -87,7 +87,7 @@ namespace OpenSim.Data.MSSQL | |||
87 | } | 87 | } |
88 | 88 | ||
89 | /// <summary> | 89 | /// <summary> |
90 | /// | 90 | /// |
91 | /// </summary> | 91 | /// </summary> |
92 | private void TestTables() | 92 | private void TestTables() |
93 | { | 93 | { |
@@ -114,7 +114,7 @@ namespace OpenSim.Data.MSSQL | |||
114 | } | 114 | } |
115 | 115 | ||
116 | /// <summary> | 116 | /// <summary> |
117 | /// The name of this DB provider. | 117 | /// The name of this DB provider. |
118 | /// </summary> | 118 | /// </summary> |
119 | /// <returns>A string containing the storage system name</returns> | 119 | /// <returns>A string containing the storage system name</returns> |
120 | override public string Name | 120 | override public string Name |
@@ -123,7 +123,7 @@ namespace OpenSim.Data.MSSQL | |||
123 | } | 123 | } |
124 | 124 | ||
125 | /// <summary> | 125 | /// <summary> |
126 | /// Database provider version. | 126 | /// Database provider version. |
127 | /// </summary> | 127 | /// </summary> |
128 | /// <returns>A string containing the storage system version</returns> | 128 | /// <returns>A string containing the storage system version</returns> |
129 | override public string Version | 129 | override public string Version |
@@ -209,7 +209,7 @@ namespace OpenSim.Data.MSSQL | |||
209 | { | 209 | { |
210 | return database.getRegionRow(reader); | 210 | return database.getRegionRow(reader); |
211 | } | 211 | } |
212 | 212 | ||
213 | } | 213 | } |
214 | catch (Exception e) | 214 | catch (Exception e) |
215 | { | 215 | { |
diff --git a/OpenSim/Data/MSSQL/MSSQLLogData.cs b/OpenSim/Data/MSSQL/MSSQLLogData.cs index d260e8c..b284c02 100644 --- a/OpenSim/Data/MSSQL/MSSQLLogData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLogData.cs | |||
@@ -40,14 +40,14 @@ namespace OpenSim.Data.MSSQL | |||
40 | internal class MSSQLLogData : ILogDataPlugin | 40 | internal class MSSQLLogData : ILogDataPlugin |
41 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | /// <summary> | 44 | /// <summary> |
45 | /// The database manager | 45 | /// The database manager |
46 | /// </summary> | 46 | /// </summary> |
47 | public MSSQLManager database; | 47 | public MSSQLManager database; |
48 | 48 | ||
49 | public void Initialise() | 49 | public void Initialise() |
50 | { | 50 | { |
51 | m_log.Info("[MSSQLLogData]: " + Name + " cannot be default-initialized!"); | 51 | m_log.Info("[MSSQLLogData]: " + Name + " cannot be default-initialized!"); |
52 | throw new PluginNotInitialisedException (Name); | 52 | throw new PluginNotInitialisedException (Name); |
53 | } | 53 | } |
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs index 9cd9eca..1a053d5 100644 --- a/OpenSim/Data/MSSQL/MSSQLManager.cs +++ b/OpenSim/Data/MSSQL/MSSQLManager.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Data.MSSQL | |||
60 | builder.UserID = userId; | 60 | builder.UserID = userId; |
61 | builder.Password = password; | 61 | builder.Password = password; |
62 | builder.ApplicationName = Assembly.GetEntryAssembly().Location; | 62 | builder.ApplicationName = Assembly.GetEntryAssembly().Location; |
63 | 63 | ||
64 | connectionString = builder.ToString(); | 64 | connectionString = builder.ToString(); |
65 | } | 65 | } |
66 | 66 | ||
@@ -117,7 +117,7 @@ namespace OpenSim.Data.MSSQL | |||
117 | //} | 117 | //} |
118 | 118 | ||
119 | /// <summary> | 119 | /// <summary> |
120 | /// | 120 | /// |
121 | /// </summary> | 121 | /// </summary> |
122 | /// <param name="dt"></param> | 122 | /// <param name="dt"></param> |
123 | /// <param name="name"></param> | 123 | /// <param name="name"></param> |
@@ -376,7 +376,7 @@ namespace OpenSim.Data.MSSQL | |||
376 | } | 376 | } |
377 | 377 | ||
378 | /// <summary> | 378 | /// <summary> |
379 | /// | 379 | /// |
380 | /// </summary> | 380 | /// </summary> |
381 | /// <param name="reader"></param> | 381 | /// <param name="reader"></param> |
382 | /// <returns></returns> | 382 | /// <returns></returns> |
@@ -492,7 +492,7 @@ namespace OpenSim.Data.MSSQL | |||
492 | } | 492 | } |
493 | 493 | ||
494 | /// <summary> | 494 | /// <summary> |
495 | /// | 495 | /// |
496 | /// </summary> | 496 | /// </summary> |
497 | /// <param name="name"></param> | 497 | /// <param name="name"></param> |
498 | /// <returns></returns> | 498 | /// <returns></returns> |
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index e832414..e63a9fe 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs | |||
@@ -52,8 +52,8 @@ namespace OpenSim.Data.MSSQL | |||
52 | private string m_usersTableName; | 52 | private string m_usersTableName; |
53 | private string m_userFriendsTableName; | 53 | private string m_userFriendsTableName; |
54 | 54 | ||
55 | public override void Initialise() | 55 | public override void Initialise() |
56 | { | 56 | { |
57 | m_log.Info("[MSSQLUserData]: " + Name + " cannot be default-initialized!"); | 57 | m_log.Info("[MSSQLUserData]: " + Name + " cannot be default-initialized!"); |
58 | throw new PluginNotInitialisedException (Name); | 58 | throw new PluginNotInitialisedException (Name); |
59 | } | 59 | } |
@@ -99,11 +99,11 @@ namespace OpenSim.Data.MSSQL | |||
99 | 99 | ||
100 | TestTables(); | 100 | TestTables(); |
101 | } | 101 | } |
102 | 102 | ||
103 | public override void Dispose () {} | 103 | public override void Dispose () {} |
104 | 104 | ||
105 | /// <summary> | 105 | /// <summary> |
106 | /// | 106 | /// |
107 | /// </summary> | 107 | /// </summary> |
108 | /// <returns></returns> | 108 | /// <returns></returns> |
109 | private bool TestTables() | 109 | private bool TestTables() |
@@ -205,7 +205,7 @@ namespace OpenSim.Data.MSSQL | |||
205 | { | 205 | { |
206 | adder.ExecuteNonQuery(); | 206 | adder.ExecuteNonQuery(); |
207 | } | 207 | } |
208 | 208 | ||
209 | using (IDbCommand adder = | 209 | using (IDbCommand adder = |
210 | database.Query( | 210 | database.Query( |
211 | "INSERT INTO " + m_userFriendsTableName + " " + | 211 | "INSERT INTO " + m_userFriendsTableName + " " + |
@@ -351,7 +351,7 @@ namespace OpenSim.Data.MSSQL | |||
351 | } | 351 | } |
352 | 352 | ||
353 | /// <summary> | 353 | /// <summary> |
354 | /// | 354 | /// |
355 | /// </summary> | 355 | /// </summary> |
356 | /// <param name="queryID"></param> | 356 | /// <param name="queryID"></param> |
357 | /// <param name="query"></param> | 357 | /// <param name="query"></param> |
@@ -379,7 +379,7 @@ namespace OpenSim.Data.MSSQL | |||
379 | user.firstName = (string)reader["username"]; | 379 | user.firstName = (string)reader["username"]; |
380 | user.lastName = (string)reader["lastname"]; | 380 | user.lastName = (string)reader["lastname"]; |
381 | returnlist.Add(user); | 381 | returnlist.Add(user); |
382 | } | 382 | } |
383 | } | 383 | } |
384 | } | 384 | } |
385 | catch (Exception e) | 385 | catch (Exception e) |
@@ -406,7 +406,7 @@ namespace OpenSim.Data.MSSQL | |||
406 | returnlist.Add(user); | 406 | returnlist.Add(user); |
407 | } | 407 | } |
408 | } | 408 | } |
409 | } | 409 | } |
410 | catch (Exception e) | 410 | catch (Exception e) |
411 | { | 411 | { |
412 | m_log.Error(e.ToString()); | 412 | m_log.Error(e.ToString()); |