diff options
author | Jeff Ames | 2008-09-18 16:07:06 +0000 |
---|---|---|
committer | Jeff Ames | 2008-09-18 16:07:06 +0000 |
commit | ac083becd96c5966e412f94696eab38250d9c179 (patch) | |
tree | 5cfa5f1829a7f566d0cb8f15df123b679047e335 /OpenSim/Region | |
parent | code formatting cleanup. (diff) | |
download | opensim-SC-ac083becd96c5966e412f94696eab38250d9c179.zip opensim-SC-ac083becd96c5966e412f94696eab38250d9c179.tar.gz opensim-SC-ac083becd96c5966e412f94696eab38250d9c179.tar.bz2 opensim-SC-ac083becd96c5966e412f94696eab38250d9c179.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 3295a96..b77676c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2728,7 +2728,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2728 | client.OnScriptAnswer-=handleScriptAnswer; | 2728 | client.OnScriptAnswer-=handleScriptAnswer; |
2729 | m_waitingForScriptAnswer=false; | 2729 | m_waitingForScriptAnswer=false; |
2730 | 2730 | ||
2731 | if((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) | 2731 | if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) |
2732 | llReleaseControls(); | 2732 | llReleaseControls(); |
2733 | 2733 | ||
2734 | m_host.TaskInventory[invItemID].PermsMask=answer; | 2734 | m_host.TaskInventory[invItemID].PermsMask=answer; |
@@ -2815,7 +2815,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2815 | // byte uf = childPrim.RootPart.UpdateFlag; | 2815 | // byte uf = childPrim.RootPart.UpdateFlag; |
2816 | childPrim.RootPart.UpdateFlag = 0; | 2816 | childPrim.RootPart.UpdateFlag = 0; |
2817 | parentPrim.LinkToGroup(childPrim); | 2817 | parentPrim.LinkToGroup(childPrim); |
2818 | // if(uf != (Byte)0) | 2818 | // if (uf != (Byte)0) |
2819 | // parent.RootPart.UpdateFlag = uf; | 2819 | // parent.RootPart.UpdateFlag = uf; |
2820 | } | 2820 | } |
2821 | parentPrim.TriggerScriptChangedEvent(Changed.LINK); | 2821 | parentPrim.TriggerScriptChangedEvent(Changed.LINK); |
@@ -3742,7 +3742,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3742 | { | 3742 | { |
3743 | face = 0; | 3743 | face = 0; |
3744 | } | 3744 | } |
3745 | if(face >= 0 && face < GetNumberOfSides(part)) | 3745 | if (face >= 0 && face < GetNumberOfSides(part)) |
3746 | { | 3746 | { |
3747 | offset.x = tex.GetFace((uint)face).OffsetU; | 3747 | offset.x = tex.GetFace((uint)face).OffsetU; |
3748 | offset.y = tex.GetFace((uint)face).OffsetV; | 3748 | offset.y = tex.GetFace((uint)face).OffsetV; |