diff options
| author | Melanie | 2011-12-24 02:21:35 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-24 02:21:35 +0000 |
| commit | c4e16b26bb417065cfadb1772379786560d33dda (patch) | |
| tree | b3fb5ff89588474ba0a9aa75a0339097c605d7b9 /OpenSim/Region | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-c4e16b26bb417065cfadb1772379786560d33dda.zip opensim-SC-c4e16b26bb417065cfadb1772379786560d33dda.tar.gz opensim-SC-c4e16b26bb417065cfadb1772379786560d33dda.tar.bz2 opensim-SC-c4e16b26bb417065cfadb1772379786560d33dda.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 9f4b6b7..843ea36 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1746,16 +1746,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1746 | 1746 | ||
| 1747 | grp.ScheduleGroupForFullUpdate(); | 1747 | grp.ScheduleGroupForFullUpdate(); |
| 1748 | } | 1748 | } |
| 1749 | |||
| 1750 | |||
| 1751 | |||
| 1752 | |||
| 1753 | |||
| 1754 | if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent)) | ||
| 1755 | { | ||
| 1756 | grp.RootPart.GroupPosition = oldGroupPosition; | ||
| 1757 | grp.ScheduleGroupForFullUpdate(); | ||
| 1758 | } | ||
| 1759 | } | 1749 | } |
| 1760 | 1750 | ||
| 1761 | 1751 | ||