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/Framework/Scenes/SceneObjectPart.cs | |
| 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/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index b59ba68..4b3dcbd 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -3763,7 +3763,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3763 | { | 3763 | { |
| 3764 | ParentGroup.stopMoveToTarget(); | 3764 | ParentGroup.stopMoveToTarget(); |
| 3765 | 3765 | ||
| 3766 | ParentGroup.ScheduleGroupForTerseUpdate(); | 3766 | // ParentGroup.ScheduleGroupForTerseUpdate(); |
| 3767 | //ParentGroup.ScheduleGroupForFullUpdate(); | 3767 | //ParentGroup.ScheduleGroupForFullUpdate(); |
| 3768 | } | 3768 | } |
| 3769 | 3769 | ||