aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-09-09 20:23:10 +0000
committerSean Dague2008-09-09 20:23:10 +0000
commit017a6f55111242919c97928c9c8c067f6cb7f47f (patch)
treec4e54fa346c3022bea23f9bc2d7e4d148185580a
parenthopefully fix embedded inventory for sqlite (diff)
downloadopensim-SC_OLD-017a6f55111242919c97928c9c8c067f6cb7f47f.zip
opensim-SC_OLD-017a6f55111242919c97928c9c8c067f6cb7f47f.tar.gz
opensim-SC_OLD-017a6f55111242919c97928c9c8c067f6cb7f47f.tar.bz2
opensim-SC_OLD-017a6f55111242919c97928c9c8c067f6cb7f47f.tar.xz
fix an automatically stripped out UUID from SQLiteManager
fix some spacing in SQLiteRegionData
-rw-r--r--OpenSim/Data/SQLite/SQLiteManager.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs12
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
182 182
183 parameters["regionHandle"] = profile.regionHandle.ToString(); 183 parameters["regionHandle"] = profile.regionHandle.ToString();
184 parameters["regionName"] = profile.regionName; 184 parameters["regionName"] = profile.regionName;
185 parameters["uuid"] = profile.ToString(); 185 parameters["uuid"] = profile.UUID.ToString();
186 parameters["regionRecvKey"] = profile.regionRecvKey; 186 parameters["regionRecvKey"] = profile.regionRecvKey;
187 parameters["regionSendKey"] = profile.regionSendKey; 187 parameters["regionSendKey"] = profile.regionSendKey;
188 parameters["regionDataURI"] = profile.regionDataURI; 188 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
130 ds.Tables.Add(createShapeTable()); 130 ds.Tables.Add(createShapeTable());
131 setupShapeCommands(shapeDa, m_conn); 131 setupShapeCommands(shapeDa, m_conn);
132 132
133 ds.Tables.Add(createItemsTable()); 133 ds.Tables.Add(createItemsTable());
134 setupItemsCommands(itemsDa, m_conn); 134 setupItemsCommands(itemsDa, m_conn);
135 itemsDa.Fill(ds.Tables["primitems"]); 135 itemsDa.Fill(ds.Tables["primitems"]);
136 136
137 ds.Tables.Add(createTerrainTable()); 137 ds.Tables.Add(createTerrainTable());
138 setupTerrainCommands(terrainDa, m_conn); 138 setupTerrainCommands(terrainDa, m_conn);
139 139
@@ -599,7 +599,7 @@ namespace OpenSim.Data.SQLite
599 primDa.Update(ds, "prims"); 599 primDa.Update(ds, "prims");
600 shapeDa.Update(ds, "primshapes"); 600 shapeDa.Update(ds, "primshapes");
601 601
602 itemsDa.Update(ds, "primitems"); 602 itemsDa.Update(ds, "primitems");
603 603
604 terrainDa.Update(ds, "terrain"); 604 terrainDa.Update(ds, "terrain");
605 landDa.Update(ds, "land"); 605 landDa.Update(ds, "land");
@@ -1184,7 +1184,7 @@ namespace OpenSim.Data.SQLite
1184 row["CreationDate"] = prim.CreationDate; 1184 row["CreationDate"] = prim.CreationDate;
1185 row["Name"] = prim.Name; 1185 row["Name"] = prim.Name;
1186 row["SceneGroupID"] = Util.ToRawUuidString(sceneGroupID); 1186 row["SceneGroupID"] = Util.ToRawUuidString(sceneGroupID);
1187 // the UUID of the root part for this SceneObjectGroup 1187 // the UUID of the root part for this SceneObjectGroup
1188 // various text fields 1188 // various text fields
1189 row["Text"] = prim.Text; 1189 row["Text"] = prim.Text;
1190 row["Description"] = prim.Description; 1190 row["Description"] = prim.Description;