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/MySQL | |
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 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index 50fcd96..9c67e3a 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -174,7 +174,7 @@ namespace OpenSim.Data.MySQL | |||
174 | "ParticleSystem, ClickAction, Material, " + | 174 | "ParticleSystem, ClickAction, Material, " + |
175 | "CollisionSound, CollisionSoundVolume, " + | 175 | "CollisionSound, CollisionSoundVolume, " + |
176 | "PassTouches, " + | 176 | "PassTouches, " + |
177 | "LinkNumber) values (" + "?UUID, " + | 177 | "LinkNumber, MediaURL) values (" + "?UUID, " + |
178 | "?CreationDate, ?Name, ?Text, " + | 178 | "?CreationDate, ?Name, ?Text, " + |
179 | "?Description, ?SitName, ?TouchName, " + | 179 | "?Description, ?SitName, ?TouchName, " + |
180 | "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " + | 180 | "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " + |
@@ -205,7 +205,7 @@ namespace OpenSim.Data.MySQL | |||
205 | "?SaleType, ?ColorR, ?ColorG, " + | 205 | "?SaleType, ?ColorR, ?ColorG, " + |
206 | "?ColorB, ?ColorA, ?ParticleSystem, " + | 206 | "?ColorB, ?ColorA, ?ParticleSystem, " + |
207 | "?ClickAction, ?Material, ?CollisionSound, " + | 207 | "?ClickAction, ?Material, ?CollisionSound, " + |
208 | "?CollisionSoundVolume, ?PassTouches, ?LinkNumber)"; | 208 | "?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL)"; |
209 | 209 | ||
210 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); | 210 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); |
211 | 211 | ||
@@ -1184,6 +1184,9 @@ namespace OpenSim.Data.MySQL | |||
1184 | 1184 | ||
1185 | prim.PassTouches = ((sbyte)row["PassTouches"] != 0); | 1185 | prim.PassTouches = ((sbyte)row["PassTouches"] != 0); |
1186 | prim.LinkNum = (int)row["LinkNumber"]; | 1186 | prim.LinkNum = (int)row["LinkNumber"]; |
1187 | |||
1188 | if (!(row["MediaURL"] is System.DBNull)) | ||
1189 | prim.MediaUrl = (string)row["MediaURL"]; | ||
1187 | 1190 | ||
1188 | return prim; | 1191 | return prim; |
1189 | } | 1192 | } |
@@ -1521,6 +1524,9 @@ namespace OpenSim.Data.MySQL | |||
1521 | cmd.Parameters.AddWithValue("PassTouches", 0); | 1524 | cmd.Parameters.AddWithValue("PassTouches", 0); |
1522 | 1525 | ||
1523 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); | 1526 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); |
1527 | |||
1528 | if (prim.MediaUrl != null) | ||
1529 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); | ||
1524 | } | 1530 | } |
1525 | 1531 | ||
1526 | /// <summary> | 1532 | /// <summary> |