aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorJeff Ames2008-08-18 00:39:10 +0000
committerJeff Ames2008-08-18 00:39:10 +0000
commit6ef9d4da901a346c232458317cca6268da888e2e (patch)
treedd1d935b10f34f261839da9f9879c02322e8ede7 /OpenSim/Data/SQLite
parentUpdate svn properties, minor formatting cleanup. (diff)
downloadopensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.zip
opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.gz
opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.bz2
opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.xz
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs18
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs22
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs52
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs50
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs28
5 files changed, 85 insertions, 85 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 99de5cd..9b274f4 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Data.SQLite
141 cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local)); 141 cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
142 cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary)); 142 cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
143 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); 143 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
144 144
145 cmd.ExecuteNonQuery(); 145 cmd.ExecuteNonQuery();
146 } 146 }
147 } 147 }
@@ -155,7 +155,7 @@ namespace OpenSim.Data.SQLite
155 override public void UpdateAsset(AssetBase asset) 155 override public void UpdateAsset(AssetBase asset)
156 { 156 {
157 LogAssetLoad(asset); 157 LogAssetLoad(asset);
158 158
159 lock (this) 159 lock (this)
160 { 160 {
161 using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn)) 161 using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
@@ -167,7 +167,7 @@ namespace OpenSim.Data.SQLite
167 cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local)); 167 cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
168 cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary)); 168 cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
169 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); 169 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
170 170
171 cmd.ExecuteNonQuery(); 171 cmd.ExecuteNonQuery();
172 } 172 }
173 } 173 }
@@ -269,7 +269,7 @@ namespace OpenSim.Data.SQLite
269 **********************************************************************/ 269 **********************************************************************/
270 270
271 /// <summary> 271 /// <summary>
272 /// 272 ///
273 /// </summary> 273 /// </summary>
274 /// <param name="row"></param> 274 /// <param name="row"></param>
275 /// <returns></returns> 275 /// <returns></returns>
@@ -301,7 +301,7 @@ namespace OpenSim.Data.SQLite
301 **********************************************************************/ 301 **********************************************************************/
302 302
303 /// <summary> 303 /// <summary>
304 /// 304 ///
305 /// </summary> 305 /// </summary>
306 /// <param name="conn"></param> 306 /// <param name="conn"></param>
307 // private static void InitDB(SqliteConnection conn) 307 // private static void InitDB(SqliteConnection conn)
@@ -312,7 +312,7 @@ namespace OpenSim.Data.SQLite
312 // } 312 // }
313 313
314 /// <summary> 314 /// <summary>
315 /// 315 ///
316 /// </summary> 316 /// </summary>
317 /// <param name="conn"></param> 317 /// <param name="conn"></param>
318 /// <param name="m"></param> 318 /// <param name="m"></param>
@@ -331,10 +331,10 @@ namespace OpenSim.Data.SQLite
331 m_log.Info("[ASSET DB]: SQLite Database doesn't exist... creating"); 331 m_log.Info("[ASSET DB]: SQLite Database doesn't exist... creating");
332 return false; 332 return false;
333 } 333 }
334 334
335 // if the tables are here, and we don't have a migration, 335 // if the tables are here, and we don't have a migration,
336 // set it to 1, as we're migrating off of legacy bits 336 // set it to 1, as we're migrating off of legacy bits
337 if (m.Version == 0) 337 if (m.Version == 0)
338 m.Version = 1; 338 m.Version = 1;
339 339
340 return true; 340 return true;
@@ -343,7 +343,7 @@ namespace OpenSim.Data.SQLite
343 #region IPlugin interface 343 #region IPlugin interface
344 344
345 /// <summary> 345 /// <summary>
346 /// 346 ///
347 /// </summary> 347 /// </summary>
348 override public string Version 348 override public string Version
349 { 349 {
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index dc5ba5e..ffe7644 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -55,12 +55,12 @@ namespace OpenSim.Data.SQLite
55 public void Initialise(string connectionString) 55 public void Initialise(string connectionString)
56 { 56 {
57 m_connectionString = connectionString; 57 m_connectionString = connectionString;
58 58
59 m_log.Info("[ESTATE DB]: Sqlite - connecting: "+m_connectionString); 59 m_log.Info("[ESTATE DB]: Sqlite - connecting: "+m_connectionString);
60 60
61 m_connection = new SqliteConnection(m_connectionString); 61 m_connection = new SqliteConnection(m_connectionString);
62 m_connection.Open(); 62 m_connection.Open();
63 63
64 Assembly assem = GetType().Assembly; 64 Assembly assem = GetType().Assembly;
65 Migration m = new Migration(m_connection, assem, "EstateStore"); 65 Migration m = new Migration(m_connection, assem, "EstateStore");
66 m.Update(); 66 m.Update();
@@ -77,7 +77,7 @@ namespace OpenSim.Data.SQLite
77 if (f.Name.Substring(0, 2) == "m_") 77 if (f.Name.Substring(0, 2) == "m_")
78 m_FieldMap[f.Name.Substring(2)] = f; 78 m_FieldMap[f.Name.Substring(2)] = f;
79 } 79 }
80 80
81 private string[] FieldList 81 private string[] FieldList
82 { 82 {
83 get { return new List<string>(m_FieldMap.Keys).ToArray(); } 83 get { return new List<string>(m_FieldMap.Keys).ToArray(); }
@@ -134,7 +134,7 @@ namespace OpenSim.Data.SQLite
134 names.Remove("EstateID"); 134 names.Remove("EstateID");
135 135
136 sql = "insert into estate_settings ("+String.Join(",", names.ToArray())+") values ( :"+String.Join(", :", names.ToArray())+")"; 136 sql = "insert into estate_settings ("+String.Join(",", names.ToArray())+") values ( :"+String.Join(", :", names.ToArray())+")";
137 137
138 cmd.CommandText = sql; 138 cmd.CommandText = sql;
139 cmd.Parameters.Clear(); 139 cmd.Parameters.Clear();
140 140
@@ -272,16 +272,16 @@ namespace OpenSim.Data.SQLite
272 private void SaveBanList(EstateSettings es) 272 private void SaveBanList(EstateSettings es)
273 { 273 {
274 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); 274 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
275 275
276 cmd.CommandText = "delete from estateban where EstateID = :EstateID"; 276 cmd.CommandText = "delete from estateban where EstateID = :EstateID";
277 cmd.Parameters.Add(":EstateID", es.EstateID.ToString()); 277 cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
278 278
279 cmd.ExecuteNonQuery(); 279 cmd.ExecuteNonQuery();
280 280
281 cmd.Parameters.Clear(); 281 cmd.Parameters.Clear();
282 282
283 cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( :EstateID, :bannedUUID, '', '', '' )"; 283 cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( :EstateID, :bannedUUID, '', '', '' )";
284 284
285 foreach (EstateBan b in es.EstateBans) 285 foreach (EstateBan b in es.EstateBans)
286 { 286 {
287 cmd.Parameters.Add(":EstateID", es.EstateID.ToString()); 287 cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
@@ -295,16 +295,16 @@ namespace OpenSim.Data.SQLite
295 void SaveUUIDList(uint EstateID, string table, LLUUID[] data) 295 void SaveUUIDList(uint EstateID, string table, LLUUID[] data)
296 { 296 {
297 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); 297 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
298 298
299 cmd.CommandText = "delete from "+table+" where EstateID = :EstateID"; 299 cmd.CommandText = "delete from "+table+" where EstateID = :EstateID";
300 cmd.Parameters.Add(":EstateID", EstateID.ToString()); 300 cmd.Parameters.Add(":EstateID", EstateID.ToString());
301 301
302 cmd.ExecuteNonQuery(); 302 cmd.ExecuteNonQuery();
303 303
304 cmd.Parameters.Clear(); 304 cmd.Parameters.Clear();
305 305
306 cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )"; 306 cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )";
307 307
308 foreach (LLUUID uuid in data) 308 foreach (LLUUID uuid in data)
309 { 309 {
310 cmd.Parameters.Add(":EstateID", EstateID.ToString()); 310 cmd.Parameters.Add(":EstateID", EstateID.ToString());
@@ -336,7 +336,7 @@ namespace OpenSim.Data.SQLite
336 uuids.Add(uuid); 336 uuids.Add(uuid);
337 } 337 }
338 r.Close(); 338 r.Close();
339 339
340 return uuids.ToArray(); 340 return uuids.ToArray();
341 } 341 }
342 } 342 }
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index e29b99c..125b6e7 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -50,8 +50,8 @@ namespace OpenSim.Data.SQLite
50 private SqliteDataAdapter invItemsDa; 50 private SqliteDataAdapter invItemsDa;
51 private SqliteDataAdapter invFoldersDa; 51 private SqliteDataAdapter invFoldersDa;
52 52
53 public void Initialise() 53 public void Initialise()
54 { 54 {
55 m_log.Info("[SQLiteInventoryData]: " + Name + " cannot be default-initialized!"); 55 m_log.Info("[SQLiteInventoryData]: " + Name + " cannot be default-initialized!");
56 throw new PluginNotInitialisedException (Name); 56 throw new PluginNotInitialisedException (Name);
57 } 57 }
@@ -105,7 +105,7 @@ namespace OpenSim.Data.SQLite
105 } 105 }
106 106
107 /// <summary> 107 /// <summary>
108 /// 108 ///
109 /// </summary> 109 /// </summary>
110 /// <param name="row"></param> 110 /// <param name="row"></param>
111 /// <returns></returns> 111 /// <returns></returns>
@@ -150,7 +150,7 @@ namespace OpenSim.Data.SQLite
150 } 150 }
151 151
152 /// <summary> 152 /// <summary>
153 /// 153 ///
154 /// </summary> 154 /// </summary>
155 /// <param name="row"></param> 155 /// <param name="row"></param>
156 /// <param name="item"></param> 156 /// <param name="item"></param>
@@ -302,7 +302,7 @@ namespace OpenSim.Data.SQLite
302 /// <returns>A string containing the DB provider version</returns> 302 /// <returns>A string containing the DB provider version</returns>
303 public string Version 303 public string Version
304 { 304 {
305 get 305 get
306 { 306 {
307 Module module = GetType().Module; 307 Module module = GetType().Module;
308 // string dllName = module.Assembly.ManifestModule.Name; 308 // string dllName = module.Assembly.ManifestModule.Name;
@@ -419,10 +419,10 @@ namespace OpenSim.Data.SQLite
419 * - We will only need to hit the database twice instead of n times. 419 * - We will only need to hit the database twice instead of n times.
420 * - We assume the database is well-formed - no stranded/dangling folders, all folders in heirarchy owned 420 * - We assume the database is well-formed - no stranded/dangling folders, all folders in heirarchy owned
421 * by the same person, each user only has 1 inventory heirarchy 421 * by the same person, each user only has 1 inventory heirarchy
422 * - The returned list is not ordered, instead of breadth-first ordered 422 * - The returned list is not ordered, instead of breadth-first ordered
423 There are basically 2 usage cases for getFolderHeirarchy: 423 There are basically 2 usage cases for getFolderHeirarchy:
424 1) Getting the user's entire inventory heirarchy when they log in 424 1) Getting the user's entire inventory heirarchy when they log in
425 2) Finding a subfolder heirarchy to delete when emptying the trash. 425 2) Finding a subfolder heirarchy to delete when emptying the trash.
426 This implementation will pull all inventory folders from the database, and then prune away any folder that 426 This implementation will pull all inventory folders from the database, and then prune away any folder that
427 is not part of the requested sub-heirarchy. The theory is that it is cheaper to make 1 request from the 427 is not part of the requested sub-heirarchy. The theory is that it is cheaper to make 1 request from the
428 database than to make n requests. This pays off only if requested heirarchy is large. 428 database than to make n requests. This pays off only if requested heirarchy is large.
@@ -449,17 +449,17 @@ namespace OpenSim.Data.SQLite
449 folderRows = inventoryFolderTable.Select(selectExp); 449 folderRows = inventoryFolderTable.Select(selectExp);
450 } 450 }
451 451
452 if ( folderRows!=null && folderRows.GetLength(0)>=1 ) // No result means parent folder does not exist 452 if (folderRows != null && folderRows.GetLength(0) >= 1) // No result means parent folder does not exist
453 { // or has no children 453 { // or has no children
454 /* if we're querying the root folder, just return an unordered list of all folders in the user's 454 /* if we're querying the root folder, just return an unordered list of all folders in the user's
455 * inventory 455 * inventory
456 */ 456 */
457 if (parentFolder.ParentID == LLUUID.Zero) 457 if (parentFolder.ParentID == LLUUID.Zero)
458 { 458 {
459 foreach (DataRow row in folderRows) 459 foreach (DataRow row in folderRows)
460 { 460 {
461 InventoryFolderBase curFolder = buildFolder(row); 461 InventoryFolderBase curFolder = buildFolder(row);
462 if (curFolder.ID != parentID) // Return all folders except the parent folder of heirarchy 462 if (curFolder.ID != parentID) // Return all folders except the parent folder of heirarchy
463 folders.Add(buildFolder(row)); 463 folders.Add(buildFolder(row));
464 } 464 }
465 } // If requesting root folder 465 } // If requesting root folder
@@ -481,16 +481,16 @@ namespace OpenSim.Data.SQLite
481 InventoryFolderBase curFolder = buildFolder(row); 481 InventoryFolderBase curFolder = buildFolder(row);
482 if (curFolder.ParentID != LLUUID.Zero) // Discard root of tree - not needed 482 if (curFolder.ParentID != LLUUID.Zero) // Discard root of tree - not needed
483 { 483 {
484 if ( hashtable.ContainsKey(curFolder.ParentID ) ) 484 if (hashtable.ContainsKey(curFolder.ParentID))
485 { 485 {
486 // Current folder already has a sibling - append to sibling list 486 // Current folder already has a sibling - append to sibling list
487 hashtable[curFolder.ParentID].Add( curFolder ); 487 hashtable[curFolder.ParentID].Add(curFolder);
488 } 488 }
489 else { 489 else {
490 List<InventoryFolderBase> siblingList = new List<InventoryFolderBase>(); 490 List<InventoryFolderBase> siblingList = new List<InventoryFolderBase>();
491 siblingList.Add( curFolder ); 491 siblingList.Add(curFolder);
492 // Current folder has no known (yet) siblings 492 // Current folder has no known (yet) siblings
493 hashtable.Add( curFolder.ParentID, siblingList ); 493 hashtable.Add(curFolder.ParentID, siblingList);
494 } 494 }
495 } 495 }
496 } // For all inventory folders 496 } // For all inventory folders
@@ -498,12 +498,12 @@ namespace OpenSim.Data.SQLite
498 // Note: Could release the ds lock here - we don't access folderRows or the database anymore. 498 // Note: Could release the ds lock here - we don't access folderRows or the database anymore.
499 // This is somewhat of a moot point as the callers of this function usually lock db anyways. 499 // This is somewhat of a moot point as the callers of this function usually lock db anyways.
500 500
501 if ( hashtable.ContainsKey( parentID ) ) // if requested folder does have children 501 if (hashtable.ContainsKey(parentID)) // if requested folder does have children
502 folders.AddRange( hashtable[parentID] ); 502 folders.AddRange(hashtable[parentID]);
503 503
504 // BreadthFirstSearch build inventory tree **Note: folders.Count is *not* static 504 // BreadthFirstSearch build inventory tree **Note: folders.Count is *not* static
505 for ( int i = 0; i < folders.Count; i++ ) 505 for (int i = 0; i < folders.Count; i++)
506 if (hashtable.ContainsKey(folders[i].ID)) 506 if (hashtable.ContainsKey(folders[i].ID))
507 folders.AddRange(hashtable[folders[i].ID]); 507 folders.AddRange(hashtable[folders[i].ID]);
508 508
509 } // if requesting a subfolder heirarchy 509 } // if requesting a subfolder heirarchy
@@ -601,7 +601,7 @@ namespace OpenSim.Data.SQLite
601 /// Delete all items in the specified folder 601 /// Delete all items in the specified folder
602 /// </summary> 602 /// </summary>
603 /// <param name="folderId">id of the folder, whose item content should be deleted</param> 603 /// <param name="folderId">id of the folder, whose item content should be deleted</param>
604 /// <todo>this is horribly inefficient, but I don't want to ruin the overall structure of this implementation</todo> 604 /// <todo>this is horribly inefficient, but I don't want to ruin the overall structure of this implementation</todo>
605 private void deleteItemsInFolder(LLUUID folderId) 605 private void deleteItemsInFolder(LLUUID folderId)
606 { 606 {
607 List<InventoryItemBase> items = getInventoryInFolder(Util.ToRawUuidString(folderId)); 607 List<InventoryItemBase> items = getInventoryInFolder(Util.ToRawUuidString(folderId));
@@ -743,7 +743,7 @@ namespace OpenSim.Data.SQLite
743 } 743 }
744 744
745 /// <summary> 745 /// <summary>
746 /// 746 ///
747 /// </summary> 747 /// </summary>
748 /// <param name="da"></param> 748 /// <param name="da"></param>
749 /// <param name="conn"></param> 749 /// <param name="conn"></param>
@@ -765,7 +765,7 @@ namespace OpenSim.Data.SQLite
765 } 765 }
766 766
767 /// <summary> 767 /// <summary>
768 /// 768 ///
769 /// </summary> 769 /// </summary>
770 /// <param name="da"></param> 770 /// <param name="da"></param>
771 /// <param name="conn"></param> 771 /// <param name="conn"></param>
@@ -787,7 +787,7 @@ namespace OpenSim.Data.SQLite
787 } 787 }
788 788
789 /// <summary> 789 /// <summary>
790 /// 790 ///
791 /// </summary> 791 /// </summary>
792 /// <param name="row"></param> 792 /// <param name="row"></param>
793 /// <returns></returns> 793 /// <returns></returns>
@@ -804,7 +804,7 @@ namespace OpenSim.Data.SQLite
804 } 804 }
805 805
806 /// <summary> 806 /// <summary>
807 /// 807 ///
808 /// </summary> 808 /// </summary>
809 /// <param name="row"></param> 809 /// <param name="row"></param>
810 /// <param name="folder"></param> 810 /// <param name="folder"></param>
@@ -819,7 +819,7 @@ namespace OpenSim.Data.SQLite
819 } 819 }
820 820
821 /// <summary> 821 /// <summary>
822 /// 822 ///
823 /// </summary> 823 /// </summary>
824 /// <param name="row"></param> 824 /// <param name="row"></param>
825 /// <param name="folder"></param> 825 /// <param name="folder"></param>
@@ -836,7 +836,7 @@ namespace OpenSim.Data.SQLite
836 **********************************************************************/ 836 **********************************************************************/
837 837
838 /// <summary> 838 /// <summary>
839 /// 839 ///
840 /// </summary> 840 /// </summary>
841 /// <param name="conn"></param> 841 /// <param name="conn"></param>
842 // private static void InitDB(SqliteConnection conn) 842 // private static void InitDB(SqliteConnection conn)
@@ -852,7 +852,7 @@ namespace OpenSim.Data.SQLite
852 // } 852 // }
853 853
854 /// <summary> 854 /// <summary>
855 /// 855 ///
856 /// </summary> 856 /// </summary>
857 /// <param name="conn"></param> 857 /// <param name="conn"></param>
858 /// <param name="m"></param> 858 /// <param name="m"></param>
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index b937272..a44b892 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -501,7 +501,7 @@ namespace OpenSim.Data.SQLite
501 } 501 }
502 502
503 /// <summary> 503 /// <summary>
504 /// 504 ///
505 /// </summary> 505 /// </summary>
506 /// <param name="globalID"></param> 506 /// <param name="globalID"></param>
507 public void RemoveLandObject(LLUUID globalID) 507 public void RemoveLandObject(LLUUID globalID)
@@ -523,7 +523,7 @@ namespace OpenSim.Data.SQLite
523 } 523 }
524 524
525 /// <summary> 525 /// <summary>
526 /// 526 ///
527 /// </summary> 527 /// </summary>
528 /// <param name="parcel"></param> 528 /// <param name="parcel"></param>
529 public void StoreLandObject(ILandObject parcel) 529 public void StoreLandObject(ILandObject parcel)
@@ -564,7 +564,7 @@ namespace OpenSim.Data.SQLite
564 } 564 }
565 565
566 /// <summary> 566 /// <summary>
567 /// 567 ///
568 /// </summary> 568 /// </summary>
569 /// <param name="regionUUID"></param> 569 /// <param name="regionUUID"></param>
570 /// <returns></returns> 570 /// <returns></returns>
@@ -594,7 +594,7 @@ namespace OpenSim.Data.SQLite
594 } 594 }
595 595
596 /// <summary> 596 /// <summary>
597 /// 597 ///
598 /// </summary> 598 /// </summary>
599 public void Commit() 599 public void Commit()
600 { 600 {
@@ -629,7 +629,7 @@ namespace OpenSim.Data.SQLite
629 **********************************************************************/ 629 **********************************************************************/
630 630
631 /// <summary> 631 /// <summary>
632 /// 632 ///
633 /// </summary> 633 /// </summary>
634 /// <param name="dt"></param> 634 /// <param name="dt"></param>
635 /// <param name="name"></param> 635 /// <param name="name"></param>
@@ -877,7 +877,7 @@ namespace OpenSim.Data.SQLite
877 **********************************************************************/ 877 **********************************************************************/
878 878
879 /// <summary> 879 /// <summary>
880 /// 880 ///
881 /// </summary> 881 /// </summary>
882 /// <param name="row"></param> 882 /// <param name="row"></param>
883 /// <returns></returns> 883 /// <returns></returns>
@@ -1071,7 +1071,7 @@ namespace OpenSim.Data.SQLite
1071 newData.UserLookAt = 1071 newData.UserLookAt =
1072 new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]), 1072 new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
1073 Convert.ToSingle(row["UserLookAtZ"])); 1073 Convert.ToSingle(row["UserLookAtZ"]));
1074 1074
1075 } 1075 }
1076 catch (InvalidCastException) 1076 catch (InvalidCastException)
1077 { 1077 {
@@ -1132,7 +1132,7 @@ namespace OpenSim.Data.SQLite
1132 } 1132 }
1133 1133
1134 /// <summary> 1134 /// <summary>
1135 /// 1135 ///
1136 /// </summary> 1136 /// </summary>
1137 /// <param name="val"></param> 1137 /// <param name="val"></param>
1138 /// <returns></returns> 1138 /// <returns></returns>
@@ -1166,7 +1166,7 @@ namespace OpenSim.Data.SQLite
1166// } 1166// }
1167 1167
1168 /// <summary> 1168 /// <summary>
1169 /// 1169 ///
1170 /// </summary> 1170 /// </summary>
1171 /// <param name="row"></param> 1171 /// <param name="row"></param>
1172 /// <param name="prim"></param> 1172 /// <param name="prim"></param>
@@ -1233,7 +1233,7 @@ namespace OpenSim.Data.SQLite
1233 } 1233 }
1234 1234
1235 /// <summary> 1235 /// <summary>
1236 /// 1236 ///
1237 /// </summary> 1237 /// </summary>
1238 /// <param name="row"></param> 1238 /// <param name="row"></param>
1239 /// <param name="taskItem"></param> 1239 /// <param name="taskItem"></param>
@@ -1263,7 +1263,7 @@ namespace OpenSim.Data.SQLite
1263 } 1263 }
1264 1264
1265 /// <summary> 1265 /// <summary>
1266 /// 1266 ///
1267 /// </summary> 1267 /// </summary>
1268 /// <param name="row"></param> 1268 /// <param name="row"></param>
1269 /// <param name="land"></param> 1269 /// <param name="land"></param>
@@ -1308,7 +1308,7 @@ namespace OpenSim.Data.SQLite
1308 } 1308 }
1309 1309
1310 /// <summary> 1310 /// <summary>
1311 /// 1311 ///
1312 /// </summary> 1312 /// </summary>
1313 /// <param name="row"></param> 1313 /// <param name="row"></param>
1314 /// <param name="entry"></param> 1314 /// <param name="entry"></param>
@@ -1321,7 +1321,7 @@ namespace OpenSim.Data.SQLite
1321 } 1321 }
1322 1322
1323 /// <summary> 1323 /// <summary>
1324 /// 1324 ///
1325 /// </summary> 1325 /// </summary>
1326 /// <param name="row"></param> 1326 /// <param name="row"></param>
1327 /// <returns></returns> 1327 /// <returns></returns>
@@ -1376,7 +1376,7 @@ namespace OpenSim.Data.SQLite
1376 } 1376 }
1377 1377
1378 /// <summary> 1378 /// <summary>
1379 /// 1379 ///
1380 /// </summary> 1380 /// </summary>
1381 /// <param name="row"></param> 1381 /// <param name="row"></param>
1382 /// <param name="prim"></param> 1382 /// <param name="prim"></param>
@@ -1418,7 +1418,7 @@ namespace OpenSim.Data.SQLite
1418 } 1418 }
1419 1419
1420 /// <summary> 1420 /// <summary>
1421 /// 1421 ///
1422 /// </summary> 1422 /// </summary>
1423 /// <param name="prim"></param> 1423 /// <param name="prim"></param>
1424 /// <param name="sceneGroupID"></param> 1424 /// <param name="sceneGroupID"></param>
@@ -1574,7 +1574,7 @@ namespace OpenSim.Data.SQLite
1574 } 1574 }
1575 1575
1576 /// <summary> 1576 /// <summary>
1577 /// 1577 ///
1578 /// </summary> 1578 /// </summary>
1579 /// <param name="dt">Data Table</param> 1579 /// <param name="dt">Data Table</param>
1580 /// <returns></returns> 1580 /// <returns></returns>
@@ -1631,7 +1631,7 @@ namespace OpenSim.Data.SQLite
1631 } 1631 }
1632 1632
1633 /// <summary> 1633 /// <summary>
1634 /// 1634 ///
1635 /// </summary> 1635 /// </summary>
1636 /// <param name="da"></param> 1636 /// <param name="da"></param>
1637 /// <param name="conn"></param> 1637 /// <param name="conn"></param>
@@ -1650,7 +1650,7 @@ namespace OpenSim.Data.SQLite
1650 } 1650 }
1651 1651
1652 /// <summary> 1652 /// <summary>
1653 /// 1653 ///
1654 /// </summary> 1654 /// </summary>
1655 /// <param name="da"></param> 1655 /// <param name="da"></param>
1656 /// <param name="conn"></param> 1656 /// <param name="conn"></param>
@@ -1669,7 +1669,7 @@ namespace OpenSim.Data.SQLite
1669 } 1669 }
1670 1670
1671 /// <summary> 1671 /// <summary>
1672 /// 1672 ///
1673 /// </summary> 1673 /// </summary>
1674 /// <param name="da"></param> 1674 /// <param name="da"></param>
1675 /// <param name="conn"></param> 1675 /// <param name="conn"></param>
@@ -1680,7 +1680,7 @@ namespace OpenSim.Data.SQLite
1680 } 1680 }
1681 1681
1682 /// <summary> 1682 /// <summary>
1683 /// 1683 ///
1684 /// </summary> 1684 /// </summary>
1685 /// <param name="da"></param> 1685 /// <param name="da"></param>
1686 /// <param name="conn"></param> 1686 /// <param name="conn"></param>
@@ -1694,7 +1694,7 @@ namespace OpenSim.Data.SQLite
1694 } 1694 }
1695 1695
1696 /// <summary> 1696 /// <summary>
1697 /// 1697 ///
1698 /// </summary> 1698 /// </summary>
1699 /// <param name="da"></param> 1699 /// <param name="da"></param>
1700 /// <param name="conn"></param> 1700 /// <param name="conn"></param>
@@ -1705,7 +1705,7 @@ namespace OpenSim.Data.SQLite
1705 } 1705 }
1706 1706
1707 /// <summary> 1707 /// <summary>
1708 /// 1708 ///
1709 /// </summary> 1709 /// </summary>
1710 /// <param name="da"></param> 1710 /// <param name="da"></param>
1711 /// <param name="conn"></param> 1711 /// <param name="conn"></param>
@@ -1799,7 +1799,7 @@ namespace OpenSim.Data.SQLite
1799 // } 1799 // }
1800 1800
1801 /// <summary> 1801 /// <summary>
1802 /// 1802 ///
1803 /// </summary> 1803 /// </summary>
1804 /// <param name="conn"></param> 1804 /// <param name="conn"></param>
1805 /// <param name="m"></param> 1805 /// <param name="m"></param>
@@ -1845,8 +1845,8 @@ namespace OpenSim.Data.SQLite
1845 // if we've gotten this far, and our version is still 0, 1845 // if we've gotten this far, and our version is still 0,
1846 // it's because the migration was never done, so 1846 // it's because the migration was never done, so
1847 // initialize to 1 just to sync up to where we should be. 1847 // initialize to 1 just to sync up to where we should be.
1848 1848
1849 if (m.Version == 0) 1849 if (m.Version == 0)
1850 m.Version = 1; 1850 m.Version = 1;
1851 1851
1852 // pDa.Fill(tmpDS, "prims"); 1852 // pDa.Fill(tmpDS, "prims");
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 910d313..08a97f09 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -65,8 +65,8 @@ namespace OpenSim.Data.SQLite
65 private SqliteDataAdapter daf; 65 private SqliteDataAdapter daf;
66 SqliteConnection g_conn; 66 SqliteConnection g_conn;
67 67
68 public override void Initialise() 68 public override void Initialise()
69 { 69 {
70 m_log.Info("[SQLiteUserData]: " + Name + " cannot be default-initialized!"); 70 m_log.Info("[SQLiteUserData]: " + Name + " cannot be default-initialized!");
71 throw new PluginNotInitialisedException (Name); 71 throw new PluginNotInitialisedException (Name);
72 } 72 }
@@ -93,7 +93,7 @@ namespace OpenSim.Data.SQLite
93 93
94 Assembly assem = GetType().Assembly; 94 Assembly assem = GetType().Assembly;
95 Migration m = new Migration(g_conn, assem, "UserStore"); 95 Migration m = new Migration(g_conn, assem, "UserStore");
96 96
97 // TODO: remove this after rev 6000 97 // TODO: remove this after rev 6000
98 TestTables(conn, m); 98 TestTables(conn, m);
99 99
@@ -130,7 +130,7 @@ namespace OpenSim.Data.SQLite
130 return; 130 return;
131 } 131 }
132 132
133 public override void Dispose () {} 133 public override void Dispose () {}
134 134
135 /// <summary> 135 /// <summary>
136 /// see IUserDataPlugin, 136 /// see IUserDataPlugin,
@@ -308,7 +308,7 @@ namespace OpenSim.Data.SQLite
308 } 308 }
309 309
310 /// <summary> 310 /// <summary>
311 /// 311 ///
312 /// </summary> 312 /// </summary>
313 /// <param name="queryID"></param> 313 /// <param name="queryID"></param>
314 /// <param name="query"></param> 314 /// <param name="query"></param>
@@ -570,7 +570,7 @@ namespace OpenSim.Data.SQLite
570 } 570 }
571 return aa; 571 return aa;
572 } 572 }
573 573
574 /// <summary> 574 /// <summary>
575 /// Update a user appearence 575 /// Update a user appearence
576 /// </summary> 576 /// </summary>
@@ -802,7 +802,7 @@ namespace OpenSim.Data.SQLite
802 } 802 }
803 803
804 /// <summary> 804 /// <summary>
805 /// 805 ///
806 /// </summary> 806 /// </summary>
807 /// <param name="row"></param> 807 /// <param name="row"></param>
808 /// <param name="user"></param> 808 /// <param name="user"></param>
@@ -853,7 +853,7 @@ namespace OpenSim.Data.SQLite
853 } 853 }
854 854
855 /// <summary> 855 /// <summary>
856 /// 856 ///
857 /// </summary> 857 /// </summary>
858 /// <param name="row"></param> 858 /// <param name="row"></param>
859 /// <returns></returns> 859 /// <returns></returns>
@@ -881,7 +881,7 @@ namespace OpenSim.Data.SQLite
881 } 881 }
882 882
883 /// <summary> 883 /// <summary>
884 /// 884 ///
885 /// </summary> 885 /// </summary>
886 /// <param name="row"></param> 886 /// <param name="row"></param>
887 /// <param name="ua"></param> 887 /// <param name="ua"></param>
@@ -914,7 +914,7 @@ namespace OpenSim.Data.SQLite
914 **********************************************************************/ 914 **********************************************************************/
915 915
916 /// <summary> 916 /// <summary>
917 /// 917 ///
918 /// </summary> 918 /// </summary>
919 /// <param name="da"></param> 919 /// <param name="da"></param>
920 /// <param name="conn"></param> 920 /// <param name="conn"></param>
@@ -933,7 +933,7 @@ namespace OpenSim.Data.SQLite
933 } 933 }
934 934
935 /// <summary> 935 /// <summary>
936 /// 936 ///
937 /// </summary> 937 /// </summary>
938 /// <param name="daf"></param> 938 /// <param name="daf"></param>
939 /// <param name="conn"></param> 939 /// <param name="conn"></param>
@@ -954,7 +954,7 @@ namespace OpenSim.Data.SQLite
954 } 954 }
955 955
956 /// <summary> 956 /// <summary>
957 /// 957 ///
958 /// </summary> 958 /// </summary>
959 /// <param name="conn"></param> 959 /// <param name="conn"></param>
960 private static void InitDB(SqliteConnection conn) 960 private static void InitDB(SqliteConnection conn)
@@ -990,7 +990,7 @@ namespace OpenSim.Data.SQLite
990 } 990 }
991 991
992 /// <summary> 992 /// <summary>
993 /// 993 ///
994 /// </summary> 994 /// </summary>
995 /// <param name="conn"></param> 995 /// <param name="conn"></param>
996 /// <param name="m"></param> 996 /// <param name="m"></param>
@@ -1016,7 +1016,7 @@ namespace OpenSim.Data.SQLite
1016 return false; 1016 return false;
1017 } 1017 }
1018 1018
1019 if (m.Version == 0) 1019 if (m.Version == 0)
1020 m.Version = 1; 1020 m.Version = 1;
1021 1021
1022 return true; 1022 return true;