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

Stopped storing dynamic attributes in the PrimShape

Browse Source
This commit is contained in:
Oren Hurvitz
2013-01-22 08:49:36 +02:00
committed by Justin Clark-Casey (justincc)
parent 8b4441d940
commit fdec05a15e
6 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@@ -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)

1
OpenSim/Data/MySQL/Resources/RegionStore.migrations
View File

@@ -908,6 +908,5 @@ COMMIT;
BEGIN;
ALTER TABLE prims ADD COLUMN DynAttrs TEXT;
ALTER TABLE primshapes ADD COLUMN DynAttrs TEXT;
COMMIT;