LinkSet Data feature from SL

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -181,7 +181,8 @@ public virtual void StoreObject(SceneObjectGroup obj, UUID regionUUID)
                                     "AttachedPosY, AttachedPosZ, " +
                                     "PhysicsShapeType, Density, GravityModifier, " +
                                     "Friction, Restitution, Vehicle, PhysInertia, DynAttrs, " +
-                                    "RotationAxisLocks, sopanims, sitactrange, pseudocrc" + 
+                                    "RotationAxisLocks, sopanims, sitactrange, pseudocrc, " +
+                                    "linksetdata" +
                                     ") values (" + "?UUID, " +
                                     "?CreationDate, ?Name, ?Text, " +
                                     "?Description, ?SitName, ?TouchName, " +
@@ -216,7 +217,8 @@ public virtual void StoreObject(SceneObjectGroup obj, UUID regionUUID)
                                     "?AttachedPosY, ?AttachedPosZ, " +
                                     "?PhysicsShapeType, ?Density, ?GravityModifier, " +
                                     "?Friction, ?Restitution, ?Vehicle, ?PhysInertia, ?DynAttrs," +
-                                    "?RotationAxisLocks, ?sopanims, ?sitactrange, ?pseudocrc)";
+                                    "?RotationAxisLocks, ?sopanims, ?sitactrange, ?pseudocrc, " +
+                                    "?linksetdata)";
 
                             FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
 
@@ -1202,6 +1204,11 @@ private SceneObjectPart BuildPrim(IDataReader row)
             if(pseudocrc != 0)
                 prim.PseudoCRC = pseudocrc;
 
+            if (!(row["linksetdata"] is DBNull))
+            {
+                prim.DeserializeLinksetData((byte[])row["linksetdata"]);
+            }
+
             return prim;
         }
 
@@ -1620,6 +1627,15 @@ private void FillPrimCommand(MySqlCommand cmd, SceneObjectPart prim, UUID sceneG
 
             cmd.Parameters.AddWithValue("sitactrange", prim.SitActiveRange);
             cmd.Parameters.AddWithValue("pseudocrc", prim.PseudoCRC);
+
+            if (prim.HasLinksetData)
+            {
+                cmd.Parameters.AddWithValue("linksetdata", prim.SerializeLinksetData());
+            }
+            else 
+            {
+                cmd.Parameters.AddWithValue("linksetdata", null);
+            }           
         }
 
         /// <summary>

OpenSim/Data/MySQL/Resources/RegionStore.migrations

@@ -550,3 +550,11 @@ BEGIN;
 ALTER TABLE `land` ADD COLUMN `environment` MEDIUMTEXT default NULL;
 COMMIT;
 
+ :VERSION 64         #----- material overrides
+ ALTER TABLE `primshapes` ADD COLUMN `MatOvrd` blob default NULL;
+ COMMIT;
+
+:VERSION 65         #----- add linkset data storage column
+BEGIN;
+ALTER TABLE `prims` ADD COLUMN `linksetdata` blob default NULL;
+COMMIT;

OpenSim/Data/PGSQL/PGSQLSimulationData.cs

@@ -355,9 +355,9 @@ UPDATE prims SET
             ""ClickAction"" = :ClickAction, ""Material"" = :Material, ""CollisionSound"" = :CollisionSound, ""CollisionSoundVolume"" = :CollisionSoundVolume, ""PassTouches"" = :PassTouches,
             ""LinkNumber"" = :LinkNumber, ""MediaURL"" = :MediaURL, ""DynAttrs"" = :DynAttrs, ""Vehicle"" = :Vehicle,
             ""PhysInertia"" = :PhysInertia, ""standtargetx"" =:standtargetx, ""standtargety"" =:standtargety, ""standtargetz"" =:standtargetz,
-            ""sitactrange"" =:sitactrange, ""pseudocrc"" = :pseudocrc, ""sopanims"" = :sopanims
-
-        WHERE ""UUID"" = :UUID ;
+            ""sitactrange"" =:sitactrange, ""pseudocrc"" = :pseudocrc, ""sopanims"" = :sopanims,
+            ""linksetdata"" =:linksetdata
+            WHERE ""UUID"" = :UUID ;
 
         INSERT INTO
             prims (
@@ -371,7 +371,7 @@ INSERT INTO
             ""ForceMouselook"", ""ScriptAccessPin"", ""AllowedDrop"", ""DieAtEdge"", ""SalePrice"", ""SaleType"", ""ColorR"", ""ColorG"", ""ColorB"", ""ColorA"",
             ""ParticleSystem"", ""ClickAction"", ""Material"", ""CollisionSound"", ""CollisionSoundVolume"", ""PassTouches"", ""LinkNumber"", ""MediaURL"", ""DynAttrs"",
             ""PhysicsShapeType"", ""Density"", ""GravityModifier"", ""Friction"", ""Restitution"", ""PassCollisions"", ""RotationAxisLocks"", ""RezzerID"" , ""Vehicle"", ""PhysInertia"",
-            ""standtargetx"", ""standtargety"", ""standtargetz"", ""sitactrange"", ""pseudocrc"", ""sopanims""
+            ""standtargetx"", ""standtargety"", ""standtargetz"", ""sitactrange"", ""pseudocrc"", ""sopanims"", ""linksetdata""
             ) Select
             :UUID, :CreationDate, :Name, :Text, :Description, :SitName, :TouchName, :ObjectFlags, :OwnerMask, :NextOwnerMask, :GroupMask,
             :EveryoneMask, :BaseMask, :PositionX, :PositionY, :PositionZ, :GroupPositionX, :GroupPositionY, :GroupPositionZ, :VelocityX,
@@ -383,7 +383,7 @@ INSERT INTO
             :ForceMouselook, :ScriptAccessPin, :AllowedDrop, :DieAtEdge, :SalePrice, :SaleType, :ColorR, :ColorG, :ColorB, :ColorA,
             :ParticleSystem, :ClickAction, :Material, :CollisionSound, :CollisionSoundVolume, :PassTouches, :LinkNumber, :MediaURL, :DynAttrs,
             :PhysicsShapeType, :Density, :GravityModifier, :Friction, :Restitution, :PassCollisions, :RotationAxisLocks, :RezzerID, :Vehicle, :PhysInertia,
-            :standtargetx, :standtargety, :standtargetz,:sitactrange, :pseudocrc, :sopanims
+            :standtargetx, :standtargety, :standtargetz,:sitactrange, :pseudocrc, :sopanims, :LinksetData
             where not EXISTS (SELECT ""UUID"" FROM prims WHERE ""UUID"" = :UUID);
         ";
 
@@ -1406,6 +1406,11 @@ private static SceneObjectPart BuildPrim(IDataRecord primRow)
                 prim.Animations = null;
             }
 
+            if ((primRow["LinksetData"] is DBNull) == false)
+            {
+                prim.DeserializeLinksetData(((byte[])primRow["linksetdata"]));
+            }
+
             return prim;
         }
 
@@ -1870,6 +1875,8 @@ private NpgsqlParameter[] CreatePrimParameters(SceneObjectPart prim, UUID sceneG
             else
                 parameters.Add(_Database.CreateParameter("sopanims", null));
 
+            parameters.Add(_Database.CreateParameter("linksetdata", prim.SerializeLinksetData()));
+
             return parameters.ToArray();
         }
 

OpenSim/Data/PGSQL/Resources/RegionStore.migrations

@@ -1261,3 +1261,8 @@ BEGIN;
 ALTER TABLE `prims` ADD COLUMN `sopanims` bytea NULL;
 ALTER TABLE `primshapes` ADD COLUMN `MatOvrd` bytea NULL;
 COMMIT;
+
+:VERSION 53         #----- add linkset data storage column
+BEGIN;
+ALTER TABLE `prims` ADD COLUMN `linksetdata` bytea NULL;
+COMMIT;

OpenSim/Data/SQLite/Resources/RegionStore.migrations

@@ -406,3 +406,8 @@ BEGIN;
 ALTER TABLE `prims` ADD COLUMN `sopanims` blob default NULL;
 ALTER TABLE `primshapes` ADD COLUMN `MatOvrd` blob default NULL;
 COMMIT;
+
+:VERSION 41         #----- add linkset data storage column
+BEGIN;
+ALTER TABLE `prims` ADD COLUMN `linksetdata` blob default NULL;
+COMMIT;

OpenSim/Data/SQLite/SQLiteSimulationData.cs

@@ -1251,6 +1251,8 @@ private static DataTable createPrimTable()
             createCol(prims, "pseudocrc", typeof(int));
             createCol(prims, "sopanims", typeof(byte[]));
 
+            createCol(prims, "linksetdata", typeof(byte[]));
+
             // Add in contraints
             prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] };
 
@@ -1810,6 +1812,11 @@ private SceneObjectPart buildPrim(DataRow row)
                 prim.Animations = null;
             }
 
+            if (!(row["linksetdata"] is DBNull))
+            {
+                prim.DeserializeLinksetData((byte[])row["LinksetData"]);
+            }
+
             return prim;
         }
 
@@ -2199,6 +2206,8 @@ private static void fillPrimRow(DataRow row, SceneObjectPart prim, UUID sceneGro
 
             row["pseudocrc"] = prim.PseudoCRC;
             row["sopanims"] = prim.SerializeAnimations();
+
+            row["linksetdata"] = prim.SerializeLinksetData();
         }
 
         /// <summary>

OpenSim/Framework/VersionInfo.cs

@@ -39,7 +39,7 @@ public class VersionInfo
     {
         public const string VersionNumber = "0.9.2.2";
         public const string AssemblyVersionNumber = "0.9.2.2";
-        public const string Release = "8688";
+        public const string Release = "8717";
 
         public static string Version
         {

OpenSim/Region/Framework/Scenes/LinksetDataEntry.cs

@@ -0,0 +1,68 @@
+using System;
+using System.IO;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+    public class LinksetDataEntry
+    {
+        public LinksetDataEntry(string value, string pass)
+        {
+            this.Value = value;
+            this.Password = pass;
+        }
+
+        private LinksetDataEntry()
+        { }
+
+        public bool IsProtected
+        {
+            get { return (string.IsNullOrEmpty(this.Password) == false); }
+        }
+
+        public string Password { get; private set; } = string.Empty;
+
+        public string Value { get; private set; }
+
+        public bool CheckPassword(string pass)
+        {
+            // A undocumented caveat for LinksetData appears to be that even for unprotected values, if a pass is provided, it is still treated as protected
+            if (this.Password == pass)
+                return true;
+            else
+                return false;
+        }
+
+        public string CheckPasswordAndGetValue(string pass)
+        {
+            if (string.IsNullOrEmpty(this.Password) || (this.Password == pass)) 
+                return this.Value;
+            else 
+                return string.Empty;
+        }
+
+        public Byte[] Serialize()
+        {
+            using (MemoryStream ms = new MemoryStream())
+            {
+                using (BinaryWriter bw = new BinaryWriter(ms))
+                {
+                    bw.Write(this.Value);
+                    bw.Write(this.Password);
+                    return ms.ToArray();
+                }
+            }
+        }
+
+        public static LinksetDataEntry Deserialize(Byte[] inf)
+        {
+            LinksetDataEntry pd = new LinksetDataEntry();
+            using (BinaryReader br = new BinaryReader(new MemoryStream(inf)))
+            {
+                pd.Value = br.ReadString();
+                pd.Password = br.ReadString();
+
+                return pd;
+            }
+        }
+    }
+}

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -88,9 +88,10 @@ public enum ScriptEventCode : int
         http_request = 38,
 
         path_update = 40,
+        linkset_data = 41,
 
         // marks highest numbered event
-        Size = 41
+        Size = 42
     }
 
     // this is not the right place for this
@@ -145,7 +146,9 @@ public enum scriptEvents : ulong
         anytouch = touch | touch_end | touch_start,
         anyTarget = at_target | not_at_target | at_rot_target | not_at_rot_target,
         anyobjcollision = collision | collision_end | collision_start,
-        anylandcollision = land_collision | land_collision_end | land_collision_start
+        anylandcollision = land_collision | land_collision_end | land_collision_start,
+
+        linkset_data = 1UL << 41
     }
 
     public struct scriptPosTarget