diff options
| author | Melanie Thielker | 2014-07-20 02:27:08 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-07-20 02:27:08 +0200 |
| commit | b3068355bc5e9859cc636f7f7864d58ce9f9fe7c (patch) | |
| tree | 5b55cb98ade86a844d9a8b87d41abad88393116b /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
| parent | Fix duplicate attach message being sent to objects picked up from the ground (diff) | |
| parent | replace old Attachoffset by AttachedPos. Comented out possible merge (diff) | |
| download | opensim-SC-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.zip opensim-SC-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.tar.gz opensim-SC-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.tar.bz2 opensim-SC-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 916d841..1e98a49 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -12801,7 +12801,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 12801 | } | 12801 | } |
| 12802 | 12802 | ||
| 12803 | group.RootPart.AttachPoint = group.RootPart.Shape.State; | 12803 | group.RootPart.AttachPoint = group.RootPart.Shape.State; |
| 12804 | group.RootPart.AttachOffset = group.AbsolutePosition; | 12804 | group.RootPart.AttachedPos = group.AbsolutePosition; |
| 12805 | 12805 | ||
| 12806 | group.ResetIDs(); | 12806 | group.ResetIDs(); |
| 12807 | 12807 | ||