aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs16
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index a06dbb3..e1ddb54 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -455,6 +455,20 @@ namespace OpenSim.Data.MySQL
455 objects.Add(grp); 455 objects.Add(grp);
456 456
457 lastGroupID = groupID; 457 lastGroupID = groupID;
458
459 // There sometimes exist OpenSim bugs that 'orphan groups' so that none of the prims are
460 // recorded as the root prim (for which the UUID must equal the persisted group UUID). In
461 // this case, force the UUID to be the same as the group UUID so that at least these can be
462 // deleted (we need to change the UUID so that any other prims in the linkset can also be
463 // deleted).
464 if (prim.UUID != groupID && groupID != UUID.Zero)
465 {
466 m_log.WarnFormat(
467 "[REGION DB]: Found root prim {0} {1} at {2} where group was actually {3}. Forcing UUID to group UUID",
468 prim.Name, prim.UUID, prim.GroupPosition, groupID);
469
470 prim.UUID = groupID;
471 }
458 472
459 grp = new SceneObjectGroup(prim); 473 grp = new SceneObjectGroup(prim);
460 } 474 }
@@ -484,7 +498,7 @@ namespace OpenSim.Data.MySQL
484 foreach (SceneObjectPart part in prims) 498 foreach (SceneObjectPart part in prims)
485 LoadItems(part); 499 LoadItems(part);
486 500
487 m_log.DebugFormat("[DATABASE] Loaded {0} objects using {1} prims", objects.Count, prims.Count); 501 m_log.DebugFormat("[REGION DB]: Loaded {0} objects using {1} prims", objects.Count, prims.Count);
488 502
489 return objects; 503 return objects;
490 } 504 }