Stopped storing dynamic attributes in the PrimShape

2 files changed, 2 insertions, 9 deletions

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 77fa1ec..1a6a0fb 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -221,7 +221,7 @@ namespace OpenSim.Data.MySQL
                                     "PathTaperX, PathTaperY, PathTwist, " +
                                     "PathTwistBegin, ProfileBegin, ProfileEnd, " +
                                     "ProfileCurve, ProfileHollow, Texture, " +
-                                    "ExtraParams, State, Media, DynAttrs) " +
+                                    "ExtraParams, State, Media) " +
                                     "values (?UUID, " +
                                     "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
                                     "?PCode, ?PathBegin, ?PathEnd, " +
@@ -233,7 +233,7 @@ namespace OpenSim.Data.MySQL
                                     "?PathTwistBegin, ?ProfileBegin, " +
                                     "?ProfileEnd, ?ProfileCurve, " +
                                     "?ProfileHollow, ?Texture, ?ExtraParams, " +
-                                    "?State, ?Media, ?DynAttrs)";
+                                    "?State, ?Media)";
     
                             FillShapeCommand(cmd, prim);
     
@@ -1838,11 +1838,6 @@ namespace OpenSim.Data.MySQL
             
             if (!(row["Media"] is System.DBNull))
                 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
-            
-            if (!(row["DynAttrs"] is System.DBNull))
-                s.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);            
-            else
-                s.DynAttrs = new DAMap();             
 
             return s;
         }
@@ -1887,7 +1882,6 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams);
             cmd.Parameters.AddWithValue("State", s.State);
             cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml());
-            cmd.Parameters.AddWithValue("DynAttrs", s.DynAttrs.ToXml());
         }
 
         public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 1a38836..c48aec2 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -908,6 +908,5 @@ COMMIT;
 BEGIN;
 
 ALTER TABLE prims ADD COLUMN DynAttrs TEXT;
-ALTER TABLE primshapes ADD COLUMN DynAttrs TEXT;
 
 COMMIT;