ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
This commit is contained in:
Melanie
2012-07-11 14:27:33 +01:00
parent 0bc8238a6c 6252114ea0
commit 89c9528e38
21 changed files with 738 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@@ -1824,6 +1824,8 @@ namespace OpenSim.Region.Framework.Scenes
{
parentGroup.LinkToGroup(child);
child.DetachFromBackup();
// this is here so physics gets updated!
// Don't remove! Bad juju! Stay away! or fix physics!
child.AbsolutePosition = child.AbsolutePosition;