diff options
| author | Melanie | 2012-02-15 01:11:35 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-15 01:11:35 +0000 |
| commit | 7be9ba55642868cb21b09908fb49635fa387fd17 (patch) | |
| tree | 12e5be55b2130942338a447bdceab7576dc7c4dd /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Implement region crossing of sitting avatars. Edit mode and llSetPos work (diff) | |
| download | opensim-SC-7be9ba55642868cb21b09908fb49635fa387fd17.zip opensim-SC-7be9ba55642868cb21b09908fb49635fa387fd17.tar.gz opensim-SC-7be9ba55642868cb21b09908fb49635fa387fd17.tar.bz2 opensim-SC-7be9ba55642868cb21b09908fb49635fa387fd17.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
1 files changed, 9 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 b0b1b16..1529140 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -2188,7 +2188,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2188 | if (part.ParentGroup.RootPart == part) | 2188 | if (part.ParentGroup.RootPart == part) |
| 2189 | { | 2189 | { |
| 2190 | SceneObjectGroup parent = part.ParentGroup; | 2190 | SceneObjectGroup parent = part.ParentGroup; |
| 2191 | parent.UpdateGroupPosition(new Vector3((float)toPos.x, (float)toPos.y, (float)toPos.z)); | 2191 | Util.FireAndForget(delegate(object x) { |
| 2192 | parent.UpdateGroupPosition(new Vector3((float)toPos.x, (float)toPos.y, (float)toPos.z)); | ||
| 2193 | }); | ||
| 2192 | } | 2194 | } |
| 2193 | else | 2195 | else |
| 2194 | { | 2196 | { |
| @@ -7973,7 +7975,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 7973 | if (part.ParentGroup.RootPart == part) | 7975 | if (part.ParentGroup.RootPart == part) |
| 7974 | { | 7976 | { |
| 7975 | SceneObjectGroup parent = part.ParentGroup; | 7977 | SceneObjectGroup parent = part.ParentGroup; |
| 7976 | parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z)); | 7978 | Util.FireAndForget(delegate(object x) { |
| 7979 | parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z)); | ||
| 7980 | }); | ||
| 7977 | } | 7981 | } |
| 7978 | else | 7982 | else |
| 7979 | { | 7983 | { |
| @@ -7990,7 +7994,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 7990 | if (part.ParentGroup.RootPart == part) | 7994 | if (part.ParentGroup.RootPart == part) |
| 7991 | { | 7995 | { |
| 7992 | SceneObjectGroup parent = part.ParentGroup; | 7996 | SceneObjectGroup parent = part.ParentGroup; |
| 7993 | parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z)); | 7997 | Util.FireAndForget(delegate(object x) { |
| 7998 | parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z)); | ||
| 7999 | }); | ||
| 7994 | } | 8000 | } |
| 7995 | else | 8001 | else |
| 7996 | { | 8002 | { |