diff options
Fixed the problem of prims not being loaded from the database (that my last commit created).
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index cb6355f..75fdccf 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -363,7 +363,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
363 | /// </summary> | 363 | /// </summary> |
364 | public void ScheduleFullUpdate() | 364 | public void ScheduleFullUpdate() |
365 | { | 365 | { |
366 | m_parentGroup.HasChanged = true; | 366 | if (m_parentGroup != null) |
367 | { | ||
368 | m_parentGroup.HasChanged = true; | ||
369 | } | ||
367 | m_updateFlag = 2; | 370 | m_updateFlag = 2; |
368 | } | 371 | } |
369 | 372 | ||
@@ -374,7 +377,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
374 | { | 377 | { |
375 | if (m_updateFlag < 1) | 378 | if (m_updateFlag < 1) |
376 | { | 379 | { |
377 | m_parentGroup.HasChanged = true; | 380 | if (m_parentGroup != null) |
381 | { | ||
382 | m_parentGroup.HasChanged = true; | ||
383 | } | ||
378 | m_updateFlag = 1; | 384 | m_updateFlag = 1; |
379 | } | 385 | } |
380 | } | 386 | } |