aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-01 22:04:35 +0000
committerJustin Clarke Casey2008-11-01 22:04:35 +0000
commit9366a234cf0dd09c0252f9af8a231c4b2865e556 (patch)
tree12ac4c2e25b048cb0b3962b1f9b3722b8e124126 /OpenSim/Region/ScriptEngine
parentFix a compile warning about unreachable code (diff)
downloadopensim-SC-9366a234cf0dd09c0252f9af8a231c4b2865e556.zip
opensim-SC-9366a234cf0dd09c0252f9af8a231c4b2865e556.tar.gz
opensim-SC-9366a234cf0dd09c0252f9af8a231c4b2865e556.tar.bz2
opensim-SC-9366a234cf0dd09c0252f9af8a231c4b2865e556.tar.xz
* refactor: Convert most non SOP methods to use SOG.IsAttachment rather than SOP.IsAttachment
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a92500c..b16125b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2861,7 +2861,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2861 2861
2862 m_host.AddScriptLPS(1); 2862 m_host.AddScriptLPS(1);
2863 2863
2864 if (m_host.ParentGroup.RootPart.IsAttachment && (UUID)agent == m_host.ParentGroup.RootPart.AttachedAvatar) 2864 if (m_host.ParentGroup.IsAttachment && (UUID)agent == m_host.ParentGroup.RootPart.AttachedAvatar)
2865 { 2865 {
2866 // When attached, certain permissions are implicit if requested from owner 2866 // When attached, certain permissions are implicit if requested from owner
2867 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | 2867 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 94d1fa7..9a4cb8b 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -545,7 +545,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
545 { 545 {
546 UUID appDomain = assetID; 546 UUID appDomain = assetID;
547 547
548 if (part.ParentGroup.RootPart.IsAttachment) 548 if (part.ParentGroup.IsAttachment)
549 appDomain = part.ParentGroup.RootPart.UUID; 549 appDomain = part.ParentGroup.RootPart.UUID;
550 550
551 if (!m_AppDomains.ContainsKey(appDomain)) 551 if (!m_AppDomains.ContainsKey(appDomain))