diff options
| author | Melanie | 2012-03-20 18:02:43 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-20 18:02:43 +0100 |
| commit | 7f7801ecb9cff8c31eee732c18f540afc67c6d38 (patch) | |
| tree | ee473d36964a65e98297723dc8a0de1a25c8b15f /OpenSim | |
| parent | Cause prims to be saved if extra physics parameters are changed (diff) | |
| download | opensim-SC_OLD-7f7801ecb9cff8c31eee732c18f540afc67c6d38.zip opensim-SC_OLD-7f7801ecb9cff8c31eee732c18f540afc67c6d38.tar.gz opensim-SC_OLD-7f7801ecb9cff8c31eee732c18f540afc67c6d38.tar.bz2 opensim-SC_OLD-7f7801ecb9cff8c31eee732c18f540afc67c6d38.tar.xz | |
Cover the case where prims are loaded and ParentGroup is not yet set
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 9914c78..84b4bb3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -1505,7 +1505,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1505 | } | 1505 | } |
| 1506 | else | 1506 | else |
| 1507 | m_physicsShapeType = DefaultPhysicsShapeType(); | 1507 | m_physicsShapeType = DefaultPhysicsShapeType(); |
| 1508 | ParentGroup.HasGroupChanged = true; | 1508 | if (ParentGroup != null) |
| 1509 | ParentGroup.HasGroupChanged = true; | ||
| 1509 | } | 1510 | } |
| 1510 | } | 1511 | } |
| 1511 | 1512 | ||
| @@ -1519,7 +1520,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1519 | m_density = value; | 1520 | m_density = value; |
| 1520 | ScheduleFullUpdateIfNone(); | 1521 | ScheduleFullUpdateIfNone(); |
| 1521 | } | 1522 | } |
| 1522 | ParentGroup.HasGroupChanged = true; | 1523 | if (ParentGroup != null) |
| 1524 | ParentGroup.HasGroupChanged = true; | ||
| 1523 | } | 1525 | } |
| 1524 | } | 1526 | } |
| 1525 | 1527 | ||
| @@ -1530,7 +1532,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1530 | { if( value >= -1 && value <=28.0f) | 1532 | { if( value >= -1 && value <=28.0f) |
| 1531 | m_gravitymod = value; | 1533 | m_gravitymod = value; |
| 1532 | ScheduleFullUpdateIfNone(); | 1534 | ScheduleFullUpdateIfNone(); |
| 1533 | ParentGroup.HasGroupChanged = true; | 1535 | if (ParentGroup != null) |
| 1536 | ParentGroup.HasGroupChanged = true; | ||
| 1534 | } | 1537 | } |
| 1535 | } | 1538 | } |
| 1536 | 1539 | ||
| @@ -1544,7 +1547,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1544 | m_friction = value; | 1547 | m_friction = value; |
| 1545 | ScheduleFullUpdateIfNone(); | 1548 | ScheduleFullUpdateIfNone(); |
| 1546 | } | 1549 | } |
| 1547 | ParentGroup.HasGroupChanged = true; | 1550 | if (ParentGroup != null) |
| 1551 | ParentGroup.HasGroupChanged = true; | ||
| 1548 | } | 1552 | } |
| 1549 | } | 1553 | } |
| 1550 | 1554 | ||
| @@ -1558,7 +1562,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1558 | m_bounce = value; | 1562 | m_bounce = value; |
| 1559 | ScheduleFullUpdateIfNone(); | 1563 | ScheduleFullUpdateIfNone(); |
| 1560 | } | 1564 | } |
| 1561 | ParentGroup.HasGroupChanged = true; | 1565 | if (ParentGroup != null) |
| 1566 | ParentGroup.HasGroupChanged = true; | ||
| 1562 | } | 1567 | } |
| 1563 | } | 1568 | } |
| 1564 | 1569 | ||