aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorMelanie2009-12-05 19:53:54 +0000
committerMelanie2009-12-05 19:53:54 +0000
commit43a6fa1d01707fda74b8ba7c2d9fb95210463b6a (patch)
tree77c5897901544e82467b1cdfafdc63644ee821ef /OpenSim/Data/MySQL
parentMerge branch 'master' into careminster (diff)
parent* Fix line endings in BaseHttpServer.cs (diff)
downloadopensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.zip
opensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.gz
opensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.bz2
opensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index c49153f..aecfaa3 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -479,7 +479,9 @@ namespace OpenSim.Data.MySQL
479 } 479 }
480 else 480 else
481 { 481 {
482 m_log.Warn("[REGION DB]: Database contains an orphan child prim " + prim.UUID + " pointing to missing parent " + prim.ParentUUID); 482 m_log.WarnFormat(
483 "[REGION DB]: Database contains an orphan child prim {0} {1} at {2} in region {3} pointing to missing parent {4}. This prim will not be loaded.",
484 prim.Name, prim.UUID, prim.AbsolutePosition, regionID, prim.ParentUUID);
483 } 485 }
484 } 486 }
485 } 487 }