diff options
author | Oren Hurvitz | 2013-01-22 08:49:36 +0200 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-25 04:03:20 +0000 |
commit | fdec05a15ef126f344c03427e9ef264b4248646b (patch) | |
tree | cf3f1813727d0700fb342ebe11b63c70b5692e7a /OpenSim/Data/MSSQL/MSSQLSimulationData.cs | |
parent | Changed DAMap to be the container of "data stores", which are OSDMaps. Store ... (diff) | |
download | opensim-SC_OLD-fdec05a15ef126f344c03427e9ef264b4248646b.zip opensim-SC_OLD-fdec05a15ef126f344c03427e9ef264b4248646b.tar.gz opensim-SC_OLD-fdec05a15ef126f344c03427e9ef264b4248646b.tar.bz2 opensim-SC_OLD-fdec05a15ef126f344c03427e9ef264b4248646b.tar.xz |
Stopped storing dynamic attributes in the PrimShape
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLSimulationData.cs')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLSimulationData.cs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs index e0e260d..24252ad 100644 --- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs +++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs | |||
@@ -409,7 +409,7 @@ IF EXISTS (SELECT UUID FROM primshapes WHERE UUID = @UUID) | |||
409 | PathSkew = @PathSkew, PathCurve = @PathCurve, PathRadiusOffset = @PathRadiusOffset, PathRevolutions = @PathRevolutions, | 409 | PathSkew = @PathSkew, PathCurve = @PathCurve, PathRadiusOffset = @PathRadiusOffset, PathRevolutions = @PathRevolutions, |
410 | PathTaperX = @PathTaperX, PathTaperY = @PathTaperY, PathTwist = @PathTwist, PathTwistBegin = @PathTwistBegin, | 410 | PathTaperX = @PathTaperX, PathTaperY = @PathTaperY, PathTwist = @PathTwist, PathTwistBegin = @PathTwistBegin, |
411 | ProfileBegin = @ProfileBegin, ProfileEnd = @ProfileEnd, ProfileCurve = @ProfileCurve, ProfileHollow = @ProfileHollow, | 411 | ProfileBegin = @ProfileBegin, ProfileEnd = @ProfileEnd, ProfileCurve = @ProfileCurve, ProfileHollow = @ProfileHollow, |
412 | Texture = @Texture, ExtraParams = @ExtraParams, State = @State, Media = @Media, DynAttrs = @DynAttrs | 412 | Texture = @Texture, ExtraParams = @ExtraParams, State = @State, Media = @Media |
413 | WHERE UUID = @UUID | 413 | WHERE UUID = @UUID |
414 | END | 414 | END |
415 | ELSE | 415 | ELSE |
@@ -418,11 +418,11 @@ ELSE | |||
418 | primshapes ( | 418 | primshapes ( |
419 | UUID, Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, | 419 | UUID, Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, |
420 | PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, | 420 | PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, |
421 | ProfileEnd, ProfileCurve, ProfileHollow, Texture, ExtraParams, State, Media, DynAttrs | 421 | ProfileEnd, ProfileCurve, ProfileHollow, Texture, ExtraParams, State, Media |
422 | ) VALUES ( | 422 | ) VALUES ( |
423 | @UUID, @Shape, @ScaleX, @ScaleY, @ScaleZ, @PCode, @PathBegin, @PathEnd, @PathScaleX, @PathScaleY, @PathShearX, @PathShearY, | 423 | @UUID, @Shape, @ScaleX, @ScaleY, @ScaleZ, @PCode, @PathBegin, @PathEnd, @PathScaleX, @PathScaleY, @PathShearX, @PathShearY, |
424 | @PathSkew, @PathCurve, @PathRadiusOffset, @PathRevolutions, @PathTaperX, @PathTaperY, @PathTwist, @PathTwistBegin, @ProfileBegin, | 424 | @PathSkew, @PathCurve, @PathRadiusOffset, @PathRevolutions, @PathTaperX, @PathTaperY, @PathTwist, @PathTwistBegin, @ProfileBegin, |
425 | @ProfileEnd, @ProfileCurve, @ProfileHollow, @Texture, @ExtraParams, @State, @Media, @DynAttrs | 425 | @ProfileEnd, @ProfileCurve, @ProfileHollow, @Texture, @ExtraParams, @State, @Media |
426 | ) | 426 | ) |
427 | END"; | 427 | END"; |
428 | 428 | ||
@@ -1754,11 +1754,6 @@ VALUES | |||
1754 | baseShape.Media = PrimitiveBaseShape.MediaList.FromXml((string)shapeRow["Media"]); | 1754 | baseShape.Media = PrimitiveBaseShape.MediaList.FromXml((string)shapeRow["Media"]); |
1755 | } | 1755 | } |
1756 | 1756 | ||
1757 | if (!(shapeRow["DynAttrs"] is System.DBNull)) | ||
1758 | baseShape.DynAttrs = DAMap.FromXml((string)shapeRow["DynAttrs"]); | ||
1759 | else | ||
1760 | baseShape.DynAttrs = new DAMap(); | ||
1761 | |||
1762 | return baseShape; | 1757 | return baseShape; |
1763 | } | 1758 | } |
1764 | 1759 | ||
@@ -2153,8 +2148,6 @@ VALUES | |||
2153 | parameters.Add(_Database.CreateParameter("Media", s.Media.ToXml())); | 2148 | parameters.Add(_Database.CreateParameter("Media", s.Media.ToXml())); |
2154 | } | 2149 | } |
2155 | 2150 | ||
2156 | parameters.Add(_Database.CreateParameter("DynAttrs", s.DynAttrs.ToXml())); | ||
2157 | |||
2158 | return parameters.ToArray(); | 2151 | return parameters.ToArray(); |
2159 | } | 2152 | } |
2160 | 2153 | ||