aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-08 15:50:21 +0100
committerJustin Clark-Casey (justincc)2010-06-08 15:50:21 +0100
commita160b44e0766329a6c336adcb804cede39e00fc7 (patch)
treeedf6d5070a0bb9dcba424cf883fe20a7c96af751 /OpenSim
parentIf a transfer request is received for a task inventory item asset, then route... (diff)
parentminor: remove some commented out code and return ScenePresence.UpdatePriority... (diff)
downloadopensim-SC_OLD-a160b44e0766329a6c336adcb804cede39e00fc7.zip
opensim-SC_OLD-a160b44e0766329a6c336adcb804cede39e00fc7.tar.gz
opensim-SC_OLD-a160b44e0766329a6c336adcb804cede39e00fc7.tar.bz2
opensim-SC_OLD-a160b44e0766329a6c336adcb804cede39e00fc7.tar.xz
Merge branch '0.6.9-post-fixes' into share-with-group
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/Migration.cs3
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs44
-rw-r--r--OpenSim/Data/SQLite/SQLiteFramework.cs20
-rw-r--r--OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs23
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs15
-rw-r--r--OpenSim/Data/SQLite/SQLiteManager.cs8
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs311
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs33
-rw-r--r--OpenSim/Data/SQLite/SQLiteUtils.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteXInventoryData.cs6
-rw-r--r--OpenSim/Data/SQLiteLegacy/Properties/AssemblyInfo.cs65
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/001_AssetStore.sql12
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/001_InventoryStore.sql32
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/001_RegionStore.sql144
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/001_UserStore.sql39
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/002_AssetStore.sql10
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/002_InventoryStore.sql8
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/002_RegionStore.sql10
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/002_UserStore.sql5
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/003_AssetStore.sql1
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/003_InventoryStore.sql5
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/003_RegionStore.sql5
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/003_UserStore.sql6
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/004_AssetStore.sql7
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/004_InventoryStore.sql36
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/004_RegionStore.sql38
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/004_UserStore.sql6
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/005_RegionStore.sql5
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/005_UserStore.sql5
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/006_RegionStore.sql102
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/006_UserStore.sql20
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/007_RegionStore.sql8
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/007_UserStore.sql7
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/008_RegionStore.sql6
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/008_UserStore.sql5
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/009_RegionStore.sql8
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/009_UserStore.sql11
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/010_RegionStore.sql5
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/010_UserStore.sql37
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/011_RegionStore.sql28
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/012_RegionStore.sql5
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/013_RegionStore.sql6
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/014_RegionStore.sql8
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/015_RegionStore.sql6
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/016_RegionStore.sql5
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/017_RegionStore.sql8
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/018_RegionStore.sql79
-rw-r--r--OpenSim/Data/SQLiteLegacy/Resources/OpenSim.Data.SQLite.addin.xml20
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs342
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteAuthenticationData.cs262
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs389
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteFramework.cs91
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteGenericTableHandler.cs268
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs898
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs2255
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteUtils.cs307
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteXInventoryData.cs155
-rw-r--r--OpenSim/Data/Tests/DataTestUtil.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs54
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs51
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs34
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs15
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs59
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs10
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs38
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs7
73 files changed, 6294 insertions, 241 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index e51dc22..2878fd0 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -149,8 +149,9 @@ namespace OpenSim.Data
149 UpdateVersion(_type, newversion); 149 UpdateVersion(_type, newversion);
150 } 150 }
151 version = newversion; 151 version = newversion;
152 cmd.Dispose();
153 } 152 }
153
154 cmd.Dispose();
154 } 155 }
155 156
156 // private int MaxVersion() 157 // private int MaxVersion()
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index c52f60b..373c903 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -30,7 +30,7 @@ using System.Data;
30using System.Reflection; 30using System.Reflection;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using log4net; 32using log4net;
33using Mono.Data.SqliteClient; 33using Mono.Data.Sqlite;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
@@ -339,4 +339,4 @@ namespace OpenSim.Data.SQLite
339 339
340 #endregion 340 #endregion
341 } 341 }
342} \ No newline at end of file 342}
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 1be99ee..643e55d 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33using Mono.Data.SqliteClient; 33using Mono.Data.Sqlite;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
@@ -62,8 +62,8 @@ namespace OpenSim.Data.SQLite
62 Migration m = new Migration(m_connection, assem, "EstateStore"); 62 Migration m = new Migration(m_connection, assem, "EstateStore");
63 m.Update(); 63 m.Update();
64 64
65 m_connection.Close(); 65 //m_connection.Close();
66 m_connection.Open(); 66 // m_connection.Open();
67 67
68 Type t = typeof(EstateSettings); 68 Type t = typeof(EstateSettings);
69 m_Fields = t.GetFields(BindingFlags.NonPublic | 69 m_Fields = t.GetFields(BindingFlags.NonPublic |
@@ -90,7 +90,7 @@ namespace OpenSim.Data.SQLite
90 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); 90 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
91 91
92 cmd.CommandText = sql; 92 cmd.CommandText = sql;
93 cmd.Parameters.Add(":RegionID", regionID.ToString()); 93 cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
94 94
95 IDataReader r = cmd.ExecuteReader(); 95 IDataReader r = cmd.ExecuteReader();
96 96
@@ -140,13 +140,13 @@ namespace OpenSim.Data.SQLite
140 if (m_FieldMap[name].GetValue(es) is bool) 140 if (m_FieldMap[name].GetValue(es) is bool)
141 { 141 {
142 if ((bool)m_FieldMap[name].GetValue(es)) 142 if ((bool)m_FieldMap[name].GetValue(es))
143 cmd.Parameters.Add(":"+name, "1"); 143 cmd.Parameters.AddWithValue(":"+name, "1");
144 else 144 else
145 cmd.Parameters.Add(":"+name, "0"); 145 cmd.Parameters.AddWithValue(":"+name, "0");
146 } 146 }
147 else 147 else
148 { 148 {
149 cmd.Parameters.Add(":"+name, m_FieldMap[name].GetValue(es).ToString()); 149 cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
150 } 150 }
151 } 151 }
152 152
@@ -164,8 +164,8 @@ namespace OpenSim.Data.SQLite
164 r.Close(); 164 r.Close();
165 165
166 cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)"; 166 cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
167 cmd.Parameters.Add(":RegionID", regionID.ToString()); 167 cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
168 cmd.Parameters.Add(":EstateID", es.EstateID.ToString()); 168 cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
169 169
170 // This will throw on dupe key 170 // This will throw on dupe key
171 try 171 try
@@ -180,7 +180,7 @@ namespace OpenSim.Data.SQLite
180 // 180 //
181 cmd.Parameters.Clear(); 181 cmd.Parameters.Clear();
182 cmd.CommandText = "insert into estateban select "+es.EstateID.ToString()+", bannedUUID, bannedIp, bannedIpHostMask, '' from regionban where regionban.regionUUID = :UUID"; 182 cmd.CommandText = "insert into estateban select "+es.EstateID.ToString()+", bannedUUID, bannedIp, bannedIpHostMask, '' from regionban where regionban.regionUUID = :UUID";
183 cmd.Parameters.Add(":UUID", regionID.ToString()); 183 cmd.Parameters.AddWithValue(":UUID", regionID.ToString());
184 184
185 try 185 try
186 { 186 {
@@ -222,13 +222,13 @@ namespace OpenSim.Data.SQLite
222 if (m_FieldMap[name].GetValue(es) is bool) 222 if (m_FieldMap[name].GetValue(es) is bool)
223 { 223 {
224 if ((bool)m_FieldMap[name].GetValue(es)) 224 if ((bool)m_FieldMap[name].GetValue(es))
225 cmd.Parameters.Add(":"+name, "1"); 225 cmd.Parameters.AddWithValue(":"+name, "1");
226 else 226 else
227 cmd.Parameters.Add(":"+name, "0"); 227 cmd.Parameters.AddWithValue(":"+name, "0");
228 } 228 }
229 else 229 else
230 { 230 {
231 cmd.Parameters.Add(":"+name, m_FieldMap[name].GetValue(es).ToString()); 231 cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
232 } 232 }
233 } 233 }
234 234
@@ -247,7 +247,7 @@ namespace OpenSim.Data.SQLite
247 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); 247 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
248 248
249 cmd.CommandText = "select bannedUUID from estateban where EstateID = :EstateID"; 249 cmd.CommandText = "select bannedUUID from estateban where EstateID = :EstateID";
250 cmd.Parameters.Add(":EstateID", es.EstateID); 250 cmd.Parameters.AddWithValue(":EstateID", es.EstateID);
251 251
252 IDataReader r = cmd.ExecuteReader(); 252 IDataReader r = cmd.ExecuteReader();
253 253
@@ -271,7 +271,7 @@ namespace OpenSim.Data.SQLite
271 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); 271 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
272 272
273 cmd.CommandText = "delete from estateban where EstateID = :EstateID"; 273 cmd.CommandText = "delete from estateban where EstateID = :EstateID";
274 cmd.Parameters.Add(":EstateID", es.EstateID.ToString()); 274 cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
275 275
276 cmd.ExecuteNonQuery(); 276 cmd.ExecuteNonQuery();
277 277
@@ -281,8 +281,8 @@ namespace OpenSim.Data.SQLite
281 281
282 foreach (EstateBan b in es.EstateBans) 282 foreach (EstateBan b in es.EstateBans)
283 { 283 {
284 cmd.Parameters.Add(":EstateID", es.EstateID.ToString()); 284 cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
285 cmd.Parameters.Add(":bannedUUID", b.BannedUserID.ToString()); 285 cmd.Parameters.AddWithValue(":bannedUUID", b.BannedUserID.ToString());
286 286
287 cmd.ExecuteNonQuery(); 287 cmd.ExecuteNonQuery();
288 cmd.Parameters.Clear(); 288 cmd.Parameters.Clear();
@@ -294,7 +294,7 @@ namespace OpenSim.Data.SQLite
294 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); 294 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
295 295
296 cmd.CommandText = "delete from "+table+" where EstateID = :EstateID"; 296 cmd.CommandText = "delete from "+table+" where EstateID = :EstateID";
297 cmd.Parameters.Add(":EstateID", EstateID.ToString()); 297 cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
298 298
299 cmd.ExecuteNonQuery(); 299 cmd.ExecuteNonQuery();
300 300
@@ -304,8 +304,8 @@ namespace OpenSim.Data.SQLite
304 304
305 foreach (UUID uuid in data) 305 foreach (UUID uuid in data)
306 { 306 {
307 cmd.Parameters.Add(":EstateID", EstateID.ToString()); 307 cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
308 cmd.Parameters.Add(":uuid", uuid.ToString()); 308 cmd.Parameters.AddWithValue(":uuid", uuid.ToString());
309 309
310 cmd.ExecuteNonQuery(); 310 cmd.ExecuteNonQuery();
311 cmd.Parameters.Clear(); 311 cmd.Parameters.Clear();
@@ -319,7 +319,7 @@ namespace OpenSim.Data.SQLite
319 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); 319 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
320 320
321 cmd.CommandText = "select uuid from "+table+" where EstateID = :EstateID"; 321 cmd.CommandText = "select uuid from "+table+" where EstateID = :EstateID";
322 cmd.Parameters.Add(":EstateID", EstateID); 322 cmd.Parameters.AddWithValue(":EstateID", EstateID);
323 323
324 IDataReader r = cmd.ExecuteReader(); 324 IDataReader r = cmd.ExecuteReader();
325 325
@@ -337,4 +337,4 @@ namespace OpenSim.Data.SQLite
337 return uuids.ToArray(); 337 return uuids.ToArray();
338 } 338 }
339 } 339 }
340} 340} \ No newline at end of file
diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs
index 12b2750..9567727 100644
--- a/OpenSim/Data/SQLite/SQLiteFramework.cs
+++ b/OpenSim/Data/SQLite/SQLiteFramework.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using Mono.Data.SqliteClient; 34using Mono.Data.Sqlite;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
37{ 37{
@@ -65,12 +65,18 @@ namespace OpenSim.Data.SQLite
65 65
66 protected IDataReader ExecuteReader(SqliteCommand cmd) 66 protected IDataReader ExecuteReader(SqliteCommand cmd)
67 { 67 {
68 SqliteConnection newConnection = 68 lock (m_Connection)
69 (SqliteConnection)((ICloneable)m_Connection).Clone(); 69 {
70 newConnection.Open(); 70 //SqliteConnection newConnection =
71 // (SqliteConnection)((ICloneable)connection).Clone();
72 //newConnection.Open();
71 73
72 cmd.Connection = newConnection; 74 //cmd.Connection = newConnection;
73 return cmd.ExecuteReader(); 75 cmd.Connection = m_Connection;
76 //Console.WriteLine("XXX " + cmd.CommandText);
77
78 return cmd.ExecuteReader();
79 }
74 } 80 }
75 81
76 protected void CloseReaderCommand(SqliteCommand cmd) 82 protected void CloseReaderCommand(SqliteCommand cmd)
@@ -80,4 +86,4 @@ namespace OpenSim.Data.SQLite
80 cmd.Dispose(); 86 cmd.Dispose();
81 } 87 }
82 } 88 }
83} 89} \ No newline at end of file
diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index 8e91693..86eaca1 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33using Mono.Data.SqliteClient; 33using Mono.Data.Sqlite;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
@@ -54,10 +54,23 @@ namespace OpenSim.Data.SQLite
54 m_Realm = realm; 54 m_Realm = realm;
55 if (storeName != String.Empty) 55 if (storeName != String.Empty)
56 { 56 {
57 Assembly assem = GetType().Assembly; 57 m_Connection = new SqliteConnection(connectionString);
58 //Console.WriteLine(string.Format("OPENING CONNECTION FOR {0} USING {1}", storeName, connectionString));
59 m_Connection.Open();
58 60
59 Migration m = new Migration(m_Connection, assem, storeName); 61 if (storeName != String.Empty)
60 m.Update(); 62 {
63 Assembly assem = GetType().Assembly;
64 //SqliteConnection newConnection =
65 // (SqliteConnection)((ICloneable)m_Connection).Clone();
66 //newConnection.Open();
67
68 //Migration m = new Migration(newConnection, assem, storeName);
69 Migration m = new Migration(m_Connection, assem, storeName);
70 m.Update();
71 //newConnection.Close();
72 //newConnection.Dispose();
73 }
61 } 74 }
62 75
63 Type t = typeof(T); 76 Type t = typeof(T);
@@ -180,7 +193,7 @@ namespace OpenSim.Data.SQLite
180 result.Add(row); 193 result.Add(row);
181 } 194 }
182 195
183 CloseReaderCommand(cmd); 196 //CloseCommand(cmd);
184 197
185 return result.ToArray(); 198 return result.ToArray();
186 } 199 }
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 64591fd..9ce21b1 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33using Mono.Data.SqliteClient; 33using Mono.Data.Sqlite;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
@@ -88,15 +88,17 @@ namespace OpenSim.Data.SQLite
88 invFoldersDa = new SqliteDataAdapter(foldersSelectCmd); 88 invFoldersDa = new SqliteDataAdapter(foldersSelectCmd);
89 89
90 ds = new DataSet(); 90 ds = new DataSet();
91 91
92 ds.Tables.Add(createInventoryFoldersTable()); 92 ds.Tables.Add(createInventoryFoldersTable());
93 invFoldersDa.Fill(ds.Tables["inventoryfolders"]); 93 invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
94 setupFoldersCommands(invFoldersDa, conn); 94 setupFoldersCommands(invFoldersDa, conn);
95 CreateDataSetMapping(invFoldersDa, "inventoryfolders");
95 m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions"); 96 m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions");
96 97
97 ds.Tables.Add(createInventoryItemsTable()); 98 ds.Tables.Add(createInventoryItemsTable());
98 invItemsDa.Fill(ds.Tables["inventoryitems"]); 99 invItemsDa.Fill(ds.Tables["inventoryitems"]);
99 setupItemsCommands(invItemsDa, conn); 100 setupItemsCommands(invItemsDa, conn);
101 CreateDataSetMapping(invItemsDa, "inventoryitems");
100 m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions"); 102 m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
101 103
102 ds.AcceptChanges(); 104 ds.AcceptChanges();
@@ -721,6 +723,15 @@ namespace OpenSim.Data.SQLite
721 * 723 *
722 **********************************************************************/ 724 **********************************************************************/
723 725
726 protected void CreateDataSetMapping(IDataAdapter da, string tableName)
727 {
728 ITableMapping dbMapping = da.TableMappings.Add(tableName, tableName);
729 foreach (DataColumn col in ds.Tables[tableName].Columns)
730 {
731 dbMapping.ColumnMappings.Add(col.ColumnName, col.ColumnName);
732 }
733 }
734
724 /// <summary> 735 /// <summary>
725 /// Create the "inventoryitems" table 736 /// Create the "inventoryitems" table
726 /// </summary> 737 /// </summary>
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index b6d4a1c..7dcd323 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SQLite;
32using System.Reflection; 31using System.Reflection;
33using log4net; 32using log4net;
33using Mono.Data.Sqlite;
34using OpenMetaverse; 34using OpenMetaverse;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
@@ -66,7 +66,7 @@ namespace OpenSim.Data.SQLite
66 connectionString = "URI=file:GridServerSqlite.db;"; 66 connectionString = "URI=file:GridServerSqlite.db;";
67 } 67 }
68 68
69 dbcon = new SQLiteConnection(connectionString); 69 dbcon = new SqliteConnection(connectionString);
70 70
71 dbcon.Open(); 71 dbcon.Open();
72 } 72 }
@@ -93,11 +93,11 @@ namespace OpenSim.Data.SQLite
93 /// <returns>A SQLite DB Command</returns> 93 /// <returns>A SQLite DB Command</returns>
94 public IDbCommand Query(string sql, Dictionary<string, string> parameters) 94 public IDbCommand Query(string sql, Dictionary<string, string> parameters)
95 { 95 {
96 SQLiteCommand dbcommand = (SQLiteCommand) dbcon.CreateCommand(); 96 SqliteCommand dbcommand = (SqliteCommand) dbcon.CreateCommand();
97 dbcommand.CommandText = sql; 97 dbcommand.CommandText = sql;
98 foreach (KeyValuePair<string, string> param in parameters) 98 foreach (KeyValuePair<string, string> param in parameters)
99 { 99 {
100 SQLiteParameter paramx = new SQLiteParameter(param.Key, param.Value); 100 SqliteParameter paramx = new SqliteParameter(param.Key, param.Value);
101 dbcommand.Parameters.Add(paramx); 101 dbcommand.Parameters.Add(paramx);
102 } 102 }
103 103
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 5a4ee2a..4313db8 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -32,7 +32,7 @@ using System.Drawing;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using log4net; 34using log4net;
35using Mono.Data.SqliteClient; 35using Mono.Data.Sqlite;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
@@ -87,119 +87,151 @@ namespace OpenSim.Data.SQLite
87 /// <param name="connectionString">the connection string</param> 87 /// <param name="connectionString">the connection string</param>
88 public void Initialise(string connectionString) 88 public void Initialise(string connectionString)
89 { 89 {
90 m_connectionString = connectionString; 90 try
91 {
92 m_connectionString = connectionString;
91 93
92 ds = new DataSet(); 94 ds = new DataSet("Region");
93 95
94 m_log.Info("[REGION DB]: Sqlite - connecting: " + connectionString); 96 m_log.Info("[SQLITE REGION DB]: Sqlite - connecting: " + connectionString);
95 m_conn = new SqliteConnection(m_connectionString); 97 m_conn = new SqliteConnection(m_connectionString);
96 m_conn.Open(); 98 m_conn.Open();
97 99
100 SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn);
101 primDa = new SqliteDataAdapter(primSelectCmd);
98 102
103 SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn);
104 shapeDa = new SqliteDataAdapter(shapeSelectCmd);
105 // SqliteCommandBuilder shapeCb = new SqliteCommandBuilder(shapeDa);
99 106
100 SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn); 107 SqliteCommand itemsSelectCmd = new SqliteCommand(itemsSelect, m_conn);
101 primDa = new SqliteDataAdapter(primSelectCmd); 108 itemsDa = new SqliteDataAdapter(itemsSelectCmd);
102 // SqliteCommandBuilder primCb = new SqliteCommandBuilder(primDa);
103 109
104 SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn); 110 SqliteCommand terrainSelectCmd = new SqliteCommand(terrainSelect, m_conn);
105 shapeDa = new SqliteDataAdapter(shapeSelectCmd); 111 terrainDa = new SqliteDataAdapter(terrainSelectCmd);
106 // SqliteCommandBuilder shapeCb = new SqliteCommandBuilder(shapeDa);
107 112
108 SqliteCommand itemsSelectCmd = new SqliteCommand(itemsSelect, m_conn); 113 SqliteCommand landSelectCmd = new SqliteCommand(landSelect, m_conn);
109 itemsDa = new SqliteDataAdapter(itemsSelectCmd); 114 landDa = new SqliteDataAdapter(landSelectCmd);
110 115
111 SqliteCommand terrainSelectCmd = new SqliteCommand(terrainSelect, m_conn); 116 SqliteCommand landAccessListSelectCmd = new SqliteCommand(landAccessListSelect, m_conn);
112 terrainDa = new SqliteDataAdapter(terrainSelectCmd); 117 landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd);
113 118
114 SqliteCommand landSelectCmd = new SqliteCommand(landSelect, m_conn); 119 SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
115 landDa = new SqliteDataAdapter(landSelectCmd); 120 regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
121 // This actually does the roll forward assembly stuff
122 Assembly assem = GetType().Assembly;
123 Migration m = new Migration(m_conn, assem, "RegionStore");
124 m.Update();
116 125
117 SqliteCommand landAccessListSelectCmd = new SqliteCommand(landAccessListSelect, m_conn); 126 lock (ds)
118 landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd); 127 {
128 ds.Tables.Add(createPrimTable());
129 setupPrimCommands(primDa, m_conn);
119 130
120 SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn); 131 ds.Tables.Add(createShapeTable());
121 regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd); 132 setupShapeCommands(shapeDa, m_conn);
122 // This actually does the roll forward assembly stuff
123 Assembly assem = GetType().Assembly;
124 Migration m = new Migration(m_conn, assem, "RegionStore");
125 m.Update();
126 133
127 lock (ds) 134 ds.Tables.Add(createItemsTable());
128 { 135 setupItemsCommands(itemsDa, m_conn);
129 ds.Tables.Add(createPrimTable());
130 setupPrimCommands(primDa, m_conn);
131 primDa.Fill(ds.Tables["prims"]);
132 136
133 ds.Tables.Add(createShapeTable()); 137 ds.Tables.Add(createTerrainTable());
134 setupShapeCommands(shapeDa, m_conn); 138 setupTerrainCommands(terrainDa, m_conn);
135 139
136 ds.Tables.Add(createItemsTable()); 140 ds.Tables.Add(createLandTable());
137 setupItemsCommands(itemsDa, m_conn); 141 setupLandCommands(landDa, m_conn);
138 itemsDa.Fill(ds.Tables["primitems"]);
139 142
140 ds.Tables.Add(createTerrainTable()); 143 ds.Tables.Add(createLandAccessListTable());
141 setupTerrainCommands(terrainDa, m_conn); 144 setupLandAccessCommands(landAccessListDa, m_conn);
142 145
143 ds.Tables.Add(createLandTable()); 146 ds.Tables.Add(createRegionSettingsTable());
144 setupLandCommands(landDa, m_conn); 147 setupRegionSettingsCommands(regionSettingsDa, m_conn);
145 148
146 ds.Tables.Add(createLandAccessListTable()); 149 // WORKAROUND: This is a work around for sqlite on
147 setupLandAccessCommands(landAccessListDa, m_conn); 150 // windows, which gets really unhappy with blob columns
151 // that have no sample data in them. At some point we
152 // need to actually find a proper way to handle this.
153 try
154 {
155 primDa.Fill(ds.Tables["prims"]);
156 }
157 catch (Exception)
158 {
159 m_log.Info("[SQLITE REGION DB]: Caught fill error on prims table");
160 }
148 161
149 ds.Tables.Add(createRegionSettingsTable()); 162 try
150 163 {
151 setupRegionSettingsCommands(regionSettingsDa, m_conn); 164 shapeDa.Fill(ds.Tables["primshapes"]);
165 }
166 catch (Exception)
167 {
168 m_log.Info("[SQLITE REGION DB]: Caught fill error on primshapes table");
169 }
152 170
153 // WORKAROUND: This is a work around for sqlite on 171 try
154 // windows, which gets really unhappy with blob columns 172 {
155 // that have no sample data in them. At some point we 173 itemsDa.Fill(ds.Tables["primitems"]);
156 // need to actually find a proper way to handle this. 174 }
157 try 175 catch (Exception)
158 { 176 {
159 shapeDa.Fill(ds.Tables["primshapes"]); 177 m_log.Info("[SQLITE REGION DB]: Caught fill error on primitems table");
160 } 178 }
161 catch (Exception) 179
162 { 180 try
163 m_log.Info("[REGION DB]: Caught fill error on primshapes table"); 181 {
164 } 182 terrainDa.Fill(ds.Tables["terrain"]);
183 }
184 catch (Exception)
185 {
186 m_log.Info("[SQLITE REGION DB]: Caught fill error on terrain table");
187 }
165 188
166 try 189 try
167 { 190 {
168 terrainDa.Fill(ds.Tables["terrain"]); 191 landDa.Fill(ds.Tables["land"]);
169 } 192 }
170 catch (Exception) 193 catch (Exception)
171 { 194 {
172 m_log.Info("[REGION DB]: Caught fill error on terrain table"); 195 m_log.Info("[SQLITE REGION DB]: Caught fill error on land table");
173 } 196 }
174 197
175 try 198 try
176 { 199 {
177 landDa.Fill(ds.Tables["land"]); 200 landAccessListDa.Fill(ds.Tables["landaccesslist"]);
178 } 201 }
179 catch (Exception) 202 catch (Exception)
180 { 203 {
181 m_log.Info("[REGION DB]: Caught fill error on land table"); 204 m_log.Info("[SQLITE REGION DB]: Caught fill error on landaccesslist table");
182 } 205 }
183 206
184 try 207 try
185 { 208 {
186 landAccessListDa.Fill(ds.Tables["landaccesslist"]); 209 regionSettingsDa.Fill(ds.Tables["regionsettings"]);
187 } 210 }
188 catch (Exception) 211 catch (Exception)
189 { 212 {
190 m_log.Info("[REGION DB]: Caught fill error on landaccesslist table"); 213 m_log.Info("[SQLITE REGION DB]: Caught fill error on regionsettings table");
191 } 214 }
192 215
193 try 216 // We have to create a data set mapping for every table, otherwise the IDataAdaptor.Update() will not populate rows with values!
194 { 217 // Not sure exactly why this is - this kind of thing was not necessary before - justincc 20100409
195 regionSettingsDa.Fill(ds.Tables["regionsettings"]); 218 // Possibly because we manually set up our own DataTables before connecting to the database
196 } 219 CreateDataSetMapping(primDa, "prims");
197 catch (Exception) 220 CreateDataSetMapping(shapeDa, "primshapes");
198 { 221 CreateDataSetMapping(itemsDa, "primitems");
199 m_log.Info("[REGION DB]: Caught fill error on regionsettings table"); 222 CreateDataSetMapping(terrainDa, "terrain");
223 CreateDataSetMapping(landDa, "land");
224 CreateDataSetMapping(landAccessListDa, "landaccesslist");
225 CreateDataSetMapping(regionSettingsDa, "regionsettings");
200 } 226 }
201 return;
202 } 227 }
228 catch (Exception e)
229 {
230 m_log.Error(e);
231 Environment.Exit(23);
232 }
233
234 return;
203 } 235 }
204 236
205 public void Dispose() 237 public void Dispose()
@@ -402,7 +434,7 @@ namespace OpenSim.Data.SQLite
402 lock (ds) 434 lock (ds)
403 { 435 {
404 DataRow[] primsForRegion = prims.Select(byRegion); 436 DataRow[] primsForRegion = prims.Select(byRegion);
405 m_log.Info("[REGION DB]: Loaded " + primsForRegion.Length + " prims for region: " + regionUUID); 437// m_log.Info("[SQLITE REGION DB]: Loaded " + primsForRegion.Length + " prims for region: " + regionUUID);
406 438
407 // First, create all groups 439 // First, create all groups
408 foreach (DataRow primRow in primsForRegion) 440 foreach (DataRow primRow in primsForRegion)
@@ -424,8 +456,8 @@ namespace OpenSim.Data.SQLite
424 } 456 }
425 else 457 else
426 { 458 {
427 m_log.Info( 459 m_log.Warn(
428 "[REGION DB]: No shape found for prim in storage, so setting default box shape"); 460 "[SQLITE REGION DB]: No shape found for prim in storage, so setting default box shape");
429 prim.Shape = PrimitiveBaseShape.Default; 461 prim.Shape = PrimitiveBaseShape.Default;
430 } 462 }
431 463
@@ -437,11 +469,11 @@ namespace OpenSim.Data.SQLite
437 } 469 }
438 catch (Exception e) 470 catch (Exception e)
439 { 471 {
440 m_log.Error("[REGION DB]: Failed create prim object in new group, exception and data follows"); 472 m_log.Error("[SQLITE REGION DB]: Failed create prim object in new group, exception and data follows");
441 m_log.Info("[REGION DB]: " + e.ToString()); 473 m_log.Error("[SQLITE REGION DB]: ", e);
442 foreach (DataColumn col in prims.Columns) 474 foreach (DataColumn col in prims.Columns)
443 { 475 {
444 m_log.Info("[REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]); 476 m_log.Error("[SQLITE REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]);
445 } 477 }
446 } 478 }
447 } 479 }
@@ -466,7 +498,7 @@ namespace OpenSim.Data.SQLite
466 else 498 else
467 { 499 {
468 m_log.Warn( 500 m_log.Warn(
469 "[REGION DB]: No shape found for prim in storage, so setting default box shape"); 501 "[SQLITE REGION DB]: No shape found for prim in storage, so setting default box shape");
470 prim.Shape = PrimitiveBaseShape.Default; 502 prim.Shape = PrimitiveBaseShape.Default;
471 } 503 }
472 504
@@ -476,11 +508,11 @@ namespace OpenSim.Data.SQLite
476 } 508 }
477 catch (Exception e) 509 catch (Exception e)
478 { 510 {
479 m_log.Error("[REGION DB]: Failed create prim object in group, exception and data follows"); 511 m_log.Error("[SQLITE REGION DB]: Failed create prim object in group, exception and data follows");
480 m_log.Info("[REGION DB]: " + e.ToString()); 512 m_log.Error("[SQLITE REGION DB]: ", e);
481 foreach (DataColumn col in prims.Columns) 513 foreach (DataColumn col in prims.Columns)
482 { 514 {
483 m_log.Info("[REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]); 515 m_log.Error("[SQLITE REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]);
484 } 516 }
485 } 517 }
486 } 518 }
@@ -493,20 +525,23 @@ namespace OpenSim.Data.SQLite
493 /// </summary> 525 /// </summary>
494 /// <param name="prim">the prim</param> 526 /// <param name="prim">the prim</param>
495 private void LoadItems(SceneObjectPart prim) 527 private void LoadItems(SceneObjectPart prim)
496 { 528 {
497 //m_log.DebugFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID); 529// m_log.DebugFormat("[SQLITE REGION DB]: Loading inventory for {0} {1}", prim.Name, prim.UUID);
498 530
499 DataTable dbItems = ds.Tables["primitems"]; 531 DataTable dbItems = ds.Tables["primitems"];
500 String sql = String.Format("primID = '{0}'", prim.UUID.ToString()); 532 String sql = String.Format("primID = '{0}'", prim.UUID.ToString());
501 DataRow[] dbItemRows = dbItems.Select(sql); 533 DataRow[] dbItemRows = dbItems.Select(sql);
502 IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>(); 534 IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
503 535
536// m_log.DebugFormat(
537// "[SQLITE REGION DB]: Found {0} items for {1} {2}", dbItemRows.Length, prim.Name, prim.UUID);
538
504 foreach (DataRow row in dbItemRows) 539 foreach (DataRow row in dbItemRows)
505 { 540 {
506 TaskInventoryItem item = buildItem(row); 541 TaskInventoryItem item = buildItem(row);
507 inventory.Add(item); 542 inventory.Add(item);
508 543
509 //m_log.DebugFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID); 544// m_log.DebugFormat("[SQLITE REGION DB]: Restored item {0} {1}", item.Name, item.ItemID);
510 } 545 }
511 546
512 prim.Inventory.RestoreInventoryItems(inventory); 547 prim.Inventory.RestoreInventoryItems(inventory);
@@ -542,7 +577,7 @@ namespace OpenSim.Data.SQLite
542 577
543 // the following is an work around for .NET. The perf 578 // the following is an work around for .NET. The perf
544 // issues associated with it aren't as bad as you think. 579 // issues associated with it aren't as bad as you think.
545 m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString()); 580 m_log.Debug("[SQLITE REGION DB]: Storing terrain revision r" + revision.ToString());
546 String sql = "insert into terrain(RegionUUID, Revision, Heightfield)" + 581 String sql = "insert into terrain(RegionUUID, Revision, Heightfield)" +
547 " values(:RegionUUID, :Revision, :Heightfield)"; 582 " values(:RegionUUID, :Revision, :Heightfield)";
548 583
@@ -594,15 +629,15 @@ namespace OpenSim.Data.SQLite
594 } 629 }
595 } 630 }
596 } 631 }
597 rev = (int) row["Revision"]; 632 rev = Convert.ToInt32(row["Revision"]);
598 } 633 }
599 else 634 else
600 { 635 {
601 m_log.Info("[REGION DB]: No terrain found for region"); 636 m_log.Warn("[SQLITE REGION DB]: No terrain found for region");
602 return null; 637 return null;
603 } 638 }
604 639
605 m_log.Info("[REGION DB]: Loaded terrain revision r" + rev.ToString()); 640 m_log.Debug("[SQLITE REGION DB]: Loaded terrain revision r" + rev.ToString());
606 } 641 }
607 } 642 }
608 return terret; 643 return terret;
@@ -746,6 +781,7 @@ namespace OpenSim.Data.SQLite
746 /// </summary> 781 /// </summary>
747 public void Commit() 782 public void Commit()
748 { 783 {
784 //m_log.Debug("[SQLITE]: Starting commit");
749 lock (ds) 785 lock (ds)
750 { 786 {
751 primDa.Update(ds, "prims"); 787 primDa.Update(ds, "prims");
@@ -760,18 +796,11 @@ namespace OpenSim.Data.SQLite
760 { 796 {
761 regionSettingsDa.Update(ds, "regionsettings"); 797 regionSettingsDa.Update(ds, "regionsettings");
762 } 798 }
763 catch (SqliteExecutionException SqlEx) 799 catch (SqliteException SqlEx)
764 { 800 {
765 if (SqlEx.Message.Contains("logic error")) 801 throw new Exception(
766 { 802 "There was a SQL error or connection string configuration error when saving the region settings. This could be a bug, it could also happen if ConnectionString is defined in the [DatabaseService] section of StandaloneCommon.ini in the config_include folder. This could also happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set. If this is your first time running OpenSimulator, please restart the simulator and bug a developer to fix this!",
767 throw new Exception( 803 SqlEx);
768 "There was a SQL error or connection string configuration error when saving the region settings. This could be a bug, it could also happen if ConnectionString is defined in the [DatabaseService] section of StandaloneCommon.ini in the config_include folder. This could also happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set. If this is your first time running OpenSimulator, please restart the simulator and bug a developer to fix this!",
769 SqlEx);
770 }
771 else
772 {
773 throw SqlEx;
774 }
775 } 804 }
776 ds.AcceptChanges(); 805 ds.AcceptChanges();
777 } 806 }
@@ -793,6 +822,15 @@ namespace OpenSim.Data.SQLite
793 * 822 *
794 **********************************************************************/ 823 **********************************************************************/
795 824
825 protected void CreateDataSetMapping(IDataAdapter da, string tableName)
826 {
827 ITableMapping dbMapping = da.TableMappings.Add(tableName, tableName);
828 foreach (DataColumn col in ds.Tables[tableName].Columns)
829 {
830 dbMapping.ColumnMappings.Add(col.ColumnName, col.ColumnName);
831 }
832 }
833
796 /// <summary> 834 /// <summary>
797 /// 835 ///
798 /// </summary> 836 /// </summary>
@@ -1381,7 +1419,7 @@ namespace OpenSim.Data.SQLite
1381 } 1419 }
1382 catch (InvalidCastException) 1420 catch (InvalidCastException)
1383 { 1421 {
1384 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); 1422 m_log.ErrorFormat("[SQLITE REGION DB]: unable to get parcel telehub settings for {1}", newData.Name);
1385 newData.UserLocation = Vector3.Zero; 1423 newData.UserLocation = Vector3.Zero;
1386 newData.UserLookAt = Vector3.Zero; 1424 newData.UserLookAt = Vector3.Zero;
1387 } 1425 }
@@ -1888,7 +1926,7 @@ namespace OpenSim.Data.SQLite
1888 /// <param name="items"></param> 1926 /// <param name="items"></param>
1889 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) 1927 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
1890 { 1928 {
1891 m_log.InfoFormat("[REGION DB]: Entered StorePrimInventory with prim ID {0}", primID); 1929// m_log.DebugFormat("[SQLITE REGION DB]: Entered StorePrimInventory with prim ID {0}", primID);
1892 1930
1893 DataTable dbItems = ds.Tables["primitems"]; 1931 DataTable dbItems = ds.Tables["primitems"];
1894 1932
@@ -1955,6 +1993,7 @@ namespace OpenSim.Data.SQLite
1955 sql += ") values (:"; 1993 sql += ") values (:";
1956 sql += String.Join(", :", cols); 1994 sql += String.Join(", :", cols);
1957 sql += ")"; 1995 sql += ")";
1996 //m_log.DebugFormat("[SQLITE]: Created insert command {0}", sql);
1958 SqliteCommand cmd = new SqliteCommand(sql); 1997 SqliteCommand cmd = new SqliteCommand(sql);
1959 1998
1960 // this provides the binding for all our parameters, so 1999 // this provides the binding for all our parameters, so
@@ -2250,6 +2289,36 @@ namespace OpenSim.Data.SQLite
2250 return DbType.String; 2289 return DbType.String;
2251 } 2290 }
2252 } 2291 }
2292
2293 static void PrintDataSet(DataSet ds)
2294 {
2295 // Print out any name and extended properties.
2296 Console.WriteLine("DataSet is named: {0}", ds.DataSetName);
2297 foreach (System.Collections.DictionaryEntry de in ds.ExtendedProperties)
2298 {
2299 Console.WriteLine("Key = {0}, Value = {1}", de.Key, de.Value);
2300 }
2301 Console.WriteLine();
2302 foreach (DataTable dt in ds.Tables)
2303 {
2304 Console.WriteLine("=> {0} Table:", dt.TableName);
2305 // Print out the column names.
2306 for (int curCol = 0; curCol < dt.Columns.Count; curCol++)
2307 {
2308 Console.Write(dt.Columns[curCol].ColumnName + "\t");
2309 }
2310 Console.WriteLine("\n----------------------------------");
2311 // Print the DataTable.
2312 for (int curRow = 0; curRow < dt.Rows.Count; curRow++)
2313 {
2314 for (int curCol = 0; curCol < dt.Columns.Count; curCol++)
2315 {
2316 Console.Write(dt.Rows[curRow][curCol].ToString() + "\t");
2317 }
2318 Console.WriteLine();
2319 }
2320 }
2321 }
2253 2322
2254 } 2323 }
2255} 2324}
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index caddcf8..ea755b0 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33using Mono.Data.SqliteClient; 33using Mono.Data.Sqlite;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
@@ -115,15 +115,19 @@ namespace OpenSim.Data.SQLite
115 115
116 setupUserCommands(da, conn); 116 setupUserCommands(da, conn);
117 da.Fill(ds.Tables["users"]); 117 da.Fill(ds.Tables["users"]);
118 CreateDataSetMapping(da, "users");
118 119
119 setupAgentCommands(dua, conn); 120 setupAgentCommands(dua, conn);
120 dua.Fill(ds.Tables["useragents"]); 121 dua.Fill(ds.Tables["useragents"]);
122 CreateDataSetMapping(dua, "useragents");
121 123
122 setupUserFriendsCommands(daf, conn); 124 setupUserFriendsCommands(daf, conn);
123 daf.Fill(ds.Tables["userfriends"]); 125 daf.Fill(ds.Tables["userfriends"]);
126 CreateDataSetMapping(daf, "userfriends");
124 127
125 setupAvatarAppearanceCommands(daa, conn); 128 setupAvatarAppearanceCommands(daa, conn);
126 daa.Fill(ds.Tables["avatarappearance"]); 129 daa.Fill(ds.Tables["avatarappearance"]);
130 CreateDataSetMapping(daa, "avatarappearance");
127 } 131 }
128 132
129 return; 133 return;
@@ -706,15 +710,10 @@ namespace OpenSim.Data.SQLite
706 aa.SkirtItem = new UUID((String)row["SkirtItem"]); 710 aa.SkirtItem = new UUID((String)row["SkirtItem"]);
707 aa.SkirtAsset = new UUID((String)row["SkirtAsset"]); 711 aa.SkirtAsset = new UUID((String)row["SkirtAsset"]);
708 712
709 // Ewe Loon 713 byte[] texture = (byte[])row["Texture"];
710 // Used Base64String because for some reason it wont accept using Byte[] (which works in Region date)
711
712 String str = (String)row["Texture"];
713 byte[] texture = Convert.FromBase64String(str);
714 aa.Texture = new Primitive.TextureEntry(texture, 0, texture.Length); 714 aa.Texture = new Primitive.TextureEntry(texture, 0, texture.Length);
715 715
716 str = (String)row["VisualParams"]; 716 byte[] VisualParams = (byte[])row["VisualParams"];
717 byte[] VisualParams = Convert.FromBase64String(str);
718 aa.VisualParams = VisualParams; 717 aa.VisualParams = VisualParams;
719 718
720 aa.Serial = Convert.ToInt32(row["Serial"]); 719 aa.Serial = Convert.ToInt32(row["Serial"]);
@@ -793,6 +792,15 @@ namespace OpenSim.Data.SQLite
793 * 792 *
794 **********************************************************************/ 793 **********************************************************************/
795 794
795 protected void CreateDataSetMapping(IDataAdapter da, string tableName)
796 {
797 ITableMapping dbMapping = da.TableMappings.Add(tableName, tableName);
798 foreach (DataColumn col in ds.Tables[tableName].Columns)
799 {
800 dbMapping.ColumnMappings.Add(col.ColumnName, col.ColumnName);
801 }
802 }
803
796 /// <summary> 804 /// <summary>
797 /// Create the "users" table 805 /// Create the "users" table
798 /// </summary> 806 /// </summary>
@@ -924,9 +932,8 @@ namespace OpenSim.Data.SQLite
924 SQLiteUtil.createCol(aa, "SkirtItem", typeof(String)); 932 SQLiteUtil.createCol(aa, "SkirtItem", typeof(String));
925 SQLiteUtil.createCol(aa, "SkirtAsset", typeof(String)); 933 SQLiteUtil.createCol(aa, "SkirtAsset", typeof(String));
926 934
927 // Used Base64String because for some reason it wont accept using Byte[] (which works in Region date) 935 SQLiteUtil.createCol(aa, "Texture", typeof (Byte[]));
928 SQLiteUtil.createCol(aa, "Texture", typeof (String)); 936 SQLiteUtil.createCol(aa, "VisualParams", typeof (Byte[]));
929 SQLiteUtil.createCol(aa, "VisualParams", typeof (String));
930 937
931 SQLiteUtil.createCol(aa, "Serial", typeof(Int32)); 938 SQLiteUtil.createCol(aa, "Serial", typeof(Int32));
932 SQLiteUtil.createCol(aa, "AvatarHeight", typeof(Double)); 939 SQLiteUtil.createCol(aa, "AvatarHeight", typeof(Double));
@@ -1090,8 +1097,8 @@ namespace OpenSim.Data.SQLite
1090 row["SkirtAsset"] = appearance.SkirtAsset.ToString(); 1097 row["SkirtAsset"] = appearance.SkirtAsset.ToString();
1091 1098
1092 // Used Base64String because for some reason it wont accept using Byte[] (which works in Region date) 1099 // Used Base64String because for some reason it wont accept using Byte[] (which works in Region date)
1093 row["Texture"] = Convert.ToBase64String(appearance.Texture.GetBytes()); 1100 row["Texture"] = appearance.Texture.GetBytes();
1094 row["VisualParams"] = Convert.ToBase64String(appearance.VisualParams); 1101 row["VisualParams"] = appearance.VisualParams;
1095 1102
1096 row["Serial"] = appearance.Serial; 1103 row["Serial"] = appearance.Serial;
1097 row["AvatarHeight"] = appearance.AvatarHeight; 1104 row["AvatarHeight"] = appearance.AvatarHeight;
diff --git a/OpenSim/Data/SQLite/SQLiteUtils.cs b/OpenSim/Data/SQLite/SQLiteUtils.cs
index 4a835ce..07c6b69 100644
--- a/OpenSim/Data/SQLite/SQLiteUtils.cs
+++ b/OpenSim/Data/SQLite/SQLiteUtils.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using Mono.Data.SqliteClient; 30using Mono.Data.Sqlite;
31 31
32namespace OpenSim.Data.SQLite 32namespace OpenSim.Data.SQLite
33{ 33{
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index 5c93f88..0d211b6 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -29,7 +29,7 @@ using System;
29using System.Data; 29using System.Data;
30using System.Reflection; 30using System.Reflection;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using Mono.Data.SqliteClient; 32using Mono.Data.Sqlite;
33using log4net; 33using log4net;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
@@ -147,8 +147,8 @@ namespace OpenSim.Data.SQLite
147 } 147 }
148 148
149 reader.Close(); 149 reader.Close();
150 CloseReaderCommand(cmd); 150
151 151 //CloseCommand(cmd);
152 return perms; 152 return perms;
153 } 153 }
154 } 154 }
diff --git a/OpenSim/Data/SQLiteLegacy/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLiteLegacy/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..609a024
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Properties/AssemblyInfo.cs
@@ -0,0 +1,65 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Reflection;
29using System.Runtime.InteropServices;
30
31// General information about an assembly is controlled through the following
32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly.
34
35[assembly : AssemblyTitle("OpenSim.Data.SQLiteLegacy")]
36[assembly : AssemblyDescription("")]
37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("http://opensimulator.org")]
39[assembly : AssemblyProduct("OpenSim.Data.SQLiteLegacy")]
40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")]
43
44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type.
47
48[assembly : ComVisible(false)]
49
50// The following GUID is for the ID of the typelib if this project is exposed to COM
51
52[assembly : Guid("6113d5ce-4547-49f4-9236-0dcc503457b1")]
53
54// Version information for an assembly consists of the following four values:
55//
56// Major Version
57// Minor Version
58// Build Number
59// Revision
60//
61// You can specify all the values or you can default the Revision and Build Numbers
62// by using the '*' as shown below:
63
64[assembly : AssemblyVersion("0.6.5.*")]
65[assembly : AssemblyFileVersion("0.6.5.0")]
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/001_AssetStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/001_AssetStore.sql
new file mode 100644
index 0000000..2e026ca
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/001_AssetStore.sql
@@ -0,0 +1,12 @@
1BEGIN TRANSACTION;
2CREATE TABLE assets(
3 UUID varchar(255) primary key,
4 Name varchar(255),
5 Description varchar(255),
6 Type integer,
7 InvType integer,
8 Local integer,
9 Temporary integer,
10 Data blob);
11
12COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/001_InventoryStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/001_InventoryStore.sql
new file mode 100644
index 0000000..554d5c2
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/001_InventoryStore.sql
@@ -0,0 +1,32 @@
1BEGIN TRANSACTION;
2
3CREATE TABLE inventoryfolders(
4 UUID varchar(255) primary key,
5 name varchar(255),
6 agentID varchar(255),
7 parentID varchar(255),
8 type integer,
9 version integer);
10
11CREATE TABLE inventoryitems(
12 UUID varchar(255) primary key,
13 assetID varchar(255),
14 assetType integer,
15 invType integer,
16 parentFolderID varchar(255),
17 avatarID varchar(255),
18 creatorsID varchar(255),
19 inventoryName varchar(255),
20 inventoryDescription varchar(255),
21 inventoryNextPermissions integer,
22 inventoryCurrentPermissions integer,
23 inventoryBasePermissions integer,
24 inventoryEveryOnePermissions integer,
25 salePrice integer default 99,
26 saleType integer default 0,
27 creationDate integer default 2000,
28 groupID varchar(255) default '00000000-0000-0000-0000-000000000000',
29 groupOwned integer default 0,
30 flags integer default 0);
31
32COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/001_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/001_RegionStore.sql
new file mode 100644
index 0000000..39e8180
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/001_RegionStore.sql
@@ -0,0 +1,144 @@
1BEGIN TRANSACTION;
2
3CREATE TABLE prims(
4 UUID varchar(255) primary key,
5 RegionUUID varchar(255),
6 ParentID integer,
7 CreationDate integer,
8 Name varchar(255),
9 SceneGroupID varchar(255),
10 Text varchar(255),
11 Description varchar(255),
12 SitName varchar(255),
13 TouchName varchar(255),
14 CreatorID varchar(255),
15 OwnerID varchar(255),
16 GroupID varchar(255),
17 LastOwnerID varchar(255),
18 OwnerMask integer,
19 NextOwnerMask integer,
20 GroupMask integer,
21 EveryoneMask integer,
22 BaseMask integer,
23 PositionX float,
24 PositionY float,
25 PositionZ float,
26 GroupPositionX float,
27 GroupPositionY float,
28 GroupPositionZ float,
29 VelocityX float,
30 VelocityY float,
31 VelocityZ float,
32 AngularVelocityX float,
33 AngularVelocityY float,
34 AngularVelocityZ float,
35 AccelerationX float,
36 AccelerationY float,
37 AccelerationZ float,
38 RotationX float,
39 RotationY float,
40 RotationZ float,
41 RotationW float,
42 ObjectFlags integer,
43 SitTargetOffsetX float NOT NULL default 0,
44 SitTargetOffsetY float NOT NULL default 0,
45 SitTargetOffsetZ float NOT NULL default 0,
46 SitTargetOrientW float NOT NULL default 0,
47 SitTargetOrientX float NOT NULL default 0,
48 SitTargetOrientY float NOT NULL default 0,
49 SitTargetOrientZ float NOT NULL default 0);
50
51CREATE TABLE primshapes(
52 UUID varchar(255) primary key,
53 Shape integer,
54 ScaleX float,
55 ScaleY float,
56 ScaleZ float,
57 PCode integer,
58 PathBegin integer,
59 PathEnd integer,
60 PathScaleX integer,
61 PathScaleY integer,
62 PathShearX integer,
63 PathShearY integer,
64 PathSkew integer,
65 PathCurve integer,
66 PathRadiusOffset integer,
67 PathRevolutions integer,
68 PathTaperX integer,
69 PathTaperY integer,
70 PathTwist integer,
71 PathTwistBegin integer,
72 ProfileBegin integer,
73 ProfileEnd integer,
74 ProfileCurve integer,
75 ProfileHollow integer,
76 Texture blob,
77 ExtraParams blob,
78 State Integer NOT NULL default 0);
79
80CREATE TABLE primitems(
81 itemID varchar(255) primary key,
82 primID varchar(255),
83 assetID varchar(255),
84 parentFolderID varchar(255),
85 invType integer,
86 assetType integer,
87 name varchar(255),
88 description varchar(255),
89 creationDate integer,
90 creatorID varchar(255),
91 ownerID varchar(255),
92 lastOwnerID varchar(255),
93 groupID varchar(255),
94 nextPermissions string,
95 currentPermissions string,
96 basePermissions string,
97 everyonePermissions string,
98 groupPermissions string);
99
100CREATE TABLE terrain(
101 RegionUUID varchar(255),
102 Revision integer,
103 Heightfield blob);
104
105CREATE TABLE land(
106 UUID varchar(255) primary key,
107 RegionUUID varchar(255),
108 LocalLandID string,
109 Bitmap blob,
110 Name varchar(255),
111 Desc varchar(255),
112 OwnerUUID varchar(255),
113 IsGroupOwned string,
114 Area integer,
115 AuctionID integer,
116 Category integer,
117 ClaimDate integer,
118 ClaimPrice integer,
119 GroupUUID varchar(255),
120 SalePrice integer,
121 LandStatus integer,
122 LandFlags string,
123 LandingType string,
124 MediaAutoScale string,
125 MediaTextureUUID varchar(255),
126 MediaURL varchar(255),
127 MusicURL varchar(255),
128 PassHours float,
129 PassPrice string,
130 SnapshotUUID varchar(255),
131 UserLocationX float,
132 UserLocationY float,
133 UserLocationZ float,
134 UserLookAtX float,
135 UserLookAtY float,
136 UserLookAtZ float,
137 AuthbuyerID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000');
138
139CREATE TABLE landaccesslist(
140 LandUUID varchar(255),
141 AccessUUID varchar(255),
142 Flags string);
143
144COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/001_UserStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/001_UserStore.sql
new file mode 100644
index 0000000..b584594
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/001_UserStore.sql
@@ -0,0 +1,39 @@
1BEGIN TRANSACTION;
2
3-- users table
4CREATE TABLE users(
5 UUID varchar(255) primary key,
6 username varchar(255),
7 surname varchar(255),
8 passwordHash varchar(255),
9 passwordSalt varchar(255),
10 homeRegionX integer,
11 homeRegionY integer,
12 homeLocationX float,
13 homeLocationY float,
14 homeLocationZ float,
15 homeLookAtX float,
16 homeLookAtY float,
17 homeLookAtZ float,
18 created integer,
19 lastLogin integer,
20 rootInventoryFolderID varchar(255),
21 userInventoryURI varchar(255),
22 userAssetURI varchar(255),
23 profileCanDoMask integer,
24 profileWantDoMask integer,
25 profileAboutText varchar(255),
26 profileFirstText varchar(255),
27 profileImage varchar(255),
28 profileFirstImage varchar(255),
29 webLoginKey text default '00000000-0000-0000-0000-000000000000');
30-- friends table
31CREATE TABLE userfriends(
32 ownerID varchar(255),
33 friendID varchar(255),
34 friendPerms integer,
35 ownerPerms integer,
36 datetimestamp integer);
37
38COMMIT;
39
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/002_AssetStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/002_AssetStore.sql
new file mode 100644
index 0000000..5339b84
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/002_AssetStore.sql
@@ -0,0 +1,10 @@
1BEGIN TRANSACTION;
2
3CREATE TEMPORARY TABLE assets_backup(UUID,Name,Description,Type,Local,Temporary,Data);
4INSERT INTO assets_backup SELECT UUID,Name,Description,Type,Local,Temporary,Data FROM assets;
5DROP TABLE assets;
6CREATE TABLE assets(UUID,Name,Description,Type,Local,Temporary,Data);
7INSERT INTO assets SELECT UUID,Name,Description,Type,Local,Temporary,Data FROM assets_backup;
8DROP TABLE assets_backup;
9
10COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/002_InventoryStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/002_InventoryStore.sql
new file mode 100644
index 0000000..01951d6
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/002_InventoryStore.sql
@@ -0,0 +1,8 @@
1BEGIN TRANSACTION;
2
3create index inventoryfolders_agentid on inventoryfolders(agentid);
4create index inventoryfolders_parentid on inventoryfolders(parentid);
5create index inventoryitems_parentfolderid on inventoryitems(parentfolderid);
6create index inventoryitems_avatarid on inventoryitems(avatarid);
7
8COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/002_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/002_RegionStore.sql
new file mode 100644
index 0000000..c5c7c99
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/002_RegionStore.sql
@@ -0,0 +1,10 @@
1BEGIN TRANSACTION;
2
3CREATE TABLE regionban(
4 regionUUID varchar (255),
5 bannedUUID varchar (255),
6 bannedIp varchar (255),
7 bannedIpHostMask varchar (255)
8 );
9
10COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/002_UserStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/002_UserStore.sql
new file mode 100644
index 0000000..48fc680
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/002_UserStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3ALTER TABLE users add homeRegionID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
4
5COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/003_AssetStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/003_AssetStore.sql
new file mode 100644
index 0000000..f54f8d9
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/003_AssetStore.sql
@@ -0,0 +1 @@
DELETE FROM assets WHERE UUID = 'dc4b9f0bd00845c696a401dd947ac621'
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/003_InventoryStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/003_InventoryStore.sql
new file mode 100644
index 0000000..4c6da91
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/003_InventoryStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3alter table inventoryitems add column inventoryGroupPermissions integer unsigned not null default 0;
4
5COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/003_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/003_RegionStore.sql
new file mode 100644
index 0000000..4db2f75
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/003_RegionStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3ALTER TABLE primitems add flags integer not null default 0;
4
5COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/003_UserStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/003_UserStore.sql
new file mode 100644
index 0000000..6f890ee
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/003_UserStore.sql
@@ -0,0 +1,6 @@
1BEGIN;
2
3ALTER TABLE users add userFlags integer NOT NULL default 0;
4ALTER TABLE users add godLevel integer NOT NULL default 0;
5
6COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/004_AssetStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/004_AssetStore.sql
new file mode 100644
index 0000000..39421c4
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/004_AssetStore.sql
@@ -0,0 +1,7 @@
1BEGIN;
2
3update assets
4 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
5 where UUID not like '%-%';
6
7COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/004_InventoryStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/004_InventoryStore.sql
new file mode 100644
index 0000000..e8f4d46
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/004_InventoryStore.sql
@@ -0,0 +1,36 @@
1BEGIN;
2
3update inventoryitems
4 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
5 where UUID not like '%-%';
6
7update inventoryitems
8 set assetID = substr(assetID, 1, 8) || "-" || substr(assetID, 9, 4) || "-" || substr(assetID, 13, 4) || "-" || substr(assetID, 17, 4) || "-" || substr(assetID, 21, 12)
9 where assetID not like '%-%';
10
11update inventoryitems
12 set parentFolderID = substr(parentFolderID, 1, 8) || "-" || substr(parentFolderID, 9, 4) || "-" || substr(parentFolderID, 13, 4) || "-" || substr(parentFolderID, 17, 4) || "-" || substr(parentFolderID, 21, 12)
13 where parentFolderID not like '%-%';
14
15update inventoryitems
16 set avatarID = substr(avatarID, 1, 8) || "-" || substr(avatarID, 9, 4) || "-" || substr(avatarID, 13, 4) || "-" || substr(avatarID, 17, 4) || "-" || substr(avatarID, 21, 12)
17 where avatarID not like '%-%';
18
19update inventoryitems
20 set creatorsID = substr(creatorsID, 1, 8) || "-" || substr(creatorsID, 9, 4) || "-" || substr(creatorsID, 13, 4) || "-" || substr(creatorsID, 17, 4) || "-" || substr(creatorsID, 21, 12)
21 where creatorsID not like '%-%';
22
23
24update inventoryfolders
25 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
26 where UUID not like '%-%';
27
28update inventoryfolders
29 set agentID = substr(agentID, 1, 8) || "-" || substr(agentID, 9, 4) || "-" || substr(agentID, 13, 4) || "-" || substr(agentID, 17, 4) || "-" || substr(agentID, 21, 12)
30 where agentID not like '%-%';
31
32update inventoryfolders
33 set parentID = substr(parentID, 1, 8) || "-" || substr(parentID, 9, 4) || "-" || substr(parentID, 13, 4) || "-" || substr(parentID, 17, 4) || "-" || substr(parentID, 21, 12)
34 where parentID not like '%-%';
35
36COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/004_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/004_RegionStore.sql
new file mode 100644
index 0000000..de328cb
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/004_RegionStore.sql
@@ -0,0 +1,38 @@
1BEGIN;
2
3create table regionsettings (
4 regionUUID char(36) not null,
5 block_terraform integer not null,
6 block_fly integer not null,
7 allow_damage integer not null,
8 restrict_pushing integer not null,
9 allow_land_resell integer not null,
10 allow_land_join_divide integer not null,
11 block_show_in_search integer not null,
12 agent_limit integer not null,
13 object_bonus float not null,
14 maturity integer not null,
15 disable_scripts integer not null,
16 disable_collisions integer not null,
17 disable_physics integer not null,
18 terrain_texture_1 char(36) not null,
19 terrain_texture_2 char(36) not null,
20 terrain_texture_3 char(36) not null,
21 terrain_texture_4 char(36) not null,
22 elevation_1_nw float not null,
23 elevation_2_nw float not null,
24 elevation_1_ne float not null,
25 elevation_2_ne float not null,
26 elevation_1_se float not null,
27 elevation_2_se float not null,
28 elevation_1_sw float not null,
29 elevation_2_sw float not null,
30 water_height float not null,
31 terrain_raise_limit float not null,
32 terrain_lower_limit float not null,
33 use_estate_sun integer not null,
34 fixed_sun integer not null,
35 sun_position float not null,
36 covenant char(36));
37
38COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/004_UserStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/004_UserStore.sql
new file mode 100644
index 0000000..03142af
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/004_UserStore.sql
@@ -0,0 +1,6 @@
1BEGIN;
2
3ALTER TABLE users add customType varchar(32) not null default '';
4ALTER TABLE users add partner char(36) not null default '00000000-0000-0000-0000-000000000000';
5
6COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/005_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/005_RegionStore.sql
new file mode 100644
index 0000000..1f6d1bd
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/005_RegionStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3delete from regionsettings;
4
5COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/005_UserStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/005_UserStore.sql
new file mode 100644
index 0000000..e45c09a
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/005_UserStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3CREATE TABLE `avatarattachments` (`UUID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', `attachpoint` int(11) NOT NULL DEFAULT 0, `item` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', `asset` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000');
4
5COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/006_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/006_RegionStore.sql
new file mode 100644
index 0000000..94ed818
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/006_RegionStore.sql
@@ -0,0 +1,102 @@
1BEGIN TRANSACTION;
2
3CREATE TABLE estate_groups (
4 EstateID int(10) NOT NULL,
5 uuid char(36) NOT NULL
6);
7
8CREATE TABLE estate_managers (
9 EstateID int(10) NOT NULL,
10 uuid char(36) NOT NULL
11);
12
13CREATE TABLE estate_map (
14 RegionID char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
15 EstateID int(11) NOT NULL
16);
17
18CREATE TABLE estate_settings (
19 EstateID INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
20 EstateName varchar(64) default NULL,
21 AbuseEmailToEstateOwner tinyint(4) NOT NULL,
22 DenyAnonymous tinyint(4) NOT NULL,
23 ResetHomeOnTeleport tinyint(4) NOT NULL,
24 FixedSun tinyint(4) NOT NULL,
25 DenyTransacted tinyint(4) NOT NULL,
26 BlockDwell tinyint(4) NOT NULL,
27 DenyIdentified tinyint(4) NOT NULL,
28 AllowVoice tinyint(4) NOT NULL,
29 UseGlobalTime tinyint(4) NOT NULL,
30 PricePerMeter int(11) NOT NULL,
31 TaxFree tinyint(4) NOT NULL,
32 AllowDirectTeleport tinyint(4) NOT NULL,
33 RedirectGridX int(11) NOT NULL,
34 RedirectGridY int(11) NOT NULL,
35 ParentEstateID int(10) NOT NULL,
36 SunPosition double NOT NULL,
37 EstateSkipScripts tinyint(4) NOT NULL,
38 BillableFactor float NOT NULL,
39 PublicAccess tinyint(4) NOT NULL
40);
41insert into estate_settings (EstateID,EstateName,AbuseEmailToEstateOwner,DenyAnonymous,ResetHomeOnTeleport,FixedSun,DenyTransacted,BlockDwell,DenyIdentified,AllowVoice,UseGlobalTime,PricePerMeter,TaxFree,AllowDirectTeleport,RedirectGridX,RedirectGridY,ParentEstateID,SunPosition,PublicAccess,EstateSkipScripts,BillableFactor) values ( 99, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
42delete from estate_settings;
43CREATE TABLE estate_users (
44 EstateID int(10) NOT NULL,
45 uuid char(36) NOT NULL
46);
47
48CREATE TABLE estateban (
49 EstateID int(10) NOT NULL,
50 bannedUUID varchar(36) NOT NULL,
51 bannedIp varchar(16) NOT NULL,
52 bannedIpHostMask varchar(16) NOT NULL,
53 bannedNameMask varchar(64) default NULL
54);
55
56drop table regionsettings;
57CREATE TABLE regionsettings (
58 regionUUID char(36) NOT NULL,
59 block_terraform int(11) NOT NULL,
60 block_fly int(11) NOT NULL,
61 allow_damage int(11) NOT NULL,
62 restrict_pushing int(11) NOT NULL,
63 allow_land_resell int(11) NOT NULL,
64 allow_land_join_divide int(11) NOT NULL,
65 block_show_in_search int(11) NOT NULL,
66 agent_limit int(11) NOT NULL,
67 object_bonus float NOT NULL,
68 maturity int(11) NOT NULL,
69 disable_scripts int(11) NOT NULL,
70 disable_collisions int(11) NOT NULL,
71 disable_physics int(11) NOT NULL,
72 terrain_texture_1 char(36) NOT NULL,
73 terrain_texture_2 char(36) NOT NULL,
74 terrain_texture_3 char(36) NOT NULL,
75 terrain_texture_4 char(36) NOT NULL,
76 elevation_1_nw float NOT NULL,
77 elevation_2_nw float NOT NULL,
78 elevation_1_ne float NOT NULL,
79 elevation_2_ne float NOT NULL,
80 elevation_1_se float NOT NULL,
81 elevation_2_se float NOT NULL,
82 elevation_1_sw float NOT NULL,
83 elevation_2_sw float NOT NULL,
84 water_height float NOT NULL,
85 terrain_raise_limit float NOT NULL,
86 terrain_lower_limit float NOT NULL,
87 use_estate_sun int(11) NOT NULL,
88 fixed_sun int(11) NOT NULL,
89 sun_position float NOT NULL,
90 covenant char(36) default NULL,
91 Sandbox tinyint(4) NOT NULL,
92 PRIMARY KEY (regionUUID)
93);
94
95CREATE INDEX estate_ban_estate_id on estateban(EstateID);
96CREATE INDEX estate_groups_estate_id on estate_groups(EstateID);
97CREATE INDEX estate_managers_estate_id on estate_managers(EstateID);
98CREATE INDEX estate_map_estate_id on estate_map(EstateID);
99CREATE UNIQUE INDEX estate_map_region_id on estate_map(RegionID);
100CREATE INDEX estate_users_estate_id on estate_users(EstateID);
101
102COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/006_UserStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/006_UserStore.sql
new file mode 100644
index 0000000..f9454c5
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/006_UserStore.sql
@@ -0,0 +1,20 @@
1BEGIN TRANSACTION;
2
3-- usersagents table
4CREATE TABLE IF NOT EXISTS useragents(
5 UUID varchar(255) primary key,
6 agentIP varchar(255),
7 agentPort integer,
8 agentOnline boolean,
9 sessionID varchar(255),
10 secureSessionID varchar(255),
11 regionID varchar(255),
12 loginTime integer,
13 logoutTime integer,
14 currentRegion varchar(255),
15 currentHandle varchar(255),
16 currentPosX float,
17 currentPosY float,
18 currentPosZ float);
19
20COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/007_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/007_RegionStore.sql
new file mode 100644
index 0000000..1c813a0
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/007_RegionStore.sql
@@ -0,0 +1,8 @@
1begin;
2
3alter table estate_settings add column AbuseEmail varchar(255) not null default '';
4
5alter table estate_settings add column EstateOwner varchar(36) not null default '';
6
7commit;
8
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/007_UserStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/007_UserStore.sql
new file mode 100644
index 0000000..8b0cd28
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/007_UserStore.sql
@@ -0,0 +1,7 @@
1BEGIN TRANSACTION;
2
3ALTER TABLE useragents add currentLookAtX float not null default 128;
4ALTER TABLE useragents add currentLookAtY float not null default 128;
5ALTER TABLE useragents add currentLookAtZ float not null default 70;
6
7COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/008_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/008_RegionStore.sql
new file mode 100644
index 0000000..28bfbf5
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/008_RegionStore.sql
@@ -0,0 +1,6 @@
1begin;
2
3alter table estate_settings add column DenyMinors tinyint not null default 0;
4
5commit;
6
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/008_UserStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/008_UserStore.sql
new file mode 100644
index 0000000..97da818
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/008_UserStore.sql
@@ -0,0 +1,5 @@
1BEGIN TRANSACTION;
2
3ALTER TABLE users add email varchar(250);
4
5COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/009_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/009_RegionStore.sql
new file mode 100644
index 0000000..1f40548
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/009_RegionStore.sql
@@ -0,0 +1,8 @@
1BEGIN;
2
3ALTER TABLE prims ADD COLUMN ColorR integer not null default 0;
4ALTER TABLE prims ADD COLUMN ColorG integer not null default 0;
5ALTER TABLE prims ADD COLUMN ColorB integer not null default 0;
6ALTER TABLE prims ADD COLUMN ColorA integer not null default 0;
7
8COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/009_UserStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/009_UserStore.sql
new file mode 100644
index 0000000..8ab03ef
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/009_UserStore.sql
@@ -0,0 +1,11 @@
1BEGIN;
2
3update users
4 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
5 where UUID not like '%-%';
6
7update useragents
8 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
9 where UUID not like '%-%';
10
11COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/010_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/010_RegionStore.sql
new file mode 100644
index 0000000..b91ccf0
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/010_RegionStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3ALTER TABLE prims ADD COLUMN ClickAction INTEGER NOT NULL default 0;
4
5COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/010_UserStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/010_UserStore.sql
new file mode 100644
index 0000000..5f956da
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/010_UserStore.sql
@@ -0,0 +1,37 @@
1BEGIN TRANSACTION;
2
3CREATE TABLE IF NOT EXISTS avatarappearance(
4 Owner varchar(36) NOT NULL primary key,
5 BodyItem varchar(36) DEFAULT NULL,
6 BodyAsset varchar(36) DEFAULT NULL,
7 SkinItem varchar(36) DEFAULT NULL,
8 SkinAsset varchar(36) DEFAULT NULL,
9 HairItem varchar(36) DEFAULT NULL,
10 HairAsset varchar(36) DEFAULT NULL,
11 EyesItem varchar(36) DEFAULT NULL,
12 EyesAsset varchar(36) DEFAULT NULL,
13 ShirtItem varchar(36) DEFAULT NULL,
14 ShirtAsset varchar(36) DEFAULT NULL,
15 PantsItem varchar(36) DEFAULT NULL,
16 PantsAsset varchar(36) DEFAULT NULL,
17 ShoesItem varchar(36) DEFAULT NULL,
18 ShoesAsset varchar(36) DEFAULT NULL,
19 SocksItem varchar(36) DEFAULT NULL,
20 SocksAsset varchar(36) DEFAULT NULL,
21 JacketItem varchar(36) DEFAULT NULL,
22 JacketAsset varchar(36) DEFAULT NULL,
23 GlovesItem varchar(36) DEFAULT NULL,
24 GlovesAsset varchar(36) DEFAULT NULL,
25 UnderShirtItem varchar(36) DEFAULT NULL,
26 UnderShirtAsset varchar(36) DEFAULT NULL,
27 UnderPantsItem varchar(36) DEFAULT NULL,
28 UnderPantsAsset varchar(36) DEFAULT NULL,
29 SkirtItem varchar(36) DEFAULT NULL,
30 SkirtAsset varchar(36) DEFAULT NULL,
31 Texture blob,
32 VisualParams blob,
33 Serial int DEFAULT NULL,
34 AvatarHeight float DEFAULT NULL
35);
36
37COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/011_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/011_RegionStore.sql
new file mode 100644
index 0000000..42bef89
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/011_RegionStore.sql
@@ -0,0 +1,28 @@
1BEGIN;
2
3ALTER TABLE prims ADD COLUMN PayPrice INTEGER NOT NULL default 0;
4ALTER TABLE prims ADD COLUMN PayButton1 INTEGER NOT NULL default 0;
5ALTER TABLE prims ADD COLUMN PayButton2 INTEGER NOT NULL default 0;
6ALTER TABLE prims ADD COLUMN PayButton3 INTEGER NOT NULL default 0;
7ALTER TABLE prims ADD COLUMN PayButton4 INTEGER NOT NULL default 0;
8ALTER TABLE prims ADD COLUMN LoopedSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
9ALTER TABLE prims ADD COLUMN LoopedSoundGain float NOT NULL default 0;
10ALTER TABLE prims ADD COLUMN TextureAnimation string;
11ALTER TABLE prims ADD COLUMN ParticleSystem string;
12ALTER TABLE prims ADD COLUMN OmegaX float NOT NULL default 0;
13ALTER TABLE prims ADD COLUMN OmegaY float NOT NULL default 0;
14ALTER TABLE prims ADD COLUMN OmegaZ float NOT NULL default 0;
15ALTER TABLE prims ADD COLUMN CameraEyeOffsetX float NOT NULL default 0;
16ALTER TABLE prims ADD COLUMN CameraEyeOffsetY float NOT NULL default 0;
17ALTER TABLE prims ADD COLUMN CameraEyeOffsetZ float NOT NULL default 0;
18ALTER TABLE prims ADD COLUMN CameraAtOffsetX float NOT NULL default 0;
19ALTER TABLE prims ADD COLUMN CameraAtOffsetY float NOT NULL default 0;
20ALTER TABLE prims ADD COLUMN CameraAtOffsetZ float NOT NULL default 0;
21ALTER TABLE prims ADD COLUMN ForceMouselook string NOT NULL default 0;
22ALTER TABLE prims ADD COLUMN ScriptAccessPin INTEGER NOT NULL default 0;
23ALTER TABLE prims ADD COLUMN AllowedDrop INTEGER NOT NULL default 0;
24ALTER TABLE prims ADD COLUMN DieAtEdge string NOT NULL default 0;
25ALTER TABLE prims ADD COLUMN SalePrice INTEGER NOT NULL default 0;
26ALTER TABLE prims ADD COLUMN SaleType string NOT NULL default 0;
27
28COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/012_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/012_RegionStore.sql
new file mode 100644
index 0000000..d952b78
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/012_RegionStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3ALTER TABLE prims ADD COLUMN Material INTEGER NOT NULL default 3;
4
5COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/013_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/013_RegionStore.sql
new file mode 100644
index 0000000..11529cd
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/013_RegionStore.sql
@@ -0,0 +1,6 @@
1BEGIN;
2
3ALTER TABLE land ADD COLUMN OtherCleanTime INTEGER NOT NULL default 0;
4ALTER TABLE land ADD COLUMN Dwell INTEGER NOT NULL default 0;
5
6COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/014_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/014_RegionStore.sql
new file mode 100644
index 0000000..c59b27e
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/014_RegionStore.sql
@@ -0,0 +1,8 @@
1begin;
2
3ALTER TABLE regionsettings ADD COLUMN sunvectorx double NOT NULL default 0;
4ALTER TABLE regionsettings ADD COLUMN sunvectory double NOT NULL default 0;
5ALTER TABLE regionsettings ADD COLUMN sunvectorz double NOT NULL default 0;
6
7commit;
8
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/015_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/015_RegionStore.sql
new file mode 100644
index 0000000..c43f356
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/015_RegionStore.sql
@@ -0,0 +1,6 @@
1BEGIN;
2
3ALTER TABLE prims ADD COLUMN CollisionSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
4ALTER TABLE prims ADD COLUMN CollisionSoundVolume float NOT NULL default 0;
5
6COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/016_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/016_RegionStore.sql
new file mode 100644
index 0000000..52f160c
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/016_RegionStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3ALTER TABLE prims ADD COLUMN VolumeDetect INTEGER NOT NULL DEFAULT 0;
4
5COMMIT;
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/017_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/017_RegionStore.sql
new file mode 100644
index 0000000..6c6b7b5
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/017_RegionStore.sql
@@ -0,0 +1,8 @@
1BEGIN;
2CREATE TEMPORARY TABLE prims_backup(UUID,RegionUUID,CreationDate,Name,SceneGroupID,Text,Description,SitName,TouchName,CreatorID,OwnerID,GroupID,LastOwnerID,OwnerMask,NextOwnerMask,GroupMask,EveryoneMask,BaseMask,PositionX,PositionY,PositionZ,GroupPositionX,GroupPositionY,GroupPositionZ,VelocityX,VelocityY,VelocityZ,AngularVelocityX,AngularVelocityY,AngularVelocityZ,AccelerationX,AccelerationY,AccelerationZ,RotationX,RotationY,RotationZ,RotationW,ObjectFlags,SitTargetOffsetX,SitTargetOffsetY,SitTargetOffsetZ,SitTargetOrientW,SitTargetOrientX,SitTargetOrientY,SitTargetOrientZ,ColorR,ColorG,ColorB,ColorA,ClickAction,PayPrice,PayButton1,PayButton2,PayButton3,PayButton4,LoopedSound,LoopedSoundGain,TextureAnimation,ParticleSystem,OmegaX,OmegaY,OmegaZ,CameraEyeOffsetX,CameraEyeOffsetY,CameraEyeOffsetZ,CameraAtOffsetX,CameraAtOffsetY,CameraAtOffsetZ,ForceMouselook,ScriptAccessPin,AllowedDrop,DieAtEdge,SalePrice,SaleType,Material,CollisionSound,CollisionSoundVolume,VolumeDetect);
3INSERT INTO prims_backup SELECT UUID,RegionUUID,CreationDate,Name,SceneGroupID,Text,Description,SitName,TouchName,CreatorID,OwnerID,GroupID,LastOwnerID,OwnerMask,NextOwnerMask,GroupMask,EveryoneMask,BaseMask,PositionX,PositionY,PositionZ,GroupPositionX,GroupPositionY,GroupPositionZ,VelocityX,VelocityY,VelocityZ,AngularVelocityX,AngularVelocityY,AngularVelocityZ,AccelerationX,AccelerationY,AccelerationZ,RotationX,RotationY,RotationZ,RotationW,ObjectFlags,SitTargetOffsetX,SitTargetOffsetY,SitTargetOffsetZ,SitTargetOrientW,SitTargetOrientX,SitTargetOrientY,SitTargetOrientZ,ColorR,ColorG,ColorB,ColorA,ClickAction,PayPrice,PayButton1,PayButton2,PayButton3,PayButton4,LoopedSound,LoopedSoundGain,TextureAnimation,ParticleSystem,OmegaX,OmegaY,OmegaZ,CameraEyeOffsetX,CameraEyeOffsetY,CameraEyeOffsetZ,CameraAtOffsetX,CameraAtOffsetY,CameraAtOffsetZ,ForceMouselook,ScriptAccessPin,AllowedDrop,DieAtEdge,SalePrice,SaleType,Material,CollisionSound,CollisionSoundVolume,VolumeDetect FROM prims;
4DROP TABLE prims;
5CREATE TABLE prims(UUID,RegionUUID,CreationDate,Name,SceneGroupID,Text,Description,SitName,TouchName,CreatorID,OwnerID,GroupID,LastOwnerID,OwnerMask,NextOwnerMask,GroupMask,EveryoneMask,BaseMask,PositionX,PositionY,PositionZ,GroupPositionX,GroupPositionY,GroupPositionZ,VelocityX,VelocityY,VelocityZ,AngularVelocityX,AngularVelocityY,AngularVelocityZ,AccelerationX,AccelerationY,AccelerationZ,RotationX,RotationY,RotationZ,RotationW,ObjectFlags,SitTargetOffsetX,SitTargetOffsetY,SitTargetOffsetZ,SitTargetOrientW,SitTargetOrientX,SitTargetOrientY,SitTargetOrientZ,ColorR,ColorG,ColorB,ColorA,ClickAction,PayPrice,PayButton1,PayButton2,PayButton3,PayButton4,LoopedSound,LoopedSoundGain,TextureAnimation,ParticleSystem,OmegaX,OmegaY,OmegaZ,CameraEyeOffsetX,CameraEyeOffsetY,CameraEyeOffsetZ,CameraAtOffsetX,CameraAtOffsetY,CameraAtOffsetZ,ForceMouselook,ScriptAccessPin,AllowedDrop,DieAtEdge,SalePrice,SaleType,Material,CollisionSound,CollisionSoundVolume,VolumeDetect);
6INSERT INTO prims SELECT UUID,RegionUUID,CreationDate,Name,SceneGroupID,Text,Description,SitName,TouchName,CreatorID,OwnerID,GroupID,LastOwnerID,OwnerMask,NextOwnerMask,GroupMask,EveryoneMask,BaseMask,PositionX,PositionY,PositionZ,GroupPositionX,GroupPositionY,GroupPositionZ,VelocityX,VelocityY,VelocityZ,AngularVelocityX,AngularVelocityY,AngularVelocityZ,AccelerationX,AccelerationY,AccelerationZ,RotationX,RotationY,RotationZ,RotationW,ObjectFlags,SitTargetOffsetX,SitTargetOffsetY,SitTargetOffsetZ,SitTargetOrientW,SitTargetOrientX,SitTargetOrientY,SitTargetOrientZ,ColorR,ColorG,ColorB,ColorA,ClickAction,PayPrice,PayButton1,PayButton2,PayButton3,PayButton4,LoopedSound,LoopedSoundGain,TextureAnimation,ParticleSystem,OmegaX,OmegaY,OmegaZ,CameraEyeOffsetX,CameraEyeOffsetY,CameraEyeOffsetZ,CameraAtOffsetX,CameraAtOffsetY,CameraAtOffsetZ,ForceMouselook,ScriptAccessPin,AllowedDrop,DieAtEdge,SalePrice,SaleType,Material,CollisionSound,CollisionSoundVolume,VolumeDetect FROM prims_backup;
7DROP TABLE prims_backup;
8COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/018_RegionStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/018_RegionStore.sql
new file mode 100644
index 0000000..6a390c2
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/018_RegionStore.sql
@@ -0,0 +1,79 @@
1BEGIN;
2
3update terrain
4 set RegionUUID = substr(RegionUUID, 1, 8) || "-" || substr(RegionUUID, 9, 4) || "-" || substr(RegionUUID, 13, 4) || "-" || substr(RegionUUID, 17, 4) || "-" || substr(RegionUUID, 21, 12)
5 where RegionUUID not like '%-%';
6
7
8update landaccesslist
9 set LandUUID = substr(LandUUID, 1, 8) || "-" || substr(LandUUID, 9, 4) || "-" || substr(LandUUID, 13, 4) || "-" || substr(LandUUID, 17, 4) || "-" || substr(LandUUID, 21, 12)
10 where LandUUID not like '%-%';
11
12update landaccesslist
13 set AccessUUID = substr(AccessUUID, 1, 8) || "-" || substr(AccessUUID, 9, 4) || "-" || substr(AccessUUID, 13, 4) || "-" || substr(AccessUUID, 17, 4) || "-" || substr(AccessUUID, 21, 12)
14 where AccessUUID not like '%-%';
15
16
17update prims
18 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
19 where UUID not like '%-%';
20
21update prims
22 set RegionUUID = substr(RegionUUID, 1, 8) || "-" || substr(RegionUUID, 9, 4) || "-" || substr(RegionUUID, 13, 4) || "-" || substr(RegionUUID, 17, 4) || "-" || substr(RegionUUID, 21, 12)
23 where RegionUUID not like '%-%';
24
25update prims
26 set SceneGroupID = substr(SceneGroupID, 1, 8) || "-" || substr(SceneGroupID, 9, 4) || "-" || substr(SceneGroupID, 13, 4) || "-" || substr(SceneGroupID, 17, 4) || "-" || substr(SceneGroupID, 21, 12)
27 where SceneGroupID not like '%-%';
28
29update prims
30 set CreatorID = substr(CreatorID, 1, 8) || "-" || substr(CreatorID, 9, 4) || "-" || substr(CreatorID, 13, 4) || "-" || substr(CreatorID, 17, 4) || "-" || substr(CreatorID, 21, 12)
31 where CreatorID not like '%-%';
32
33update prims
34 set OwnerID = substr(OwnerID, 1, 8) || "-" || substr(OwnerID, 9, 4) || "-" || substr(OwnerID, 13, 4) || "-" || substr(OwnerID, 17, 4) || "-" || substr(OwnerID, 21, 12)
35 where OwnerID not like '%-%';
36
37update prims
38 set GroupID = substr(GroupID, 1, 8) || "-" || substr(GroupID, 9, 4) || "-" || substr(GroupID, 13, 4) || "-" || substr(GroupID, 17, 4) || "-" || substr(GroupID, 21, 12)
39 where GroupID not like '%-%';
40
41update prims
42 set LastOwnerID = substr(LastOwnerID, 1, 8) || "-" || substr(LastOwnerID, 9, 4) || "-" || substr(LastOwnerID, 13, 4) || "-" || substr(LastOwnerID, 17, 4) || "-" || substr(LastOwnerID, 21, 12)
43 where LastOwnerID not like '%-%';
44
45
46update primshapes
47 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
48 where UUID not like '%-%';
49
50
51update land
52 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
53 where UUID not like '%-%';
54
55update land
56 set RegionUUID = substr(RegionUUID, 1, 8) || "-" || substr(RegionUUID, 9, 4) || "-" || substr(RegionUUID, 13, 4) || "-" || substr(RegionUUID, 17, 4) || "-" || substr(RegionUUID, 21, 12)
57 where RegionUUID not like '%-%';
58
59update land
60 set OwnerUUID = substr(OwnerUUID, 1, 8) || "-" || substr(OwnerUUID, 9, 4) || "-" || substr(OwnerUUID, 13, 4) || "-" || substr(OwnerUUID, 17, 4) || "-" || substr(OwnerUUID, 21, 12)
61 where OwnerUUID not like '%-%';
62
63update land
64 set GroupUUID = substr(GroupUUID, 1, 8) || "-" || substr(GroupUUID, 9, 4) || "-" || substr(GroupUUID, 13, 4) || "-" || substr(GroupUUID, 17, 4) || "-" || substr(GroupUUID, 21, 12)
65 where GroupUUID not like '%-%';
66
67update land
68 set MediaTextureUUID = substr(MediaTextureUUID, 1, 8) || "-" || substr(MediaTextureUUID, 9, 4) || "-" || substr(MediaTextureUUID, 13, 4) || "-" || substr(MediaTextureUUID, 17, 4) || "-" || substr(MediaTextureUUID, 21, 12)
69 where MediaTextureUUID not like '%-%';
70
71update land
72 set SnapshotUUID = substr(SnapshotUUID, 1, 8) || "-" || substr(SnapshotUUID, 9, 4) || "-" || substr(SnapshotUUID, 13, 4) || "-" || substr(SnapshotUUID, 17, 4) || "-" || substr(SnapshotUUID, 21, 12)
73 where SnapshotUUID not like '%-%';
74
75update land
76 set AuthbuyerID = substr(AuthbuyerID, 1, 8) || "-" || substr(AuthbuyerID, 9, 4) || "-" || substr(AuthbuyerID, 13, 4) || "-" || substr(AuthbuyerID, 17, 4) || "-" || substr(AuthbuyerID, 21, 12)
77 where AuthbuyerID not like '%-%';
78
79COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/SQLiteLegacy/Resources/OpenSim.Data.SQLite.addin.xml b/OpenSim/Data/SQLiteLegacy/Resources/OpenSim.Data.SQLite.addin.xml
new file mode 100644
index 0000000..e6764fa
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/OpenSim.Data.SQLite.addin.xml
@@ -0,0 +1,20 @@
1<Addin id="OpenSim.Data.SQLite" version="0.1">
2 <Runtime>
3 <Import assembly="OpenSim.Data.SQLite.dll"/>
4 </Runtime>
5 <Dependencies>
6 <Addin id="OpenSim.Data" version="0.5" />
7 </Dependencies>
8 <Extension path = "/OpenSim/GridData">
9 <Plugin id="SQLiteGridData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" />
10 </Extension>
11 <Extension path = "/OpenSim/AssetData">
12 <Plugin id="SQLiteAssetData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteAssetData" />
13 </Extension>
14 <Extension path = "/OpenSim/InventoryData">
15 <Plugin id="SQLiteInventoryData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteInventoryStore" />
16 </Extension>
17 <Extension path = "/OpenSim/UserData">
18 <Plugin id="SQLiteUserData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteUserData" />
19 </Extension>
20</Addin>
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs
new file mode 100644
index 0000000..23cdfd4
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs
@@ -0,0 +1,342 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Data;
30using System.Reflection;
31using System.Collections.Generic;
32using log4net;
33using Mono.Data.SqliteClient;
34using OpenMetaverse;
35using OpenSim.Framework;
36
37namespace OpenSim.Data.SQLiteLegacy
38{
39 /// <summary>
40 /// An asset storage interface for the SQLite database system
41 /// </summary>
42 public class SQLiteAssetData : AssetDataBase
43 {
44// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45
46 private const string SelectAssetSQL = "select * from assets where UUID=:UUID";
47 private const string SelectAssetMetadataSQL = "select Name, Description, Type, Temporary, UUID from assets limit :start, :count";
48 private const string DeleteAssetSQL = "delete from assets where UUID=:UUID";
49 private const string InsertAssetSQL = "insert into assets(UUID, Name, Description, Type, Local, Temporary, Data) values(:UUID, :Name, :Description, :Type, :Local, :Temporary, :Data)";
50 private const string UpdateAssetSQL = "update assets set Name=:Name, Description=:Description, Type=:Type, Local=:Local, Temporary=:Temporary, Data=:Data where UUID=:UUID";
51 private const string assetSelect = "select * from assets";
52
53 private SqliteConnection m_conn;
54
55 override public void Dispose()
56 {
57 if (m_conn != null)
58 {
59 m_conn.Close();
60 m_conn = null;
61 }
62 }
63
64 /// <summary>
65 /// <list type="bullet">
66 /// <item>Initialises AssetData interface</item>
67 /// <item>Loads and initialises a new SQLite connection and maintains it.</item>
68 /// <item>use default URI if connect string is empty.</item>
69 /// </list>
70 /// </summary>
71 /// <param name="dbconnect">connect string</param>
72 override public void Initialise(string dbconnect)
73 {
74 if (dbconnect == string.Empty)
75 {
76 dbconnect = "URI=file:Asset.db,version=3";
77 }
78 m_conn = new SqliteConnection(dbconnect);
79 m_conn.Open();
80
81 Assembly assem = GetType().Assembly;
82 Migration m = new Migration(m_conn, assem, "AssetStore");
83 m.Update();
84
85 return;
86 }
87
88 /// <summary>
89 /// Fetch Asset
90 /// </summary>
91 /// <param name="uuid">UUID of ... ?</param>
92 /// <returns>Asset base</returns>
93 override public AssetBase GetAsset(UUID uuid)
94 {
95 lock (this)
96 {
97 using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn))
98 {
99 cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString()));
100 using (IDataReader reader = cmd.ExecuteReader())
101 {
102 if (reader.Read())
103 {
104 AssetBase asset = buildAsset(reader);
105 reader.Close();
106 return asset;
107 }
108 else
109 {
110 reader.Close();
111 return null;
112 }
113 }
114 }
115 }
116 }
117
118 /// <summary>
119 /// Create an asset
120 /// </summary>
121 /// <param name="asset">Asset Base</param>
122 override public void StoreAsset(AssetBase asset)
123 {
124 //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
125 if (ExistsAsset(asset.FullID))
126 {
127 //LogAssetLoad(asset);
128
129 lock (this)
130 {
131 using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
132 {
133 cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
134 cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
135 cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
136 cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
137 cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
138 cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
139 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
140
141 cmd.ExecuteNonQuery();
142 }
143 }
144 }
145 else
146 {
147 lock (this)
148 {
149 using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
150 {
151 cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
152 cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
153 cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
154 cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
155 cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
156 cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
157 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
158
159 cmd.ExecuteNonQuery();
160 }
161 }
162 }
163 }
164
165// /// <summary>
166// /// Some... logging functionnality
167// /// </summary>
168// /// <param name="asset"></param>
169// private static void LogAssetLoad(AssetBase asset)
170// {
171// string temporary = asset.Temporary ? "Temporary" : "Stored";
172// string local = asset.Local ? "Local" : "Remote";
173//
174// int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
175//
176// m_log.Debug("[ASSET DB]: " +
177// string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)",
178// asset.FullID, asset.Name, asset.Description, asset.Type,
179// temporary, local, assetLength));
180// }
181
182 /// <summary>
183 /// Check if an asset exist in database
184 /// </summary>
185 /// <param name="uuid">The asset UUID</param>
186 /// <returns>True if exist, or false.</returns>
187 override public bool ExistsAsset(UUID uuid)
188 {
189 lock (this) {
190 using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn))
191 {
192 cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString()));
193 using (IDataReader reader = cmd.ExecuteReader())
194 {
195 if (reader.Read())
196 {
197 reader.Close();
198 return true;
199 }
200 else
201 {
202 reader.Close();
203 return false;
204 }
205 }
206 }
207 }
208 }
209
210 /// <summary>
211 /// Delete an asset from database
212 /// </summary>
213 /// <param name="uuid"></param>
214 public void DeleteAsset(UUID uuid)
215 {
216 using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
217 {
218 cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString()));
219
220 cmd.ExecuteNonQuery();
221 }
222 }
223
224 /// <summary>
225 ///
226 /// </summary>
227 /// <param name="row"></param>
228 /// <returns></returns>
229 private static AssetBase buildAsset(IDataReader row)
230 {
231 // TODO: this doesn't work yet because something more
232 // interesting has to be done to actually get these values
233 // back out. Not enough time to figure it out yet.
234 AssetBase asset = new AssetBase(
235 new UUID((String)row["UUID"]),
236 (String)row["Name"],
237 Convert.ToSByte(row["Type"])
238 );
239
240 asset.Description = (String) row["Description"];
241 asset.Local = Convert.ToBoolean(row["Local"]);
242 asset.Temporary = Convert.ToBoolean(row["Temporary"]);
243 asset.Data = (byte[]) row["Data"];
244 return asset;
245 }
246
247 private static AssetMetadata buildAssetMetadata(IDataReader row)
248 {
249 AssetMetadata metadata = new AssetMetadata();
250
251 metadata.FullID = new UUID((string) row["UUID"]);
252 metadata.Name = (string) row["Name"];
253 metadata.Description = (string) row["Description"];
254 metadata.Type = Convert.ToSByte(row["Type"]);
255 metadata.Temporary = Convert.ToBoolean(row["Temporary"]); // Not sure if this is correct.
256
257 // Current SHA1s are not stored/computed.
258 metadata.SHA1 = new byte[] {};
259
260 return metadata;
261 }
262
263 /// <summary>
264 /// Returns a list of AssetMetadata objects. The list is a subset of
265 /// the entire data set offset by <paramref name="start" /> containing
266 /// <paramref name="count" /> elements.
267 /// </summary>
268 /// <param name="start">The number of results to discard from the total data set.</param>
269 /// <param name="count">The number of rows the returned list should contain.</param>
270 /// <returns>A list of AssetMetadata objects.</returns>
271 public override List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
272 {
273 List<AssetMetadata> retList = new List<AssetMetadata>(count);
274
275 lock (this)
276 {
277 using (SqliteCommand cmd = new SqliteCommand(SelectAssetMetadataSQL, m_conn))
278 {
279 cmd.Parameters.Add(new SqliteParameter(":start", start));
280 cmd.Parameters.Add(new SqliteParameter(":count", count));
281
282 using (IDataReader reader = cmd.ExecuteReader())
283 {
284 while (reader.Read())
285 {
286 AssetMetadata metadata = buildAssetMetadata(reader);
287 retList.Add(metadata);
288 }
289 }
290 }
291 }
292
293 return retList;
294 }
295
296 /***********************************************************************
297 *
298 * Database Binding functions
299 *
300 * These will be db specific due to typing, and minor differences
301 * in databases.
302 *
303 **********************************************************************/
304
305 #region IPlugin interface
306
307 /// <summary>
308 ///
309 /// </summary>
310 override public string Version
311 {
312 get
313 {
314 Module module = GetType().Module;
315 // string dllName = module.Assembly.ManifestModule.Name;
316 Version dllVersion = module.Assembly.GetName().Version;
317
318 return
319 string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
320 dllVersion.Revision);
321 }
322 }
323
324 /// <summary>
325 /// Initialise the AssetData interface using default URI
326 /// </summary>
327 override public void Initialise()
328 {
329 Initialise("URI=file:Asset.db,version=3");
330 }
331
332 /// <summary>
333 /// Name of this DB provider
334 /// </summary>
335 override public string Name
336 {
337 get { return "SQLite Asset storage engine"; }
338 }
339
340 #endregion
341 }
342} \ No newline at end of file
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteAuthenticationData.cs
new file mode 100644
index 0000000..c64830a
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteAuthenticationData.cs
@@ -0,0 +1,262 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Data;
32using OpenMetaverse;
33using OpenSim.Framework;
34using Mono.Data.SqliteClient;
35
36namespace OpenSim.Data.SQLiteLegacy
37{
38 public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData
39 {
40 private string m_Realm;
41 private List<string> m_ColumnNames;
42 private int m_LastExpire;
43 private string m_connectionString;
44
45 protected static SqliteConnection m_Connection;
46 private static bool m_initialized = false;
47
48 public SQLiteAuthenticationData(string connectionString, string realm)
49 : base(connectionString)
50 {
51 m_Realm = realm;
52 m_connectionString = connectionString;
53
54 if (!m_initialized)
55 {
56 m_Connection = new SqliteConnection(connectionString);
57 m_Connection.Open();
58
59 using (SqliteConnection dbcon = (SqliteConnection)((ICloneable)m_Connection).Clone())
60 {
61 dbcon.Open();
62 Migration m = new Migration(dbcon, GetType().Assembly, "AuthStore");
63 m.Update();
64 dbcon.Close();
65 }
66
67 m_initialized = true;
68 }
69 }
70
71 public AuthenticationData Get(UUID principalID)
72 {
73 AuthenticationData ret = new AuthenticationData();
74 ret.Data = new Dictionary<string, object>();
75
76 SqliteCommand cmd = new SqliteCommand("select * from `" + m_Realm + "` where UUID = :PrincipalID");
77 cmd.Parameters.Add(new SqliteParameter(":PrincipalID", principalID.ToString()));
78
79 IDataReader result = ExecuteReader(cmd, m_Connection);
80
81 try
82 {
83 if (result.Read())
84 {
85 ret.PrincipalID = principalID;
86
87 if (m_ColumnNames == null)
88 {
89 m_ColumnNames = new List<string>();
90
91 DataTable schemaTable = result.GetSchemaTable();
92 foreach (DataRow row in schemaTable.Rows)
93 m_ColumnNames.Add(row["ColumnName"].ToString());
94 }
95
96 foreach (string s in m_ColumnNames)
97 {
98 if (s == "UUID")
99 continue;
100
101 ret.Data[s] = result[s].ToString();
102 }
103
104 return ret;
105 }
106 else
107 {
108 return null;
109 }
110 }
111 catch
112 {
113 }
114 finally
115 {
116 CloseCommand(cmd);
117 }
118
119 return null;
120 }
121
122 public bool Store(AuthenticationData data)
123 {
124 if (data.Data.ContainsKey("UUID"))
125 data.Data.Remove("UUID");
126
127 string[] fields = new List<string>(data.Data.Keys).ToArray();
128 string[] values = new string[data.Data.Count];
129 int i = 0;
130 foreach (object o in data.Data.Values)
131 values[i++] = o.ToString();
132
133 SqliteCommand cmd = new SqliteCommand();
134
135 if (Get(data.PrincipalID) != null)
136 {
137
138
139 string update = "update `" + m_Realm + "` set ";
140 bool first = true;
141 foreach (string field in fields)
142 {
143 if (!first)
144 update += ", ";
145 update += "`" + field + "` = :" + field;
146 cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));
147
148 first = false;
149 }
150
151 update += " where UUID = :UUID";
152 cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
153
154 cmd.CommandText = update;
155 try
156 {
157 if (ExecuteNonQuery(cmd, m_Connection) < 1)
158 {
159 CloseCommand(cmd);
160 return false;
161 }
162 }
163 catch (Exception e)
164 {
165 Console.WriteLine(e.ToString());
166 CloseCommand(cmd);
167 return false;
168 }
169 }
170
171 else
172 {
173 string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
174 String.Join("`, `", fields) +
175 "`) values (:UUID, :" + String.Join(", :", fields) + ")";
176
177 cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
178 foreach (string field in fields)
179 cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));
180
181 cmd.CommandText = insert;
182
183 try
184 {
185 if (ExecuteNonQuery(cmd, m_Connection) < 1)
186 {
187 CloseCommand(cmd);
188 return false;
189 }
190 }
191 catch (Exception e)
192 {
193 Console.WriteLine(e.ToString());
194 CloseCommand(cmd);
195 return false;
196 }
197 }
198
199 CloseCommand(cmd);
200
201 return true;
202 }
203
204 public bool SetDataItem(UUID principalID, string item, string value)
205 {
206 SqliteCommand cmd = new SqliteCommand("update `" + m_Realm +
207 "` set `" + item + "` = " + value + " where UUID = '" + principalID.ToString() + "'");
208
209 if (ExecuteNonQuery(cmd, m_Connection) > 0)
210 return true;
211
212 return false;
213 }
214
215 public bool SetToken(UUID principalID, string token, int lifetime)
216 {
217 if (System.Environment.TickCount - m_LastExpire > 30000)
218 DoExpire();
219
220 SqliteCommand cmd = new SqliteCommand("insert into tokens (UUID, token, validity) values ('" + principalID.ToString() +
221 "', '" + token + "', datetime('now', 'localtime', '+" + lifetime.ToString() + " minutes'))");
222
223 if (ExecuteNonQuery(cmd, m_Connection) > 0)
224 {
225 cmd.Dispose();
226 return true;
227 }
228
229 cmd.Dispose();
230 return false;
231 }
232
233 public bool CheckToken(UUID principalID, string token, int lifetime)
234 {
235 if (System.Environment.TickCount - m_LastExpire > 30000)
236 DoExpire();
237
238 SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() +
239 " minutes') where UUID = '" + principalID.ToString() + "' and token = '" + token + "' and validity > datetime('now', 'localtime')");
240
241 if (ExecuteNonQuery(cmd, m_Connection) > 0)
242 {
243 cmd.Dispose();
244 return true;
245 }
246
247 cmd.Dispose();
248
249 return false;
250 }
251
252 private void DoExpire()
253 {
254 SqliteCommand cmd = new SqliteCommand("delete from tokens where validity < datetime('now', 'localtime')");
255 ExecuteNonQuery(cmd, m_Connection);
256
257 cmd.Dispose();
258
259 m_LastExpire = System.Environment.TickCount;
260 }
261 }
262}
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs
new file mode 100644
index 0000000..5a7fbd7
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs
@@ -0,0 +1,389 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Data;
31using System.Reflection;
32using log4net;
33using Mono.Data.SqliteClient;
34using OpenMetaverse;
35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces;
37
38namespace OpenSim.Data.SQLiteLegacy
39{
40 public class SQLiteEstateStore : IEstateDataStore
41 {
42 private static readonly ILog m_log =
43 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44
45 private SqliteConnection m_connection;
46 private string m_connectionString;
47
48 private FieldInfo[] m_Fields;
49 private Dictionary<string, FieldInfo> m_FieldMap =
50 new Dictionary<string, FieldInfo>();
51
52 public void Initialise(string connectionString)
53 {
54 m_connectionString = connectionString;
55
56 m_log.Info("[ESTATE DB]: Sqlite - connecting: "+m_connectionString);
57
58 m_connection = new SqliteConnection(m_connectionString);
59 m_connection.Open();
60
61 Assembly assem = GetType().Assembly;
62 Migration m = new Migration(m_connection, assem, "EstateStore");
63 m.Update();
64
65 m_connection.Close();
66 m_connection.Open();
67
68 Type t = typeof(EstateSettings);
69 m_Fields = t.GetFields(BindingFlags.NonPublic |
70 BindingFlags.Instance |
71 BindingFlags.DeclaredOnly);
72
73 foreach (FieldInfo f in m_Fields)
74 if (f.Name.Substring(0, 2) == "m_")
75 m_FieldMap[f.Name.Substring(2)] = f;
76 }
77
78 private string[] FieldList
79 {
80 get { return new List<string>(m_FieldMap.Keys).ToArray(); }
81 }
82
83 public EstateSettings LoadEstateSettings(UUID regionID)
84 {
85 string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID where estate_settings.EstateID is not null and RegionID = :RegionID";
86
87 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
88
89 cmd.CommandText = sql;
90 cmd.Parameters.Add(":RegionID", regionID.ToString());
91
92 return DoLoad(cmd, regionID);
93 }
94
95 private EstateSettings DoLoad(SqliteCommand cmd, UUID regionID)
96 {
97 EstateSettings es = new EstateSettings();
98 es.OnSave += StoreEstateSettings;
99
100 IDataReader r = cmd.ExecuteReader();
101
102 if (r.Read())
103 {
104 foreach (string name in FieldList)
105 {
106 if (m_FieldMap[name].GetValue(es) is bool)
107 {
108 int v = Convert.ToInt32(r[name]);
109 if (v != 0)
110 m_FieldMap[name].SetValue(es, true);
111 else
112 m_FieldMap[name].SetValue(es, false);
113 }
114 else if (m_FieldMap[name].GetValue(es) is UUID)
115 {
116 UUID uuid = UUID.Zero;
117
118 UUID.TryParse(r[name].ToString(), out uuid);
119 m_FieldMap[name].SetValue(es, uuid);
120 }
121 else
122 {
123 m_FieldMap[name].SetValue(es, Convert.ChangeType(r[name], m_FieldMap[name].FieldType));
124 }
125 }
126 r.Close();
127 }
128 else
129 {
130 // Migration case
131 //
132 r.Close();
133
134 List<string> names = new List<string>(FieldList);
135
136 names.Remove("EstateID");
137
138 string sql = "insert into estate_settings ("+String.Join(",", names.ToArray())+") values ( :"+String.Join(", :", names.ToArray())+")";
139
140 cmd.CommandText = sql;
141 cmd.Parameters.Clear();
142
143 foreach (string name in FieldList)
144 {
145 if (m_FieldMap[name].GetValue(es) is bool)
146 {
147 if ((bool)m_FieldMap[name].GetValue(es))
148 cmd.Parameters.Add(":"+name, "1");
149 else
150 cmd.Parameters.Add(":"+name, "0");
151 }
152 else
153 {
154 cmd.Parameters.Add(":"+name, m_FieldMap[name].GetValue(es).ToString());
155 }
156 }
157
158 cmd.ExecuteNonQuery();
159
160 cmd.CommandText = "select LAST_INSERT_ROWID() as id";
161 cmd.Parameters.Clear();
162
163 r = cmd.ExecuteReader();
164
165 r.Read();
166
167 es.EstateID = Convert.ToUInt32(r["id"]);
168
169 r.Close();
170
171 cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
172 cmd.Parameters.Add(":RegionID", regionID.ToString());
173 cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
174
175 // This will throw on dupe key
176 try
177 {
178 cmd.ExecuteNonQuery();
179 }
180 catch (Exception)
181 {
182 }
183
184 es.Save();
185 }
186
187 LoadBanList(es);
188
189 es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
190 es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
191 es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
192 return es;
193 }
194
195 public void StoreEstateSettings(EstateSettings es)
196 {
197 List<string> fields = new List<string>(FieldList);
198 fields.Remove("EstateID");
199
200 List<string> terms = new List<string>();
201
202 foreach (string f in fields)
203 terms.Add(f+" = :"+f);
204
205 string sql = "update estate_settings set "+String.Join(", ", terms.ToArray())+" where EstateID = :EstateID";
206
207 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
208
209 cmd.CommandText = sql;
210
211 foreach (string name in FieldList)
212 {
213 if (m_FieldMap[name].GetValue(es) is bool)
214 {
215 if ((bool)m_FieldMap[name].GetValue(es))
216 cmd.Parameters.Add(":"+name, "1");
217 else
218 cmd.Parameters.Add(":"+name, "0");
219 }
220 else
221 {
222 cmd.Parameters.Add(":"+name, m_FieldMap[name].GetValue(es).ToString());
223 }
224 }
225
226 cmd.ExecuteNonQuery();
227
228 SaveBanList(es);
229 SaveUUIDList(es.EstateID, "estate_managers", es.EstateManagers);
230 SaveUUIDList(es.EstateID, "estate_users", es.EstateAccess);
231 SaveUUIDList(es.EstateID, "estate_groups", es.EstateGroups);
232 }
233
234 private void LoadBanList(EstateSettings es)
235 {
236 es.ClearBans();
237
238 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
239
240 cmd.CommandText = "select bannedUUID from estateban where EstateID = :EstateID";
241 cmd.Parameters.Add(":EstateID", es.EstateID);
242
243 IDataReader r = cmd.ExecuteReader();
244
245 while (r.Read())
246 {
247 EstateBan eb = new EstateBan();
248
249 UUID uuid = new UUID();
250 UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
251
252 eb.BannedUserID = uuid;
253 eb.BannedHostAddress = "0.0.0.0";
254 eb.BannedHostIPMask = "0.0.0.0";
255 es.AddBan(eb);
256 }
257 r.Close();
258 }
259
260 private void SaveBanList(EstateSettings es)
261 {
262 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
263
264 cmd.CommandText = "delete from estateban where EstateID = :EstateID";
265 cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
266
267 cmd.ExecuteNonQuery();
268
269 cmd.Parameters.Clear();
270
271 cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( :EstateID, :bannedUUID, '', '', '' )";
272
273 foreach (EstateBan b in es.EstateBans)
274 {
275 cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
276 cmd.Parameters.Add(":bannedUUID", b.BannedUserID.ToString());
277
278 cmd.ExecuteNonQuery();
279 cmd.Parameters.Clear();
280 }
281 }
282
283 void SaveUUIDList(uint EstateID, string table, UUID[] data)
284 {
285 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
286
287 cmd.CommandText = "delete from "+table+" where EstateID = :EstateID";
288 cmd.Parameters.Add(":EstateID", EstateID.ToString());
289
290 cmd.ExecuteNonQuery();
291
292 cmd.Parameters.Clear();
293
294 cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )";
295
296 foreach (UUID uuid in data)
297 {
298 cmd.Parameters.Add(":EstateID", EstateID.ToString());
299 cmd.Parameters.Add(":uuid", uuid.ToString());
300
301 cmd.ExecuteNonQuery();
302 cmd.Parameters.Clear();
303 }
304 }
305
306 UUID[] LoadUUIDList(uint EstateID, string table)
307 {
308 List<UUID> uuids = new List<UUID>();
309
310 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
311
312 cmd.CommandText = "select uuid from "+table+" where EstateID = :EstateID";
313 cmd.Parameters.Add(":EstateID", EstateID);
314
315 IDataReader r = cmd.ExecuteReader();
316
317 while (r.Read())
318 {
319 // EstateBan eb = new EstateBan();
320
321 UUID uuid = new UUID();
322 UUID.TryParse(r["uuid"].ToString(), out uuid);
323
324 uuids.Add(uuid);
325 }
326 r.Close();
327
328 return uuids.ToArray();
329 }
330
331 public EstateSettings LoadEstateSettings(int estateID)
332 {
333 string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_settings where estate_settings.EstateID :EstateID";
334
335 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
336
337 cmd.CommandText = sql;
338 cmd.Parameters.Add(":EstateID", estateID.ToString());
339
340 return DoLoad(cmd, UUID.Zero);
341 }
342
343 public List<int> GetEstates(string search)
344 {
345 List<int> result = new List<int>();
346
347 string sql = "select EstateID from estate_settings where estate_settings.EstateName :EstateName";
348
349 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
350
351 cmd.CommandText = sql;
352 cmd.Parameters.Add(":EstateName", search);
353
354 IDataReader r = cmd.ExecuteReader();
355
356 while (r.Read())
357 {
358 result.Add(Convert.ToInt32(r["EstateID"]));
359 }
360 r.Close();
361
362 return result;
363 }
364
365 public bool LinkRegion(UUID regionID, int estateID)
366 {
367 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
368
369 cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
370 cmd.Parameters.Add(":RegionID", regionID.ToString());
371 cmd.Parameters.Add(":EstateID", estateID.ToString());
372
373 if (cmd.ExecuteNonQuery() == 0)
374 return false;
375
376 return true;
377 }
378
379 public List<UUID> GetRegions(int estateID)
380 {
381 return new List<UUID>();
382 }
383
384 public bool DeleteEstate(int estateID)
385 {
386 return false;
387 }
388 }
389}
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteFramework.cs b/OpenSim/Data/SQLiteLegacy/SQLiteFramework.cs
new file mode 100644
index 0000000..606478e
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteFramework.cs
@@ -0,0 +1,91 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Data;
32using OpenMetaverse;
33using OpenSim.Framework;
34using Mono.Data.SqliteClient;
35
36namespace OpenSim.Data.SQLiteLegacy
37{
38 /// <summary>
39 /// A database interface class to a user profile storage system
40 /// </summary>
41 public class SQLiteFramework
42 {
43 protected Object m_lockObject = new Object();
44
45 protected SQLiteFramework(string connectionString)
46 {
47 }
48
49 //////////////////////////////////////////////////////////////
50 //
51 // All non queries are funneled through one connection
52 // to increase performance a little
53 //
54 protected int ExecuteNonQuery(SqliteCommand cmd, SqliteConnection connection)
55 {
56 lock (connection)
57 {
58 SqliteConnection newConnection =
59 (SqliteConnection)((ICloneable)connection).Clone();
60 newConnection.Open();
61
62 cmd.Connection = newConnection;
63 //Console.WriteLine("XXX " + cmd.CommandText);
64
65 return cmd.ExecuteNonQuery();
66 }
67 }
68
69 protected IDataReader ExecuteReader(SqliteCommand cmd, SqliteConnection connection)
70 {
71 lock (connection)
72 {
73 SqliteConnection newConnection =
74 (SqliteConnection)((ICloneable)connection).Clone();
75 newConnection.Open();
76
77 cmd.Connection = newConnection;
78 //Console.WriteLine("XXX " + cmd.CommandText);
79
80 return cmd.ExecuteReader();
81 }
82 }
83
84 protected void CloseCommand(SqliteCommand cmd)
85 {
86 cmd.Connection.Close();
87 cmd.Connection.Dispose();
88 cmd.Dispose();
89 }
90 }
91}
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLiteLegacy/SQLiteGenericTableHandler.cs
new file mode 100644
index 0000000..1c1fe8c
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteGenericTableHandler.cs
@@ -0,0 +1,268 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Data;
31using System.Reflection;
32using log4net;
33using Mono.Data.SqliteClient;
34using OpenMetaverse;
35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces;
37
38namespace OpenSim.Data.SQLiteLegacy
39{
40 public class SQLiteGenericTableHandler<T> : SQLiteFramework where T: class, new()
41 {
42// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43
44 protected Dictionary<string, FieldInfo> m_Fields =
45 new Dictionary<string, FieldInfo>();
46
47 protected List<string> m_ColumnNames = null;
48 protected string m_Realm;
49 protected FieldInfo m_DataField = null;
50
51 protected static SqliteConnection m_Connection;
52 private static bool m_initialized;
53
54 public SQLiteGenericTableHandler(string connectionString,
55 string realm, string storeName) : base(connectionString)
56 {
57 m_Realm = realm;
58
59 if (!m_initialized)
60 {
61 m_Connection = new SqliteConnection(connectionString);
62 m_Connection.Open();
63
64 if (storeName != String.Empty)
65 {
66 Assembly assem = GetType().Assembly;
67 SqliteConnection newConnection =
68 (SqliteConnection)((ICloneable)m_Connection).Clone();
69 newConnection.Open();
70
71 Migration m = new Migration(newConnection, assem, storeName);
72 m.Update();
73 newConnection.Close();
74 newConnection.Dispose();
75 }
76
77 m_initialized = true;
78 }
79
80 Type t = typeof(T);
81 FieldInfo[] fields = t.GetFields(BindingFlags.Public |
82 BindingFlags.Instance |
83 BindingFlags.DeclaredOnly);
84
85 if (fields.Length == 0)
86 return;
87
88 foreach (FieldInfo f in fields)
89 {
90 if (f.Name != "Data")
91 m_Fields[f.Name] = f;
92 else
93 m_DataField = f;
94 }
95 }
96
97 private void CheckColumnNames(IDataReader reader)
98 {
99 if (m_ColumnNames != null)
100 return;
101
102 m_ColumnNames = new List<string>();
103
104 DataTable schemaTable = reader.GetSchemaTable();
105 foreach (DataRow row in schemaTable.Rows)
106 {
107 if (row["ColumnName"] != null &&
108 (!m_Fields.ContainsKey(row["ColumnName"].ToString())))
109 m_ColumnNames.Add(row["ColumnName"].ToString());
110 }
111 }
112
113 public T[] Get(string field, string key)
114 {
115 return Get(new string[] { field }, new string[] { key });
116 }
117
118 public T[] Get(string[] fields, string[] keys)
119 {
120 if (fields.Length != keys.Length)
121 return new T[0];
122
123 List<string> terms = new List<string>();
124
125 SqliteCommand cmd = new SqliteCommand();
126
127 for (int i = 0 ; i < fields.Length ; i++)
128 {
129 cmd.Parameters.Add(new SqliteParameter(":" + fields[i], keys[i]));
130 terms.Add("`" + fields[i] + "` = :" + fields[i]);
131 }
132
133 string where = String.Join(" and ", terms.ToArray());
134
135 string query = String.Format("select * from {0} where {1}",
136 m_Realm, where);
137
138 cmd.CommandText = query;
139
140 return DoQuery(cmd);
141 }
142
143 protected T[] DoQuery(SqliteCommand cmd)
144 {
145 IDataReader reader = ExecuteReader(cmd, m_Connection);
146 if (reader == null)
147 return new T[0];
148
149 CheckColumnNames(reader);
150
151 List<T> result = new List<T>();
152
153 while (reader.Read())
154 {
155 T row = new T();
156
157 foreach (string name in m_Fields.Keys)
158 {
159 if (m_Fields[name].GetValue(row) is bool)
160 {
161 int v = Convert.ToInt32(reader[name]);
162 m_Fields[name].SetValue(row, v != 0 ? true : false);
163 }
164 else if (m_Fields[name].GetValue(row) is UUID)
165 {
166 UUID uuid = UUID.Zero;
167
168 UUID.TryParse(reader[name].ToString(), out uuid);
169 m_Fields[name].SetValue(row, uuid);
170 }
171 else if (m_Fields[name].GetValue(row) is int)
172 {
173 int v = Convert.ToInt32(reader[name]);
174 m_Fields[name].SetValue(row, v);
175 }
176 else
177 {
178 m_Fields[name].SetValue(row, reader[name]);
179 }
180 }
181
182 if (m_DataField != null)
183 {
184 Dictionary<string, string> data =
185 new Dictionary<string, string>();
186
187 foreach (string col in m_ColumnNames)
188 {
189 data[col] = reader[col].ToString();
190 if (data[col] == null)
191 data[col] = String.Empty;
192 }
193
194 m_DataField.SetValue(row, data);
195 }
196
197 result.Add(row);
198 }
199
200 CloseCommand(cmd);
201
202 return result.ToArray();
203 }
204
205 public T[] Get(string where)
206 {
207 SqliteCommand cmd = new SqliteCommand();
208
209 string query = String.Format("select * from {0} where {1}",
210 m_Realm, where);
211
212 cmd.CommandText = query;
213
214 return DoQuery(cmd);
215 }
216
217 public bool Store(T row)
218 {
219 SqliteCommand cmd = new SqliteCommand();
220
221 string query = "";
222 List<String> names = new List<String>();
223 List<String> values = new List<String>();
224
225 foreach (FieldInfo fi in m_Fields.Values)
226 {
227 names.Add(fi.Name);
228 values.Add(":" + fi.Name);
229 cmd.Parameters.Add(new SqliteParameter(":" + fi.Name, fi.GetValue(row).ToString()));
230 }
231
232 if (m_DataField != null)
233 {
234 Dictionary<string, string> data =
235 (Dictionary<string, string>)m_DataField.GetValue(row);
236
237 foreach (KeyValuePair<string, string> kvp in data)
238 {
239 names.Add(kvp.Key);
240 values.Add(":" + kvp.Key);
241 cmd.Parameters.Add(new SqliteParameter(":" + kvp.Key, kvp.Value));
242 }
243 }
244
245 query = String.Format("replace into {0} (`", m_Realm) + String.Join("`,`", names.ToArray()) + "`) values (" + String.Join(",", values.ToArray()) + ")";
246
247 cmd.CommandText = query;
248
249 if (ExecuteNonQuery(cmd, m_Connection) > 0)
250 return true;
251
252 return false;
253 }
254
255 public bool Delete(string field, string val)
256 {
257 SqliteCommand cmd = new SqliteCommand();
258
259 cmd.CommandText = String.Format("delete from {0} where `{1}` = :{1}", m_Realm, field);
260 cmd.Parameters.Add(new SqliteParameter(field, val));
261
262 if (ExecuteNonQuery(cmd, m_Connection) > 0)
263 return true;
264
265 return false;
266 }
267 }
268}
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs b/OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs
new file mode 100644
index 0000000..726703b
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs
@@ -0,0 +1,898 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Data;
31using System.Reflection;
32using log4net;
33using Mono.Data.SqliteClient;
34using OpenMetaverse;
35using OpenSim.Framework;
36
37namespace OpenSim.Data.SQLiteLegacy
38{
39 /// <summary>
40 /// An Inventory Interface to the SQLite database
41 /// </summary>
42 public class SQLiteInventoryStore : SQLiteUtil, IInventoryDataPlugin
43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45
46 private const string invItemsSelect = "select * from inventoryitems";
47 private const string invFoldersSelect = "select * from inventoryfolders";
48
49 private static SqliteConnection conn;
50 private static DataSet ds;
51 private static SqliteDataAdapter invItemsDa;
52 private static SqliteDataAdapter invFoldersDa;
53
54 private static bool m_Initialized = false;
55
56 public void Initialise()
57 {
58 m_log.Info("[SQLiteInventoryData]: " + Name + " cannot be default-initialized!");
59 throw new PluginNotInitialisedException(Name);
60 }
61
62 /// <summary>
63 /// <list type="bullet">
64 /// <item>Initialises Inventory interface</item>
65 /// <item>Loads and initialises a new SQLite connection and maintains it.</item>
66 /// <item>use default URI if connect string string is empty.</item>
67 /// </list>
68 /// </summary>
69 /// <param name="dbconnect">connect string</param>
70 public void Initialise(string dbconnect)
71 {
72 if (!m_Initialized)
73 {
74 m_Initialized = true;
75
76 if (dbconnect == string.Empty)
77 {
78 dbconnect = "URI=file:inventoryStore.db,version=3";
79 }
80 m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect);
81 conn = new SqliteConnection(dbconnect);
82
83 conn.Open();
84
85 Assembly assem = GetType().Assembly;
86 Migration m = new Migration(conn, assem, "InventoryStore");
87 m.Update();
88
89 SqliteCommand itemsSelectCmd = new SqliteCommand(invItemsSelect, conn);
90 invItemsDa = new SqliteDataAdapter(itemsSelectCmd);
91 // SqliteCommandBuilder primCb = new SqliteCommandBuilder(primDa);
92
93 SqliteCommand foldersSelectCmd = new SqliteCommand(invFoldersSelect, conn);
94 invFoldersDa = new SqliteDataAdapter(foldersSelectCmd);
95
96 ds = new DataSet();
97
98 ds.Tables.Add(createInventoryFoldersTable());
99 invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
100 setupFoldersCommands(invFoldersDa, conn);
101 m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions");
102
103 ds.Tables.Add(createInventoryItemsTable());
104 invItemsDa.Fill(ds.Tables["inventoryitems"]);
105 setupItemsCommands(invItemsDa, conn);
106 m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
107
108 ds.AcceptChanges();
109 }
110 }
111
112 /// <summary>
113 /// Closes the inventory interface
114 /// </summary>
115 public void Dispose()
116 {
117 if (conn != null)
118 {
119 conn.Close();
120 conn = null;
121 }
122 if (invItemsDa != null)
123 {
124 invItemsDa.Dispose();
125 invItemsDa = null;
126 }
127 if (invFoldersDa != null)
128 {
129 invFoldersDa.Dispose();
130 invFoldersDa = null;
131 }
132 if (ds != null)
133 {
134 ds.Dispose();
135 ds = null;
136 }
137 }
138
139 /// <summary>
140 ///
141 /// </summary>
142 /// <param name="row"></param>
143 /// <returns></returns>
144 public InventoryItemBase buildItem(DataRow row)
145 {
146 InventoryItemBase item = new InventoryItemBase();
147 item.ID = new UUID((string) row["UUID"]);
148 item.AssetID = new UUID((string) row["assetID"]);
149 item.AssetType = Convert.ToInt32(row["assetType"]);
150 item.InvType = Convert.ToInt32(row["invType"]);
151 item.Folder = new UUID((string) row["parentFolderID"]);
152 item.Owner = new UUID((string) row["avatarID"]);
153 item.CreatorId = (string)row["creatorsID"];
154 item.Name = (string) row["inventoryName"];
155 item.Description = (string) row["inventoryDescription"];
156
157 item.NextPermissions = Convert.ToUInt32(row["inventoryNextPermissions"]);
158 item.CurrentPermissions = Convert.ToUInt32(row["inventoryCurrentPermissions"]);
159 item.BasePermissions = Convert.ToUInt32(row["inventoryBasePermissions"]);
160 item.EveryOnePermissions = Convert.ToUInt32(row["inventoryEveryOnePermissions"]);
161 item.GroupPermissions = Convert.ToUInt32(row["inventoryGroupPermissions"]);
162
163 // new fields
164 if (!Convert.IsDBNull(row["salePrice"]))
165 item.SalePrice = Convert.ToInt32(row["salePrice"]);
166
167 if (!Convert.IsDBNull(row["saleType"]))
168 item.SaleType = Convert.ToByte(row["saleType"]);
169
170 if (!Convert.IsDBNull(row["creationDate"]))
171 item.CreationDate = Convert.ToInt32(row["creationDate"]);
172
173 if (!Convert.IsDBNull(row["groupID"]))
174 item.GroupID = new UUID((string)row["groupID"]);
175
176 if (!Convert.IsDBNull(row["groupOwned"]))
177 item.GroupOwned = Convert.ToBoolean(row["groupOwned"]);
178
179 if (!Convert.IsDBNull(row["Flags"]))
180 item.Flags = Convert.ToUInt32(row["Flags"]);
181
182 return item;
183 }
184
185 /// <summary>
186 /// Fill a database row with item data
187 /// </summary>
188 /// <param name="row"></param>
189 /// <param name="item"></param>
190 private static void fillItemRow(DataRow row, InventoryItemBase item)
191 {
192 row["UUID"] = item.ID.ToString();
193 row["assetID"] = item.AssetID.ToString();
194 row["assetType"] = item.AssetType;
195 row["invType"] = item.InvType;
196 row["parentFolderID"] = item.Folder.ToString();
197 row["avatarID"] = item.Owner.ToString();
198 row["creatorsID"] = item.CreatorId.ToString();
199 row["inventoryName"] = item.Name;
200 row["inventoryDescription"] = item.Description;
201
202 row["inventoryNextPermissions"] = item.NextPermissions;
203 row["inventoryCurrentPermissions"] = item.CurrentPermissions;
204 row["inventoryBasePermissions"] = item.BasePermissions;
205 row["inventoryEveryOnePermissions"] = item.EveryOnePermissions;
206 row["inventoryGroupPermissions"] = item.GroupPermissions;
207
208 // new fields
209 row["salePrice"] = item.SalePrice;
210 row["saleType"] = item.SaleType;
211 row["creationDate"] = item.CreationDate;
212 row["groupID"] = item.GroupID.ToString();
213 row["groupOwned"] = item.GroupOwned;
214 row["flags"] = item.Flags;
215 }
216
217 /// <summary>
218 /// Add inventory folder
219 /// </summary>
220 /// <param name="folder">Folder base</param>
221 /// <param name="add">true=create folder. false=update existing folder</param>
222 /// <remarks>nasty</remarks>
223 private void addFolder(InventoryFolderBase folder, bool add)
224 {
225 lock (ds)
226 {
227 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
228
229 DataRow inventoryRow = inventoryFolderTable.Rows.Find(folder.ID.ToString());
230 if (inventoryRow == null)
231 {
232 if (! add)
233 m_log.ErrorFormat("Interface Misuse: Attempting to Update non-existant inventory folder: {0}", folder.ID);
234
235 inventoryRow = inventoryFolderTable.NewRow();
236 fillFolderRow(inventoryRow, folder);
237 inventoryFolderTable.Rows.Add(inventoryRow);
238 }
239 else
240 {
241 if (add)
242 m_log.ErrorFormat("Interface Misuse: Attempting to Add inventory folder that already exists: {0}", folder.ID);
243
244 fillFolderRow(inventoryRow, folder);
245 }
246
247 invFoldersDa.Update(ds, "inventoryfolders");
248 }
249 }
250
251 /// <summary>
252 /// Move an inventory folder
253 /// </summary>
254 /// <param name="folder">folder base</param>
255 private void moveFolder(InventoryFolderBase folder)
256 {
257 lock (ds)
258 {
259 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
260
261 DataRow inventoryRow = inventoryFolderTable.Rows.Find(folder.ID.ToString());
262 if (inventoryRow == null)
263 {
264 inventoryRow = inventoryFolderTable.NewRow();
265 fillFolderRow(inventoryRow, folder);
266 inventoryFolderTable.Rows.Add(inventoryRow);
267 }
268 else
269 {
270 moveFolderRow(inventoryRow, folder);
271 }
272
273 invFoldersDa.Update(ds, "inventoryfolders");
274 }
275 }
276
277 /// <summary>
278 /// add an item in inventory
279 /// </summary>
280 /// <param name="item">the item</param>
281 /// <param name="add">true=add item ; false=update existing item</param>
282 private void addItem(InventoryItemBase item, bool add)
283 {
284 lock (ds)
285 {
286 DataTable inventoryItemTable = ds.Tables["inventoryitems"];
287
288 DataRow inventoryRow = inventoryItemTable.Rows.Find(item.ID.ToString());
289 if (inventoryRow == null)
290 {
291 if (!add)
292 m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existant inventory item: {0}", item.ID);
293
294 inventoryRow = inventoryItemTable.NewRow();
295 fillItemRow(inventoryRow, item);
296 inventoryItemTable.Rows.Add(inventoryRow);
297 }
298 else
299 {
300 if (add)
301 m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Add inventory item that already exists: {0}", item.ID);
302
303 fillItemRow(inventoryRow, item);
304 }
305
306 invItemsDa.Update(ds, "inventoryitems");
307
308 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
309
310 inventoryRow = inventoryFolderTable.Rows.Find(item.Folder.ToString());
311 if (inventoryRow != null) //MySQL doesn't throw an exception here, so sqlite shouldn't either.
312 inventoryRow["version"] = (int)inventoryRow["version"] + 1;
313
314 invFoldersDa.Update(ds, "inventoryfolders");
315 }
316 }
317
318 /// <summary>
319 /// TODO : DataSet commit
320 /// </summary>
321 public void Shutdown()
322 {
323 // TODO: DataSet commit
324 }
325
326 /// <summary>
327 /// The name of this DB provider
328 /// </summary>
329 /// <returns>Name of DB provider</returns>
330 public string Name
331 {
332 get { return "SQLite Inventory Data Interface"; }
333 }
334
335 /// <summary>
336 /// Returns the version of this DB provider
337 /// </summary>
338 /// <returns>A string containing the DB provider version</returns>
339 public string Version
340 {
341 get
342 {
343 Module module = GetType().Module;
344 // string dllName = module.Assembly.ManifestModule.Name;
345 Version dllVersion = module.Assembly.GetName().Version;
346
347
348 return
349 string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
350 dllVersion.Revision);
351 }
352 }
353
354 /// <summary>
355 /// Returns a list of inventory items contained within the specified folder
356 /// </summary>
357 /// <param name="folderID">The UUID of the target folder</param>
358 /// <returns>A List of InventoryItemBase items</returns>
359 public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
360 {
361 lock (ds)
362 {
363 List<InventoryItemBase> retval = new List<InventoryItemBase>();
364 DataTable inventoryItemTable = ds.Tables["inventoryitems"];
365 string selectExp = "parentFolderID = '" + folderID + "'";
366 DataRow[] rows = inventoryItemTable.Select(selectExp);
367 foreach (DataRow row in rows)
368 {
369 retval.Add(buildItem(row));
370 }
371
372 return retval;
373 }
374 }
375
376 /// <summary>
377 /// Returns a list of the root folders within a users inventory
378 /// </summary>
379 /// <param name="user">The user whos inventory is to be searched</param>
380 /// <returns>A list of folder objects</returns>
381 public List<InventoryFolderBase> getUserRootFolders(UUID user)
382 {
383 return new List<InventoryFolderBase>();
384 }
385
386 // see InventoryItemBase.getUserRootFolder
387 public InventoryFolderBase getUserRootFolder(UUID user)
388 {
389 lock (ds)
390 {
391 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
392 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
393 string selectExp = "agentID = '" + user + "' AND parentID = '" + UUID.Zero + "'";
394 DataRow[] rows = inventoryFolderTable.Select(selectExp);
395 foreach (DataRow row in rows)
396 {
397 folders.Add(buildFolder(row));
398 }
399
400 // There should only ever be one root folder for a user. However, if there's more
401 // than one we'll simply use the first one rather than failing. It would be even
402 // nicer to print some message to this effect, but this feels like it's too low a
403 // to put such a message out, and it's too minor right now to spare the time to
404 // suitably refactor.
405 if (folders.Count > 0)
406 {
407 return folders[0];
408 }
409
410 return null;
411 }
412 }
413
414 /// <summary>
415 /// Append a list of all the child folders of a parent folder
416 /// </summary>
417 /// <param name="folders">list where folders will be appended</param>
418 /// <param name="parentID">ID of parent</param>
419 protected void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
420 {
421 lock (ds)
422 {
423 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
424 string selectExp = "parentID = '" + parentID + "'";
425 DataRow[] rows = inventoryFolderTable.Select(selectExp);
426 foreach (DataRow row in rows)
427 {
428 folders.Add(buildFolder(row));
429 }
430
431 }
432 }
433
434 /// <summary>
435 /// Returns a list of inventory folders contained in the folder 'parentID'
436 /// </summary>
437 /// <param name="parentID">The folder to get subfolders for</param>
438 /// <returns>A list of inventory folders</returns>
439 public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
440 {
441 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
442 getInventoryFolders(ref folders, parentID);
443 return folders;
444 }
445
446 /// <summary>
447 /// See IInventoryDataPlugin
448 /// </summary>
449 /// <param name="parentID"></param>
450 /// <returns></returns>
451 public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
452 {
453 /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one
454 * - We will only need to hit the database twice instead of n times.
455 * - We assume the database is well-formed - no stranded/dangling folders, all folders in heirarchy owned
456 * by the same person, each user only has 1 inventory heirarchy
457 * - The returned list is not ordered, instead of breadth-first ordered
458 There are basically 2 usage cases for getFolderHeirarchy:
459 1) Getting the user's entire inventory heirarchy when they log in
460 2) Finding a subfolder heirarchy to delete when emptying the trash.
461 This implementation will pull all inventory folders from the database, and then prune away any folder that
462 is not part of the requested sub-heirarchy. The theory is that it is cheaper to make 1 request from the
463 database than to make n requests. This pays off only if requested heirarchy is large.
464 By making this choice, we are making the worst case better at the cost of making the best case worse
465 - Francis
466 */
467
468 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
469 DataRow[] folderRows = null, parentRow;
470 InventoryFolderBase parentFolder = null;
471 lock (ds)
472 {
473 /* Fetch the parent folder from the database to determine the agent ID.
474 * Then fetch all inventory folders for that agent from the agent ID.
475 */
476 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
477 string selectExp = "UUID = '" + parentID + "'";
478 parentRow = inventoryFolderTable.Select(selectExp); // Assume at most 1 result
479 if (parentRow.GetLength(0) >= 1) // No result means parent folder does not exist
480 {
481 parentFolder = buildFolder(parentRow[0]);
482 UUID agentID = parentFolder.Owner;
483 selectExp = "agentID = '" + agentID + "'";
484 folderRows = inventoryFolderTable.Select(selectExp);
485 }
486
487 if (folderRows != null && folderRows.GetLength(0) >= 1) // No result means parent folder does not exist
488 { // or has no children
489 /* if we're querying the root folder, just return an unordered list of all folders in the user's
490 * inventory
491 */
492 if (parentFolder.ParentID == UUID.Zero)
493 {
494 foreach (DataRow row in folderRows)
495 {
496 InventoryFolderBase curFolder = buildFolder(row);
497 if (curFolder.ID != parentID) // Return all folders except the parent folder of heirarchy
498 folders.Add(buildFolder(row));
499 }
500 } // If requesting root folder
501 /* else we are querying a non-root folder. We currently have a list of all of the user's folders,
502 * we must construct a list of all folders in the heirarchy below parentID.
503 * Our first step will be to construct a hash table of all folders, indexed by parent ID.
504 * Once we have constructed the hash table, we will do a breadth-first traversal on the tree using the
505 * hash table to find child folders.
506 */
507 else
508 { // Querying a non-root folder
509
510 // Build a hash table of all user's inventory folders, indexed by each folder's parent ID
511 Dictionary<UUID, List<InventoryFolderBase>> hashtable =
512 new Dictionary<UUID, List<InventoryFolderBase>>(folderRows.GetLength(0));
513
514 foreach (DataRow row in folderRows)
515 {
516 InventoryFolderBase curFolder = buildFolder(row);
517 if (curFolder.ParentID != UUID.Zero) // Discard root of tree - not needed
518 {
519 if (hashtable.ContainsKey(curFolder.ParentID))
520 {
521 // Current folder already has a sibling - append to sibling list
522 hashtable[curFolder.ParentID].Add(curFolder);
523 }
524 else
525 {
526 List<InventoryFolderBase> siblingList = new List<InventoryFolderBase>();
527 siblingList.Add(curFolder);
528 // Current folder has no known (yet) siblings
529 hashtable.Add(curFolder.ParentID, siblingList);
530 }
531 }
532 } // For all inventory folders
533
534 // Note: Could release the ds lock here - we don't access folderRows or the database anymore.
535 // This is somewhat of a moot point as the callers of this function usually lock db anyways.
536
537 if (hashtable.ContainsKey(parentID)) // if requested folder does have children
538 folders.AddRange(hashtable[parentID]);
539
540 // BreadthFirstSearch build inventory tree **Note: folders.Count is *not* static
541 for (int i = 0; i < folders.Count; i++)
542 if (hashtable.ContainsKey(folders[i].ID))
543 folders.AddRange(hashtable[folders[i].ID]);
544
545 } // if requesting a subfolder heirarchy
546 } // if folder parentID exists and has children
547 } // lock ds
548 return folders;
549 }
550
551 /// <summary>
552 /// Returns an inventory item by its UUID
553 /// </summary>
554 /// <param name="item">The UUID of the item to be returned</param>
555 /// <returns>A class containing item information</returns>
556 public InventoryItemBase getInventoryItem(UUID item)
557 {
558 lock (ds)
559 {
560 DataRow row = ds.Tables["inventoryitems"].Rows.Find(item.ToString());
561 if (row != null)
562 {
563 return buildItem(row);
564 }
565 else
566 {
567 return null;
568 }
569 }
570 }
571
572 /// <summary>
573 /// Returns a specified inventory folder by its UUID
574 /// </summary>
575 /// <param name="folder">The UUID of the folder to be returned</param>
576 /// <returns>A class containing folder information</returns>
577 public InventoryFolderBase getInventoryFolder(UUID folder)
578 {
579 // TODO: Deep voodoo here. If you enable this code then
580 // multi region breaks. No idea why, but I figured it was
581 // better to leave multi region at this point. It does mean
582 // that you don't get to see system textures why creating
583 // clothes and the like. :(
584 lock (ds)
585 {
586 DataRow row = ds.Tables["inventoryfolders"].Rows.Find(folder.ToString());
587 if (row != null)
588 {
589 return buildFolder(row);
590 }
591 else
592 {
593 return null;
594 }
595 }
596 }
597
598 /// <summary>
599 /// Creates a new inventory item based on item
600 /// </summary>
601 /// <param name="item">The item to be created</param>
602 public void addInventoryItem(InventoryItemBase item)
603 {
604 addItem(item, true);
605 }
606
607 /// <summary>
608 /// Updates an inventory item with item (updates based on ID)
609 /// </summary>
610 /// <param name="item">The updated item</param>
611 public void updateInventoryItem(InventoryItemBase item)
612 {
613 addItem(item, false);
614 }
615
616 /// <summary>
617 /// Delete an inventory item
618 /// </summary>
619 /// <param name="item">The item UUID</param>
620 public void deleteInventoryItem(UUID itemID)
621 {
622 lock (ds)
623 {
624 DataTable inventoryItemTable = ds.Tables["inventoryitems"];
625
626 DataRow inventoryRow = inventoryItemTable.Rows.Find(itemID.ToString());
627 if (inventoryRow != null)
628 {
629 inventoryRow.Delete();
630 }
631
632 invItemsDa.Update(ds, "inventoryitems");
633 }
634 }
635
636 public InventoryItemBase queryInventoryItem(UUID itemID)
637 {
638 return getInventoryItem(itemID);
639 }
640
641 public InventoryFolderBase queryInventoryFolder(UUID folderID)
642 {
643 return getInventoryFolder(folderID);
644 }
645
646 /// <summary>
647 /// Delete all items in the specified folder
648 /// </summary>
649 /// <param name="folderId">id of the folder, whose item content should be deleted</param>
650 /// <todo>this is horribly inefficient, but I don't want to ruin the overall structure of this implementation</todo>
651 private void deleteItemsInFolder(UUID folderId)
652 {
653 List<InventoryItemBase> items = getInventoryInFolder(folderId);
654
655 foreach (InventoryItemBase i in items)
656 deleteInventoryItem(i.ID);
657 }
658
659 /// <summary>
660 /// Adds a new folder specified by folder
661 /// </summary>
662 /// <param name="folder">The inventory folder</param>
663 public void addInventoryFolder(InventoryFolderBase folder)
664 {
665 addFolder(folder, true);
666 }
667
668 /// <summary>
669 /// Updates a folder based on its ID with folder
670 /// </summary>
671 /// <param name="folder">The inventory folder</param>
672 public void updateInventoryFolder(InventoryFolderBase folder)
673 {
674 addFolder(folder, false);
675 }
676
677 /// <summary>
678 /// Moves a folder based on its ID with folder
679 /// </summary>
680 /// <param name="folder">The inventory folder</param>
681 public void moveInventoryFolder(InventoryFolderBase folder)
682 {
683 moveFolder(folder);
684 }
685
686 /// <summary>
687 /// Delete a folder
688 /// </summary>
689 /// <remarks>
690 /// This will clean-up any child folders and child items as well
691 /// </remarks>
692 /// <param name="folderID">the folder UUID</param>
693 public void deleteInventoryFolder(UUID folderID)
694 {
695 lock (ds)
696 {
697 List<InventoryFolderBase> subFolders = getFolderHierarchy(folderID);
698
699 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
700 DataRow inventoryRow;
701
702 //Delete all sub-folders
703 foreach (InventoryFolderBase f in subFolders)
704 {
705 inventoryRow = inventoryFolderTable.Rows.Find(f.ID.ToString());
706 if (inventoryRow != null)
707 {
708 deleteItemsInFolder(f.ID);
709 inventoryRow.Delete();
710 }
711 }
712
713 //Delete the actual row
714 inventoryRow = inventoryFolderTable.Rows.Find(folderID.ToString());
715 if (inventoryRow != null)
716 {
717 deleteItemsInFolder(folderID);
718 inventoryRow.Delete();
719 }
720
721 invFoldersDa.Update(ds, "inventoryfolders");
722 }
723 }
724
725 /***********************************************************************
726 *
727 * Data Table definitions
728 *
729 **********************************************************************/
730
731 /// <summary>
732 /// Create the "inventoryitems" table
733 /// </summary>
734 private static DataTable createInventoryItemsTable()
735 {
736 DataTable inv = new DataTable("inventoryitems");
737
738 createCol(inv, "UUID", typeof (String)); //inventoryID
739 createCol(inv, "assetID", typeof (String));
740 createCol(inv, "assetType", typeof (Int32));
741 createCol(inv, "invType", typeof (Int32));
742 createCol(inv, "parentFolderID", typeof (String));
743 createCol(inv, "avatarID", typeof (String));
744 createCol(inv, "creatorsID", typeof (String));
745
746 createCol(inv, "inventoryName", typeof (String));
747 createCol(inv, "inventoryDescription", typeof (String));
748 // permissions
749 createCol(inv, "inventoryNextPermissions", typeof (Int32));
750 createCol(inv, "inventoryCurrentPermissions", typeof (Int32));
751 createCol(inv, "inventoryBasePermissions", typeof (Int32));
752 createCol(inv, "inventoryEveryOnePermissions", typeof (Int32));
753 createCol(inv, "inventoryGroupPermissions", typeof (Int32));
754
755 // sale info
756 createCol(inv, "salePrice", typeof(Int32));
757 createCol(inv, "saleType", typeof(Byte));
758
759 // creation date
760 createCol(inv, "creationDate", typeof(Int32));
761
762 // group info
763 createCol(inv, "groupID", typeof(String));
764 createCol(inv, "groupOwned", typeof(Boolean));
765
766 // Flags
767 createCol(inv, "flags", typeof(UInt32));
768
769 inv.PrimaryKey = new DataColumn[] { inv.Columns["UUID"] };
770 return inv;
771 }
772
773 /// <summary>
774 /// Creates the "inventoryfolders" table
775 /// </summary>
776 /// <returns></returns>
777 private static DataTable createInventoryFoldersTable()
778 {
779 DataTable fol = new DataTable("inventoryfolders");
780
781 createCol(fol, "UUID", typeof (String)); //folderID
782 createCol(fol, "name", typeof (String));
783 createCol(fol, "agentID", typeof (String));
784 createCol(fol, "parentID", typeof (String));
785 createCol(fol, "type", typeof (Int32));
786 createCol(fol, "version", typeof (Int32));
787
788 fol.PrimaryKey = new DataColumn[] {fol.Columns["UUID"]};
789 return fol;
790 }
791
792 /// <summary>
793 ///
794 /// </summary>
795 /// <param name="da"></param>
796 /// <param name="conn"></param>
797 private void setupItemsCommands(SqliteDataAdapter da, SqliteConnection conn)
798 {
799 lock (ds)
800 {
801 da.InsertCommand = createInsertCommand("inventoryitems", ds.Tables["inventoryitems"]);
802 da.InsertCommand.Connection = conn;
803
804 da.UpdateCommand = createUpdateCommand("inventoryitems", "UUID=:UUID", ds.Tables["inventoryitems"]);
805 da.UpdateCommand.Connection = conn;
806
807 SqliteCommand delete = new SqliteCommand("delete from inventoryitems where UUID = :UUID");
808 delete.Parameters.Add(createSqliteParameter("UUID", typeof(String)));
809 delete.Connection = conn;
810 da.DeleteCommand = delete;
811 }
812 }
813
814 /// <summary>
815 ///
816 /// </summary>
817 /// <param name="da"></param>
818 /// <param name="conn"></param>
819 private void setupFoldersCommands(SqliteDataAdapter da, SqliteConnection conn)
820 {
821 lock (ds)
822 {
823 da.InsertCommand = createInsertCommand("inventoryfolders", ds.Tables["inventoryfolders"]);
824 da.InsertCommand.Connection = conn;
825
826 da.UpdateCommand = createUpdateCommand("inventoryfolders", "UUID=:UUID", ds.Tables["inventoryfolders"]);
827 da.UpdateCommand.Connection = conn;
828
829 SqliteCommand delete = new SqliteCommand("delete from inventoryfolders where UUID = :UUID");
830 delete.Parameters.Add(createSqliteParameter("UUID", typeof(String)));
831 delete.Connection = conn;
832 da.DeleteCommand = delete;
833 }
834 }
835
836 /// <summary>
837 ///
838 /// </summary>
839 /// <param name="row"></param>
840 /// <returns></returns>
841 private static InventoryFolderBase buildFolder(DataRow row)
842 {
843 InventoryFolderBase folder = new InventoryFolderBase();
844 folder.ID = new UUID((string) row["UUID"]);
845 folder.Name = (string) row["name"];
846 folder.Owner = new UUID((string) row["agentID"]);
847 folder.ParentID = new UUID((string) row["parentID"]);
848 folder.Type = Convert.ToInt16(row["type"]);
849 folder.Version = Convert.ToUInt16(row["version"]);
850 return folder;
851 }
852
853 /// <summary>
854 ///
855 /// </summary>
856 /// <param name="row"></param>
857 /// <param name="folder"></param>
858 private static void fillFolderRow(DataRow row, InventoryFolderBase folder)
859 {
860 row["UUID"] = folder.ID.ToString();
861 row["name"] = folder.Name;
862 row["agentID"] = folder.Owner.ToString();
863 row["parentID"] = folder.ParentID.ToString();
864 row["type"] = folder.Type;
865 row["version"] = folder.Version;
866 }
867
868 /// <summary>
869 ///
870 /// </summary>
871 /// <param name="row"></param>
872 /// <param name="folder"></param>
873 private static void moveFolderRow(DataRow row, InventoryFolderBase folder)
874 {
875 row["UUID"] = folder.ID.ToString();
876 row["parentID"] = folder.ParentID.ToString();
877 }
878
879 public List<InventoryItemBase> fetchActiveGestures (UUID avatarID)
880 {
881 lock (ds)
882 {
883 List<InventoryItemBase> items = new List<InventoryItemBase>();
884
885 DataTable inventoryItemTable = ds.Tables["inventoryitems"];
886 string selectExp
887 = "avatarID = '" + avatarID + "' AND assetType = " + (int)AssetType.Gesture + " AND flags = 1";
888 //m_log.DebugFormat("[SQL]: sql = " + selectExp);
889 DataRow[] rows = inventoryItemTable.Select(selectExp);
890 foreach (DataRow row in rows)
891 {
892 items.Add(buildItem(row));
893 }
894 return items;
895 }
896 }
897 }
898}
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
new file mode 100644
index 0000000..f8660c7
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
@@ -0,0 +1,2255 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Data;
31using System.Drawing;
32using System.IO;
33using System.Reflection;
34using log4net;
35using Mono.Data.SqliteClient;
36using OpenMetaverse;
37using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes;
40
41namespace OpenSim.Data.SQLiteLegacy
42{
43 /// <summary>
44 /// A RegionData Interface to the SQLite database
45 /// </summary>
46 public class SQLiteRegionData : IRegionDataStore
47 {
48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49
50 private const string primSelect = "select * from prims";
51 private const string shapeSelect = "select * from primshapes";
52 private const string itemsSelect = "select * from primitems";
53 private const string terrainSelect = "select * from terrain limit 1";
54 private const string landSelect = "select * from land";
55 private const string landAccessListSelect = "select distinct * from landaccesslist";
56 private const string regionbanListSelect = "select * from regionban";
57 private const string regionSettingsSelect = "select * from regionsettings";
58
59 private DataSet ds;
60 private SqliteDataAdapter primDa;
61 private SqliteDataAdapter shapeDa;
62 private SqliteDataAdapter itemsDa;
63 private SqliteDataAdapter terrainDa;
64 private SqliteDataAdapter landDa;
65 private SqliteDataAdapter landAccessListDa;
66 private SqliteDataAdapter regionSettingsDa;
67
68 private SqliteConnection m_conn;
69
70 private String m_connectionString;
71
72 // Temporary attribute while this is experimental
73
74 /***********************************************************************
75 *
76 * Public Interface Functions
77 *
78 **********************************************************************/
79
80 /// <summary>
81 /// See IRegionDataStore
82 /// <list type="bullet">
83 /// <item>Initialises RegionData Interface</item>
84 /// <item>Loads and initialises a new SQLite connection and maintains it.</item>
85 /// </list>
86 /// </summary>
87 /// <param name="connectionString">the connection string</param>
88 public void Initialise(string connectionString)
89 {
90 m_connectionString = connectionString;
91
92 ds = new DataSet();
93
94 m_log.Info("[REGION DB]: Sqlite - connecting: " + connectionString);
95 m_conn = new SqliteConnection(m_connectionString);
96 m_conn.Open();
97
98
99
100 SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn);
101 primDa = new SqliteDataAdapter(primSelectCmd);
102 // SqliteCommandBuilder primCb = new SqliteCommandBuilder(primDa);
103
104 SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn);
105 shapeDa = new SqliteDataAdapter(shapeSelectCmd);
106 // SqliteCommandBuilder shapeCb = new SqliteCommandBuilder(shapeDa);
107
108 SqliteCommand itemsSelectCmd = new SqliteCommand(itemsSelect, m_conn);
109 itemsDa = new SqliteDataAdapter(itemsSelectCmd);
110
111 SqliteCommand terrainSelectCmd = new SqliteCommand(terrainSelect, m_conn);
112 terrainDa = new SqliteDataAdapter(terrainSelectCmd);
113
114 SqliteCommand landSelectCmd = new SqliteCommand(landSelect, m_conn);
115 landDa = new SqliteDataAdapter(landSelectCmd);
116
117 SqliteCommand landAccessListSelectCmd = new SqliteCommand(landAccessListSelect, m_conn);
118 landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd);
119
120 SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
121 regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
122 // This actually does the roll forward assembly stuff
123 Assembly assem = GetType().Assembly;
124 Migration m = new Migration(m_conn, assem, "RegionStore");
125 m.Update();
126
127 lock (ds)
128 {
129 ds.Tables.Add(createPrimTable());
130 setupPrimCommands(primDa, m_conn);
131 primDa.Fill(ds.Tables["prims"]);
132
133 ds.Tables.Add(createShapeTable());
134 setupShapeCommands(shapeDa, m_conn);
135
136 ds.Tables.Add(createItemsTable());
137 setupItemsCommands(itemsDa, m_conn);
138 itemsDa.Fill(ds.Tables["primitems"]);
139
140 ds.Tables.Add(createTerrainTable());
141 setupTerrainCommands(terrainDa, m_conn);
142
143 ds.Tables.Add(createLandTable());
144 setupLandCommands(landDa, m_conn);
145
146 ds.Tables.Add(createLandAccessListTable());
147 setupLandAccessCommands(landAccessListDa, m_conn);
148
149 ds.Tables.Add(createRegionSettingsTable());
150
151 setupRegionSettingsCommands(regionSettingsDa, m_conn);
152
153 // WORKAROUND: This is a work around for sqlite on
154 // windows, which gets really unhappy with blob columns
155 // that have no sample data in them. At some point we
156 // need to actually find a proper way to handle this.
157 try
158 {
159 shapeDa.Fill(ds.Tables["primshapes"]);
160 }
161 catch (Exception)
162 {
163 m_log.Info("[REGION DB]: Caught fill error on primshapes table");
164 }
165
166 try
167 {
168 terrainDa.Fill(ds.Tables["terrain"]);
169 }
170 catch (Exception)
171 {
172 m_log.Info("[REGION DB]: Caught fill error on terrain table");
173 }
174
175 try
176 {
177 landDa.Fill(ds.Tables["land"]);
178 }
179 catch (Exception)
180 {
181 m_log.Info("[REGION DB]: Caught fill error on land table");
182 }
183
184 try
185 {
186 landAccessListDa.Fill(ds.Tables["landaccesslist"]);
187 }
188 catch (Exception)
189 {
190 m_log.Info("[REGION DB]: Caught fill error on landaccesslist table");
191 }
192
193 try
194 {
195 regionSettingsDa.Fill(ds.Tables["regionsettings"]);
196 }
197 catch (Exception)
198 {
199 m_log.Info("[REGION DB]: Caught fill error on regionsettings table");
200 }
201 return;
202 }
203 }
204
205 public void Dispose()
206 {
207 if (m_conn != null)
208 {
209 m_conn.Close();
210 m_conn = null;
211 }
212 if (ds != null)
213 {
214 ds.Dispose();
215 ds = null;
216 }
217 if (primDa != null)
218 {
219 primDa.Dispose();
220 primDa = null;
221 }
222 if (shapeDa != null)
223 {
224 shapeDa.Dispose();
225 shapeDa = null;
226 }
227 if (itemsDa != null)
228 {
229 itemsDa.Dispose();
230 itemsDa = null;
231 }
232 if (terrainDa != null)
233 {
234 terrainDa.Dispose();
235 terrainDa = null;
236 }
237 if (landDa != null)
238 {
239 landDa.Dispose();
240 landDa = null;
241 }
242 if (landAccessListDa != null)
243 {
244 landAccessListDa.Dispose();
245 landAccessListDa = null;
246 }
247 if (regionSettingsDa != null)
248 {
249 regionSettingsDa.Dispose();
250 regionSettingsDa = null;
251 }
252 }
253
254 public void StoreRegionSettings(RegionSettings rs)
255 {
256 lock (ds)
257 {
258 DataTable regionsettings = ds.Tables["regionsettings"];
259
260 DataRow settingsRow = regionsettings.Rows.Find(rs.RegionUUID.ToString());
261 if (settingsRow == null)
262 {
263 settingsRow = regionsettings.NewRow();
264 fillRegionSettingsRow(settingsRow, rs);
265 regionsettings.Rows.Add(settingsRow);
266 }
267 else
268 {
269 fillRegionSettingsRow(settingsRow, rs);
270 }
271
272 Commit();
273 }
274 }
275
276 public RegionSettings LoadRegionSettings(UUID regionUUID)
277 {
278 lock (ds)
279 {
280 DataTable regionsettings = ds.Tables["regionsettings"];
281
282 string searchExp = "regionUUID = '" + regionUUID.ToString() + "'";
283 DataRow[] rawsettings = regionsettings.Select(searchExp);
284 if (rawsettings.Length == 0)
285 {
286 RegionSettings rs = new RegionSettings();
287 rs.RegionUUID = regionUUID;
288 rs.OnSave += StoreRegionSettings;
289
290 StoreRegionSettings(rs);
291
292 return rs;
293 }
294 DataRow row = rawsettings[0];
295
296 RegionSettings newSettings = buildRegionSettings(row);
297 newSettings.OnSave += StoreRegionSettings;
298
299 return newSettings;
300 }
301 }
302
303 /// <summary>
304 /// Adds an object into region storage
305 /// </summary>
306 /// <param name="obj">the object</param>
307 /// <param name="regionUUID">the region UUID</param>
308 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
309 {
310 uint flags = obj.RootPart.GetEffectiveObjectFlags();
311
312 // Eligibility check
313 //
314 if ((flags & (uint)PrimFlags.Temporary) != 0)
315 return;
316 if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0)
317 return;
318
319 lock (ds)
320 {
321 foreach (SceneObjectPart prim in obj.Children.Values)
322 {
323// m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
324 addPrim(prim, obj.UUID, regionUUID);
325 }
326 }
327
328 Commit();
329 // m_log.Info("[Dump of prims]: " + ds.GetXml());
330 }
331
332 /// <summary>
333 /// Removes an object from region storage
334 /// </summary>
335 /// <param name="obj">the object</param>
336 /// <param name="regionUUID">the region UUID</param>
337 public void RemoveObject(UUID obj, UUID regionUUID)
338 {
339 // m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
340
341 DataTable prims = ds.Tables["prims"];
342 DataTable shapes = ds.Tables["primshapes"];
343
344 string selectExp = "SceneGroupID = '" + obj + "' and RegionUUID = '" + regionUUID + "'";
345 lock (ds)
346 {
347 DataRow[] primRows = prims.Select(selectExp);
348 foreach (DataRow row in primRows)
349 {
350 // Remove shape rows
351 UUID uuid = new UUID((string) row["UUID"]);
352 DataRow shapeRow = shapes.Rows.Find(uuid.ToString());
353 if (shapeRow != null)
354 {
355 shapeRow.Delete();
356 }
357
358 RemoveItems(uuid);
359
360 // Remove prim row
361 row.Delete();
362 }
363 }
364
365 Commit();
366 }
367
368 /// <summary>
369 /// Remove all persisted items of the given prim.
370 /// The caller must acquire the necessrary synchronization locks and commit or rollback changes.
371 /// </summary>
372 /// <param name="uuid">The item UUID</param>
373 private void RemoveItems(UUID uuid)
374 {
375 DataTable items = ds.Tables["primitems"];
376
377 String sql = String.Format("primID = '{0}'", uuid);
378 DataRow[] itemRows = items.Select(sql);
379
380 foreach (DataRow itemRow in itemRows)
381 {
382 itemRow.Delete();
383 }
384 }
385
386 /// <summary>
387 /// Load persisted objects from region storage.
388 /// </summary>
389 /// <param name="regionUUID">The region UUID</param>
390 /// <returns>List of loaded groups</returns>
391 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
392 {
393 Dictionary<UUID, SceneObjectGroup> createdObjects = new Dictionary<UUID, SceneObjectGroup>();
394
395 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
396
397 DataTable prims = ds.Tables["prims"];
398 DataTable shapes = ds.Tables["primshapes"];
399
400 string byRegion = "RegionUUID = '" + regionUUID + "'";
401
402 lock (ds)
403 {
404 DataRow[] primsForRegion = prims.Select(byRegion);
405 m_log.Info("[REGION DB]: Loaded " + primsForRegion.Length + " prims for region: " + regionUUID);
406
407 // First, create all groups
408 foreach (DataRow primRow in primsForRegion)
409 {
410 try
411 {
412 SceneObjectPart prim = null;
413
414 string uuid = (string) primRow["UUID"];
415 string objID = (string) primRow["SceneGroupID"];
416
417 if (uuid == objID) //is new SceneObjectGroup ?
418 {
419 prim = buildPrim(primRow);
420 DataRow shapeRow = shapes.Rows.Find(prim.UUID.ToString());
421 if (shapeRow != null)
422 {
423 prim.Shape = buildShape(shapeRow);
424 }
425 else
426 {
427 m_log.Info(
428 "[REGION DB]: No shape found for prim in storage, so setting default box shape");
429 prim.Shape = PrimitiveBaseShape.Default;
430 }
431
432 SceneObjectGroup group = new SceneObjectGroup(prim);
433 createdObjects.Add(group.UUID, group);
434 retvals.Add(group);
435 LoadItems(prim);
436 }
437 }
438 catch (Exception e)
439 {
440 m_log.Error("[REGION DB]: Failed create prim object in new group, exception and data follows");
441 m_log.Info("[REGION DB]: " + e.ToString());
442 foreach (DataColumn col in prims.Columns)
443 {
444 m_log.Info("[REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]);
445 }
446 }
447 }
448
449 // Now fill the groups with part data
450 foreach (DataRow primRow in primsForRegion)
451 {
452 try
453 {
454 SceneObjectPart prim = null;
455
456 string uuid = (string) primRow["UUID"];
457 string objID = (string) primRow["SceneGroupID"];
458 if (uuid != objID) //is new SceneObjectGroup ?
459 {
460 prim = buildPrim(primRow);
461 DataRow shapeRow = shapes.Rows.Find(prim.UUID.ToString());
462 if (shapeRow != null)
463 {
464 prim.Shape = buildShape(shapeRow);
465 }
466 else
467 {
468 m_log.Warn(
469 "[REGION DB]: No shape found for prim in storage, so setting default box shape");
470 prim.Shape = PrimitiveBaseShape.Default;
471 }
472
473 createdObjects[new UUID(objID)].AddPart(prim);
474 LoadItems(prim);
475 }
476 }
477 catch (Exception e)
478 {
479 m_log.Error("[REGION DB]: Failed create prim object in group, exception and data follows");
480 m_log.Info("[REGION DB]: " + e.ToString());
481 foreach (DataColumn col in prims.Columns)
482 {
483 m_log.Info("[REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]);
484 }
485 }
486 }
487 }
488 return retvals;
489 }
490
491 /// <summary>
492 /// Load in a prim's persisted inventory.
493 /// </summary>
494 /// <param name="prim">the prim</param>
495 private void LoadItems(SceneObjectPart prim)
496 {
497 //m_log.DebugFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID);
498
499 DataTable dbItems = ds.Tables["primitems"];
500 String sql = String.Format("primID = '{0}'", prim.UUID.ToString());
501 DataRow[] dbItemRows = dbItems.Select(sql);
502 IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
503
504 foreach (DataRow row in dbItemRows)
505 {
506 TaskInventoryItem item = buildItem(row);
507 inventory.Add(item);
508
509 //m_log.DebugFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID);
510 }
511
512 prim.Inventory.RestoreInventoryItems(inventory);
513 }
514
515 /// <summary>
516 /// Store a terrain revision in region storage
517 /// </summary>
518 /// <param name="ter">terrain heightfield</param>
519 /// <param name="regionID">region UUID</param>
520 public void StoreTerrain(double[,] ter, UUID regionID)
521 {
522 lock (ds)
523 {
524 int revision = Util.UnixTimeSinceEpoch();
525
526 // This is added to get rid of the infinitely growing
527 // terrain databases which negatively impact on SQLite
528 // over time. Before reenabling this feature there
529 // needs to be a limitter put on the number of
530 // revisions in the database, as this old
531 // implementation is a DOS attack waiting to happen.
532
533 using (
534 SqliteCommand cmd =
535 new SqliteCommand("delete from terrain where RegionUUID=:RegionUUID and Revision <= :Revision",
536 m_conn))
537 {
538 cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
539 cmd.Parameters.Add(new SqliteParameter(":Revision", revision));
540 cmd.ExecuteNonQuery();
541 }
542
543 // the following is an work around for .NET. The perf
544 // issues associated with it aren't as bad as you think.
545 m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString());
546 String sql = "insert into terrain(RegionUUID, Revision, Heightfield)" +
547 " values(:RegionUUID, :Revision, :Heightfield)";
548
549 using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
550 {
551 cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
552 cmd.Parameters.Add(new SqliteParameter(":Revision", revision));
553 cmd.Parameters.Add(new SqliteParameter(":Heightfield", serializeTerrain(ter)));
554 cmd.ExecuteNonQuery();
555 }
556 }
557 }
558
559 /// <summary>
560 /// Load the latest terrain revision from region storage
561 /// </summary>
562 /// <param name="regionID">the region UUID</param>
563 /// <returns>Heightfield data</returns>
564 public double[,] LoadTerrain(UUID regionID)
565 {
566 lock (ds)
567 {
568 double[,] terret = new double[(int)Constants.RegionSize, (int)Constants.RegionSize];
569 terret.Initialize();
570
571 String sql = "select RegionUUID, Revision, Heightfield from terrain" +
572 " where RegionUUID=:RegionUUID order by Revision desc";
573
574 using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
575 {
576 cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
577
578 using (IDataReader row = cmd.ExecuteReader())
579 {
580 int rev = 0;
581 if (row.Read())
582 {
583 // TODO: put this into a function
584 using (MemoryStream str = new MemoryStream((byte[])row["Heightfield"]))
585 {
586 using (BinaryReader br = new BinaryReader(str))
587 {
588 for (int x = 0; x < (int)Constants.RegionSize; x++)
589 {
590 for (int y = 0; y < (int)Constants.RegionSize; y++)
591 {
592 terret[x, y] = br.ReadDouble();
593 }
594 }
595 }
596 }
597 rev = (int) row["Revision"];
598 }
599 else
600 {
601 m_log.Info("[REGION DB]: No terrain found for region");
602 return null;
603 }
604
605 m_log.Info("[REGION DB]: Loaded terrain revision r" + rev.ToString());
606 }
607 }
608 return terret;
609 }
610 }
611
612 /// <summary>
613 ///
614 /// </summary>
615 /// <param name="globalID"></param>
616 public void RemoveLandObject(UUID globalID)
617 {
618 lock (ds)
619 {
620 // Can't use blanket SQL statements when using SqlAdapters unless you re-read the data into the adapter
621 // after you're done.
622 // replaced below code with the SqliteAdapter version.
623 //using (SqliteCommand cmd = new SqliteCommand("delete from land where UUID=:UUID", m_conn))
624 //{
625 // cmd.Parameters.Add(new SqliteParameter(":UUID", globalID.ToString()));
626 // cmd.ExecuteNonQuery();
627 //}
628
629 //using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:UUID", m_conn))
630 //{
631 // cmd.Parameters.Add(new SqliteParameter(":UUID", globalID.ToString()));
632 // cmd.ExecuteNonQuery();
633 //}
634
635 DataTable land = ds.Tables["land"];
636 DataTable landaccesslist = ds.Tables["landaccesslist"];
637 DataRow landRow = land.Rows.Find(globalID.ToString());
638 if (landRow != null)
639 {
640 land.Rows.Remove(landRow);
641 }
642 List<DataRow> rowsToDelete = new List<DataRow>();
643 foreach (DataRow rowToCheck in landaccesslist.Rows)
644 {
645 if (rowToCheck["LandUUID"].ToString() == globalID.ToString())
646 rowsToDelete.Add(rowToCheck);
647 }
648 for (int iter = 0; iter < rowsToDelete.Count; iter++)
649 {
650 landaccesslist.Rows.Remove(rowsToDelete[iter]);
651 }
652
653
654 }
655 Commit();
656 }
657
658 /// <summary>
659 ///
660 /// </summary>
661 /// <param name="parcel"></param>
662 public void StoreLandObject(ILandObject parcel)
663 {
664 lock (ds)
665 {
666 DataTable land = ds.Tables["land"];
667 DataTable landaccesslist = ds.Tables["landaccesslist"];
668
669 DataRow landRow = land.Rows.Find(parcel.LandData.GlobalID.ToString());
670 if (landRow == null)
671 {
672 landRow = land.NewRow();
673 fillLandRow(landRow, parcel.LandData, parcel.RegionUUID);
674 land.Rows.Add(landRow);
675 }
676 else
677 {
678 fillLandRow(landRow, parcel.LandData, parcel.RegionUUID);
679 }
680
681 // I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around
682 //using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn))
683 //{
684 // cmd.Parameters.Add(new SqliteParameter(":LandUUID", parcel.LandData.GlobalID.ToString()));
685 // cmd.ExecuteNonQuery();
686
687// }
688
689 // This is the slower.. but more appropriate thing to do
690
691 // We can't modify the table with direct queries before calling Commit() and re-filling them.
692 List<DataRow> rowsToDelete = new List<DataRow>();
693 foreach (DataRow rowToCheck in landaccesslist.Rows)
694 {
695 if (rowToCheck["LandUUID"].ToString() == parcel.LandData.GlobalID.ToString())
696 rowsToDelete.Add(rowToCheck);
697 }
698 for (int iter = 0; iter < rowsToDelete.Count; iter++)
699 {
700 landaccesslist.Rows.Remove(rowsToDelete[iter]);
701 }
702 rowsToDelete.Clear();
703 foreach (ParcelManager.ParcelAccessEntry entry in parcel.LandData.ParcelAccessList)
704 {
705 DataRow newAccessRow = landaccesslist.NewRow();
706 fillLandAccessRow(newAccessRow, entry, parcel.LandData.GlobalID);
707 landaccesslist.Rows.Add(newAccessRow);
708 }
709 }
710
711 Commit();
712 }
713
714 /// <summary>
715 ///
716 /// </summary>
717 /// <param name="regionUUID"></param>
718 /// <returns></returns>
719 public List<LandData> LoadLandObjects(UUID regionUUID)
720 {
721 List<LandData> landDataForRegion = new List<LandData>();
722 lock (ds)
723 {
724 DataTable land = ds.Tables["land"];
725 DataTable landaccesslist = ds.Tables["landaccesslist"];
726 string searchExp = "RegionUUID = '" + regionUUID + "'";
727 DataRow[] rawDataForRegion = land.Select(searchExp);
728 foreach (DataRow rawDataLand in rawDataForRegion)
729 {
730 LandData newLand = buildLandData(rawDataLand);
731 string accessListSearchExp = "LandUUID = '" + newLand.GlobalID + "'";
732 DataRow[] rawDataForLandAccessList = landaccesslist.Select(accessListSearchExp);
733 foreach (DataRow rawDataLandAccess in rawDataForLandAccessList)
734 {
735 newLand.ParcelAccessList.Add(buildLandAccessData(rawDataLandAccess));
736 }
737
738 landDataForRegion.Add(newLand);
739 }
740 }
741 return landDataForRegion;
742 }
743
744 /// <summary>
745 ///
746 /// </summary>
747 public void Commit()
748 {
749 lock (ds)
750 {
751 primDa.Update(ds, "prims");
752 shapeDa.Update(ds, "primshapes");
753
754 itemsDa.Update(ds, "primitems");
755
756 terrainDa.Update(ds, "terrain");
757 landDa.Update(ds, "land");
758 landAccessListDa.Update(ds, "landaccesslist");
759 try
760 {
761 regionSettingsDa.Update(ds, "regionsettings");
762 }
763 catch (SqliteExecutionException SqlEx)
764 {
765 if (SqlEx.Message.Contains("logic error"))
766 {
767 throw new Exception(
768 "There was a SQL error or connection string configuration error when saving the region settings. This could be a bug, it could also happen if ConnectionString is defined in the [DatabaseService] section of StandaloneCommon.ini in the config_include folder. This could also happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set. If this is your first time running OpenSimulator, please restart the simulator and bug a developer to fix this!",
769 SqlEx);
770 }
771 else
772 {
773 throw SqlEx;
774 }
775 }
776 ds.AcceptChanges();
777 }
778 }
779
780 /// <summary>
781 /// See <see cref="Commit"/>
782 /// </summary>
783 public void Shutdown()
784 {
785 Commit();
786 }
787
788 /***********************************************************************
789 *
790 * Database Definition Functions
791 *
792 * This should be db agnostic as we define them in ADO.NET terms
793 *
794 **********************************************************************/
795
796 /// <summary>
797 ///
798 /// </summary>
799 /// <param name="dt"></param>
800 /// <param name="name"></param>
801 /// <param name="type"></param>
802 private static void createCol(DataTable dt, string name, Type type)
803 {
804 DataColumn col = new DataColumn(name, type);
805 dt.Columns.Add(col);
806 }
807
808 /// <summary>
809 /// Creates the "terrain" table
810 /// </summary>
811 /// <returns>terrain table DataTable</returns>
812 private static DataTable createTerrainTable()
813 {
814 DataTable terrain = new DataTable("terrain");
815
816 createCol(terrain, "RegionUUID", typeof (String));
817 createCol(terrain, "Revision", typeof (Int32));
818 createCol(terrain, "Heightfield", typeof (Byte[]));
819
820 return terrain;
821 }
822
823 /// <summary>
824 /// Creates the "prims" table
825 /// </summary>
826 /// <returns>prim table DataTable</returns>
827 private static DataTable createPrimTable()
828 {
829 DataTable prims = new DataTable("prims");
830
831 createCol(prims, "UUID", typeof (String));
832 createCol(prims, "RegionUUID", typeof (String));
833 createCol(prims, "CreationDate", typeof (Int32));
834 createCol(prims, "Name", typeof (String));
835 createCol(prims, "SceneGroupID", typeof (String));
836 // various text fields
837 createCol(prims, "Text", typeof (String));
838 createCol(prims, "ColorR", typeof (Int32));
839 createCol(prims, "ColorG", typeof (Int32));
840 createCol(prims, "ColorB", typeof (Int32));
841 createCol(prims, "ColorA", typeof (Int32));
842 createCol(prims, "Description", typeof (String));
843 createCol(prims, "SitName", typeof (String));
844 createCol(prims, "TouchName", typeof (String));
845 // permissions
846 createCol(prims, "ObjectFlags", typeof (Int32));
847 createCol(prims, "CreatorID", typeof (String));
848 createCol(prims, "OwnerID", typeof (String));
849 createCol(prims, "GroupID", typeof (String));
850 createCol(prims, "LastOwnerID", typeof (String));
851 createCol(prims, "OwnerMask", typeof (Int32));
852 createCol(prims, "NextOwnerMask", typeof (Int32));
853 createCol(prims, "GroupMask", typeof (Int32));
854 createCol(prims, "EveryoneMask", typeof (Int32));
855 createCol(prims, "BaseMask", typeof (Int32));
856 // vectors
857 createCol(prims, "PositionX", typeof (Double));
858 createCol(prims, "PositionY", typeof (Double));
859 createCol(prims, "PositionZ", typeof (Double));
860 createCol(prims, "GroupPositionX", typeof (Double));
861 createCol(prims, "GroupPositionY", typeof (Double));
862 createCol(prims, "GroupPositionZ", typeof (Double));
863 createCol(prims, "VelocityX", typeof (Double));
864 createCol(prims, "VelocityY", typeof (Double));
865 createCol(prims, "VelocityZ", typeof (Double));
866 createCol(prims, "AngularVelocityX", typeof (Double));
867 createCol(prims, "AngularVelocityY", typeof (Double));
868 createCol(prims, "AngularVelocityZ", typeof (Double));
869 createCol(prims, "AccelerationX", typeof (Double));
870 createCol(prims, "AccelerationY", typeof (Double));
871 createCol(prims, "AccelerationZ", typeof (Double));
872 // quaternions
873 createCol(prims, "RotationX", typeof (Double));
874 createCol(prims, "RotationY", typeof (Double));
875 createCol(prims, "RotationZ", typeof (Double));
876 createCol(prims, "RotationW", typeof (Double));
877
878 // sit target
879 createCol(prims, "SitTargetOffsetX", typeof (Double));
880 createCol(prims, "SitTargetOffsetY", typeof (Double));
881 createCol(prims, "SitTargetOffsetZ", typeof (Double));
882
883 createCol(prims, "SitTargetOrientW", typeof (Double));
884 createCol(prims, "SitTargetOrientX", typeof (Double));
885 createCol(prims, "SitTargetOrientY", typeof (Double));
886 createCol(prims, "SitTargetOrientZ", typeof (Double));
887
888 createCol(prims, "PayPrice", typeof(Int32));
889 createCol(prims, "PayButton1", typeof(Int32));
890 createCol(prims, "PayButton2", typeof(Int32));
891 createCol(prims, "PayButton3", typeof(Int32));
892 createCol(prims, "PayButton4", typeof(Int32));
893
894 createCol(prims, "LoopedSound", typeof(String));
895 createCol(prims, "LoopedSoundGain", typeof(Double));
896 createCol(prims, "TextureAnimation", typeof(String));
897 createCol(prims, "ParticleSystem", typeof(String));
898
899 createCol(prims, "OmegaX", typeof(Double));
900 createCol(prims, "OmegaY", typeof(Double));
901 createCol(prims, "OmegaZ", typeof(Double));
902
903 createCol(prims, "CameraEyeOffsetX", typeof(Double));
904 createCol(prims, "CameraEyeOffsetY", typeof(Double));
905 createCol(prims, "CameraEyeOffsetZ", typeof(Double));
906
907 createCol(prims, "CameraAtOffsetX", typeof(Double));
908 createCol(prims, "CameraAtOffsetY", typeof(Double));
909 createCol(prims, "CameraAtOffsetZ", typeof(Double));
910
911 createCol(prims, "ForceMouselook", typeof(Int16));
912
913 createCol(prims, "ScriptAccessPin", typeof(Int32));
914
915 createCol(prims, "AllowedDrop", typeof(Int16));
916 createCol(prims, "DieAtEdge", typeof(Int16));
917
918 createCol(prims, "SalePrice", typeof(Int32));
919 createCol(prims, "SaleType", typeof(Int16));
920
921 // click action
922 createCol(prims, "ClickAction", typeof (Byte));
923
924 createCol(prims, "Material", typeof(Byte));
925
926 createCol(prims, "CollisionSound", typeof(String));
927 createCol(prims, "CollisionSoundVolume", typeof(Double));
928
929 createCol(prims, "VolumeDetect", typeof(Int16));
930
931 // Add in contraints
932 prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]};
933
934 return prims;
935 }
936
937 /// <summary>
938 /// Creates "primshapes" table
939 /// </summary>
940 /// <returns>shape table DataTable</returns>
941 private static DataTable createShapeTable()
942 {
943 DataTable shapes = new DataTable("primshapes");
944 createCol(shapes, "UUID", typeof (String));
945 // shape is an enum
946 createCol(shapes, "Shape", typeof (Int32));
947 // vectors
948 createCol(shapes, "ScaleX", typeof (Double));
949 createCol(shapes, "ScaleY", typeof (Double));
950 createCol(shapes, "ScaleZ", typeof (Double));
951 // paths
952 createCol(shapes, "PCode", typeof (Int32));
953 createCol(shapes, "PathBegin", typeof (Int32));
954 createCol(shapes, "PathEnd", typeof (Int32));
955 createCol(shapes, "PathScaleX", typeof (Int32));
956 createCol(shapes, "PathScaleY", typeof (Int32));
957 createCol(shapes, "PathShearX", typeof (Int32));
958 createCol(shapes, "PathShearY", typeof (Int32));
959 createCol(shapes, "PathSkew", typeof (Int32));
960 createCol(shapes, "PathCurve", typeof (Int32));
961 createCol(shapes, "PathRadiusOffset", typeof (Int32));
962 createCol(shapes, "PathRevolutions", typeof (Int32));
963 createCol(shapes, "PathTaperX", typeof (Int32));
964 createCol(shapes, "PathTaperY", typeof (Int32));
965 createCol(shapes, "PathTwist", typeof (Int32));
966 createCol(shapes, "PathTwistBegin", typeof (Int32));
967 // profile
968 createCol(shapes, "ProfileBegin", typeof (Int32));
969 createCol(shapes, "ProfileEnd", typeof (Int32));
970 createCol(shapes, "ProfileCurve", typeof (Int32));
971 createCol(shapes, "ProfileHollow", typeof (Int32));
972 createCol(shapes, "State", typeof(Int32));
973 // text TODO: this isn't right, but I'm not sure the right
974 // way to specify this as a blob atm
975 createCol(shapes, "Texture", typeof (Byte[]));
976 createCol(shapes, "ExtraParams", typeof (Byte[]));
977
978 shapes.PrimaryKey = new DataColumn[] {shapes.Columns["UUID"]};
979
980 return shapes;
981 }
982
983 /// <summary>
984 /// creates "primitems" table
985 /// </summary>
986 /// <returns>item table DataTable</returns>
987 private static DataTable createItemsTable()
988 {
989 DataTable items = new DataTable("primitems");
990
991 createCol(items, "itemID", typeof (String));
992 createCol(items, "primID", typeof (String));
993 createCol(items, "assetID", typeof (String));
994 createCol(items, "parentFolderID", typeof (String));
995
996 createCol(items, "invType", typeof (Int32));
997 createCol(items, "assetType", typeof (Int32));
998
999 createCol(items, "name", typeof (String));
1000 createCol(items, "description", typeof (String));
1001
1002 createCol(items, "creationDate", typeof (Int64));
1003 createCol(items, "creatorID", typeof (String));
1004 createCol(items, "ownerID", typeof (String));
1005 createCol(items, "lastOwnerID", typeof (String));
1006 createCol(items, "groupID", typeof (String));
1007
1008 createCol(items, "nextPermissions", typeof (UInt32));
1009 createCol(items, "currentPermissions", typeof (UInt32));
1010 createCol(items, "basePermissions", typeof (UInt32));
1011 createCol(items, "everyonePermissions", typeof (UInt32));
1012 createCol(items, "groupPermissions", typeof (UInt32));
1013 createCol(items, "flags", typeof (UInt32));
1014
1015 items.PrimaryKey = new DataColumn[] { items.Columns["itemID"] };
1016
1017 return items;
1018 }
1019
1020 /// <summary>
1021 /// Creates "land" table
1022 /// </summary>
1023 /// <returns>land table DataTable</returns>
1024 private static DataTable createLandTable()
1025 {
1026 DataTable land = new DataTable("land");
1027 createCol(land, "UUID", typeof (String));
1028 createCol(land, "RegionUUID", typeof (String));
1029 createCol(land, "LocalLandID", typeof (UInt32));
1030
1031 // Bitmap is a byte[512]
1032 createCol(land, "Bitmap", typeof (Byte[]));
1033
1034 createCol(land, "Name", typeof (String));
1035 createCol(land, "Desc", typeof (String));
1036 createCol(land, "OwnerUUID", typeof (String));
1037 createCol(land, "IsGroupOwned", typeof (Boolean));
1038 createCol(land, "Area", typeof (Int32));
1039 createCol(land, "AuctionID", typeof (Int32)); //Unemplemented
1040 createCol(land, "Category", typeof (Int32)); //Enum OpenMetaverse.Parcel.ParcelCategory
1041 createCol(land, "ClaimDate", typeof (Int32));
1042 createCol(land, "ClaimPrice", typeof (Int32));
1043 createCol(land, "GroupUUID", typeof (string));
1044 createCol(land, "SalePrice", typeof (Int32));
1045 createCol(land, "LandStatus", typeof (Int32)); //Enum. OpenMetaverse.Parcel.ParcelStatus
1046 createCol(land, "LandFlags", typeof (UInt32));
1047 createCol(land, "LandingType", typeof (Byte));
1048 createCol(land, "MediaAutoScale", typeof (Byte));
1049 createCol(land, "MediaTextureUUID", typeof (String));
1050 createCol(land, "MediaURL", typeof (String));
1051 createCol(land, "MusicURL", typeof (String));
1052 createCol(land, "PassHours", typeof (Double));
1053 createCol(land, "PassPrice", typeof (UInt32));
1054 createCol(land, "SnapshotUUID", typeof (String));
1055 createCol(land, "UserLocationX", typeof (Double));
1056 createCol(land, "UserLocationY", typeof (Double));
1057 createCol(land, "UserLocationZ", typeof (Double));
1058 createCol(land, "UserLookAtX", typeof (Double));
1059 createCol(land, "UserLookAtY", typeof (Double));
1060 createCol(land, "UserLookAtZ", typeof (Double));
1061 createCol(land, "AuthbuyerID", typeof(String));
1062 createCol(land, "OtherCleanTime", typeof(Int32));
1063 createCol(land, "Dwell", typeof(Int32));
1064
1065 land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]};
1066
1067 return land;
1068 }
1069
1070 /// <summary>
1071 /// create "landaccesslist" table
1072 /// </summary>
1073 /// <returns>Landacceslist DataTable</returns>
1074 private static DataTable createLandAccessListTable()
1075 {
1076 DataTable landaccess = new DataTable("landaccesslist");
1077 createCol(landaccess, "LandUUID", typeof (String));
1078 createCol(landaccess, "AccessUUID", typeof (String));
1079 createCol(landaccess, "Flags", typeof (UInt32));
1080
1081 return landaccess;
1082 }
1083
1084 private static DataTable createRegionSettingsTable()
1085 {
1086 DataTable regionsettings = new DataTable("regionsettings");
1087 createCol(regionsettings, "regionUUID", typeof(String));
1088 createCol(regionsettings, "block_terraform", typeof (Int32));
1089 createCol(regionsettings, "block_fly", typeof (Int32));
1090 createCol(regionsettings, "allow_damage", typeof (Int32));
1091 createCol(regionsettings, "restrict_pushing", typeof (Int32));
1092 createCol(regionsettings, "allow_land_resell", typeof (Int32));
1093 createCol(regionsettings, "allow_land_join_divide", typeof (Int32));
1094 createCol(regionsettings, "block_show_in_search", typeof (Int32));
1095 createCol(regionsettings, "agent_limit", typeof (Int32));
1096 createCol(regionsettings, "object_bonus", typeof (Double));
1097 createCol(regionsettings, "maturity", typeof (Int32));
1098 createCol(regionsettings, "disable_scripts", typeof (Int32));
1099 createCol(regionsettings, "disable_collisions", typeof (Int32));
1100 createCol(regionsettings, "disable_physics", typeof (Int32));
1101 createCol(regionsettings, "terrain_texture_1", typeof(String));
1102 createCol(regionsettings, "terrain_texture_2", typeof(String));
1103 createCol(regionsettings, "terrain_texture_3", typeof(String));
1104 createCol(regionsettings, "terrain_texture_4", typeof(String));
1105 createCol(regionsettings, "elevation_1_nw", typeof (Double));
1106 createCol(regionsettings, "elevation_2_nw", typeof (Double));
1107 createCol(regionsettings, "elevation_1_ne", typeof (Double));
1108 createCol(regionsettings, "elevation_2_ne", typeof (Double));
1109 createCol(regionsettings, "elevation_1_se", typeof (Double));
1110 createCol(regionsettings, "elevation_2_se", typeof (Double));
1111 createCol(regionsettings, "elevation_1_sw", typeof (Double));
1112 createCol(regionsettings, "elevation_2_sw", typeof (Double));
1113 createCol(regionsettings, "water_height", typeof (Double));
1114 createCol(regionsettings, "terrain_raise_limit", typeof (Double));
1115 createCol(regionsettings, "terrain_lower_limit", typeof (Double));
1116 createCol(regionsettings, "use_estate_sun", typeof (Int32));
1117 createCol(regionsettings, "sandbox", typeof (Int32));
1118 createCol(regionsettings, "sunvectorx",typeof (Double));
1119 createCol(regionsettings, "sunvectory",typeof (Double));
1120 createCol(regionsettings, "sunvectorz",typeof (Double));
1121 createCol(regionsettings, "fixed_sun", typeof (Int32));
1122 createCol(regionsettings, "sun_position", typeof (Double));
1123 createCol(regionsettings, "covenant", typeof(String));
1124 regionsettings.PrimaryKey = new DataColumn[] { regionsettings.Columns["regionUUID"] };
1125 return regionsettings;
1126 }
1127
1128 /***********************************************************************
1129 *
1130 * Convert between ADO.NET <=> OpenSim Objects
1131 *
1132 * These should be database independant
1133 *
1134 **********************************************************************/
1135
1136 /// <summary>
1137 ///
1138 /// </summary>
1139 /// <param name="row"></param>
1140 /// <returns></returns>
1141 private SceneObjectPart buildPrim(DataRow row)
1142 {
1143 // Code commented. Uncomment to test the unit test inline.
1144
1145 // The unit test mentions this commented code for the purposes
1146 // of debugging a unit test failure
1147
1148 // SceneObjectGroup sog = new SceneObjectGroup();
1149 // SceneObjectPart sop = new SceneObjectPart();
1150 // sop.LocalId = 1;
1151 // sop.Name = "object1";
1152 // sop.Description = "object1";
1153 // sop.Text = "";
1154 // sop.SitName = "";
1155 // sop.TouchName = "";
1156 // sop.UUID = UUID.Random();
1157 // sop.Shape = PrimitiveBaseShape.Default;
1158 // sog.SetRootPart(sop);
1159 // Add breakpoint in above line. Check sop fields.
1160
1161 // TODO: this doesn't work yet because something more
1162 // interesting has to be done to actually get these values
1163 // back out. Not enough time to figure it out yet.
1164
1165 SceneObjectPart prim = new SceneObjectPart();
1166 prim.UUID = new UUID((String) row["UUID"]);
1167 // explicit conversion of integers is required, which sort
1168 // of sucks. No idea if there is a shortcut here or not.
1169 prim.CreationDate = Convert.ToInt32(row["CreationDate"]);
1170 prim.Name = row["Name"] == DBNull.Value ? string.Empty : (string)row["Name"];
1171 // various text fields
1172 prim.Text = (String) row["Text"];
1173 prim.Color = Color.FromArgb(Convert.ToInt32(row["ColorA"]),
1174 Convert.ToInt32(row["ColorR"]),
1175 Convert.ToInt32(row["ColorG"]),
1176 Convert.ToInt32(row["ColorB"]));
1177 prim.Description = (String) row["Description"];
1178 prim.SitName = (String) row["SitName"];
1179 prim.TouchName = (String) row["TouchName"];
1180 // permissions
1181 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
1182 prim.CreatorID = new UUID((String) row["CreatorID"]);
1183 prim.OwnerID = new UUID((String) row["OwnerID"]);
1184 prim.GroupID = new UUID((String) row["GroupID"]);
1185 prim.LastOwnerID = new UUID((String) row["LastOwnerID"]);
1186 prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]);
1187 prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]);
1188 prim.GroupMask = Convert.ToUInt32(row["GroupMask"]);
1189 prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]);
1190 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]);
1191 // vectors
1192 prim.OffsetPosition = new Vector3(
1193 Convert.ToSingle(row["PositionX"]),
1194 Convert.ToSingle(row["PositionY"]),
1195 Convert.ToSingle(row["PositionZ"])
1196 );
1197 prim.GroupPosition = new Vector3(
1198 Convert.ToSingle(row["GroupPositionX"]),
1199 Convert.ToSingle(row["GroupPositionY"]),
1200 Convert.ToSingle(row["GroupPositionZ"])
1201 );
1202 prim.Velocity = new Vector3(
1203 Convert.ToSingle(row["VelocityX"]),
1204 Convert.ToSingle(row["VelocityY"]),
1205 Convert.ToSingle(row["VelocityZ"])
1206 );
1207 prim.AngularVelocity = new Vector3(
1208 Convert.ToSingle(row["AngularVelocityX"]),
1209 Convert.ToSingle(row["AngularVelocityY"]),
1210 Convert.ToSingle(row["AngularVelocityZ"])
1211 );
1212 prim.Acceleration = new Vector3(
1213 Convert.ToSingle(row["AccelerationX"]),
1214 Convert.ToSingle(row["AccelerationY"]),
1215 Convert.ToSingle(row["AccelerationZ"])
1216 );
1217 // quaternions
1218 prim.RotationOffset = new Quaternion(
1219 Convert.ToSingle(row["RotationX"]),
1220 Convert.ToSingle(row["RotationY"]),
1221 Convert.ToSingle(row["RotationZ"]),
1222 Convert.ToSingle(row["RotationW"])
1223 );
1224
1225 prim.SitTargetPositionLL = new Vector3(
1226 Convert.ToSingle(row["SitTargetOffsetX"]),
1227 Convert.ToSingle(row["SitTargetOffsetY"]),
1228 Convert.ToSingle(row["SitTargetOffsetZ"]));
1229 prim.SitTargetOrientationLL = new Quaternion(
1230 Convert.ToSingle(
1231 row["SitTargetOrientX"]),
1232 Convert.ToSingle(
1233 row["SitTargetOrientY"]),
1234 Convert.ToSingle(
1235 row["SitTargetOrientZ"]),
1236 Convert.ToSingle(
1237 row["SitTargetOrientW"]));
1238
1239 prim.ClickAction = Convert.ToByte(row["ClickAction"]);
1240 prim.PayPrice[0] = Convert.ToInt32(row["PayPrice"]);
1241 prim.PayPrice[1] = Convert.ToInt32(row["PayButton1"]);
1242 prim.PayPrice[2] = Convert.ToInt32(row["PayButton2"]);
1243 prim.PayPrice[3] = Convert.ToInt32(row["PayButton3"]);
1244 prim.PayPrice[4] = Convert.ToInt32(row["PayButton4"]);
1245
1246 prim.Sound = new UUID(row["LoopedSound"].ToString());
1247 prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]);
1248 prim.SoundFlags = 1; // If it's persisted at all, it's looped
1249
1250 if (!row.IsNull("TextureAnimation"))
1251 prim.TextureAnimation = Convert.FromBase64String(row["TextureAnimation"].ToString());
1252 if (!row.IsNull("ParticleSystem"))
1253 prim.ParticleSystem = Convert.FromBase64String(row["ParticleSystem"].ToString());
1254
1255 prim.AngularVelocity = new Vector3(
1256 Convert.ToSingle(row["OmegaX"]),
1257 Convert.ToSingle(row["OmegaY"]),
1258 Convert.ToSingle(row["OmegaZ"])
1259 );
1260
1261 prim.SetCameraEyeOffset(new Vector3(
1262 Convert.ToSingle(row["CameraEyeOffsetX"]),
1263 Convert.ToSingle(row["CameraEyeOffsetY"]),
1264 Convert.ToSingle(row["CameraEyeOffsetZ"])
1265 ));
1266
1267 prim.SetCameraAtOffset(new Vector3(
1268 Convert.ToSingle(row["CameraAtOffsetX"]),
1269 Convert.ToSingle(row["CameraAtOffsetY"]),
1270 Convert.ToSingle(row["CameraAtOffsetZ"])
1271 ));
1272
1273 if (Convert.ToInt16(row["ForceMouselook"]) != 0)
1274 prim.SetForceMouselook(true);
1275
1276 prim.ScriptAccessPin = Convert.ToInt32(row["ScriptAccessPin"]);
1277
1278 if (Convert.ToInt16(row["AllowedDrop"]) != 0)
1279 prim.AllowedDrop = true;
1280
1281 if (Convert.ToInt16(row["DieAtEdge"]) != 0)
1282 prim.DIE_AT_EDGE = true;
1283
1284 prim.SalePrice = Convert.ToInt32(row["SalePrice"]);
1285 prim.ObjectSaleType = Convert.ToByte(row["SaleType"]);
1286
1287 prim.Material = Convert.ToByte(row["Material"]);
1288
1289 prim.CollisionSound = new UUID(row["CollisionSound"].ToString());
1290 prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]);
1291
1292 if (Convert.ToInt16(row["VolumeDetect"]) != 0)
1293 prim.VolumeDetectActive = true;
1294
1295 return prim;
1296 }
1297
1298 /// <summary>
1299 /// Build a prim inventory item from the persisted data.
1300 /// </summary>
1301 /// <param name="row"></param>
1302 /// <returns></returns>
1303 private static TaskInventoryItem buildItem(DataRow row)
1304 {
1305 TaskInventoryItem taskItem = new TaskInventoryItem();
1306
1307 taskItem.ItemID = new UUID((String)row["itemID"]);
1308 taskItem.ParentPartID = new UUID((String)row["primID"]);
1309 taskItem.AssetID = new UUID((String)row["assetID"]);
1310 taskItem.ParentID = new UUID((String)row["parentFolderID"]);
1311
1312 taskItem.InvType = Convert.ToInt32(row["invType"]);
1313 taskItem.Type = Convert.ToInt32(row["assetType"]);
1314
1315 taskItem.Name = (String)row["name"];
1316 taskItem.Description = (String)row["description"];
1317 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]);
1318 taskItem.CreatorID = new UUID((String)row["creatorID"]);
1319 taskItem.OwnerID = new UUID((String)row["ownerID"]);
1320 taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]);
1321 taskItem.GroupID = new UUID((String)row["groupID"]);
1322
1323 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
1324 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]);
1325 taskItem.BasePermissions = Convert.ToUInt32(row["basePermissions"]);
1326 taskItem.EveryonePermissions = Convert.ToUInt32(row["everyonePermissions"]);
1327 taskItem.GroupPermissions = Convert.ToUInt32(row["groupPermissions"]);
1328 taskItem.Flags = Convert.ToUInt32(row["flags"]);
1329
1330 return taskItem;
1331 }
1332
1333 /// <summary>
1334 /// Build a Land Data from the persisted data.
1335 /// </summary>
1336 /// <param name="row"></param>
1337 /// <returns></returns>
1338 private LandData buildLandData(DataRow row)
1339 {
1340 LandData newData = new LandData();
1341
1342 newData.GlobalID = new UUID((String) row["UUID"]);
1343 newData.LocalID = Convert.ToInt32(row["LocalLandID"]);
1344
1345 // Bitmap is a byte[512]
1346 newData.Bitmap = (Byte[]) row["Bitmap"];
1347
1348 newData.Name = (String) row["Name"];
1349 newData.Description = (String) row["Desc"];
1350 newData.OwnerID = (UUID)(String) row["OwnerUUID"];
1351 newData.IsGroupOwned = (Boolean) row["IsGroupOwned"];
1352 newData.Area = Convert.ToInt32(row["Area"]);
1353 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented
1354 newData.Category = (ParcelCategory) Convert.ToInt32(row["Category"]);
1355 //Enum OpenMetaverse.Parcel.ParcelCategory
1356 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
1357 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
1358 newData.GroupID = new UUID((String) row["GroupUUID"]);
1359 newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
1360 newData.Status = (ParcelStatus) Convert.ToInt32(row["LandStatus"]);
1361 //Enum. OpenMetaverse.Parcel.ParcelStatus
1362 newData.Flags = Convert.ToUInt32(row["LandFlags"]);
1363 newData.LandingType = (Byte) row["LandingType"];
1364 newData.MediaAutoScale = (Byte) row["MediaAutoScale"];
1365 newData.MediaID = new UUID((String) row["MediaTextureUUID"]);
1366 newData.MediaURL = (String) row["MediaURL"];
1367 newData.MusicURL = (String) row["MusicURL"];
1368 newData.PassHours = Convert.ToSingle(row["PassHours"]);
1369 newData.PassPrice = Convert.ToInt32(row["PassPrice"]);
1370 newData.SnapshotID = (UUID)(String) row["SnapshotUUID"];
1371 try
1372 {
1373
1374 newData.UserLocation =
1375 new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
1376 Convert.ToSingle(row["UserLocationZ"]));
1377 newData.UserLookAt =
1378 new Vector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
1379 Convert.ToSingle(row["UserLookAtZ"]));
1380
1381 }
1382 catch (InvalidCastException)
1383 {
1384 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
1385 newData.UserLocation = Vector3.Zero;
1386 newData.UserLookAt = Vector3.Zero;
1387 }
1388 newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
1389 UUID authBuyerID = UUID.Zero;
1390
1391 UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID);
1392
1393 newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
1394 newData.Dwell = Convert.ToInt32(row["Dwell"]);
1395
1396 return newData;
1397 }
1398
1399 private RegionSettings buildRegionSettings(DataRow row)
1400 {
1401 RegionSettings newSettings = new RegionSettings();
1402
1403 newSettings.RegionUUID = new UUID((string) row["regionUUID"]);
1404 newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]);
1405 newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]);
1406 newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]);
1407 newSettings.RestrictPushing = Convert.ToBoolean(row["restrict_pushing"]);
1408 newSettings.AllowLandResell = Convert.ToBoolean(row["allow_land_resell"]);
1409 newSettings.AllowLandJoinDivide = Convert.ToBoolean(row["allow_land_join_divide"]);
1410 newSettings.BlockShowInSearch = Convert.ToBoolean(row["block_show_in_search"]);
1411 newSettings.AgentLimit = Convert.ToInt32(row["agent_limit"]);
1412 newSettings.ObjectBonus = Convert.ToDouble(row["object_bonus"]);
1413 newSettings.Maturity = Convert.ToInt32(row["maturity"]);
1414 newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]);
1415 newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]);
1416 newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]);
1417 newSettings.TerrainTexture1 = new UUID((String) row["terrain_texture_1"]);
1418 newSettings.TerrainTexture2 = new UUID((String) row["terrain_texture_2"]);
1419 newSettings.TerrainTexture3 = new UUID((String) row["terrain_texture_3"]);
1420 newSettings.TerrainTexture4 = new UUID((String) row["terrain_texture_4"]);
1421 newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]);
1422 newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]);
1423 newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]);
1424 newSettings.Elevation2NE = Convert.ToDouble(row["elevation_2_ne"]);
1425 newSettings.Elevation1SE = Convert.ToDouble(row["elevation_1_se"]);
1426 newSettings.Elevation2SE = Convert.ToDouble(row["elevation_2_se"]);
1427 newSettings.Elevation1SW = Convert.ToDouble(row["elevation_1_sw"]);
1428 newSettings.Elevation2SW = Convert.ToDouble(row["elevation_2_sw"]);
1429 newSettings.WaterHeight = Convert.ToDouble(row["water_height"]);
1430 newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]);
1431 newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]);
1432 newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]);
1433 newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
1434 newSettings.SunVector = new Vector3 (
1435 Convert.ToSingle(row["sunvectorx"]),
1436 Convert.ToSingle(row["sunvectory"]),
1437 Convert.ToSingle(row["sunvectorz"])
1438 );
1439 newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
1440 newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
1441 newSettings.Covenant = new UUID((String) row["covenant"]);
1442
1443 return newSettings;
1444 }
1445
1446 /// <summary>
1447 /// Build a land access entry from the persisted data.
1448 /// </summary>
1449 /// <param name="row"></param>
1450 /// <returns></returns>
1451 private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row)
1452 {
1453 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1454 entry.AgentID = new UUID((string) row["AccessUUID"]);
1455 entry.Flags = (AccessList) row["Flags"];
1456 entry.Time = new DateTime();
1457 return entry;
1458 }
1459
1460 /// <summary>
1461 ///
1462 /// </summary>
1463 /// <param name="val"></param>
1464 /// <returns></returns>
1465 private static Array serializeTerrain(double[,] val)
1466 {
1467 MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) *sizeof (double));
1468 BinaryWriter bw = new BinaryWriter(str);
1469
1470 // TODO: COMPATIBILITY - Add byte-order conversions
1471 for (int x = 0; x < (int)Constants.RegionSize; x++)
1472 for (int y = 0; y < (int)Constants.RegionSize; y++)
1473 bw.Write(val[x, y]);
1474
1475 return str.ToArray();
1476 }
1477
1478// private void fillTerrainRow(DataRow row, UUID regionUUID, int rev, double[,] val)
1479// {
1480// row["RegionUUID"] = regionUUID;
1481// row["Revision"] = rev;
1482
1483 // MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize)*sizeof (double));
1484// BinaryWriter bw = new BinaryWriter(str);
1485
1486// // TODO: COMPATIBILITY - Add byte-order conversions
1487 // for (int x = 0; x < (int)Constants.RegionSize; x++)
1488 // for (int y = 0; y < (int)Constants.RegionSize; y++)
1489// bw.Write(val[x, y]);
1490
1491// row["Heightfield"] = str.ToArray();
1492// }
1493
1494 /// <summary>
1495 ///
1496 /// </summary>
1497 /// <param name="row"></param>
1498 /// <param name="prim"></param>
1499 /// <param name="sceneGroupID"></param>
1500 /// <param name="regionUUID"></param>
1501 private static void fillPrimRow(DataRow row, SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
1502 {
1503 row["UUID"] = prim.UUID.ToString();
1504 row["RegionUUID"] = regionUUID.ToString();
1505 row["CreationDate"] = prim.CreationDate;
1506 row["Name"] = prim.Name;
1507 row["SceneGroupID"] = sceneGroupID.ToString();
1508 // the UUID of the root part for this SceneObjectGroup
1509 // various text fields
1510 row["Text"] = prim.Text;
1511 row["Description"] = prim.Description;
1512 row["SitName"] = prim.SitName;
1513 row["TouchName"] = prim.TouchName;
1514 // permissions
1515 row["ObjectFlags"] = prim.ObjectFlags;
1516 row["CreatorID"] = prim.CreatorID.ToString();
1517 row["OwnerID"] = prim.OwnerID.ToString();
1518 row["GroupID"] = prim.GroupID.ToString();
1519 row["LastOwnerID"] = prim.LastOwnerID.ToString();
1520 row["OwnerMask"] = prim.OwnerMask;
1521 row["NextOwnerMask"] = prim.NextOwnerMask;
1522 row["GroupMask"] = prim.GroupMask;
1523 row["EveryoneMask"] = prim.EveryoneMask;
1524 row["BaseMask"] = prim.BaseMask;
1525 // vectors
1526 row["PositionX"] = prim.OffsetPosition.X;
1527 row["PositionY"] = prim.OffsetPosition.Y;
1528 row["PositionZ"] = prim.OffsetPosition.Z;
1529 row["GroupPositionX"] = prim.GroupPosition.X;
1530 row["GroupPositionY"] = prim.GroupPosition.Y;
1531 row["GroupPositionZ"] = prim.GroupPosition.Z;
1532 row["VelocityX"] = prim.Velocity.X;
1533 row["VelocityY"] = prim.Velocity.Y;
1534 row["VelocityZ"] = prim.Velocity.Z;
1535 row["AngularVelocityX"] = prim.AngularVelocity.X;
1536 row["AngularVelocityY"] = prim.AngularVelocity.Y;
1537 row["AngularVelocityZ"] = prim.AngularVelocity.Z;
1538 row["AccelerationX"] = prim.Acceleration.X;
1539 row["AccelerationY"] = prim.Acceleration.Y;
1540 row["AccelerationZ"] = prim.Acceleration.Z;
1541 // quaternions
1542 row["RotationX"] = prim.RotationOffset.X;
1543 row["RotationY"] = prim.RotationOffset.Y;
1544 row["RotationZ"] = prim.RotationOffset.Z;
1545 row["RotationW"] = prim.RotationOffset.W;
1546
1547 // Sit target
1548 Vector3 sitTargetPos = prim.SitTargetPositionLL;
1549 row["SitTargetOffsetX"] = sitTargetPos.X;
1550 row["SitTargetOffsetY"] = sitTargetPos.Y;
1551 row["SitTargetOffsetZ"] = sitTargetPos.Z;
1552
1553 Quaternion sitTargetOrient = prim.SitTargetOrientationLL;
1554 row["SitTargetOrientW"] = sitTargetOrient.W;
1555 row["SitTargetOrientX"] = sitTargetOrient.X;
1556 row["SitTargetOrientY"] = sitTargetOrient.Y;
1557 row["SitTargetOrientZ"] = sitTargetOrient.Z;
1558 row["ColorR"] = Convert.ToInt32(prim.Color.R);
1559 row["ColorG"] = Convert.ToInt32(prim.Color.G);
1560 row["ColorB"] = Convert.ToInt32(prim.Color.B);
1561 row["ColorA"] = Convert.ToInt32(prim.Color.A);
1562 row["PayPrice"] = prim.PayPrice[0];
1563 row["PayButton1"] = prim.PayPrice[1];
1564 row["PayButton2"] = prim.PayPrice[2];
1565 row["PayButton3"] = prim.PayPrice[3];
1566 row["PayButton4"] = prim.PayPrice[4];
1567
1568
1569 row["TextureAnimation"] = Convert.ToBase64String(prim.TextureAnimation);
1570 row["ParticleSystem"] = Convert.ToBase64String(prim.ParticleSystem);
1571
1572 row["OmegaX"] = prim.AngularVelocity.X;
1573 row["OmegaY"] = prim.AngularVelocity.Y;
1574 row["OmegaZ"] = prim.AngularVelocity.Z;
1575
1576 row["CameraEyeOffsetX"] = prim.GetCameraEyeOffset().X;
1577 row["CameraEyeOffsetY"] = prim.GetCameraEyeOffset().Y;
1578 row["CameraEyeOffsetZ"] = prim.GetCameraEyeOffset().Z;
1579
1580 row["CameraAtOffsetX"] = prim.GetCameraAtOffset().X;
1581 row["CameraAtOffsetY"] = prim.GetCameraAtOffset().Y;
1582 row["CameraAtOffsetZ"] = prim.GetCameraAtOffset().Z;
1583
1584
1585 if ((prim.SoundFlags & 1) != 0) // Looped
1586 {
1587 row["LoopedSound"] = prim.Sound.ToString();
1588 row["LoopedSoundGain"] = prim.SoundGain;
1589 }
1590 else
1591 {
1592 row["LoopedSound"] = UUID.Zero.ToString();
1593 row["LoopedSoundGain"] = 0.0f;
1594 }
1595
1596 if (prim.GetForceMouselook())
1597 row["ForceMouselook"] = 1;
1598 else
1599 row["ForceMouselook"] = 0;
1600
1601 row["ScriptAccessPin"] = prim.ScriptAccessPin;
1602
1603 if (prim.AllowedDrop)
1604 row["AllowedDrop"] = 1;
1605 else
1606 row["AllowedDrop"] = 0;
1607
1608 if (prim.DIE_AT_EDGE)
1609 row["DieAtEdge"] = 1;
1610 else
1611 row["DieAtEdge"] = 0;
1612
1613 row["SalePrice"] = prim.SalePrice;
1614 row["SaleType"] = Convert.ToInt16(prim.ObjectSaleType);
1615
1616 // click action
1617 row["ClickAction"] = prim.ClickAction;
1618
1619 row["SalePrice"] = prim.SalePrice;
1620 row["Material"] = prim.Material;
1621
1622 row["CollisionSound"] = prim.CollisionSound.ToString();
1623 row["CollisionSoundVolume"] = prim.CollisionSoundVolume;
1624 if (prim.VolumeDetectActive)
1625 row["VolumeDetect"] = 1;
1626 else
1627 row["VolumeDetect"] = 0;
1628
1629 }
1630
1631 /// <summary>
1632 ///
1633 /// </summary>
1634 /// <param name="row"></param>
1635 /// <param name="taskItem"></param>
1636 private static void fillItemRow(DataRow row, TaskInventoryItem taskItem)
1637 {
1638 row["itemID"] = taskItem.ItemID.ToString();
1639 row["primID"] = taskItem.ParentPartID.ToString();
1640 row["assetID"] = taskItem.AssetID.ToString();
1641 row["parentFolderID"] = taskItem.ParentID.ToString();
1642
1643 row["invType"] = taskItem.InvType;
1644 row["assetType"] = taskItem.Type;
1645
1646 row["name"] = taskItem.Name;
1647 row["description"] = taskItem.Description;
1648 row["creationDate"] = taskItem.CreationDate;
1649 row["creatorID"] = taskItem.CreatorID.ToString();
1650 row["ownerID"] = taskItem.OwnerID.ToString();
1651 row["lastOwnerID"] = taskItem.LastOwnerID.ToString();
1652 row["groupID"] = taskItem.GroupID.ToString();
1653 row["nextPermissions"] = taskItem.NextPermissions;
1654 row["currentPermissions"] = taskItem.CurrentPermissions;
1655 row["basePermissions"] = taskItem.BasePermissions;
1656 row["everyonePermissions"] = taskItem.EveryonePermissions;
1657 row["groupPermissions"] = taskItem.GroupPermissions;
1658 row["flags"] = taskItem.Flags;
1659 }
1660
1661 /// <summary>
1662 ///
1663 /// </summary>
1664 /// <param name="row"></param>
1665 /// <param name="land"></param>
1666 /// <param name="regionUUID"></param>
1667 private static void fillLandRow(DataRow row, LandData land, UUID regionUUID)
1668 {
1669 row["UUID"] = land.GlobalID.ToString();
1670 row["RegionUUID"] = regionUUID.ToString();
1671 row["LocalLandID"] = land.LocalID;
1672
1673 // Bitmap is a byte[512]
1674 row["Bitmap"] = land.Bitmap;
1675
1676 row["Name"] = land.Name;
1677 row["Desc"] = land.Description;
1678 row["OwnerUUID"] = land.OwnerID.ToString();
1679 row["IsGroupOwned"] = land.IsGroupOwned;
1680 row["Area"] = land.Area;
1681 row["AuctionID"] = land.AuctionID; //Unemplemented
1682 row["Category"] = land.Category; //Enum OpenMetaverse.Parcel.ParcelCategory
1683 row["ClaimDate"] = land.ClaimDate;
1684 row["ClaimPrice"] = land.ClaimPrice;
1685 row["GroupUUID"] = land.GroupID.ToString();
1686 row["SalePrice"] = land.SalePrice;
1687 row["LandStatus"] = land.Status; //Enum. OpenMetaverse.Parcel.ParcelStatus
1688 row["LandFlags"] = land.Flags;
1689 row["LandingType"] = land.LandingType;
1690 row["MediaAutoScale"] = land.MediaAutoScale;
1691 row["MediaTextureUUID"] = land.MediaID.ToString();
1692 row["MediaURL"] = land.MediaURL;
1693 row["MusicURL"] = land.MusicURL;
1694 row["PassHours"] = land.PassHours;
1695 row["PassPrice"] = land.PassPrice;
1696 row["SnapshotUUID"] = land.SnapshotID.ToString();
1697 row["UserLocationX"] = land.UserLocation.X;
1698 row["UserLocationY"] = land.UserLocation.Y;
1699 row["UserLocationZ"] = land.UserLocation.Z;
1700 row["UserLookAtX"] = land.UserLookAt.X;
1701 row["UserLookAtY"] = land.UserLookAt.Y;
1702 row["UserLookAtZ"] = land.UserLookAt.Z;
1703 row["AuthbuyerID"] = land.AuthBuyerID.ToString();
1704 row["OtherCleanTime"] = land.OtherCleanTime;
1705 row["Dwell"] = land.Dwell;
1706 }
1707
1708 /// <summary>
1709 ///
1710 /// </summary>
1711 /// <param name="row"></param>
1712 /// <param name="entry"></param>
1713 /// <param name="parcelID"></param>
1714 private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, UUID parcelID)
1715 {
1716 row["LandUUID"] = parcelID.ToString();
1717 row["AccessUUID"] = entry.AgentID.ToString();
1718 row["Flags"] = entry.Flags;
1719 }
1720
1721 private static void fillRegionSettingsRow(DataRow row, RegionSettings settings)
1722 {
1723 row["regionUUID"] = settings.RegionUUID.ToString();
1724 row["block_terraform"] = settings.BlockTerraform;
1725 row["block_fly"] = settings.BlockFly;
1726 row["allow_damage"] = settings.AllowDamage;
1727 row["restrict_pushing"] = settings.RestrictPushing;
1728 row["allow_land_resell"] = settings.AllowLandResell;
1729 row["allow_land_join_divide"] = settings.AllowLandJoinDivide;
1730 row["block_show_in_search"] = settings.BlockShowInSearch;
1731 row["agent_limit"] = settings.AgentLimit;
1732 row["object_bonus"] = settings.ObjectBonus;
1733 row["maturity"] = settings.Maturity;
1734 row["disable_scripts"] = settings.DisableScripts;
1735 row["disable_collisions"] = settings.DisableCollisions;
1736 row["disable_physics"] = settings.DisablePhysics;
1737 row["terrain_texture_1"] = settings.TerrainTexture1.ToString();
1738 row["terrain_texture_2"] = settings.TerrainTexture2.ToString();
1739 row["terrain_texture_3"] = settings.TerrainTexture3.ToString();
1740 row["terrain_texture_4"] = settings.TerrainTexture4.ToString();
1741 row["elevation_1_nw"] = settings.Elevation1NW;
1742 row["elevation_2_nw"] = settings.Elevation2NW;
1743 row["elevation_1_ne"] = settings.Elevation1NE;
1744 row["elevation_2_ne"] = settings.Elevation2NE;
1745 row["elevation_1_se"] = settings.Elevation1SE;
1746 row["elevation_2_se"] = settings.Elevation2SE;
1747 row["elevation_1_sw"] = settings.Elevation1SW;
1748 row["elevation_2_sw"] = settings.Elevation2SW;
1749 row["water_height"] = settings.WaterHeight;
1750 row["terrain_raise_limit"] = settings.TerrainRaiseLimit;
1751 row["terrain_lower_limit"] = settings.TerrainLowerLimit;
1752 row["use_estate_sun"] = settings.UseEstateSun;
1753 row["Sandbox"] = settings.Sandbox; // database uses upper case S for sandbox
1754 row["sunvectorx"] = settings.SunVector.X;
1755 row["sunvectory"] = settings.SunVector.Y;
1756 row["sunvectorz"] = settings.SunVector.Z;
1757 row["fixed_sun"] = settings.FixedSun;
1758 row["sun_position"] = settings.SunPosition;
1759 row["covenant"] = settings.Covenant.ToString();
1760 }
1761
1762 /// <summary>
1763 ///
1764 /// </summary>
1765 /// <param name="row"></param>
1766 /// <returns></returns>
1767 private PrimitiveBaseShape buildShape(DataRow row)
1768 {
1769 PrimitiveBaseShape s = new PrimitiveBaseShape();
1770 s.Scale = new Vector3(
1771 Convert.ToSingle(row["ScaleX"]),
1772 Convert.ToSingle(row["ScaleY"]),
1773 Convert.ToSingle(row["ScaleZ"])
1774 );
1775 // paths
1776 s.PCode = Convert.ToByte(row["PCode"]);
1777 s.PathBegin = Convert.ToUInt16(row["PathBegin"]);
1778 s.PathEnd = Convert.ToUInt16(row["PathEnd"]);
1779 s.PathScaleX = Convert.ToByte(row["PathScaleX"]);
1780 s.PathScaleY = Convert.ToByte(row["PathScaleY"]);
1781 s.PathShearX = Convert.ToByte(row["PathShearX"]);
1782 s.PathShearY = Convert.ToByte(row["PathShearY"]);
1783 s.PathSkew = Convert.ToSByte(row["PathSkew"]);
1784 s.PathCurve = Convert.ToByte(row["PathCurve"]);
1785 s.PathRadiusOffset = Convert.ToSByte(row["PathRadiusOffset"]);
1786 s.PathRevolutions = Convert.ToByte(row["PathRevolutions"]);
1787 s.PathTaperX = Convert.ToSByte(row["PathTaperX"]);
1788 s.PathTaperY = Convert.ToSByte(row["PathTaperY"]);
1789 s.PathTwist = Convert.ToSByte(row["PathTwist"]);
1790 s.PathTwistBegin = Convert.ToSByte(row["PathTwistBegin"]);
1791 // profile
1792 s.ProfileBegin = Convert.ToUInt16(row["ProfileBegin"]);
1793 s.ProfileEnd = Convert.ToUInt16(row["ProfileEnd"]);
1794 s.ProfileCurve = Convert.ToByte(row["ProfileCurve"]);
1795 s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]);
1796 s.State = Convert.ToByte(row["State"]);
1797
1798 byte[] textureEntry = (byte[])row["Texture"];
1799 s.TextureEntry = textureEntry;
1800
1801 s.ExtraParams = (byte[]) row["ExtraParams"];
1802 return s;
1803 }
1804
1805 /// <summary>
1806 ///
1807 /// </summary>
1808 /// <param name="row"></param>
1809 /// <param name="prim"></param>
1810 private static void fillShapeRow(DataRow row, SceneObjectPart prim)
1811 {
1812 PrimitiveBaseShape s = prim.Shape;
1813 row["UUID"] = prim.UUID.ToString();
1814 // shape is an enum
1815 row["Shape"] = 0;
1816 // vectors
1817 row["ScaleX"] = s.Scale.X;
1818 row["ScaleY"] = s.Scale.Y;
1819 row["ScaleZ"] = s.Scale.Z;
1820 // paths
1821 row["PCode"] = s.PCode;
1822 row["PathBegin"] = s.PathBegin;
1823 row["PathEnd"] = s.PathEnd;
1824 row["PathScaleX"] = s.PathScaleX;
1825 row["PathScaleY"] = s.PathScaleY;
1826 row["PathShearX"] = s.PathShearX;
1827 row["PathShearY"] = s.PathShearY;
1828 row["PathSkew"] = s.PathSkew;
1829 row["PathCurve"] = s.PathCurve;
1830 row["PathRadiusOffset"] = s.PathRadiusOffset;
1831 row["PathRevolutions"] = s.PathRevolutions;
1832 row["PathTaperX"] = s.PathTaperX;
1833 row["PathTaperY"] = s.PathTaperY;
1834 row["PathTwist"] = s.PathTwist;
1835 row["PathTwistBegin"] = s.PathTwistBegin;
1836 // profile
1837 row["ProfileBegin"] = s.ProfileBegin;
1838 row["ProfileEnd"] = s.ProfileEnd;
1839 row["ProfileCurve"] = s.ProfileCurve;
1840 row["ProfileHollow"] = s.ProfileHollow;
1841 row["State"] = s.State;
1842
1843 row["Texture"] = s.TextureEntry;
1844 row["ExtraParams"] = s.ExtraParams;
1845 }
1846
1847 /// <summary>
1848 ///
1849 /// </summary>
1850 /// <param name="prim"></param>
1851 /// <param name="sceneGroupID"></param>
1852 /// <param name="regionUUID"></param>
1853 private void addPrim(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
1854 {
1855
1856 DataTable prims = ds.Tables["prims"];
1857 DataTable shapes = ds.Tables["primshapes"];
1858
1859 DataRow primRow = prims.Rows.Find(prim.UUID.ToString());
1860 if (primRow == null)
1861 {
1862 primRow = prims.NewRow();
1863 fillPrimRow(primRow, prim, sceneGroupID, regionUUID);
1864 prims.Rows.Add(primRow);
1865 }
1866 else
1867 {
1868 fillPrimRow(primRow, prim, sceneGroupID, regionUUID);
1869 }
1870
1871 DataRow shapeRow = shapes.Rows.Find(prim.UUID.ToString());
1872 if (shapeRow == null)
1873 {
1874 shapeRow = shapes.NewRow();
1875 fillShapeRow(shapeRow, prim);
1876 shapes.Rows.Add(shapeRow);
1877 }
1878 else
1879 {
1880 fillShapeRow(shapeRow, prim);
1881 }
1882 }
1883
1884 /// <summary>
1885 /// see IRegionDatastore
1886 /// </summary>
1887 /// <param name="primID"></param>
1888 /// <param name="items"></param>
1889 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
1890 {
1891 m_log.InfoFormat("[REGION DB]: Entered StorePrimInventory with prim ID {0}", primID);
1892
1893 DataTable dbItems = ds.Tables["primitems"];
1894
1895 // For now, we're just going to crudely remove all the previous inventory items
1896 // no matter whether they have changed or not, and replace them with the current set.
1897 lock (ds)
1898 {
1899 RemoveItems(primID);
1900
1901 // repalce with current inventory details
1902 foreach (TaskInventoryItem newItem in items)
1903 {
1904// m_log.InfoFormat(
1905// "[DATASTORE]: ",
1906// "Adding item {0}, {1} to prim ID {2}",
1907// newItem.Name, newItem.ItemID, newItem.ParentPartID);
1908
1909 DataRow newItemRow = dbItems.NewRow();
1910 fillItemRow(newItemRow, newItem);
1911 dbItems.Rows.Add(newItemRow);
1912 }
1913 }
1914
1915 Commit();
1916 }
1917
1918 /***********************************************************************
1919 *
1920 * SQL Statement Creation Functions
1921 *
1922 * These functions create SQL statements for update, insert, and create.
1923 * They can probably be factored later to have a db independant
1924 * portion and a db specific portion
1925 *
1926 **********************************************************************/
1927
1928 /// <summary>
1929 /// Create an insert command
1930 /// </summary>
1931 /// <param name="table">table name</param>
1932 /// <param name="dt">data table</param>
1933 /// <returns>the created command</returns>
1934 /// <remarks>
1935 /// This is subtle enough to deserve some commentary.
1936 /// Instead of doing *lots* and *lots of hardcoded strings
1937 /// for database definitions we'll use the fact that
1938 /// realistically all insert statements look like "insert
1939 /// into A(b, c) values(:b, :c) on the parameterized query
1940 /// front. If we just have a list of b, c, etc... we can
1941 /// generate these strings instead of typing them out.
1942 /// </remarks>
1943 private static SqliteCommand createInsertCommand(string table, DataTable dt)
1944 {
1945 string[] cols = new string[dt.Columns.Count];
1946 for (int i = 0; i < dt.Columns.Count; i++)
1947 {
1948 DataColumn col = dt.Columns[i];
1949 cols[i] = col.ColumnName;
1950 }
1951
1952 string sql = "insert into " + table + "(";
1953 sql += String.Join(", ", cols);
1954 // important, the first ':' needs to be here, the rest get added in the join
1955 sql += ") values (:";
1956 sql += String.Join(", :", cols);
1957 sql += ")";
1958 SqliteCommand cmd = new SqliteCommand(sql);
1959
1960 // this provides the binding for all our parameters, so
1961 // much less code than it used to be
1962 foreach (DataColumn col in dt.Columns)
1963 {
1964 cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
1965 }
1966 return cmd;
1967 }
1968
1969
1970 /// <summary>
1971 /// create an update command
1972 /// </summary>
1973 /// <param name="table">table name</param>
1974 /// <param name="pk"></param>
1975 /// <param name="dt"></param>
1976 /// <returns>the created command</returns>
1977 private static SqliteCommand createUpdateCommand(string table, string pk, DataTable dt)
1978 {
1979 string sql = "update " + table + " set ";
1980 string subsql = String.Empty;
1981 foreach (DataColumn col in dt.Columns)
1982 {
1983 if (subsql.Length > 0)
1984 {
1985 // a map function would rock so much here
1986 subsql += ", ";
1987 }
1988 subsql += col.ColumnName + "= :" + col.ColumnName;
1989 }
1990 sql += subsql;
1991 sql += " where " + pk;
1992 SqliteCommand cmd = new SqliteCommand(sql);
1993
1994 // this provides the binding for all our parameters, so
1995 // much less code than it used to be
1996
1997 foreach (DataColumn col in dt.Columns)
1998 {
1999 cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
2000 }
2001 return cmd;
2002 }
2003
2004 /// <summary>
2005 /// create an update command
2006 /// </summary>
2007 /// <param name="table">table name</param>
2008 /// <param name="pk"></param>
2009 /// <param name="dt"></param>
2010 /// <returns>the created command</returns>
2011 private static SqliteCommand createUpdateCommand(string table, string pk1, string pk2, DataTable dt)
2012 {
2013 string sql = "update " + table + " set ";
2014 string subsql = String.Empty;
2015 foreach (DataColumn col in dt.Columns)
2016 {
2017 if (subsql.Length > 0)
2018 {
2019 // a map function would rock so much here
2020 subsql += ", ";
2021 }
2022 subsql += col.ColumnName + "= :" + col.ColumnName;
2023 }
2024 sql += subsql;
2025 sql += " where " + pk1 + " and " + pk2;
2026 SqliteCommand cmd = new SqliteCommand(sql);
2027
2028 // this provides the binding for all our parameters, so
2029 // much less code than it used to be
2030
2031 foreach (DataColumn col in dt.Columns)
2032 {
2033 cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
2034 }
2035 return cmd;
2036 }
2037
2038 /// <summary>
2039 ///
2040 /// </summary>
2041 /// <param name="dt">Data Table</param>
2042 /// <returns></returns>
2043 // private static string defineTable(DataTable dt)
2044 // {
2045 // string sql = "create table " + dt.TableName + "(";
2046 // string subsql = String.Empty;
2047 // foreach (DataColumn col in dt.Columns)
2048 // {
2049 // if (subsql.Length > 0)
2050 // {
2051 // // a map function would rock so much here
2052 // subsql += ",\n";
2053 // }
2054 // subsql += col.ColumnName + " " + sqliteType(col.DataType);
2055 // if (dt.PrimaryKey.Length > 0 && col == dt.PrimaryKey[0])
2056 // {
2057 // subsql += " primary key";
2058 // }
2059 // }
2060 // sql += subsql;
2061 // sql += ")";
2062 // return sql;
2063 // }
2064
2065 /***********************************************************************
2066 *
2067 * Database Binding functions
2068 *
2069 * These will be db specific due to typing, and minor differences
2070 * in databases.
2071 *
2072 **********************************************************************/
2073
2074 ///<summary>
2075 /// This is a convenience function that collapses 5 repetitive
2076 /// lines for defining SqliteParameters to 2 parameters:
2077 /// column name and database type.
2078 ///
2079 /// It assumes certain conventions like :param as the param
2080 /// name to replace in parametrized queries, and that source
2081 /// version is always current version, both of which are fine
2082 /// for us.
2083 ///</summary>
2084 ///<returns>a built sqlite parameter</returns>
2085 private static SqliteParameter createSqliteParameter(string name, Type type)
2086 {
2087 SqliteParameter param = new SqliteParameter();
2088 param.ParameterName = ":" + name;
2089 param.DbType = dbtypeFromType(type);
2090 param.SourceColumn = name;
2091 param.SourceVersion = DataRowVersion.Current;
2092 return param;
2093 }
2094
2095 /// <summary>
2096 ///
2097 /// </summary>
2098 /// <param name="da"></param>
2099 /// <param name="conn"></param>
2100 private void setupPrimCommands(SqliteDataAdapter da, SqliteConnection conn)
2101 {
2102 da.InsertCommand = createInsertCommand("prims", ds.Tables["prims"]);
2103 da.InsertCommand.Connection = conn;
2104
2105 da.UpdateCommand = createUpdateCommand("prims", "UUID=:UUID", ds.Tables["prims"]);
2106 da.UpdateCommand.Connection = conn;
2107
2108 SqliteCommand delete = new SqliteCommand("delete from prims where UUID = :UUID");
2109 delete.Parameters.Add(createSqliteParameter("UUID", typeof (String)));
2110 delete.Connection = conn;
2111 da.DeleteCommand = delete;
2112 }
2113
2114 /// <summary>
2115 ///
2116 /// </summary>
2117 /// <param name="da"></param>
2118 /// <param name="conn"></param>
2119 private void setupItemsCommands(SqliteDataAdapter da, SqliteConnection conn)
2120 {
2121 da.InsertCommand = createInsertCommand("primitems", ds.Tables["primitems"]);
2122 da.InsertCommand.Connection = conn;
2123
2124 da.UpdateCommand = createUpdateCommand("primitems", "itemID = :itemID", ds.Tables["primitems"]);
2125 da.UpdateCommand.Connection = conn;
2126
2127 SqliteCommand delete = new SqliteCommand("delete from primitems where itemID = :itemID");
2128 delete.Parameters.Add(createSqliteParameter("itemID", typeof (String)));
2129 delete.Connection = conn;
2130 da.DeleteCommand = delete;
2131 }
2132
2133 /// <summary>
2134 ///
2135 /// </summary>
2136 /// <param name="da"></param>
2137 /// <param name="conn"></param>
2138 private void setupTerrainCommands(SqliteDataAdapter da, SqliteConnection conn)
2139 {
2140 da.InsertCommand = createInsertCommand("terrain", ds.Tables["terrain"]);
2141 da.InsertCommand.Connection = conn;
2142 }
2143
2144 /// <summary>
2145 ///
2146 /// </summary>
2147 /// <param name="da"></param>
2148 /// <param name="conn"></param>
2149 private void setupLandCommands(SqliteDataAdapter da, SqliteConnection conn)
2150 {
2151 da.InsertCommand = createInsertCommand("land", ds.Tables["land"]);
2152 da.InsertCommand.Connection = conn;
2153
2154 da.UpdateCommand = createUpdateCommand("land", "UUID=:UUID", ds.Tables["land"]);
2155 da.UpdateCommand.Connection = conn;
2156
2157 SqliteCommand delete = new SqliteCommand("delete from land where UUID=:UUID");
2158 delete.Parameters.Add(createSqliteParameter("UUID", typeof(String)));
2159 da.DeleteCommand = delete;
2160 da.DeleteCommand.Connection = conn;
2161 }
2162
2163 /// <summary>
2164 ///
2165 /// </summary>
2166 /// <param name="da"></param>
2167 /// <param name="conn"></param>
2168 private void setupLandAccessCommands(SqliteDataAdapter da, SqliteConnection conn)
2169 {
2170 da.InsertCommand = createInsertCommand("landaccesslist", ds.Tables["landaccesslist"]);
2171 da.InsertCommand.Connection = conn;
2172
2173 da.UpdateCommand = createUpdateCommand("landaccesslist", "LandUUID=:landUUID", "AccessUUID=:AccessUUID", ds.Tables["landaccesslist"]);
2174 da.UpdateCommand.Connection = conn;
2175
2176 SqliteCommand delete = new SqliteCommand("delete from landaccesslist where LandUUID= :LandUUID and AccessUUID= :AccessUUID");
2177 delete.Parameters.Add(createSqliteParameter("LandUUID", typeof(String)));
2178 delete.Parameters.Add(createSqliteParameter("AccessUUID", typeof(String)));
2179 da.DeleteCommand = delete;
2180 da.DeleteCommand.Connection = conn;
2181
2182 }
2183
2184 private void setupRegionSettingsCommands(SqliteDataAdapter da, SqliteConnection conn)
2185 {
2186 da.InsertCommand = createInsertCommand("regionsettings", ds.Tables["regionsettings"]);
2187 da.InsertCommand.Connection = conn;
2188 da.UpdateCommand = createUpdateCommand("regionsettings", "regionUUID=:regionUUID", ds.Tables["regionsettings"]);
2189 da.UpdateCommand.Connection = conn;
2190 }
2191
2192 /// <summary>
2193 ///
2194 /// </summary>
2195 /// <param name="da"></param>
2196 /// <param name="conn"></param>
2197 private void setupShapeCommands(SqliteDataAdapter da, SqliteConnection conn)
2198 {
2199 da.InsertCommand = createInsertCommand("primshapes", ds.Tables["primshapes"]);
2200 da.InsertCommand.Connection = conn;
2201
2202 da.UpdateCommand = createUpdateCommand("primshapes", "UUID=:UUID", ds.Tables["primshapes"]);
2203 da.UpdateCommand.Connection = conn;
2204
2205 SqliteCommand delete = new SqliteCommand("delete from primshapes where UUID = :UUID");
2206 delete.Parameters.Add(createSqliteParameter("UUID", typeof (String)));
2207 delete.Connection = conn;
2208 da.DeleteCommand = delete;
2209 }
2210
2211 /***********************************************************************
2212 *
2213 * Type conversion functions
2214 *
2215 **********************************************************************/
2216
2217 /// <summary>
2218 /// Type conversion function
2219 /// </summary>
2220 /// <param name="type"></param>
2221 /// <returns></returns>
2222 private static DbType dbtypeFromType(Type type)
2223 {
2224 if (type == typeof (String))
2225 {
2226 return DbType.String;
2227 }
2228 else if (type == typeof (Int32))
2229 {
2230 return DbType.Int32;
2231 }
2232 else if (type == typeof (Double))
2233 {
2234 return DbType.Double;
2235 }
2236 else if (type == typeof (Byte))
2237 {
2238 return DbType.Byte;
2239 }
2240 else if (type == typeof (Double))
2241 {
2242 return DbType.Double;
2243 }
2244 else if (type == typeof (Byte[]))
2245 {
2246 return DbType.Binary;
2247 }
2248 else
2249 {
2250 return DbType.String;
2251 }
2252 }
2253
2254 }
2255}
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteUtils.cs b/OpenSim/Data/SQLiteLegacy/SQLiteUtils.cs
new file mode 100644
index 0000000..095a262
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteUtils.cs
@@ -0,0 +1,307 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Data;
30using Mono.Data.SqliteClient;
31
32namespace OpenSim.Data.SQLiteLegacy
33{
34 /// <summary>
35 /// A base class for methods needed by all SQLite database classes
36 /// </summary>
37 public class SQLiteUtil
38 {
39 /***********************************************************************
40 *
41 * Database Definition Helper Functions
42 *
43 * This should be db agnostic as we define them in ADO.NET terms
44 *
45 **********************************************************************/
46
47 /// <summary>
48 ///
49 /// </summary>
50 /// <param name="dt"></param>
51 /// <param name="name"></param>
52 /// <param name="type"></param>
53 public static void createCol(DataTable dt, string name, Type type)
54 {
55 DataColumn col = new DataColumn(name, type);
56 dt.Columns.Add(col);
57 }
58
59 /***********************************************************************
60 *
61 * SQL Statement Creation Functions
62 *
63 * These functions create SQL statements for update, insert, and create.
64 * They can probably be factored later to have a db independant
65 * portion and a db specific portion
66 *
67 **********************************************************************/
68
69 /// <summary>
70 /// Create an insert command
71 /// </summary>
72 /// <param name="table">table name</param>
73 /// <param name="dt">data table</param>
74 /// <returns>the created command</returns>
75 /// <remarks>
76 /// This is subtle enough to deserve some commentary.
77 /// Instead of doing *lots* and *lots of hardcoded strings
78 /// for database definitions we'll use the fact that
79 /// realistically all insert statements look like "insert
80 /// into A(b, c) values(:b, :c) on the parameterized query
81 /// front. If we just have a list of b, c, etc... we can
82 /// generate these strings instead of typing them out.
83 /// </remarks>
84 public static SqliteCommand createInsertCommand(string table, DataTable dt)
85 {
86
87 string[] cols = new string[dt.Columns.Count];
88 for (int i = 0; i < dt.Columns.Count; i++)
89 {
90 DataColumn col = dt.Columns[i];
91 cols[i] = col.ColumnName;
92 }
93
94 string sql = "insert into " + table + "(";
95 sql += String.Join(", ", cols);
96 // important, the first ':' needs to be here, the rest get added in the join
97 sql += ") values (:";
98 sql += String.Join(", :", cols);
99 sql += ")";
100 SqliteCommand cmd = new SqliteCommand(sql);
101
102 // this provides the binding for all our parameters, so
103 // much less code than it used to be
104 foreach (DataColumn col in dt.Columns)
105 {
106 cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
107 }
108 return cmd;
109 }
110
111 /// <summary>
112 /// create an update command
113 /// </summary>
114 /// <param name="table">table name</param>
115 /// <param name="pk"></param>
116 /// <param name="dt"></param>
117 /// <returns>the created command</returns>
118 public static SqliteCommand createUpdateCommand(string table, string pk, DataTable dt)
119 {
120 string sql = "update " + table + " set ";
121 string subsql = String.Empty;
122 foreach (DataColumn col in dt.Columns)
123 {
124 if (subsql.Length > 0)
125 {
126 // a map function would rock so much here
127 subsql += ", ";
128 }
129 subsql += col.ColumnName + "= :" + col.ColumnName;
130 }
131 sql += subsql;
132 sql += " where " + pk;
133 SqliteCommand cmd = new SqliteCommand(sql);
134
135 // this provides the binding for all our parameters, so
136 // much less code than it used to be
137
138 foreach (DataColumn col in dt.Columns)
139 {
140 cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
141 }
142 return cmd;
143 }
144
145 /// <summary>
146 ///
147 /// </summary>
148 /// <param name="dt">Data Table</param>
149 /// <returns></returns>
150 public static string defineTable(DataTable dt)
151 {
152 string sql = "create table " + dt.TableName + "(";
153 string subsql = String.Empty;
154 foreach (DataColumn col in dt.Columns)
155 {
156 if (subsql.Length > 0)
157 {
158 // a map function would rock so much here
159 subsql += ",\n";
160 }
161 subsql += col.ColumnName + " " + sqliteType(col.DataType);
162 if (dt.PrimaryKey.Length > 0)
163 {
164 if (col == dt.PrimaryKey[0])
165 {
166 subsql += " primary key";
167 }
168 }
169 }
170 sql += subsql;
171 sql += ")";
172 return sql;
173 }
174
175 /***********************************************************************
176 *
177 * Database Binding functions
178 *
179 * These will be db specific due to typing, and minor differences
180 * in databases.
181 *
182 **********************************************************************/
183
184 ///<summary>
185 /// <para>
186 /// This is a convenience function that collapses 5 repetitive
187 /// lines for defining SqliteParameters to 2 parameters:
188 /// column name and database type.
189 /// </para>
190 ///
191 /// <para>
192 /// It assumes certain conventions like :param as the param
193 /// name to replace in parametrized queries, and that source
194 /// version is always current version, both of which are fine
195 /// for us.
196 /// </para>
197 ///</summary>
198 /// <param name="name"></param>
199 /// <param name="type"></param>
200 ///<returns>a built sqlite parameter</returns>
201 public static SqliteParameter createSqliteParameter(string name, Type type)
202 {
203 SqliteParameter param = new SqliteParameter();
204 param.ParameterName = ":" + name;
205 param.DbType = dbtypeFromType(type);
206 param.SourceColumn = name;
207 param.SourceVersion = DataRowVersion.Current;
208 return param;
209 }
210
211 /***********************************************************************
212 *
213 * Type conversion functions
214 *
215 **********************************************************************/
216
217 /// <summary>
218 /// Type conversion function
219 /// </summary>
220 /// <param name="type">a type</param>
221 /// <returns>a DbType</returns>
222 public static DbType dbtypeFromType(Type type)
223 {
224 if (type == typeof (String))
225 {
226 return DbType.String;
227 }
228 else if (type == typeof (Int32))
229 {
230 return DbType.Int32;
231 }
232 else if (type == typeof (UInt32))
233 {
234 return DbType.UInt32;
235 }
236 else if (type == typeof (Int64))
237 {
238 return DbType.Int64;
239 }
240 else if (type == typeof (UInt64))
241 {
242 return DbType.UInt64;
243 }
244 else if (type == typeof (Double))
245 {
246 return DbType.Double;
247 }
248 else if (type == typeof (Boolean))
249 {
250 return DbType.Boolean;
251 }
252 else if (type == typeof (Byte[]))
253 {
254 return DbType.Binary;
255 }
256 else
257 {
258 return DbType.String;
259 }
260 }
261
262 /// <summary>
263 /// </summary>
264 /// <param name="type">a Type</param>
265 /// <returns>a string</returns>
266 /// <remarks>this is something we'll need to implement for each db slightly differently.</remarks>
267 public static string sqliteType(Type type)
268 {
269 if (type == typeof (String))
270 {
271 return "varchar(255)";
272 }
273 else if (type == typeof (Int32))
274 {
275 return "integer";
276 }
277 else if (type == typeof (UInt32))
278 {
279 return "integer";
280 }
281 else if (type == typeof (Int64))
282 {
283 return "varchar(255)";
284 }
285 else if (type == typeof (UInt64))
286 {
287 return "varchar(255)";
288 }
289 else if (type == typeof (Double))
290 {
291 return "float";
292 }
293 else if (type == typeof (Boolean))
294 {
295 return "integer";
296 }
297 else if (type == typeof (Byte[]))
298 {
299 return "blob";
300 }
301 else
302 {
303 return "string";
304 }
305 }
306 }
307}
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteXInventoryData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteXInventoryData.cs
new file mode 100644
index 0000000..5422cbf
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteXInventoryData.cs
@@ -0,0 +1,155 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Data;
30using System.Reflection;
31using System.Collections.Generic;
32using Mono.Data.SqliteClient;
33using log4net;
34using OpenMetaverse;
35using OpenSim.Framework;
36
37namespace OpenSim.Data.SQLiteLegacy
38{
39 /// <summary>
40 /// A MySQL Interface for the Asset Server
41 /// </summary>
42 public class SQLiteXInventoryData : IXInventoryData
43 {
44// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45
46 private SQLiteGenericTableHandler<XInventoryFolder> m_Folders;
47 private SqliteItemHandler m_Items;
48
49 public SQLiteXInventoryData(string conn, string realm)
50 {
51 m_Folders = new SQLiteGenericTableHandler<XInventoryFolder>(
52 conn, "inventoryfolders", "InventoryStore");
53 m_Items = new SqliteItemHandler(
54 conn, "inventoryitems", String.Empty);
55 }
56
57 public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
58 {
59 return m_Folders.Get(fields, vals);
60 }
61
62 public XInventoryItem[] GetItems(string[] fields, string[] vals)
63 {
64 return m_Items.Get(fields, vals);
65 }
66
67 public bool StoreFolder(XInventoryFolder folder)
68 {
69 return m_Folders.Store(folder);
70 }
71
72 public bool StoreItem(XInventoryItem item)
73 {
74 return m_Items.Store(item);
75 }
76
77 public bool DeleteFolders(string field, string val)
78 {
79 return m_Folders.Delete(field, val);
80 }
81
82 public bool DeleteItems(string field, string val)
83 {
84 return m_Items.Delete(field, val);
85 }
86
87 public bool MoveItem(string id, string newParent)
88 {
89 return m_Items.MoveItem(id, newParent);
90 }
91
92 public XInventoryItem[] GetActiveGestures(UUID principalID)
93 {
94 return m_Items.GetActiveGestures(principalID);
95 }
96
97 public int GetAssetPermissions(UUID principalID, UUID assetID)
98 {
99 return m_Items.GetAssetPermissions(principalID, assetID);
100 }
101 }
102
103 public class SqliteItemHandler : SQLiteGenericTableHandler<XInventoryItem>
104 {
105 public SqliteItemHandler(string c, string t, string m) :
106 base(c, t, m)
107 {
108 }
109
110 public bool MoveItem(string id, string newParent)
111 {
112 SqliteCommand cmd = new SqliteCommand();
113
114 cmd.CommandText = String.Format("update {0} set parentFolderID = :ParentFolderID where inventoryID = :InventoryID", m_Realm);
115 cmd.Parameters.Add(new SqliteParameter(":ParentFolderID", newParent));
116 cmd.Parameters.Add(new SqliteParameter(":InventoryID", id));
117
118 return ExecuteNonQuery(cmd, m_Connection) == 0 ? false : true;
119 }
120
121 public XInventoryItem[] GetActiveGestures(UUID principalID)
122 {
123 SqliteCommand cmd = new SqliteCommand();
124 cmd.CommandText = String.Format("select * from inventoryitems where avatarId = :uuid and assetType = :type and flags = 1", m_Realm);
125
126 cmd.Parameters.Add(new SqliteParameter(":uuid", principalID.ToString()));
127 cmd.Parameters.Add(new SqliteParameter(":type", (int)AssetType.Gesture));
128
129 return DoQuery(cmd);
130 }
131
132 public int GetAssetPermissions(UUID principalID, UUID assetID)
133 {
134 SqliteCommand cmd = new SqliteCommand();
135
136 cmd.CommandText = String.Format("select inventoryCurrentPermissions from inventoryitems where avatarID = :PrincipalID and assetID = :AssetID", m_Realm);
137 cmd.Parameters.Add(new SqliteParameter(":PrincipalID", principalID.ToString()));
138 cmd.Parameters.Add(new SqliteParameter(":AssetID", assetID.ToString()));
139
140 IDataReader reader = ExecuteReader(cmd, m_Connection);
141
142 int perms = 0;
143
144 while (reader.Read())
145 {
146 perms |= Convert.ToInt32(reader["inventoryCurrentPermissions"]);
147 }
148
149 reader.Close();
150 CloseCommand(cmd);
151
152 return perms;
153 }
154 }
155}
diff --git a/OpenSim/Data/Tests/DataTestUtil.cs b/OpenSim/Data/Tests/DataTestUtil.cs
index d211ab3..5393529 100644
--- a/OpenSim/Data/Tests/DataTestUtil.cs
+++ b/OpenSim/Data/Tests/DataTestUtil.cs
@@ -39,7 +39,8 @@ namespace OpenSim.Data.Tests
39 public class DataTestUtil 39 public class DataTestUtil
40 { 40 {
41 public const uint UNSIGNED_INTEGER_MIN = uint.MinValue; 41 public const uint UNSIGNED_INTEGER_MIN = uint.MinValue;
42 public const uint UNSIGNED_INTEGER_MAX = uint.MaxValue; 42 //public const uint UNSIGNED_INTEGER_MAX = uint.MaxValue;
43 public const uint UNSIGNED_INTEGER_MAX = INTEGER_MAX;
43 44
44 public const int INTEGER_MIN = int.MinValue + 1; // Postgresql requires +1 to .NET int.MinValue 45 public const int INTEGER_MIN = int.MinValue + 1; // Postgresql requires +1 to .NET int.MinValue
45 public const int INTEGER_MAX = int.MaxValue; 46 public const int INTEGER_MAX = int.MaxValue;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c9ef173..ec238ef 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -365,6 +365,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
365 /// </value> 365 /// </value>
366 protected HashSet<uint> m_killRecord; 366 protected HashSet<uint> m_killRecord;
367 367
368// protected HashSet<uint> m_attachmentsQueued;
369// protected HashSet<uint> m_attachmentsSent;
370
368 private int m_moneyBalance; 371 private int m_moneyBalance;
369 private int m_animationSequenceNumber = 1; 372 private int m_animationSequenceNumber = 1;
370 private bool m_SendLogoutPacketWhenClosing = true; 373 private bool m_SendLogoutPacketWhenClosing = true;
@@ -456,6 +459,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
456 m_primFullUpdates = new PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock>(m_scene.Entities.Count); 459 m_primFullUpdates = new PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock>(m_scene.Entities.Count);
457 m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>(); 460 m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
458 m_killRecord = new HashSet<uint>(); 461 m_killRecord = new HashSet<uint>();
462// m_attachmentsQueued = new HashSet<uint>();
463// m_attachmentsSent = new HashSet<uint>();
459 464
460 m_assetService = m_scene.RequestModuleInterface<IAssetService>(); 465 m_assetService = m_scene.RequestModuleInterface<IAssetService>();
461 m_hyperAssets = m_scene.RequestModuleInterface<IHyperAssetService>(); 466 m_hyperAssets = m_scene.RequestModuleInterface<IHyperAssetService>();
@@ -3400,6 +3405,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3400 objupdate.ObjectData[0] = CreateAvatarUpdateBlock(data); 3405 objupdate.ObjectData[0] = CreateAvatarUpdateBlock(data);
3401 3406
3402 OutPacket(objupdate, ThrottleOutPacketType.Task); 3407 OutPacket(objupdate, ThrottleOutPacketType.Task);
3408
3409 // We need to record the avatar local id since the root prim of an attachment points to this.
3410// m_attachmentsSent.Add(data.AvatarLocalID);
3403 } 3411 }
3404 3412
3405 /// <summary> 3413 /// <summary>
@@ -3522,6 +3530,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3522 return; 3530 return;
3523 3531
3524 ObjectUpdatePacket.ObjectDataBlock objectData = CreatePrimUpdateBlock(data); 3532 ObjectUpdatePacket.ObjectDataBlock objectData = CreatePrimUpdateBlock(data);
3533
3534// if (data.attachment)
3535// m_attachmentsQueued.Add(data.localID);
3525 3536
3526 lock (m_primFullUpdates.SyncRoot) 3537 lock (m_primFullUpdates.SyncRoot)
3527 m_primFullUpdates.Enqueue(data.priority, objectData, data.localID); 3538 m_primFullUpdates.Enqueue(data.priority, objectData, data.localID);
@@ -3548,15 +3559,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3548 ObjectUpdatePacket.ObjectDataBlock block = m_primFullUpdates.Dequeue(); 3559 ObjectUpdatePacket.ObjectDataBlock block = m_primFullUpdates.Dequeue();
3549 3560
3550 if (!m_killRecord.Contains(block.ID)) 3561 if (!m_killRecord.Contains(block.ID))
3551 { 3562 {
3563// if (m_attachmentsQueued.Contains(block.ID))
3564// {
3565// string text = Util.FieldToString(block.Text);
3566// if (text.IndexOf("\n") >= 0)
3567// text = text.Remove(text.IndexOf("\n"));
3568//
3569// if (m_attachmentsSent.Contains(block.ParentID))
3570// {
3571// m_log.DebugFormat(
3572// "[CLIENT]: Sending full info about attached prim {0} text {1}",
3573// block.ID, text);
3574//
3575// m_fullUpdateDataBlocksBuilder.Add(block);
3576//
3577// m_attachmentsSent.Add(block.ID);
3578// }
3579// else
3580// {
3581// m_log.DebugFormat(
3582// "[CLIENT]: Requeueing full update of prim {0} text {1} since we haven't sent its parent {2} yet",
3583// block.ID, text, block.ParentID);
3584//
3585// lock (m_primFullUpdates.SyncRoot)
3586// m_primFullUpdates.Enqueue(double.MaxValue, block, block.ID);
3587// }
3588// }
3589// else
3590// {
3552 m_fullUpdateDataBlocksBuilder.Add(block); 3591 m_fullUpdateDataBlocksBuilder.Add(block);
3553 3592// }
3554// string text = Util.FieldToString(outPacket.ObjectData[i].Text);
3555// if (text.IndexOf("\n") >= 0)
3556// text = text.Remove(text.IndexOf("\n"));
3557// m_log.DebugFormat(
3558// "[CLIENT]: Sending full info about prim {0} text {1} to client {2}",
3559// outPacket.ObjectData[i].ID, text, Name);
3560 } 3593 }
3561// else 3594// else
3562// { 3595// {
@@ -4505,6 +4538,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4505 4538
4506 protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SendPrimitiveData data) 4539 protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SendPrimitiveData data)
4507 { 4540 {
4541// if (data.attachment)
4542// m_log.DebugFormat(
4543// "[LLCLIENTVIEW]: Creating prim update block for {0}, parent {1}, priority {2}",
4544// data.localID, data.parentID, data.priority);
4545
4508 byte[] objectData = new byte[60]; 4546 byte[] objectData = new byte[60];
4509 data.pos.ToBytes(objectData, 0); 4547 data.pos.ToBytes(objectData, 0);
4510 data.vel.ToBytes(objectData, 12); 4548 data.vel.ToBytes(objectData, 12);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
index d68c683..0730f8b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
260 { 260 {
261 if (s.RegionInfo.RegionHandle == regionHandle) 261 if (s.RegionInfo.RegionHandle == regionHandle)
262 { 262 {
263 //m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject"); 263// m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
264 if (isLocalCall) 264 if (isLocalCall)
265 { 265 {
266 // We need to make a local copy of the object 266 // We need to make a local copy of the object
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 26d3372..79b3cfd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2450,6 +2450,8 @@ namespace OpenSim.Region.Framework.Scenes
2450 return; 2450 return;
2451 } 2451 }
2452 2452
2453// m_log.DebugFormat("[SCENE INVENTORY]: {0} {1} IsAttachment={2}", att.Name, att.LocalId, att.IsAttachment);
2454// Console.WriteLine("HERE X");
2453 ScenePresence presence; 2455 ScenePresence presence;
2454 if (TryGetAvatar(remoteClient.AgentId, out presence)) 2456 if (TryGetAvatar(remoteClient.AgentId, out presence))
2455 { 2457 {
@@ -2457,9 +2459,12 @@ namespace OpenSim.Region.Framework.Scenes
2457 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 2459 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
2458 item = InventoryService.GetItem(item); 2460 item = InventoryService.GetItem(item);
2459 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); 2461 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
2462// Console.WriteLine("HERE Y");
2460 2463
2461 if (m_AvatarFactory != null) 2464 if (m_AvatarFactory != null)
2462 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance); 2465 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
2466
2467// Console.WriteLine("HERE Z");
2463 } 2468 }
2464 } 2469 }
2465 2470
@@ -2642,4 +2647,4 @@ namespace OpenSim.Region.Framework.Scenes
2642 m_sceneGraph.LinkObjects(root, children); 2647 m_sceneGraph.LinkObjects(root, children);
2643 } 2648 }
2644 } 2649 }
2645} 2650} \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index ac04dc7..adc9496 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -124,6 +124,7 @@ namespace OpenSim.Region.Framework.Scenes
124 { 124 {
125 if (((SceneObjectGroup)ent).LocalId == primLocalID) 125 if (((SceneObjectGroup)ent).LocalId == primLocalID)
126 { 126 {
127// m_log.DebugFormat("[SCENE]: Received full update request for {0} from {1}", primLocalID, remoteClient.Name);
127 ((SceneObjectGroup)ent).SendFullUpdateToClient(remoteClient); 128 ((SceneObjectGroup)ent).SendFullUpdateToClient(remoteClient);
128 return; 129 return;
129 } 130 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 637ebff..7089368 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1850,9 +1850,31 @@ namespace OpenSim.Region.Framework.Scenes
1850 /// true if the object was added, false if an object with the same uuid was already in the scene 1850 /// true if the object was added, false if an object with the same uuid was already in the scene
1851 /// </returns> 1851 /// </returns>
1852 public bool AddRestoredSceneObject( 1852 public bool AddRestoredSceneObject(
1853 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
1854 {
1855 return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates);
1856 }
1857
1858 /// <summary>
1859 /// Add an object into the scene that has come from storage
1860 /// </summary>
1861 ///
1862 /// <param name="sceneObject"></param>
1863 /// <param name="attachToBackup">
1864 /// If true, changes to the object will be reflected in its persisted data
1865 /// If false, the persisted data will not be changed even if the object in the scene is changed
1866 /// </param>
1867 /// <param name="alreadyPersisted">
1868 /// If true, we won't persist this object until it changes
1869 /// If false, we'll persist this object immediately
1870 /// </param>
1871 /// <returns>
1872 /// true if the object was added, false if an object with the same uuid was already in the scene
1873 /// </returns>
1874 public bool AddRestoredSceneObject(
1853 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted) 1875 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
1854 { 1876 {
1855 return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted); 1877 return AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, true);
1856 } 1878 }
1857 1879
1858 /// <summary> 1880 /// <summary>
@@ -1886,7 +1908,7 @@ namespace OpenSim.Region.Framework.Scenes
1886 } 1908 }
1887 1909
1888 /// <summary> 1910 /// <summary>
1889 /// Delete every object from the scene 1911 /// Delete every object from the scene. This does not include attachments worn by avatars.
1890 /// </summary> 1912 /// </summary>
1891 public void DeleteAllSceneObjects() 1913 public void DeleteAllSceneObjects()
1892 { 1914 {
@@ -1897,7 +1919,11 @@ namespace OpenSim.Region.Framework.Scenes
1897 foreach (EntityBase e in entities) 1919 foreach (EntityBase e in entities)
1898 { 1920 {
1899 if (e is SceneObjectGroup) 1921 if (e is SceneObjectGroup)
1900 DeleteSceneObject((SceneObjectGroup)e, false); 1922 {
1923 SceneObjectGroup sog = (SceneObjectGroup)e;
1924 if (!sog.IsAttachment)
1925 DeleteSceneObject((SceneObjectGroup)e, false);
1926 }
1901 } 1927 }
1902 } 1928 }
1903 } 1929 }
@@ -2461,7 +2487,7 @@ namespace OpenSim.Region.Framework.Scenes
2461 /// <returns></returns> 2487 /// <returns></returns>
2462 public bool IncomingCreateObject(ISceneObject sog) 2488 public bool IncomingCreateObject(ISceneObject sog)
2463 { 2489 {
2464 //m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted); 2490// m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted);
2465 SceneObjectGroup newObject; 2491 SceneObjectGroup newObject;
2466 try 2492 try
2467 { 2493 {
@@ -2533,10 +2559,12 @@ namespace OpenSim.Region.Framework.Scenes
2533 2559
2534 if (sceneObject.IsAttachmentCheckFull()) // Attachment 2560 if (sceneObject.IsAttachmentCheckFull()) // Attachment
2535 { 2561 {
2562// m_log.DebugFormat("[SCENE]: Adding attachment {0} {1}", sceneObject.Name, sceneObject.LocalId);
2563
2536 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez); 2564 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
2537 sceneObject.RootPart.AddFlag(PrimFlags.Phantom); 2565 sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
2538 2566
2539 AddRestoredSceneObject(sceneObject, false, false); 2567 AddRestoredSceneObject(sceneObject, false, false, false);
2540 2568
2541 // Handle attachment special case 2569 // Handle attachment special case
2542 SceneObjectPart RootPrim = sceneObject.RootPart; 2570 SceneObjectPart RootPrim = sceneObject.RootPart;
@@ -2544,6 +2572,8 @@ namespace OpenSim.Region.Framework.Scenes
2544 // Fix up attachment Parent Local ID 2572 // Fix up attachment Parent Local ID
2545 ScenePresence sp = GetScenePresence(sceneObject.OwnerID); 2573 ScenePresence sp = GetScenePresence(sceneObject.OwnerID);
2546 2574
2575// Console.WriteLine("AAAA");
2576
2547 //uint parentLocalID = 0; 2577 //uint parentLocalID = 0;
2548 if (sp != null) 2578 if (sp != null)
2549 { 2579 {
@@ -2562,20 +2592,25 @@ namespace OpenSim.Region.Framework.Scenes
2562 //grp.SetFromAssetID(grp.RootPart.LastOwnerID); 2592 //grp.SetFromAssetID(grp.RootPart.LastOwnerID);
2563 m_log.DebugFormat( 2593 m_log.DebugFormat(
2564 "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition); 2594 "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
2565 2595
2596 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2566 AttachObject( 2597 AttachObject(
2567 sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false); 2598 sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false);
2568 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2599
2569 grp.SendGroupFullUpdate(); 2600 //grp.SendGroupFullUpdate();
2570 } 2601 }
2571 else 2602 else
2572 { 2603 {
2573 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2604 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2574 RootPrim.AddFlag(PrimFlags.TemporaryOnRez); 2605 RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
2575 } 2606 }
2607
2608// Console.WriteLine("BBBB");
2576 } 2609 }
2577 else 2610 else
2578 { 2611 {
2612// m_log.DebugFormat("[SCENE]: Adding ordinary object {0} {1}", sceneObject.Name, sceneObject.LocalId);
2613
2579 AddRestoredSceneObject(sceneObject, true, false); 2614 AddRestoredSceneObject(sceneObject, true, false);
2580 2615
2581 if (!Permissions.CanObjectEntry(sceneObject.UUID, 2616 if (!Permissions.CanObjectEntry(sceneObject.UUID,
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 2f6a0db..67fa13d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1383,7 +1383,9 @@ namespace OpenSim.Region.Framework.Scenes
1383 // now we have a child agent in this region. Request all interesting data about other (root) agents 1383 // now we have a child agent in this region. Request all interesting data about other (root) agents
1384 agent.SendInitialFullUpdateToAllClients(); 1384 agent.SendInitialFullUpdateToAllClients();
1385 1385
1386// Console.WriteLine("SCS 1");
1386 agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true); 1387 agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true);
1388// Console.WriteLine("SCS 2");
1387 1389
1388 // m_scene.SendKillObject(m_localId); 1390 // m_scene.SendKillObject(m_localId);
1389 1391
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 59a2f41..bdab696 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -216,11 +216,15 @@ namespace OpenSim.Region.Framework.Scenes
216 /// If true, we won't persist this object until it changes 216 /// If true, we won't persist this object until it changes
217 /// If false, we'll persist this object immediately 217 /// If false, we'll persist this object immediately
218 /// </param> 218 /// </param>
219 /// <param name="sendClientUpdate">
220 /// If true, we send updates to the client to tell it about this object
221 /// If false, we leave it up to the caller to do this
222 /// </param>
219 /// <returns> 223 /// <returns>
220 /// true if the object was added, false if an object with the same uuid was already in the scene 224 /// true if the object was added, false if an object with the same uuid was already in the scene
221 /// </returns> 225 /// </returns>
222 protected internal bool AddRestoredSceneObject( 226 protected internal bool AddRestoredSceneObject(
223 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted) 227 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
224 { 228 {
225 if (!alreadyPersisted) 229 if (!alreadyPersisted)
226 { 230 {
@@ -228,8 +232,29 @@ namespace OpenSim.Region.Framework.Scenes
228 sceneObject.HasGroupChanged = true; 232 sceneObject.HasGroupChanged = true;
229 } 233 }
230 234
231 return AddSceneObject(sceneObject, attachToBackup, true); 235 return AddSceneObject(sceneObject, attachToBackup, sendClientUpdates);
232 } 236 }
237
238// /// <summary>
239// /// Add an object into the scene that has come from storage
240// /// </summary>
241// /// <param name="sceneObject"></param>
242// /// <param name="attachToBackup">
243// /// If true, changes to the object will be reflected in its persisted data
244// /// If false, the persisted data will not be changed even if the object in the scene is changed
245// /// </param>
246// /// <param name="alreadyPersisted">
247// /// If true, we won't persist this object until it changes
248// /// If false, we'll persist this object immediately
249// /// </param>
250// /// <returns>
251// /// true if the object was added, false if an object with the same uuid was already in the scene
252// /// </returns>
253// protected internal bool AddRestoredSceneObject(
254// SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
255// {
256// AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, true);
257// }
233 258
234 /// <summary> 259 /// <summary>
235 /// Add a newly created object to the scene. This will both update the scene, and send information about the 260 /// Add a newly created object to the scene. This will both update the scene, and send information about the
@@ -611,11 +636,13 @@ namespace OpenSim.Region.Framework.Scenes
611 protected internal bool AttachObject( 636 protected internal bool AttachObject(
612 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent) 637 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
613 { 638 {
639// Console.WriteLine("HERE A");
614 SceneObjectGroup group = GetGroupByPrim(objectLocalID); 640 SceneObjectGroup group = GetGroupByPrim(objectLocalID);
615 if (group != null) 641 if (group != null)
616 { 642 {
617 if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) 643 if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
618 { 644 {
645// Console.WriteLine("HERE -1");
619 // If the attachment point isn't the same as the one previously used 646 // If the attachment point isn't the same as the one previously used
620 // set it's offset position = 0 so that it appears on the attachment point 647 // set it's offset position = 0 so that it appears on the attachment point
621 // and not in a weird location somewhere unknown. 648 // and not in a weird location somewhere unknown.
@@ -654,9 +681,12 @@ namespace OpenSim.Region.Framework.Scenes
654 itemId = group.GetFromItemID(); 681 itemId = group.GetFromItemID();
655 } 682 }
656 683
684// Console.WriteLine("HERE 0");
657 m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); 685 m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group);
658 686
687// Console.WriteLine("HERE 1");
659 group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent); 688 group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
689// Console.WriteLine("HERE 2");
660 // In case it is later dropped again, don't let 690 // In case it is later dropped again, don't let
661 // it get cleaned up 691 // it get cleaned up
662 // 692 //
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 602b811..451c6f9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1494,6 +1494,10 @@ namespace OpenSim.Region.Framework.Scenes
1494 1494
1495 public void SendFullUpdateToClient(IClientAPI remoteClient) 1495 public void SendFullUpdateToClient(IClientAPI remoteClient)
1496 { 1496 {
1497// if (IsAttachment)
1498// m_log.DebugFormat(
1499// "[SOG]: Sending full update to client {0} for {1} {2}", remoteClient.Name, Name, LocalId);
1500
1497 SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID)); 1501 SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID));
1498 1502
1499 lock (m_parts) 1503 lock (m_parts)
@@ -1513,8 +1517,9 @@ namespace OpenSim.Region.Framework.Scenes
1513 /// <param name="part"></param> 1517 /// <param name="part"></param>
1514 internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags) 1518 internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags)
1515 { 1519 {
1516// m_log.DebugFormat( 1520// if (IsAttachment)
1517// "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId); 1521// m_log.DebugFormat(
1522// "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
1518 1523
1519 if (m_rootPart.UUID == part.UUID) 1524 if (m_rootPart.UUID == part.UUID)
1520 { 1525 {
@@ -1994,7 +1999,8 @@ namespace OpenSim.Region.Framework.Scenes
1994 1999
1995 public void ScheduleFullUpdateToAvatar(ScenePresence presence) 2000 public void ScheduleFullUpdateToAvatar(ScenePresence presence)
1996 { 2001 {
1997// m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name); 2002// if (IsAttachment)
2003// m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name);
1998 2004
1999 RootPart.AddFullUpdateToAvatar(presence); 2005 RootPart.AddFullUpdateToAvatar(presence);
2000 2006
@@ -2026,7 +2032,8 @@ namespace OpenSim.Region.Framework.Scenes
2026 /// </summary> 2032 /// </summary>
2027 public void ScheduleGroupForFullUpdate() 2033 public void ScheduleGroupForFullUpdate()
2028 { 2034 {
2029// m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID); 2035// if (IsAttachment)
2036// m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID);
2030 2037
2031 checkAtTargets(); 2038 checkAtTargets();
2032 RootPart.ScheduleFullUpdate(); 2039 RootPart.ScheduleFullUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a85a4b3..19ff288 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1259,16 +1259,17 @@ namespace OpenSim.Region.Framework.Scenes
1259 /// Tell all scene presences that they should send updates for this part to their clients 1259 /// Tell all scene presences that they should send updates for this part to their clients
1260 /// </summary> 1260 /// </summary>
1261 public void AddFullUpdateToAllAvatars() 1261 public void AddFullUpdateToAllAvatars()
1262 { 1262 {
1263 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 1263 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
1264 for (int i = 0; i < avatars.Length; i++) 1264 for (int i = 0; i < avatars.Length; i++)
1265 { 1265 AddFullUpdateToAvatar(avatars[i]);
1266 avatars[i].SceneViewer.QueuePartForUpdate(this);
1267 }
1268 } 1266 }
1269 1267
1270 public void AddFullUpdateToAvatar(ScenePresence presence) 1268 public void AddFullUpdateToAvatar(ScenePresence presence)
1271 { 1269 {
1270// if (IsAttachment)
1271// m_log.DebugFormat("AddFullUpdateToAllAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
1272
1272 presence.SceneViewer.QueuePartForUpdate(this); 1273 presence.SceneViewer.QueuePartForUpdate(this);
1273 } 1274 }
1274 1275
@@ -1287,13 +1288,14 @@ namespace OpenSim.Region.Framework.Scenes
1287 { 1288 {
1288 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 1289 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
1289 for (int i = 0; i < avatars.Length; i++) 1290 for (int i = 0; i < avatars.Length; i++)
1290 { 1291 AddTerseUpdateToAvatar(avatars[i]);
1291 avatars[i].SceneViewer.QueuePartForUpdate(this);
1292 }
1293 } 1292 }
1294 1293
1295 public void AddTerseUpdateToAvatar(ScenePresence presence) 1294 public void AddTerseUpdateToAvatar(ScenePresence presence)
1296 { 1295 {
1296// if (IsAttachment)
1297// m_log.DebugFormat("AddTerseUpdateToAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
1298
1297 presence.SceneViewer.QueuePartForUpdate(this); 1299 presence.SceneViewer.QueuePartForUpdate(this);
1298 } 1300 }
1299 1301
@@ -2727,7 +2729,8 @@ namespace OpenSim.Region.Framework.Scenes
2727 /// </summary> 2729 /// </summary>
2728 public void ScheduleFullUpdate() 2730 public void ScheduleFullUpdate()
2729 { 2731 {
2730// m_log.DebugFormat("[SCENE OBJECT PART]: Scheduling full update for {0} {1}", Name, LocalId); 2732// if (IsAttachment)
2733// m_log.DebugFormat("[SOP]: Scheduling full update for {0} {1}", Name, LocalId);
2731 2734
2732 if (m_parentGroup != null) 2735 if (m_parentGroup != null)
2733 { 2736 {
@@ -2840,6 +2843,10 @@ namespace OpenSim.Region.Framework.Scenes
2840 /// <param name="remoteClient"></param> 2843 /// <param name="remoteClient"></param>
2841 public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags) 2844 public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
2842 { 2845 {
2846// if (IsAttachment)
2847// m_log.DebugFormat(
2848// "[SCENE OBJECT PART]: Sending part full update to {0} for {1} {2}", remoteClient.Name, Name, LocalId);
2849
2843 m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags); 2850 m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags);
2844 } 2851 }
2845 2852
@@ -2848,6 +2855,10 @@ namespace OpenSim.Region.Framework.Scenes
2848 /// </summary> 2855 /// </summary>
2849 public void SendFullUpdateToAllClients() 2856 public void SendFullUpdateToAllClients()
2850 { 2857 {
2858// if (IsAttachment)
2859// m_log.DebugFormat(
2860// "[SCENE OBJECT PART]: Sending full update for {0} {1} for all clients", Name, LocalId);
2861
2851 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 2862 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
2852 for (int i = 0; i < avatars.Length; i++) 2863 for (int i = 0; i < avatars.Length; i++)
2853 { 2864 {
@@ -2859,6 +2870,10 @@ namespace OpenSim.Region.Framework.Scenes
2859 2870
2860 public void SendFullUpdateToAllClientsExcept(UUID agentID) 2871 public void SendFullUpdateToAllClientsExcept(UUID agentID)
2861 { 2872 {
2873// if (IsAttachment)
2874// m_log.DebugFormat(
2875// "[SCENE OBJECT PART]: Sending full update for {0} {1} to all clients except {2}", Name, LocalId, agentID);
2876
2862 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 2877 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
2863 for (int i = 0; i < avatars.Length; i++) 2878 for (int i = 0; i < avatars.Length; i++)
2864 { 2879 {
@@ -2914,10 +2929,27 @@ namespace OpenSim.Region.Framework.Scenes
2914 //isattachment = ParentGroup.RootPart.IsAttachment; 2929 //isattachment = ParentGroup.RootPart.IsAttachment;
2915 2930
2916 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; 2931 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
2917 remoteClient.SendPrimitiveToClient(new SendPrimitiveData(m_regionHandle, m_parentGroup.GetTimeDilation(), LocalId, m_shape, 2932
2918 lPos, Velocity, Acceleration, RotationOffset, AngularVelocity, clientFlags, m_uuid, _ownerID, 2933 double priority = ParentGroup.GetUpdatePriority(remoteClient);
2919 m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment, 2934 if (IsRoot && IsAttachment)
2920 AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, ParentGroup.GetUpdatePriority(remoteClient))); 2935 {
2936 if (double.MinValue == priority)
2937 {
2938 m_log.WarnFormat(
2939 "[SOP]: Couldn't raise update priority of root part for attachment {0} {1} because priority is already highest value",
2940 Name, LocalId);
2941 }
2942 else
2943 {
2944 priority = double.MinValue;
2945 }
2946 }
2947
2948 remoteClient.SendPrimitiveToClient(
2949 new SendPrimitiveData(m_regionHandle, m_parentGroup.GetTimeDilation(), LocalId, m_shape,
2950 lPos, Velocity, Acceleration, RotationOffset, AngularVelocity, clientFlags, m_uuid, _ownerID,
2951 m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment,
2952 AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, priority));
2921 } 2953 }
2922 2954
2923 /// <summary> 2955 /// <summary>
@@ -2965,6 +2997,9 @@ namespace OpenSim.Region.Framework.Scenes
2965 { 2997 {
2966 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes 2998 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
2967 { 2999 {
3000// if (IsAttachment)
3001// m_log.DebugFormat("[SOP]: Sending scheduled full update for {0} {1}", Name, LocalId);
3002
2968 AddFullUpdateToAllAvatars(); 3003 AddFullUpdateToAllAvatars();
2969 ClearUpdateSchedule(); 3004 ClearUpdateSchedule();
2970 } 3005 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4973663..51cdf1b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3873,6 +3873,8 @@ namespace OpenSim.Region.Framework.Scenes
3873 3873
3874 private double UpdatePriority(UpdatePriorityData data) 3874 private double UpdatePriority(UpdatePriorityData data)
3875 { 3875 {
3876// m_log.DebugFormat("[SCENE PRESENCE]: Reprioritizing updates to client {0} for {1}", Name, data.localID);
3877
3876 EntityBase entity; 3878 EntityBase entity;
3877 SceneObjectGroup group; 3879 SceneObjectGroup group;
3878 3880
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index e4296ef..23663dd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.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 *
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using OpenMetaverse; 31using OpenMetaverse;
31using log4net; 32using log4net;
32using OpenSim.Framework; 33using OpenSim.Framework;
@@ -39,6 +40,8 @@ namespace OpenSim.Region.Framework.Scenes
39{ 40{
40 public class SceneViewer : ISceneViewer 41 public class SceneViewer : ISceneViewer
41 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44
42 protected ScenePresence m_presence; 45 protected ScenePresence m_presence;
43 protected UpdateQueue m_partsUpdateQueue = new UpdateQueue(); 46 protected UpdateQueue m_partsUpdateQueue = new UpdateQueue();
44 protected Queue<SceneObjectGroup> m_pendingObjects; 47 protected Queue<SceneObjectGroup> m_pendingObjects;
@@ -60,6 +63,9 @@ namespace OpenSim.Region.Framework.Scenes
60 /// <param name="part"></param> 63 /// <param name="part"></param>
61 public void QueuePartForUpdate(SceneObjectPart part) 64 public void QueuePartForUpdate(SceneObjectPart part)
62 { 65 {
66// if (part.IsAttachment)
67// m_log.DebugFormat("[SCENE VIEWER]: Queueing part {0} {1} for update", part.Name, part.LocalId);
68
63 lock (m_partsUpdateQueue) 69 lock (m_partsUpdateQueue)
64 { 70 {
65 m_partsUpdateQueue.Enqueue(part); 71 m_partsUpdateQueue.Enqueue(part);
@@ -134,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
134 } 140 }
135 else if (update.LastTerseUpdateTime <= part.TimeStampTerse) 141 else if (update.LastTerseUpdateTime <= part.TimeStampTerse)
136 { 142 {
137// m_log.DebugFormat( 143// m_log.DebugFormat(AddFullUpdateToAvatar
138// "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}", 144// "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}",
139// part.Name, part.UUID, part.TimeStampTerse); 145// part.Name, part.UUID, part.TimeStampTerse);
140 146
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index c653e98..672109b 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -146,6 +146,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
146 c.Position = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 30); 146 c.Position = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 30);
147 c.Sender = null; 147 c.Sender = null;
148 c.SenderUUID = UUID.Zero; 148 c.SenderUUID = UUID.Zero;
149 c.Scene = m_scene;
149 150
150 m_log.InfoFormat("[RegionReady]: Region \"{0}\" is ready: \"{1}\" on channel {2}", 151 m_log.InfoFormat("[RegionReady]: Region \"{0}\" is ready: \"{1}\" on channel {2}",
151 m_scene.RegionInfo.RegionName, c.Message, m_channelNotify); 152 m_scene.RegionInfo.RegionName, c.Message, m_channelNotify);
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index d8c0ba5..959164b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -32,7 +32,7 @@ using System.Globalization;
32using System.Reflection; 32using System.Reflection;
33using System.IO; 33using System.IO;
34using Microsoft.CSharp; 34using Microsoft.CSharp;
35using Microsoft.JScript; 35//using Microsoft.JScript;
36using Microsoft.VisualBasic; 36using Microsoft.VisualBasic;
37using log4net; 37using log4net;
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
82 82
83 private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); 83 private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
84 private static VBCodeProvider VBcodeProvider = new VBCodeProvider(); 84 private static VBCodeProvider VBcodeProvider = new VBCodeProvider();
85 private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider(); 85// private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider();
86 private static CSharpCodeProvider YPcodeProvider = new CSharpCodeProvider(); // YP is translated into CSharp 86 private static CSharpCodeProvider YPcodeProvider = new CSharpCodeProvider(); // YP is translated into CSharp
87 private static YP2CSConverter YP_Converter = new YP2CSConverter(); 87 private static YP2CSConverter YP_Converter = new YP2CSConverter();
88 88
@@ -395,9 +395,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
395 case enumCompileType.vb: 395 case enumCompileType.vb:
396 compileScript = CreateVBCompilerScript(compileScript); 396 compileScript = CreateVBCompilerScript(compileScript);
397 break; 397 break;
398 case enumCompileType.js: 398// case enumCompileType.js:
399 compileScript = CreateJSCompilerScript(compileScript); 399// compileScript = CreateJSCompilerScript(compileScript);
400 break; 400// break;
401 case enumCompileType.yp: 401 case enumCompileType.yp:
402 compileScript = CreateYPCompilerScript(compileScript); 402 compileScript = CreateYPCompilerScript(compileScript);
403 break; 403 break;
@@ -420,16 +420,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
420 } 420 }
421 } 421 }
422 422
423 private static string CreateJSCompilerScript(string compileScript) 423// private static string CreateJSCompilerScript(string compileScript)
424 { 424// {
425 compileScript = String.Empty + 425// compileScript = String.Empty +
426 "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" + 426// "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" +
427 "package SecondLife {\r\n" + 427// "package SecondLife {\r\n" +
428 "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" + 428// "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" +
429 compileScript + 429// compileScript +
430 "} }\r\n"; 430// "} }\r\n";
431 return compileScript; 431// return compileScript;
432 } 432// }
433 433
434 private static string CreateCSCompilerScript(string compileScript) 434 private static string CreateCSCompilerScript(string compileScript)
435 { 435 {
@@ -580,10 +580,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
580 } 580 }
581 } while (!complete); 581 } while (!complete);
582 break; 582 break;
583 case enumCompileType.js: 583// case enumCompileType.js:
584 results = JScodeProvider.CompileAssemblyFromSource( 584// results = JScodeProvider.CompileAssemblyFromSource(
585 parameters, Script); 585// parameters, Script);
586 break; 586// break;
587 case enumCompileType.yp: 587 case enumCompileType.yp:
588 results = YPcodeProvider.CompileAssemblyFromSource( 588 results = YPcodeProvider.CompileAssemblyFromSource(
589 parameters, Script); 589 parameters, Script);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index d30d2dc..18351ad 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -541,7 +541,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
541 m_CurrentResult = null; 541 m_CurrentResult = null;
542 } 542 }
543 543
544 return true; 544 return false;
545 } 545 }
546 546
547 public void SetState(string state) 547 public void SetState(string state)
@@ -991,7 +991,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
991 public string GetXMLState() 991 public string GetXMLState()
992 { 992 {
993 bool run = Running; 993 bool run = Running;
994 Stop(100); 994 bool stopped = Stop(100);
995 Running = run; 995 Running = run;
996 996
997 // We should not be doing this, but since we are about to 997 // We should not be doing this, but since we are about to
@@ -1002,6 +1002,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
1002 1002
1003 // Force an update of the in-memory plugin data 1003 // Force an update of the in-memory plugin data
1004 // 1004 //
1005 if (!stopped)
1006 return String.Empty;
1007
1005 PluginData = AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID); 1008 PluginData = AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID);
1006 1009
1007 return ScriptSerializer.Serialize(this); 1010 return ScriptSerializer.Serialize(this);