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

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2017-11-12 12:11:29 +00:00
parent cdb7d506fd 6546ea6da6
commit 17c65d918a
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -2288,13 +2288,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
if(gotCrossUpdate)
{
if(IgnoredControls != ScriptControlled.CONTROL_ZERO)
ControllingClient.SendTakeControls((int)IgnoredControls, false, true);
}
m_log.DebugFormat("[CompleteMovement] attachments: {0}ms", Util.EnvironmentTickCountSubtract(ts));
if (openChildAgents)
{
@@ -5685,7 +5678,6 @@ namespace OpenSim.Region.Framework.Scenes
{
IgnoredControls = ScriptControlled.CONTROL_ZERO;
obj.eventControls = (ScriptControlled)controls;
obj.ignoreControls = ScriptControlled.CONTROL_ZERO;
}
lock (scriptedcontrols)
@@ -5801,7 +5793,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if (scriptedcontrols.TryGetValue(Script_item_UUID, out takecontrols))
{
ScriptControlled sctc = takecontrols.eventControls;
ScriptControlled sctc = takecontrols.eventControls;
ControllingClient.SendTakeControls((int)sctc, false, false);
ControllingClient.SendTakeControls((int)sctc, true, false);