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

mantis 8427: add new reject flags, change default, see mantis

0.9.1.0-post-fixes
UbitUmarov 2018-12-17 10:57:09 +00:00
parent f94b6c3ead
commit 530a6a40ed
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -15305,6 +15305,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
bool checkAgents = !((rejectTypes & ScriptBaseClass.RC_REJECT_AGENTS) == ScriptBaseClass.RC_REJECT_AGENTS); bool checkAgents = !((rejectTypes & ScriptBaseClass.RC_REJECT_AGENTS) == ScriptBaseClass.RC_REJECT_AGENTS);
bool checkNonPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_NONPHYSICAL) == ScriptBaseClass.RC_REJECT_NONPHYSICAL); bool checkNonPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_NONPHYSICAL) == ScriptBaseClass.RC_REJECT_NONPHYSICAL);
bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL);
bool rejectHost = ((rejectTypes & ScriptBaseClass.RC_REJECT_HOST) != 0);
bool rejectHostGroup = ((rejectTypes & ScriptBaseClass.RC_REJECT_HOSTGROUP) != 0);
if (World.SupportsRayCastFiltered()) if (World.SupportsRayCastFiltered())
{ {
@ -15432,7 +15434,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
continue; continue;
// physics ray can return colisions with host prim // physics ray can return colisions with host prim
if (m_host.LocalId == result.ConsumerID) if (rejectHost && m_host.LocalId == result.ConsumerID)
continue; continue;
UUID itemID = UUID.Zero; UUID itemID = UUID.Zero;
@ -15442,8 +15444,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// It's a prim! // It's a prim!
if (part != null) if (part != null)
{ {
// dont detect members of same object ??? if (rejectHostGroup && part.ParentGroup == thisgrp)
if (part.ParentGroup == thisgrp)
continue; continue;
if ((dataFlags & ScriptBaseClass.RC_GET_ROOT_KEY) == ScriptBaseClass.RC_GET_ROOT_KEY) if ((dataFlags & ScriptBaseClass.RC_GET_ROOT_KEY) == ScriptBaseClass.RC_GET_ROOT_KEY)

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@ -842,6 +842,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public static readonly LSLInteger RC_REJECT_PHYSICAL = 2; public static readonly LSLInteger RC_REJECT_PHYSICAL = 2;
public static readonly LSLInteger RC_REJECT_NONPHYSICAL = 4; public static readonly LSLInteger RC_REJECT_NONPHYSICAL = 4;
public static readonly LSLInteger RC_REJECT_LAND = 8; public static readonly LSLInteger RC_REJECT_LAND = 8;
public static readonly LSLInteger RC_REJECT_HOST = 0x20000000;
public static readonly LSLInteger RC_REJECT_HOSTGROUP = 0x40000000;
public static readonly LSLInteger RC_GET_NORMAL = 1; public static readonly LSLInteger RC_GET_NORMAL = 1;
public static readonly LSLInteger RC_GET_ROOT_KEY = 2; public static readonly LSLInteger RC_GET_ROOT_KEY = 2;

10
bin/ScriptSyntax.xml
View File

@ -1,4 +1,4 @@
fe7d5416-2379-feca-3b16-6b9854799c50 41ccf83c-178f-6070-7960-1448d28dcdab
<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer> <llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
<key>controls</key> <key>controls</key>
<map> <map>
@ -2567,6 +2567,14 @@ fe7d5416-2379-feca-3b16-6b9854799c50
<key>type</key><string>integer</string> <key>type</key><string>integer</string>
<key>value</key><string>1</string> <key>value</key><string>1</string>
</map> </map>
<key>RC_REJECT_HOST</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>0x20000000</string>
</map>
<key>RC_REJECT_HOSTGROUP</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>0x40000000</string>
</map>
<key>RC_REJECT_LAND</key><map> <key>RC_REJECT_LAND</key><map>
<key>type</key><string>integer</string> <key>type</key><string>integer</string>
<key>value</key><string>8</string> <key>value</key><string>8</string>