diff options
| author | Melanie | 2011-11-05 11:17:40 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-05 11:17:40 +0000 |
| commit | 03f5bbcaf2a58990b59d573cdde671ae803e2224 (patch) | |
| tree | caa6bad1f5f66f7933be6f6f36013e26fba7a100 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | add myself to the contributors.txt (diff) | |
| download | opensim-SC-03f5bbcaf2a58990b59d573cdde671ae803e2224.zip opensim-SC-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.gz opensim-SC-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.bz2 opensim-SC-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 84d0e71..6e20f90 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -3362,7 +3362,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3362 | prim.OffsetPosition = axPos; | 3362 | prim.OffsetPosition = axPos; |
| 3363 | 3363 | ||
| 3364 | prim.IgnoreUndoUpdate = false; | 3364 | prim.IgnoreUndoUpdate = false; |
| 3365 | prim.IgnoreUndoUpdate = false; | ||
| 3366 | } | 3365 | } |
| 3367 | } | 3366 | } |
| 3368 | 3367 | ||