aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-12-12 01:24:25 -0500
committerTeravus Ovares (Dan Olivares)2009-12-12 01:24:25 -0500
commit35961caec6de48ec79e9af79fa1a2edf176b4389 (patch)
tree17872ae62dc84525420ff8a248f3eaf8aac6dbba /OpenSim/Data/MySQL
parent* Commit some sit code that's commented out for now. (diff)
parentGetting rid of SimpleRegionInfo and SerializableRegionInfo per Mel (diff)
downloadopensim-SC_OLD-35961caec6de48ec79e9af79fa1a2edf176b4389.zip
opensim-SC_OLD-35961caec6de48ec79e9af79fa1a2edf176b4389.tar.gz
opensim-SC_OLD-35961caec6de48ec79e9af79fa1a2edf176b4389.tar.bz2
opensim-SC_OLD-35961caec6de48ec79e9af79fa1a2edf176b4389.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index aecfaa3..9a4a4bb 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -480,8 +480,8 @@ namespace OpenSim.Data.MySQL
480 else 480 else
481 { 481 {
482 m_log.WarnFormat( 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.", 483 "[REGION DB]: Database contains an orphan child prim {0} {1} in region {2} pointing to missing parent {3}. This prim will not be loaded.",
484 prim.Name, prim.UUID, prim.AbsolutePosition, regionID, prim.ParentUUID); 484 prim.Name, prim.UUID, regionID, prim.ParentUUID);
485 } 485 }
486 } 486 }
487 } 487 }