ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting from it

Browse Source 
This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
This commit is contained in:
Justin Clark-Casey (justincc)
2010-08-16 22:21:46 +01:00
parent a3e1e6dd61
commit a6d9c26365
8 changed files with 191 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Data/SQLite/SQLiteSimulationData.cs
View File

@@ -1718,11 +1718,11 @@ namespace OpenSim.Data.SQLite
if (!(row["DynAttrs"] is System.DBNull))
{
//m_log.DebugFormat("[SQLITE]: DynAttrs type [{0}]", row["DynAttrs"].GetType());
prim.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]);
prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
}
else
{
prim.DynAttrs = new DynAttrsOSDMap();
prim.DynAttrs = new DAMap();
}
return prim;
@@ -2408,9 +2408,9 @@ namespace OpenSim.Data.SQLite
s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
if (!(row["DynAttrs"] is System.DBNull))
s.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]);
s.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
else
s.DynAttrs = new DynAttrsOSDMap();
s.DynAttrs = new DAMap();
return s;
}