Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
This commit is contained in:
Melanie
2011-11-05 11:17:40 +00:00
5 changed files with 25 additions and 32 deletions

View File

@@ -3362,7 +3362,6 @@ namespace OpenSim.Region.Framework.Scenes
prim.OffsetPosition = axPos;
prim.IgnoreUndoUpdate = false;
prim.IgnoreUndoUpdate = false;
}
}