aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorlbsa712008-07-26 21:22:15 +0000
committerlbsa712008-07-26 21:22:15 +0000
commit8e869b2ffffac0cf2625d23b35b6fb5ac9d2ae41 (patch)
tree6dedebe2263033b81a9df093fc22c86853fd83e3 /OpenSim/Region/ScriptEngine
parentModified ResetChildPrimPhysicsPositions() to allow archiving and physics to c... (diff)
downloadopensim-SC_OLD-8e869b2ffffac0cf2625d23b35b6fb5ac9d2ae41.zip
opensim-SC_OLD-8e869b2ffffac0cf2625d23b35b6fb5ac9d2ae41.tar.gz
opensim-SC_OLD-8e869b2ffffac0cf2625d23b35b6fb5ac9d2ae41.tar.bz2
opensim-SC_OLD-8e869b2ffffac0cf2625d23b35b6fb5ac9d2ae41.tar.xz
* Changed a number of field names to ccc (public members shouldn't be called m_)
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
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 2ef5c47..a67e7ab 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2554,7 +2554,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2554 2554
2555 m_host.AddScriptLPS(1); 2555 m_host.AddScriptLPS(1);
2556 2556
2557 if (m_host.ParentGroup.RootPart.m_IsAttachment && agent == m_host.ParentGroup.RootPart.m_attachedAvatar) 2557 if (m_host.ParentGroup.RootPart.IsAttachment && agent == m_host.ParentGroup.RootPart.AttachedAvatar)
2558 { 2558 {
2559 // When attached, certain permissions are implicit if requested from owner 2559 // When attached, certain permissions are implicit if requested from owner
2560 int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS | 2560 int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c9c4026..ed9bebf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2432,7 +2432,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2432 2432
2433 m_host.AddScriptLPS(1); 2433 m_host.AddScriptLPS(1);
2434 2434
2435 if (m_host.ParentGroup.RootPart.m_IsAttachment && agent == m_host.ParentGroup.RootPart.m_attachedAvatar) 2435 if (m_host.ParentGroup.RootPart.IsAttachment && agent == m_host.ParentGroup.RootPart.AttachedAvatar)
2436 { 2436 {
2437 // When attached, certain permissions are implicit if requested from owner 2437 // When attached, certain permissions are implicit if requested from owner
2438 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | 2438 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 673189a..cdba1ac 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -468,7 +468,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
468 { 468 {
469 LLUUID appDomain=assetID; 469 LLUUID appDomain=assetID;
470 470
471 if (part.ParentGroup.RootPart.m_IsAttachment) 471 if (part.ParentGroup.RootPart.IsAttachment)
472 appDomain = part.ParentGroup.RootPart.UUID; 472 appDomain = part.ParentGroup.RootPart.UUID;
473 473
474 if (!m_AppDomains.ContainsKey(appDomain)) 474 if (!m_AppDomains.ContainsKey(appDomain))