ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

a few more test changes

Browse Source
This commit is contained in:
UbitUmarov
2023-03-13 02:38:02 +00:00
parent 77d8bb9968
commit abd7b60899
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -2199,9 +2199,18 @@ namespace OpenSim.Region.Framework.Scenes
dupe.RezzerID = RezzerID;
byte[] extraP = new byte[Shape.ExtraParams.Length];
Array.Copy(Shape.ExtraParams, extraP, extraP.Length);
byte[] oldextrap = Shape.ExtraParams;
byte[] extraP = new byte[oldextrap.Length];
Array.Copy(oldextrap, extraP, extraP.Length);
dupe.Shape.ExtraParams = extraP;
if(Shape.RenderMaterials is not null && Shape.RenderMaterials.overrides is not null &&
Shape.RenderMaterials.overrides.Length > 0)
{
if(dupe.Shape.RenderMaterials == null)
dupe.Shape.RenderMaterials = new Primitive.RenderMaterials();
dupe.Shape.RenderMaterials.overrides = new Primitive.RenderMaterials.RenderMaterialOverrideEntry[Shape.RenderMaterials.overrides.Length];
Shape.RenderMaterials.overrides.CopyTo(dupe.Shape.RenderMaterials.overrides,0);
}
dupe.m_sittingAvatars = new HashSet<ScenePresence>();
dupe.SitTargetAvatar = UUID.Zero;

6
OpenSim/Region/Framework/Scenes/UuidGatherer.cs
View File

@@ -1060,6 +1060,12 @@ namespace OpenSim.Region.Framework.Scenes
{
GatheredUuids[teid] = (sbyte)AssetType.Texture;
}
if(ps.RenderMaterials is not null && ps.RenderMaterials.entries is not null &&
ps.RenderMaterials.entries.Length > 0)
{
foreach(Primitive.RenderMaterials.RenderMaterialEntry re in ps.RenderMaterials.entries)
AddForInspection(re.id, (sbyte)AssetType.Material);
}
/* multiple store
teid = ps.SculptTexture; //??
if (teid != UUID.Zero &&