diff options
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r-- | OpenSim/Data/SQLite/Properties/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Resources/RegionStore.migrations | 5 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 19 |
3 files changed, 24 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs index c9a8553..ba52f82 100644 --- a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs | |||
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices; | |||
61 | // You can specify all the values or you can default the Revision and Build Numbers | 61 | // You can specify all the values or you can default the Revision and Build Numbers |
62 | // by using the '*' as shown below: | 62 | // by using the '*' as shown below: |
63 | 63 | ||
64 | [assembly : AssemblyVersion("0.7.5.*")] | 64 | [assembly : AssemblyVersion("0.7.6.*")] |
65 | [assembly : AssemblyFileVersion("0.6.5.0")] | 65 | [assembly : AssemblyFileVersion("0.6.5.0")] |
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations index e872977..e583dc2 100644 --- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations +++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations | |||
@@ -575,3 +575,8 @@ CREATE TABLE `regionenvironment` ( | |||
575 | ); | 575 | ); |
576 | 576 | ||
577 | COMMIT; | 577 | COMMIT; |
578 | |||
579 | :VERSION 27 | ||
580 | BEGIN; | ||
581 | ALTER TABLE prims ADD COLUMN DynAttrs TEXT; | ||
582 | COMMIT; | ||
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 29cac3c..91fc704 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -1232,6 +1232,8 @@ namespace OpenSim.Data.SQLite | |||
1232 | createCol(prims, "VolumeDetect", typeof(Int16)); | 1232 | createCol(prims, "VolumeDetect", typeof(Int16)); |
1233 | 1233 | ||
1234 | createCol(prims, "MediaURL", typeof(String)); | 1234 | createCol(prims, "MediaURL", typeof(String)); |
1235 | |||
1236 | createCol(prims, "DynAttrs", typeof(String)); | ||
1235 | 1237 | ||
1236 | // Add in contraints | 1238 | // Add in contraints |
1237 | prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] }; | 1239 | prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] }; |
@@ -1711,6 +1713,16 @@ namespace OpenSim.Data.SQLite | |||
1711 | // m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType()); | 1713 | // m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType()); |
1712 | prim.MediaUrl = (string)row["MediaURL"]; | 1714 | prim.MediaUrl = (string)row["MediaURL"]; |
1713 | } | 1715 | } |
1716 | |||
1717 | if (!(row["DynAttrs"] is System.DBNull)) | ||
1718 | { | ||
1719 | //m_log.DebugFormat("[SQLITE]: DynAttrs type [{0}]", row["DynAttrs"].GetType()); | ||
1720 | prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]); | ||
1721 | } | ||
1722 | else | ||
1723 | { | ||
1724 | prim.DynAttrs = new DAMap(); | ||
1725 | } | ||
1714 | 1726 | ||
1715 | return prim; | 1727 | return prim; |
1716 | } | 1728 | } |
@@ -2133,6 +2145,11 @@ namespace OpenSim.Data.SQLite | |||
2133 | row["VolumeDetect"] = 0; | 2145 | row["VolumeDetect"] = 0; |
2134 | 2146 | ||
2135 | row["MediaURL"] = prim.MediaUrl; | 2147 | row["MediaURL"] = prim.MediaUrl; |
2148 | |||
2149 | if (prim.DynAttrs.Count > 0) | ||
2150 | row["DynAttrs"] = prim.DynAttrs.ToXml(); | ||
2151 | else | ||
2152 | row["DynAttrs"] = null; | ||
2136 | } | 2153 | } |
2137 | 2154 | ||
2138 | /// <summary> | 2155 | /// <summary> |
@@ -2392,7 +2409,7 @@ namespace OpenSim.Data.SQLite | |||
2392 | 2409 | ||
2393 | if (!(row["Media"] is System.DBNull)) | 2410 | if (!(row["Media"] is System.DBNull)) |
2394 | s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); | 2411 | s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); |
2395 | 2412 | ||
2396 | return s; | 2413 | return s; |
2397 | } | 2414 | } |
2398 | 2415 | ||