OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

missing file

master
UbitUmarov 2020-02-25 23:08:17 +00:00
parent ceb9289f13
commit c9137912c9
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,7 +242,7 @@ namespace OpenSim.Region.Framework.Scenes
set { m_fromUserInventoryItemID = value; } set { m_fromUserInventoryItemID = value; }
} }
public scriptEvents AggregateScriptEvents; public scriptEvents AggregatedScriptEvents;
public Vector3 AttachedPos { get; set; } public Vector3 AttachedPos { get; set; }
@ -1216,7 +1216,7 @@ namespace OpenSim.Region.Framework.Scenes
public scriptEvents ScriptEvents public scriptEvents ScriptEvents
{ {
get { return AggregateScriptEvents; } get { return AggregatedScriptEvents; }
} }
public Quaternion SitTargetOrientation public Quaternion SitTargetOrientation
@ -4000,20 +4000,10 @@ namespace OpenSim.Region.Framework.Scenes
// scriptEvents oldparts; // scriptEvents oldparts;
lock (m_scriptEvents) lock (m_scriptEvents)
{ {
if (m_scriptEvents.ContainsKey(scriptid)) if (m_scriptEvents.ContainsKey(scriptid) && m_scriptEvents[scriptid] == (scriptEvents) events)
{
// oldparts = m_scriptEvents[scriptid];
// remove values from aggregated script events
if (m_scriptEvents[scriptid] == (scriptEvents) events)
return; return;
m_scriptEvents[scriptid] = (scriptEvents) events; m_scriptEvents[scriptid] = (scriptEvents) events;
} }
else
{
m_scriptEvents.Add(scriptid, (scriptEvents) events);
}
}
aggregateScriptEvents(); aggregateScriptEvents();
} }
@ -5199,11 +5189,11 @@ namespace OpenSim.Region.Framework.Scenes
bool hassound = (!VolumeDetectActive && CollisionSoundType >= 0 && ((Flags & PrimFlags.Physics) != 0)); bool hassound = (!VolumeDetectActive && CollisionSoundType >= 0 && ((Flags & PrimFlags.Physics) != 0));
scriptEvents CombinedEvents = AggregateScriptEvents; scriptEvents CombinedEvents = AggregatedScriptEvents;
// merge with root part // merge with root part
if (ParentGroup != null && ParentGroup.RootPart != null) if (ParentGroup != null && ParentGroup.RootPart != null)
CombinedEvents |= ParentGroup.RootPart.AggregateScriptEvents; CombinedEvents |= ParentGroup.RootPart.AggregatedScriptEvents;
// submit to this part case // submit to this part case
if (VolumeDetectActive) if (VolumeDetectActive)
@ -5225,35 +5215,34 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
public void aggregateScriptEvents() public void aggregateScriptEvents()
{ {
if (ParentGroup == null || ParentGroup.RootPart == null) if (ParentGroup == null || ParentGroup.RootPart == null)
return; return;
AggregateScriptEvents = 0; AggregatedScriptEvents = 0;
// Aggregate script events // Aggregate script events
lock (m_scriptEvents) lock (m_scriptEvents)
{ {
foreach (scriptEvents s in m_scriptEvents.Values) foreach (scriptEvents s in m_scriptEvents.Values)
{ {
AggregateScriptEvents |= s; AggregatedScriptEvents |= s;
} }
} }
uint objectflagupdate = 0; uint objectflagupdate = 0;
if ( if (
((AggregateScriptEvents & scriptEvents.touch) != 0) || ((AggregatedScriptEvents & scriptEvents.touch) != 0) ||
((AggregateScriptEvents & scriptEvents.touch_end) != 0) || ((AggregatedScriptEvents & scriptEvents.touch_end) != 0) ||
((AggregateScriptEvents & scriptEvents.touch_start) != 0) ((AggregatedScriptEvents & scriptEvents.touch_start) != 0)
) )
{ {
objectflagupdate |= (uint) PrimFlags.Touch; objectflagupdate |= (uint) PrimFlags.Touch;
} }
if ((AggregateScriptEvents & scriptEvents.money) != 0) if ((AggregatedScriptEvents & scriptEvents.money) != 0)
{ {
objectflagupdate |= (uint) PrimFlags.Money; objectflagupdate |= (uint) PrimFlags.Money;
} }