diff options
| author | Melanie | 2013-01-19 21:49:33 +0100 |
|---|---|---|
| committer | Melanie | 2013-01-19 21:49:33 +0100 |
| commit | 2d3a57a002c74704501f4ce0f0359f2a19699eb5 (patch) | |
| tree | cc74ca02d7b8f8c9e63e4007c354f3296fe87392 /OpenSim/Region/ScriptEngine/Shared/Api | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove group IM test code also mentioning "OpenSimulator Testing" (diff) | |
| download | opensim-SC_OLD-2d3a57a002c74704501f4ce0f0359f2a19699eb5.zip opensim-SC_OLD-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.gz opensim-SC_OLD-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.bz2 opensim-SC_OLD-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.xz | |
Merge branch 'avination'
Conflicts:
OpenSim/Framework/ThrottleOutPacketType.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 5cbb9c7..4ed6d75 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -2331,9 +2331,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2331 | else | 2331 | else |
| 2332 | { | 2332 | { |
| 2333 | part.OffsetPosition = (Vector3)toPos; | 2333 | part.OffsetPosition = (Vector3)toPos; |
| 2334 | SceneObjectGroup parent = part.ParentGroup; | 2334 | // SceneObjectGroup parent = part.ParentGroup; |
| 2335 | parent.HasGroupChanged = true; | 2335 | // parent.HasGroupChanged = true; |
| 2336 | parent.ScheduleGroupForTerseUpdate(); | 2336 | // parent.ScheduleGroupForTerseUpdate(); |
| 2337 | part.ScheduleTerseUpdate(); | ||
| 2337 | } | 2338 | } |
| 2338 | } | 2339 | } |
| 2339 | 2340 | ||
| @@ -8356,9 +8357,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 8356 | else | 8357 | else |
| 8357 | { | 8358 | { |
| 8358 | part.OffsetPosition = currentPosition; | 8359 | part.OffsetPosition = currentPosition; |
| 8359 | SceneObjectGroup parent = part.ParentGroup; | 8360 | // SceneObjectGroup parent = part.ParentGroup; |
| 8360 | parent.HasGroupChanged = true; | 8361 | // parent.HasGroupChanged = true; |
| 8361 | parent.ScheduleGroupForTerseUpdate(); | 8362 | // parent.ScheduleGroupForTerseUpdate(); |
| 8363 | part.ScheduleTerseUpdate(); | ||
| 8362 | } | 8364 | } |
| 8363 | } | 8365 | } |
| 8364 | } | 8366 | } |