aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLSimulationData.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs8
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs8
3 files changed, 12 insertions, 12 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
1693 prim.MediaUrl = (string)primRow["MediaURL"]; 1693 prim.MediaUrl = (string)primRow["MediaURL"];
1694 1694
1695 if (!(primRow["DynAttrs"] is System.DBNull)) 1695 if (!(primRow["DynAttrs"] is System.DBNull))
1696 prim.DynAttrs = DynAttrsOSDMap.FromXml((string)primRow["DynAttrs"]); 1696 prim.DynAttrs = DAMap.FromXml((string)primRow["DynAttrs"]);
1697 else 1697 else
1698 prim.DynAttrs = new DynAttrsOSDMap(); 1698 prim.DynAttrs = new DAMap();
1699 1699
1700 return prim; 1700 return prim;
1701 } 1701 }
@@ -1755,9 +1755,9 @@ VALUES
1755 } 1755 }
1756 1756
1757 if (!(shapeRow["DynAttrs"] is System.DBNull)) 1757 if (!(shapeRow["DynAttrs"] is System.DBNull))
1758 baseShape.DynAttrs = DynAttrsOSDMap.FromXml((string)shapeRow["DynAttrs"]); 1758 baseShape.DynAttrs = DAMap.FromXml((string)shapeRow["DynAttrs"]);
1759 else 1759 else
1760 baseShape.DynAttrs = new DynAttrsOSDMap(); 1760 baseShape.DynAttrs = new DAMap();
1761 1761
1762 return baseShape; 1762 return baseShape;
1763 } 1763 }
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
1293 prim.MediaUrl = (string)row["MediaURL"]; 1293 prim.MediaUrl = (string)row["MediaURL"];
1294 1294
1295 if (!(row["DynAttrs"] is System.DBNull)) 1295 if (!(row["DynAttrs"] is System.DBNull))
1296 prim.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]); 1296 prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
1297 else 1297 else
1298 prim.DynAttrs = new DynAttrsOSDMap(); 1298 prim.DynAttrs = new DAMap();
1299 1299
1300 return prim; 1300 return prim;
1301 } 1301 }
@@ -1837,9 +1837,9 @@ namespace OpenSim.Data.MySQL
1837 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); 1837 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
1838 1838
1839 if (!(row["DynAttrs"] is System.DBNull)) 1839 if (!(row["DynAttrs"] is System.DBNull))
1840 s.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]); 1840 s.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
1841 else 1841 else
1842 s.DynAttrs = new DynAttrsOSDMap(); 1842 s.DynAttrs = new DAMap();
1843 1843
1844 return s; 1844 return s;
1845 } 1845 }
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 }