aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-16 20:38:20 +0100
committerJustin Clark-Casey (justincc)2013-01-25 04:03:04 +0000
commit1bd0b06ec1a0a5a7d6302d8017edcea7faf557e0 (patch)
tree71e12201d2d14b11ab1b0a9e7ed3905793ed9dff /OpenSim/Data
parentDisable json tests for now - I see this is failing on jenkins because mono 2.... (diff)
downloadopensim-SC_OLD-1bd0b06ec1a0a5a7d6302d8017edcea7faf557e0.zip
opensim-SC_OLD-1bd0b06ec1a0a5a7d6302d8017edcea7faf557e0.tar.gz
opensim-SC_OLD-1bd0b06ec1a0a5a7d6302d8017edcea7faf557e0.tar.bz2
opensim-SC_OLD-1bd0b06ec1a0a5a7d6302d8017edcea7faf557e0.tar.xz
Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLite
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs21
1 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 29cac3c..b97653b 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"] };
@@ -1280,6 +1282,7 @@ namespace OpenSim.Data.SQLite
1280 createCol(shapes, "Texture", typeof(Byte[])); 1282 createCol(shapes, "Texture", typeof(Byte[]));
1281 createCol(shapes, "ExtraParams", typeof(Byte[])); 1283 createCol(shapes, "ExtraParams", typeof(Byte[]));
1282 createCol(shapes, "Media", typeof(String)); 1284 createCol(shapes, "Media", typeof(String));
1285 createCol(shapes, "DynAttrs", typeof(String));
1283 1286
1284 shapes.PrimaryKey = new DataColumn[] { shapes.Columns["UUID"] }; 1287 shapes.PrimaryKey = new DataColumn[] { shapes.Columns["UUID"] };
1285 1288
@@ -1711,6 +1714,16 @@ namespace OpenSim.Data.SQLite
1711// m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType()); 1714// m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType());
1712 prim.MediaUrl = (string)row["MediaURL"]; 1715 prim.MediaUrl = (string)row["MediaURL"];
1713 } 1716 }
1717
1718 if (!(row["DynAttrs"] is System.DBNull))
1719 {
1720 //m_log.DebugFormat("[SQLITE]: DynAttrs type [{0}]", row["DynAttrs"].GetType());
1721 prim.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]);
1722 }
1723 else
1724 {
1725 prim.DynAttrs = new DynAttrsOSDMap();
1726 }
1714 1727
1715 return prim; 1728 return prim;
1716 } 1729 }
@@ -2133,6 +2146,7 @@ namespace OpenSim.Data.SQLite
2133 row["VolumeDetect"] = 0; 2146 row["VolumeDetect"] = 0;
2134 2147
2135 row["MediaURL"] = prim.MediaUrl; 2148 row["MediaURL"] = prim.MediaUrl;
2149 row["DynAttrs"] = prim.DynAttrs.ToXml();
2136 } 2150 }
2137 2151
2138 /// <summary> 2152 /// <summary>
@@ -2393,6 +2407,11 @@ namespace OpenSim.Data.SQLite
2393 if (!(row["Media"] is System.DBNull)) 2407 if (!(row["Media"] is System.DBNull))
2394 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); 2408 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
2395 2409
2410 if (!(row["DynAttrs"] is System.DBNull))
2411 s.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]);
2412 else
2413 s.DynAttrs = new DynAttrsOSDMap();
2414
2396 return s; 2415 return s;
2397 } 2416 }
2398 2417
@@ -2439,6 +2458,8 @@ namespace OpenSim.Data.SQLite
2439 2458
2440 if (s.Media != null) 2459 if (s.Media != null)
2441 row["Media"] = s.Media.ToXml(); 2460 row["Media"] = s.Media.ToXml();
2461
2462 row["DynAttrs"] = s.DynAttrs.ToXml();
2442 } 2463 }
2443 2464
2444 /// <summary> 2465 /// <summary>