From 017a6f55111242919c97928c9c8c067f6cb7f47f Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Tue, 9 Sep 2008 20:23:10 +0000
Subject: fix an automatically stripped out UUID from SQLiteManager fix some
spacing in SQLiteRegionData
---
OpenSim/Data/SQLite/SQLiteManager.cs | 2 +-
OpenSim/Data/SQLite/SQLiteRegionData.cs | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index 4a7e910..a936ec1 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -182,7 +182,7 @@ namespace OpenSim.Data.SQLite
parameters["regionHandle"] = profile.regionHandle.ToString();
parameters["regionName"] = profile.regionName;
- parameters["uuid"] = profile.ToString();
+ parameters["uuid"] = profile.UUID.ToString();
parameters["regionRecvKey"] = profile.regionRecvKey;
parameters["regionSendKey"] = profile.regionSendKey;
parameters["regionDataURI"] = profile.regionDataURI;
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index b6d1abe..a9bf5ef 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -130,10 +130,10 @@ namespace OpenSim.Data.SQLite
ds.Tables.Add(createShapeTable());
setupShapeCommands(shapeDa, m_conn);
- ds.Tables.Add(createItemsTable());
- setupItemsCommands(itemsDa, m_conn);
- itemsDa.Fill(ds.Tables["primitems"]);
-
+ ds.Tables.Add(createItemsTable());
+ setupItemsCommands(itemsDa, m_conn);
+ itemsDa.Fill(ds.Tables["primitems"]);
+
ds.Tables.Add(createTerrainTable());
setupTerrainCommands(terrainDa, m_conn);
@@ -599,7 +599,7 @@ namespace OpenSim.Data.SQLite
primDa.Update(ds, "prims");
shapeDa.Update(ds, "primshapes");
- itemsDa.Update(ds, "primitems");
+ itemsDa.Update(ds, "primitems");
terrainDa.Update(ds, "terrain");
landDa.Update(ds, "land");
@@ -1184,7 +1184,7 @@ namespace OpenSim.Data.SQLite
row["CreationDate"] = prim.CreationDate;
row["Name"] = prim.Name;
row["SceneGroupID"] = Util.ToRawUuidString(sceneGroupID);
- // the UUID of the root part for this SceneObjectGroup
+ // the UUID of the root part for this SceneObjectGroup
// various text fields
row["Text"] = prim.Text;
row["Description"] = prim.Description;
--
cgit v1.1