mantis 8573 and 8569: be more aggressive on drag block with touch on non physical prims
parent
c9b7ec2af9
commit
ffd5c5cc9c
|
@ -2097,8 +2097,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
SceneObjectPart part = GetPart(localId);
|
SceneObjectPart part = GetPart(localId);
|
||||||
|
|
||||||
if (((part.ScriptEvents & scriptEvents.anytouch) != 0) ||
|
if (((part.ScriptEvents & scriptEvents.anytouch) != 0) || (RootPart.ScriptEvents & scriptEvents.anytouch) != 0)
|
||||||
(part.PassTouches && (RootPart.ScriptEvents & scriptEvents.anytouch) != 0))
|
|
||||||
lastTouchTime = Util.GetTimeStampMS();
|
lastTouchTime = Util.GetTimeStampMS();
|
||||||
OnGrabPart(part, offsetPos, remoteClient);
|
OnGrabPart(part, offsetPos, remoteClient);
|
||||||
}
|
}
|
||||||
|
@ -3673,8 +3672,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
}
|
}
|
||||||
|
|
||||||
// a touch or pass may had become active ??
|
// a touch or pass may had become active ??
|
||||||
if (((part.ScriptEvents & scriptEvents.anytouch) != 0) ||
|
if (((part.ScriptEvents & scriptEvents.anytouch) != 0) || (RootPart.ScriptEvents & scriptEvents.anytouch) != 0)
|
||||||
(part.PassTouches && (RootPart.ScriptEvents & scriptEvents.anytouch) != 0))
|
|
||||||
{
|
{
|
||||||
lastTouchTime = now;
|
lastTouchTime = now;
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue