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

Resolve merge failure

Browse Source
This commit is contained in:
meta7
2010-08-10 09:11:55 -07:00
parent 1ead2ed5ee 5e8c3f8325
commit 9fba4b66bb
10 changed files with 4456 additions and 4411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -1629,7 +1629,7 @@ namespace OpenSim.Region.Framework.Scenes
ScheduleGroupForFullUpdate();
}
public override void SetText(string text, Vector3 color, double alpha)
public void SetText(string text, Vector3 color, double alpha)
{
Color = Color.FromArgb(0xff - (int) (alpha * 0xff),
(int) (color.X * 0xff),
@@ -1868,10 +1868,10 @@ namespace OpenSim.Region.Framework.Scenes
dupe.RootPart.DoPhysicsPropertyUpdate(dupe.RootPart.PhysActor.IsPhysical, true);
}
List<SceneObjectPart> partList;
lockPartsForRead(true);
List<SceneObjectPart> partList;
partList = new List<SceneObjectPart>(m_parts.Values);
lockPartsForRead(false);
@@ -1890,8 +1890,26 @@ namespace OpenSim.Region.Framework.Scenes
newPart.LinkNum = part.LinkNum;
}
}
// Need to duplicate the physics actor as well
if (part.PhysActor != null && userExposed)
{
PrimitiveBaseShape pbs = part.Shape;
part.PhysActor
= m_scene.PhysicsScene.AddPrimShape(
part.Name,
pbs,
part.AbsolutePosition,
part.Scale,
part.RotationOffset,
part.PhysActor.IsPhysical);
part.PhysActor.LocalID = part.LocalId;
part.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
}
}
if (userExposed)
{
dupe.UpdateParentIDs();
@@ -1900,6 +1918,7 @@ namespace OpenSim.Region.Framework.Scenes
ScheduleGroupForFullUpdate();
}
}
finally
{