diff options
author | Melanie | 2013-10-04 20:03:12 +0100 |
---|---|---|
committer | Melanie | 2013-10-04 20:03:12 +0100 |
commit | 75c68fa29e3a2fed81c883e7925bf161e968639f (patch) | |
tree | 13ba69e6818f634018a5954d38750cf48128b7f8 /OpenSim/Data/MySQL | |
parent | Merge branch 'avination-current' into careminster (diff) | |
parent | minor: Disable logging left active on regression test TestSameSimulatorIsolat... (diff) | |
download | opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.zip opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.gz opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.bz2 opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 29 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 17 |
2 files changed, 41 insertions, 5 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index feacbb2..1b3e81e 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -174,7 +174,8 @@ namespace OpenSim.Data.MySQL | |||
174 | "CollisionSound, CollisionSoundVolume, " + | 174 | "CollisionSound, CollisionSoundVolume, " + |
175 | "PassTouches, " + | 175 | "PassTouches, " + |
176 | "PassCollisions, " + | 176 | "PassCollisions, " + |
177 | "LinkNumber, MediaURL, KeyframeMotion, " + | 177 | "LinkNumber, MediaURL, KeyframeMotion, AttachedPosX, " + |
178 | "AttachedPosY, AttachedPosZ, " + | ||
178 | "PhysicsShapeType, Density, GravityModifier, " + | 179 | "PhysicsShapeType, Density, GravityModifier, " + |
179 | "Friction, Restitution, Vehicle, DynAttrs " + | 180 | "Friction, Restitution, Vehicle, DynAttrs " + |
180 | ") values (" + "?UUID, " + | 181 | ") values (" + "?UUID, " + |
@@ -209,7 +210,8 @@ namespace OpenSim.Data.MySQL | |||
209 | "?ColorB, ?ColorA, ?ParticleSystem, " + | 210 | "?ColorB, ?ColorA, ?ParticleSystem, " + |
210 | "?ClickAction, ?Material, ?CollisionSound, " + | 211 | "?ClickAction, ?Material, ?CollisionSound, " + |
211 | "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " + | 212 | "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " + |
212 | "?LinkNumber, ?MediaURL, ?KeyframeMotion, " + | 213 | "?LinkNumber, ?MediaURL, ?KeyframeMotion, ?AttachedPosX, " + |
214 | "?AttachedPosY, ?AttachedPosZ, " + | ||
213 | "?PhysicsShapeType, ?Density, ?GravityModifier, " + | 215 | "?PhysicsShapeType, ?Density, ?GravityModifier, " + |
214 | "?Friction, ?Restitution, ?Vehicle, ?DynAttrs)"; | 216 | "?Friction, ?Restitution, ?Vehicle, ?DynAttrs)"; |
215 | 217 | ||
@@ -228,7 +230,7 @@ namespace OpenSim.Data.MySQL | |||
228 | "PathTaperX, PathTaperY, PathTwist, " + | 230 | "PathTaperX, PathTaperY, PathTwist, " + |
229 | "PathTwistBegin, ProfileBegin, ProfileEnd, " + | 231 | "PathTwistBegin, ProfileBegin, ProfileEnd, " + |
230 | "ProfileCurve, ProfileHollow, Texture, " + | 232 | "ProfileCurve, ProfileHollow, Texture, " + |
231 | "ExtraParams, State, Media) " + | 233 | "ExtraParams, State, LastAttachPoint, Media) " + |
232 | "values (?UUID, " + | 234 | "values (?UUID, " + |
233 | "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " + | 235 | "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " + |
234 | "?PCode, ?PathBegin, ?PathEnd, " + | 236 | "?PCode, ?PathBegin, ?PathEnd, " + |
@@ -240,7 +242,7 @@ namespace OpenSim.Data.MySQL | |||
240 | "?PathTwistBegin, ?ProfileBegin, " + | 242 | "?PathTwistBegin, ?ProfileBegin, " + |
241 | "?ProfileEnd, ?ProfileCurve, " + | 243 | "?ProfileEnd, ?ProfileCurve, " + |
242 | "?ProfileHollow, ?Texture, ?ExtraParams, " + | 244 | "?ProfileHollow, ?Texture, ?ExtraParams, " + |
243 | "?State, ?Media)"; | 245 | "?State, ?LastAttachPoint, ?Media)"; |
244 | 246 | ||
245 | FillShapeCommand(cmd, prim); | 247 | FillShapeCommand(cmd, prim); |
246 | 248 | ||
@@ -1320,7 +1322,16 @@ namespace OpenSim.Data.MySQL | |||
1320 | 1322 | ||
1321 | if (!(row["MediaURL"] is System.DBNull)) | 1323 | if (!(row["MediaURL"] is System.DBNull)) |
1322 | prim.MediaUrl = (string)row["MediaURL"]; | 1324 | prim.MediaUrl = (string)row["MediaURL"]; |
1323 | 1325 | ||
1326 | if (!(row["AttachedPosX"] is System.DBNull)) | ||
1327 | { | ||
1328 | prim.AttachedPos = new Vector3( | ||
1329 | (float)(double)row["AttachedPosX"], | ||
1330 | (float)(double)row["AttachedPosY"], | ||
1331 | (float)(double)row["AttachedPosZ"] | ||
1332 | ); | ||
1333 | } | ||
1334 | |||
1324 | if (!(row["DynAttrs"] is System.DBNull)) | 1335 | if (!(row["DynAttrs"] is System.DBNull)) |
1325 | prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]); | 1336 | prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]); |
1326 | else | 1337 | else |
@@ -1719,6 +1730,12 @@ namespace OpenSim.Data.MySQL | |||
1719 | 1730 | ||
1720 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); | 1731 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); |
1721 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); | 1732 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); |
1733 | if (prim.AttachedPos != null) | ||
1734 | { | ||
1735 | cmd.Parameters.AddWithValue("AttachedPosX", (double)prim.AttachedPos.X); | ||
1736 | cmd.Parameters.AddWithValue("AttachedPosY", (double)prim.AttachedPos.Y); | ||
1737 | cmd.Parameters.AddWithValue("AttachedPosZ", (double)prim.AttachedPos.Z); | ||
1738 | } | ||
1722 | 1739 | ||
1723 | if (prim.KeyframeMotion != null) | 1740 | if (prim.KeyframeMotion != null) |
1724 | cmd.Parameters.AddWithValue("KeyframeMotion", prim.KeyframeMotion.Serialize()); | 1741 | cmd.Parameters.AddWithValue("KeyframeMotion", prim.KeyframeMotion.Serialize()); |
@@ -1932,6 +1949,7 @@ namespace OpenSim.Data.MySQL | |||
1932 | s.ExtraParams = (byte[])row["ExtraParams"]; | 1949 | s.ExtraParams = (byte[])row["ExtraParams"]; |
1933 | 1950 | ||
1934 | s.State = (byte)(int)row["State"]; | 1951 | s.State = (byte)(int)row["State"]; |
1952 | s.LastAttachPoint = (byte)(int)row["LastAttachPoint"]; | ||
1935 | 1953 | ||
1936 | if (!(row["Media"] is System.DBNull)) | 1954 | if (!(row["Media"] is System.DBNull)) |
1937 | s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); | 1955 | s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); |
@@ -1978,6 +1996,7 @@ namespace OpenSim.Data.MySQL | |||
1978 | cmd.Parameters.AddWithValue("Texture", s.TextureEntry); | 1996 | cmd.Parameters.AddWithValue("Texture", s.TextureEntry); |
1979 | cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams); | 1997 | cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams); |
1980 | cmd.Parameters.AddWithValue("State", s.State); | 1998 | cmd.Parameters.AddWithValue("State", s.State); |
1999 | cmd.Parameters.AddWithValue("LastAttachPoint", s.LastAttachPoint); | ||
1981 | cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml()); | 2000 | cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml()); |
1982 | } | 2001 | } |
1983 | 2002 | ||
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index bda1b6a..c2e3afe 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -922,3 +922,20 @@ ALTER TABLE prims ADD COLUMN `Friction` double NOT NULL default '0.6'; | |||
922 | ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5'; | 922 | ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5'; |
923 | 923 | ||
924 | COMMIT; | 924 | COMMIT; |
925 | |||
926 | :VERSION 48 #---------------- Keyframes | ||
927 | |||
928 | BEGIN; | ||
929 | |||
930 | ALTER TABLE prims ADD COLUMN `KeyframeMotion` blob; | ||
931 | |||
932 | COMMIT; | ||
933 | |||
934 | :VERSION 49 #--------------------- Save attachment info | ||
935 | |||
936 | BEGIN; | ||
937 | ALTER TABLE prims ADD COLUMN AttachedPosX double default 0; | ||
938 | ALTER TABLE prims ADD COLUMN AttachedPosY double default 0; | ||
939 | ALTER TABLE prims ADD COLUMN AttachedPosZ double default 0; | ||
940 | ALTER TABLE primshapes ADD COLUMN LastAttachPoint int(4) not null default '0'; | ||
941 | COMMIT; | ||