aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteSimulationData.cs
diff options
context:
space:
mode:
authorOren Hurvitz2013-01-22 08:49:36 +0200
committerJustin Clark-Casey (justincc)2013-01-25 04:03:20 +0000
commitfdec05a15ef126f344c03427e9ef264b4248646b (patch)
treecf3f1813727d0700fb342ebe11b63c70b5692e7a /OpenSim/Data/SQLite/SQLiteSimulationData.cs
parentChanged DAMap to be the container of "data stores", which are OSDMaps. Store ... (diff)
downloadopensim-SC_OLD-fdec05a15ef126f344c03427e9ef264b4248646b.zip
opensim-SC_OLD-fdec05a15ef126f344c03427e9ef264b4248646b.tar.gz
opensim-SC_OLD-fdec05a15ef126f344c03427e9ef264b4248646b.tar.bz2
opensim-SC_OLD-fdec05a15ef126f344c03427e9ef264b4248646b.tar.xz
Stopped storing dynamic attributes in the PrimShape
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteSimulationData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs8
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 6875ed6..fda7728 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -1282,7 +1282,6 @@ namespace OpenSim.Data.SQLite
1282 createCol(shapes, "Texture", typeof(Byte[])); 1282 createCol(shapes, "Texture", typeof(Byte[]));
1283 createCol(shapes, "ExtraParams", typeof(Byte[])); 1283 createCol(shapes, "ExtraParams", typeof(Byte[]));
1284 createCol(shapes, "Media", typeof(String)); 1284 createCol(shapes, "Media", typeof(String));
1285 createCol(shapes, "DynAttrs", typeof(String));
1286 1285
1287 shapes.PrimaryKey = new DataColumn[] { shapes.Columns["UUID"] }; 1286 shapes.PrimaryKey = new DataColumn[] { shapes.Columns["UUID"] };
1288 1287
@@ -2406,11 +2405,6 @@ namespace OpenSim.Data.SQLite
2406 2405
2407 if (!(row["Media"] is System.DBNull)) 2406 if (!(row["Media"] is System.DBNull))
2408 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); 2407 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
2409
2410 if (!(row["DynAttrs"] is System.DBNull))
2411 s.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
2412 else
2413 s.DynAttrs = new DAMap();
2414 2408
2415 return s; 2409 return s;
2416 } 2410 }
@@ -2458,8 +2452,6 @@ namespace OpenSim.Data.SQLite
2458 2452
2459 if (s.Media != null) 2453 if (s.Media != null)
2460 row["Media"] = s.Media.ToXml(); 2454 row["Media"] = s.Media.ToXml();
2461
2462 row["DynAttrs"] = s.DynAttrs.ToXml();
2463 } 2455 }
2464 2456
2465 /// <summary> 2457 /// <summary>