diff options
author | Justin Clark-Casey (justincc) | 2010-08-03 17:54:40 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-03 17:54:40 +0100 |
commit | 2a0254f2da3b92f22289815c05bcd03a4032dd40 (patch) | |
tree | 8959ac0d25538e0bd59e593f48b21eff834e7d6f /OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | |
parent | Simplify serialized version string. Change element capitalization for consis... (diff) | |
download | opensim-SC_OLD-2a0254f2da3b92f22289815c05bcd03a4032dd40.zip opensim-SC_OLD-2a0254f2da3b92f22289815c05bcd03a4032dd40.tar.gz opensim-SC_OLD-2a0254f2da3b92f22289815c05bcd03a4032dd40.tar.bz2 opensim-SC_OLD-2a0254f2da3b92f22289815c05bcd03a4032dd40.tar.xz |
Implement MediaUrl persistence for MySQL and MsSQL
Not sure how I forgot this. This may resolve problems with media textures not persisting over restart for these databases.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs index 9d819b3..05b14bf 100644 --- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | |||
@@ -327,7 +327,7 @@ IF EXISTS (SELECT UUID FROM prims WHERE UUID = @UUID) | |||
327 | ScriptAccessPin = @ScriptAccessPin, AllowedDrop = @AllowedDrop, DieAtEdge = @DieAtEdge, SalePrice = @SalePrice, | 327 | ScriptAccessPin = @ScriptAccessPin, AllowedDrop = @AllowedDrop, DieAtEdge = @DieAtEdge, SalePrice = @SalePrice, |
328 | SaleType = @SaleType, ColorR = @ColorR, ColorG = @ColorG, ColorB = @ColorB, ColorA = @ColorA, ParticleSystem = @ParticleSystem, | 328 | SaleType = @SaleType, ColorR = @ColorR, ColorG = @ColorG, ColorB = @ColorB, ColorA = @ColorA, ParticleSystem = @ParticleSystem, |
329 | ClickAction = @ClickAction, Material = @Material, CollisionSound = @CollisionSound, CollisionSoundVolume = @CollisionSoundVolume, PassTouches = @PassTouches, | 329 | ClickAction = @ClickAction, Material = @Material, CollisionSound = @CollisionSound, CollisionSoundVolume = @CollisionSoundVolume, PassTouches = @PassTouches, |
330 | LinkNumber = @LinkNumber | 330 | LinkNumber = @LinkNumber, MediaURL = @MediaURL |
331 | WHERE UUID = @UUID | 331 | WHERE UUID = @UUID |
332 | END | 332 | END |
333 | ELSE | 333 | ELSE |
@@ -342,7 +342,7 @@ ELSE | |||
342 | PayPrice, PayButton1, PayButton2, PayButton3, PayButton4, LoopedSound, LoopedSoundGain, TextureAnimation, OmegaX, | 342 | PayPrice, PayButton1, PayButton2, PayButton3, PayButton4, LoopedSound, LoopedSoundGain, TextureAnimation, OmegaX, |
343 | OmegaY, OmegaZ, CameraEyeOffsetX, CameraEyeOffsetY, CameraEyeOffsetZ, CameraAtOffsetX, CameraAtOffsetY, CameraAtOffsetZ, | 343 | OmegaY, OmegaZ, CameraEyeOffsetX, CameraEyeOffsetY, CameraEyeOffsetZ, CameraAtOffsetX, CameraAtOffsetY, CameraAtOffsetZ, |
344 | ForceMouselook, ScriptAccessPin, AllowedDrop, DieAtEdge, SalePrice, SaleType, ColorR, ColorG, ColorB, ColorA, | 344 | ForceMouselook, ScriptAccessPin, AllowedDrop, DieAtEdge, SalePrice, SaleType, ColorR, ColorG, ColorB, ColorA, |
345 | ParticleSystem, ClickAction, Material, CollisionSound, CollisionSoundVolume, PassTouches, LinkNumber | 345 | ParticleSystem, ClickAction, Material, CollisionSound, CollisionSoundVolume, PassTouches, LinkNumber, MediaURL |
346 | ) VALUES ( | 346 | ) VALUES ( |
347 | @UUID, @CreationDate, @Name, @Text, @Description, @SitName, @TouchName, @ObjectFlags, @OwnerMask, @NextOwnerMask, @GroupMask, | 347 | @UUID, @CreationDate, @Name, @Text, @Description, @SitName, @TouchName, @ObjectFlags, @OwnerMask, @NextOwnerMask, @GroupMask, |
348 | @EveryoneMask, @BaseMask, @PositionX, @PositionY, @PositionZ, @GroupPositionX, @GroupPositionY, @GroupPositionZ, @VelocityX, | 348 | @EveryoneMask, @BaseMask, @PositionX, @PositionY, @PositionZ, @GroupPositionX, @GroupPositionY, @GroupPositionZ, @VelocityX, |
@@ -352,7 +352,7 @@ ELSE | |||
352 | @PayPrice, @PayButton1, @PayButton2, @PayButton3, @PayButton4, @LoopedSound, @LoopedSoundGain, @TextureAnimation, @OmegaX, | 352 | @PayPrice, @PayButton1, @PayButton2, @PayButton3, @PayButton4, @LoopedSound, @LoopedSoundGain, @TextureAnimation, @OmegaX, |
353 | @OmegaY, @OmegaZ, @CameraEyeOffsetX, @CameraEyeOffsetY, @CameraEyeOffsetZ, @CameraAtOffsetX, @CameraAtOffsetY, @CameraAtOffsetZ, | 353 | @OmegaY, @OmegaZ, @CameraEyeOffsetX, @CameraEyeOffsetY, @CameraEyeOffsetZ, @CameraAtOffsetX, @CameraAtOffsetY, @CameraAtOffsetZ, |
354 | @ForceMouselook, @ScriptAccessPin, @AllowedDrop, @DieAtEdge, @SalePrice, @SaleType, @ColorR, @ColorG, @ColorB, @ColorA, | 354 | @ForceMouselook, @ScriptAccessPin, @AllowedDrop, @DieAtEdge, @SalePrice, @SaleType, @ColorR, @ColorG, @ColorB, @ColorA, |
355 | @ParticleSystem, @ClickAction, @Material, @CollisionSound, @CollisionSoundVolume, @PassTouches, @LinkNumber | 355 | @ParticleSystem, @ClickAction, @Material, @CollisionSound, @CollisionSoundVolume, @PassTouches, @LinkNumber, @MediaURL |
356 | ) | 356 | ) |
357 | END"; | 357 | END"; |
358 | 358 | ||
@@ -1127,6 +1127,9 @@ VALUES | |||
1127 | if (Convert.ToInt16(primRow["PassTouches"]) != 0) | 1127 | if (Convert.ToInt16(primRow["PassTouches"]) != 0) |
1128 | prim.PassTouches = true; | 1128 | prim.PassTouches = true; |
1129 | prim.LinkNum = Convert.ToInt32(primRow["LinkNumber"]); | 1129 | prim.LinkNum = Convert.ToInt32(primRow["LinkNumber"]); |
1130 | |||
1131 | if (!(primRow["MediaURL"] is System.DBNull)) | ||
1132 | prim.MediaUrl = (string)primRow["MediaURL"]; | ||
1130 | 1133 | ||
1131 | return prim; | 1134 | return prim; |
1132 | } | 1135 | } |
@@ -1512,7 +1515,10 @@ VALUES | |||
1512 | parameters.Add(_Database.CreateParameter("PassTouches", 1)); | 1515 | parameters.Add(_Database.CreateParameter("PassTouches", 1)); |
1513 | else | 1516 | else |
1514 | parameters.Add(_Database.CreateParameter("PassTouches", 0)); | 1517 | parameters.Add(_Database.CreateParameter("PassTouches", 0)); |
1515 | parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum)); | 1518 | parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum)); |
1519 | |||
1520 | if (prim.MediaUrl != null) | ||
1521 | parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl)); | ||
1516 | 1522 | ||
1517 | return parameters.ToArray(); | 1523 | return parameters.ToArray(); |
1518 | } | 1524 | } |