From a6d9c263650cc23d60f941718f87a64aa2f360b2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 16 Aug 2010 22:21:46 +0100
Subject: 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
---
 OpenSim/Data/MSSQL/MSSQLSimulationData.cs   | 8 ++++----
 OpenSim/Data/MySQL/MySQLSimulationData.cs   | 8 ++++----
 OpenSim/Data/SQLite/SQLiteSimulationData.cs | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Data')

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;
         }
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index b7f39fb..e558702 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1293,9 +1293,9 @@ namespace OpenSim.Data.MySQL
                 prim.MediaUrl = (string)row["MediaURL"];
             
             if (!(row["DynAttrs"] is System.DBNull))
-                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;
         }
@@ -1837,9 +1837,9 @@ namespace OpenSim.Data.MySQL
                 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;
         }
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
             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;
         }
-- 
cgit v1.1