aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-16 22:21:46 +0100
committerJustin Clark-Casey (justincc)2013-01-25 04:03:11 +0000
commita6d9c263650cc23d60f941718f87a64aa2f360b2 (patch)
tree29bdd5df7bae66360e19a38c304e7197b6a55342 /OpenSim/Data/SQLite
parentImplement dynamic attribute persistence on mysql and mssql (diff)
downloadopensim-SC_OLD-a6d9c263650cc23d60f941718f87a64aa2f360b2.zip
opensim-SC_OLD-a6d9c263650cc23d60f941718f87a64aa2f360b2.tar.gz
opensim-SC_OLD-a6d9c263650cc23d60f941718f87a64aa2f360b2.tar.bz2
opensim-SC_OLD-a6d9c263650cc23d60f941718f87a64aa2f360b2.tar.xz
Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting from it
This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index b97653b..6875ed6 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -1718,11 +1718,11 @@ namespace OpenSim.Data.SQLite
1718 if (!(row["DynAttrs"] is System.DBNull)) 1718 if (!(row["DynAttrs"] is System.DBNull))
1719 { 1719 {
1720 //m_log.DebugFormat("[SQLITE]: DynAttrs type [{0}]", row["DynAttrs"].GetType()); 1720 //m_log.DebugFormat("[SQLITE]: DynAttrs type [{0}]", row["DynAttrs"].GetType());
1721 prim.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]); 1721 prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
1722 } 1722 }
1723 else 1723 else
1724 { 1724 {
1725 prim.DynAttrs = new DynAttrsOSDMap(); 1725 prim.DynAttrs = new DAMap();
1726 } 1726 }
1727 1727
1728 return prim; 1728 return prim;
@@ -2408,9 +2408,9 @@ namespace OpenSim.Data.SQLite
2408 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); 2408 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
2409 2409
2410 if (!(row["DynAttrs"] is System.DBNull)) 2410 if (!(row["DynAttrs"] is System.DBNull))
2411 s.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]); 2411 s.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
2412 else 2412 else
2413 s.DynAttrs = new DynAttrsOSDMap(); 2413 s.DynAttrs = new DAMap();
2414 2414
2415 return s; 2415 return s;
2416 } 2416 }