Merge changes from 8738 release into dotnet6 branch. Includes fixes a…

…nd the Linksetdata changes. a few small changes due to later version of C# standard.

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -177,7 +177,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, " +
@@ -212,7 +213,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);
 
@@ -1196,6 +1198,11 @@ private SceneObjectPart BuildPrim(IDataReader row)
             if(pseudocrc != 0)
                 prim.PseudoCRC = pseudocrc;
 
+            if (!(row["linksetdata"] is DBNull))
+            {
+                prim.DeserializeLinksetData((string)row["linksetdata"]);
+            }
+
             return prim;
         }
 
@@ -1616,6 +1623,15 @@ private void FillPrimCommand(MySqlCommand cmd, SceneObjectPart prim, UUID sceneG
 
             cmd.Parameters.AddWithValue("sitactrange", prim.SitActiveRange);
             cmd.Parameters.AddWithValue("pseudocrc", prim.PseudoCRC);
+
+            if (prim.LinksetData != null)
+            {
+                cmd.Parameters.AddWithValue("linksetdata", prim.SerializeLinksetData());
+            }
+            else 
+            {
+                cmd.Parameters.AddWithValue("linksetdata", null);
+            }           
         }
 
         /// <summary>

OpenSim/Data/MySQL/Resources/RegionStore.migrations

@@ -553,3 +553,8 @@ 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` MEDIUMTEXT default NULL;
+COMMIT;

OpenSim/Data/PGSQL/PGSQLSimulationData.cs

@@ -355,8 +355,8 @@ 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
-
+            ""sitactrange"" =:sitactrange, ""pseudocrc"" = :pseudocrc, ""sopanims"" = :sopanims,
+            ""linksetdata"" =:linksetdata
         WHERE ""UUID"" = :UUID ;
 
         INSERT INTO
@@ -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);
         ";
 
@@ -1410,6 +1410,11 @@ private static SceneObjectPart BuildPrim(IDataRecord primRow)
                 prim.Animations = null;
             }
 
+            if ((primRow["LinksetData"] is DBNull) == false)
+            {
+                prim.DeserializeLinksetData(((string)primRow["linksetdata"]));
+            }
+
             return prim;
         }
 
@@ -1879,6 +1884,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` varchar default NULL;
+COMMIT;

OpenSim/Data/SQLite/Resources/RegionStore.migrations

@@ -405,3 +405,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` TEXT default NULL;
+COMMIT;

OpenSim/Data/SQLite/SQLiteSimulationData.cs

@@ -1250,6 +1250,8 @@ private static DataTable createPrimTable()
             createCol(prims, "pseudocrc", typeof(int));
             createCol(prims, "sopanims", typeof(byte[]));
 
+            createCol(prims, "linksetdata", typeof(string));
+
             // Add in contraints
             prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] };
 
@@ -1809,6 +1811,11 @@ private SceneObjectPart buildPrim(DataRow row)
                 prim.Animations = null;
             }
 
+            if (!(row["linksetdata"] is DBNull))
+            {
+                prim.DeserializeLinksetData((string)row["LinksetData"]);
+            }
+
             return prim;
         }
 
@@ -2202,6 +2209,7 @@ 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.3.0";
         public const string AssemblyVersionNumber = "0.9.3.0";
-        public const string Release = "8704";
+        public const string Release = "8740";
 
         public const int VERSIONINFO_VERSION_LENGTH = 48;
 

OpenSim/Region/Framework/OpenSim.Region.Framework.csproj

@@ -74,5 +74,6 @@
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="RawScape.Nini" Version="1.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="6.0.9" />
   </ItemGroup>
 </Project>