aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorSean Dague2008-07-02 20:31:17 +0000
committerSean Dague2008-07-02 20:31:17 +0000
commit2c113c00cf5a8a026ed27e295ba107d21b458649 (patch)
treed263a3c2445acd57ba7020683f623e2d4ba85d89 /OpenSim/Region/ScriptEngine
parent* Twiddle with archive asset extensions yet again (diff)
downloadopensim-SC_OLD-2c113c00cf5a8a026ed27e295ba107d21b458649.zip
opensim-SC_OLD-2c113c00cf5a8a026ed27e295ba107d21b458649.tar.gz
opensim-SC_OLD-2c113c00cf5a8a026ed27e295ba107d21b458649.tar.bz2
opensim-SC_OLD-2c113c00cf5a8a026ed27e295ba107d21b458649.tar.xz
property encapsulation for SOP
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index b65174e..7122d65 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2396,7 +2396,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2396 return; 2396 return;
2397 } 2397 }
2398 } 2398 }
2399 else if (m_host.m_sitTargetAvatar == agentID) // Sitting avatar 2399 else if (m_host.SitTargetAvatar == agentID) // Sitting avatar
2400 { 2400 {
2401 // When agent is sitting, certain permissions are implicit if requested from sitting agent 2401 // When agent is sitting, certain permissions are implicit if requested from sitting agent
2402 int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION | 2402 int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index f4944cc..7225ae0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2256,7 +2256,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2256 return; 2256 return;
2257 } 2257 }
2258 } 2258 }
2259 else if (m_host.m_sitTargetAvatar == agentID) // Sitting avatar 2259 else if (m_host.SitTargetAvatar == agentID) // Sitting avatar
2260 { 2260 {
2261 // When agent is sitting, certain permissions are implicit if requested from sitting agent 2261 // When agent is sitting, certain permissions are implicit if requested from sitting agent
2262 int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 2262 int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |