OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stopped storing dynamic attributes in the PrimShape

user_profiles
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Data/MSSQL/MSSQLSimulationData.cs
View File

@ -409,7 +409,7 @@ IF EXISTS (SELECT UUID FROM primshapes WHERE UUID = @UUID)
PathSkew = @PathSkew, PathCurve = @PathCurve, PathRadiusOffset = @PathRadiusOffset, PathRevolutions = @PathRevolutions,
PathTaperX = @PathTaperX, PathTaperY = @PathTaperY, PathTwist = @PathTwist, PathTwistBegin = @PathTwistBegin,
ProfileBegin = @ProfileBegin, ProfileEnd = @ProfileEnd, ProfileCurve = @ProfileCurve, ProfileHollow = @ProfileHollow,
Texture = @Texture, ExtraParams = @ExtraParams, State = @State, Media = @Media, DynAttrs = @DynAttrs
Texture = @Texture, ExtraParams = @ExtraParams, State = @State, Media = @Media
WHERE UUID = @UUID
END
ELSE
@ -418,11 +418,11 @@ ELSE
primshapes (
UUID, Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY,
PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin,
ProfileEnd, ProfileCurve, ProfileHollow, Texture, ExtraParams, State, Media, DynAttrs
ProfileEnd, ProfileCurve, ProfileHollow, Texture, ExtraParams, State, Media
) VALUES (
@UUID, @Shape, @ScaleX, @ScaleY, @ScaleZ, @PCode, @PathBegin, @PathEnd, @PathScaleX, @PathScaleY, @PathShearX, @PathShearY,
@PathSkew, @PathCurve, @PathRadiusOffset, @PathRevolutions, @PathTaperX, @PathTaperY, @PathTwist, @PathTwistBegin, @ProfileBegin,
@ProfileEnd, @ProfileCurve, @ProfileHollow, @Texture, @ExtraParams, @State, @Media, @DynAttrs
@ProfileEnd, @ProfileCurve, @ProfileHollow, @Texture, @ExtraParams, @State, @Media
)
END";
@ -1754,11 +1754,6 @@ VALUES
baseShape.Media = PrimitiveBaseShape.MediaList.FromXml((string)shapeRow["Media"]);
}
if (!(shapeRow["DynAttrs"] is System.DBNull))
baseShape.DynAttrs = DAMap.FromXml((string)shapeRow["DynAttrs"]);
else
baseShape.DynAttrs = new DAMap();
return baseShape;
}
@ -2153,8 +2148,6 @@ VALUES
parameters.Add(_Database.CreateParameter("Media", s.Media.ToXml()));
}
parameters.Add(_Database.CreateParameter("DynAttrs", s.DynAttrs.ToXml()));
return parameters.ToArray();
}

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

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

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;

8
OpenSim/Data/SQLite/SQLiteSimulationData.cs
View File

@ -1282,7 +1282,6 @@ namespace OpenSim.Data.SQLite
createCol(shapes, "Texture", typeof(Byte[]));
createCol(shapes, "ExtraParams", typeof(Byte[]));
createCol(shapes, "Media", typeof(String));
createCol(shapes, "DynAttrs", typeof(String));
shapes.PrimaryKey = new DataColumn[] { shapes.Columns["UUID"] };
@ -2406,11 +2405,6 @@ namespace OpenSim.Data.SQLite
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;
}
@ -2458,8 +2452,6 @@ namespace OpenSim.Data.SQLite
if (s.Media != null)
row["Media"] = s.Media.ToXml();
row["DynAttrs"] = s.DynAttrs.ToXml();
}
/// <summary>

7
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -82,11 +82,6 @@ namespace OpenSim.Framework
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly byte[] DEFAULT_TEXTURE = new Primitive.TextureEntry(new UUID("89556747-24cb-43ed-920b-47caed15465f")).GetBytes();
/// <summary>
/// Dynamic attributes can be created and deleted as required.
/// </summary>
public DAMap DynAttrs { get; set; }
private byte[] m_textureEntry;
@ -199,7 +194,6 @@ namespace OpenSim.Framework
{
PCode = (byte)PCodeEnum.Primitive;
m_textureEntry = DEFAULT_TEXTURE;
DynAttrs = new DAMap();
}
/// <summary>
@ -211,7 +205,6 @@ namespace OpenSim.Framework
// m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: Creating from {0}", prim.ID);
PCode = (byte)prim.PrimData.PCode;
DynAttrs = new DAMap();
State = prim.PrimData.State;
PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);