Merge branch 'moap'

1 files changed, 12 insertions, 4 deletions

diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index bfeae12..d8debc5 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Data.MySQL
                                 "ParticleSystem, ClickAction, Material, " +
                                 "CollisionSound, CollisionSoundVolume, " +
                                 "PassTouches, " +
-                                "LinkNumber) values (" + "?UUID, " +
+                                "LinkNumber, MediaURL) values (" + "?UUID, " +
                                 "?CreationDate, ?Name, ?Text, " +
                                 "?Description, ?SitName, ?TouchName, " +
                                 "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +
@@ -205,7 +205,7 @@ namespace OpenSim.Data.MySQL
                                 "?SaleType, ?ColorR, ?ColorG, " +
                                 "?ColorB, ?ColorA, ?ParticleSystem, " +
                                 "?ClickAction, ?Material, ?CollisionSound, " +
-                                "?CollisionSoundVolume, ?PassTouches, ?LinkNumber)";
+                                "?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL)";
 
                         FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
 
@@ -222,7 +222,7 @@ namespace OpenSim.Data.MySQL
                                 "PathTaperX, PathTaperY, PathTwist, " +
                                 "PathTwistBegin, ProfileBegin, ProfileEnd, " +
                                 "ProfileCurve, ProfileHollow, Texture, " +
-                                "ExtraParams, State) values (?UUID, " +
+                                "ExtraParams, State, Media) values (?UUID, " +
                                 "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
                                 "?PCode, ?PathBegin, ?PathEnd, " +
                                 "?PathScaleX, ?PathScaleY, " +
@@ -233,7 +233,7 @@ namespace OpenSim.Data.MySQL
                                 "?PathTwistBegin, ?ProfileBegin, " +
                                 "?ProfileEnd, ?ProfileCurve, " +
                                 "?ProfileHollow, ?Texture, ?ExtraParams, " +
-                                "?State)";
+                                "?State, ?Media)";
 
                         FillShapeCommand(cmd, prim);
 
@@ -1184,6 +1184,9 @@ namespace OpenSim.Data.MySQL
             
             prim.PassTouches = ((sbyte)row["PassTouches"] != 0);
             prim.LinkNum = (int)row["LinkNumber"];
+            
+            if (!(row["MediaURL"] is System.DBNull))
+                prim.MediaUrl = (string)row["MediaURL"];
 
             return prim;
         }
@@ -1521,6 +1524,7 @@ namespace OpenSim.Data.MySQL
                 cmd.Parameters.AddWithValue("PassTouches", 0);
 
             cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
+            cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl);
         }
 
         /// <summary>
@@ -1700,6 +1704,9 @@ namespace OpenSim.Data.MySQL
             s.ExtraParams = (byte[])row["ExtraParams"];
 
             s.State = (byte)(int)row["State"];
+            
+            if (!(row["Media"] is System.DBNull))         
+                s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
 
             return s;
         }
@@ -1743,6 +1750,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("Texture", s.TextureEntry);
             cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams);
             cmd.Parameters.AddWithValue("State", s.State);
+            cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml());
         }
 
         public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)