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

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index e949738..e0e260d 100644
--- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -1693,9 +1693,9 @@ VALUES
                 prim.MediaUrl = (string)primRow["MediaURL"];
             
             if (!(primRow["DynAttrs"] is System.DBNull))
-                prim.DynAttrs = DynAttrsOSDMap.FromXml((string)primRow["DynAttrs"]);
+                prim.DynAttrs = DAMap.FromXml((string)primRow["DynAttrs"]);
             else
-                prim.DynAttrs = new DynAttrsOSDMap();             
+                prim.DynAttrs = new DAMap();             
 
             return prim;
         }
@@ -1755,9 +1755,9 @@ VALUES
             }
 
             if (!(shapeRow["DynAttrs"] is System.DBNull))
-                baseShape.DynAttrs = DynAttrsOSDMap.FromXml((string)shapeRow["DynAttrs"]);            
+                baseShape.DynAttrs = DAMap.FromXml((string)shapeRow["DynAttrs"]);            
             else
-                baseShape.DynAttrs = new DynAttrsOSDMap();             
+                baseShape.DynAttrs = new DAMap();             
 
             return baseShape;
         }