From d68b6642439d70178f367ef2cac5aa7b573fea44 Mon Sep 17 00:00:00 2001
From: grid
Date: Thu, 10 Dec 2009 22:09:16 -0500
Subject: Kill a NRE caused by an error message trying to print unavailable
 data

---
 OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index aecfaa3..c33dc52 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -480,8 +480,8 @@ namespace OpenSim.Data.MySQL
                     else
                     {
                         m_log.WarnFormat(
-                            "[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.",
-                            prim.Name, prim.UUID, prim.AbsolutePosition, regionID, prim.ParentUUID);
+                            "[REGION DB]: Database contains an orphan child prim {0} {1} in region {3} pointing to missing parent {4}.  This prim will not be loaded.",
+                            prim.Name, prim.UUID, regionID, prim.ParentUUID);
                     }
                 }
             }
-- 
cgit v1.1


From 204c59c5acc79b30f90a0de9e69350bcd0de06c3 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 11 Dec 2009 02:40:33 +0000
Subject: Refix the fix

---
 OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index c33dc52..9a4a4bb 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -480,7 +480,7 @@ namespace OpenSim.Data.MySQL
                     else
                     {
                         m_log.WarnFormat(
-                            "[REGION DB]: Database contains an orphan child prim {0} {1} in region {3} pointing to missing parent {4}.  This prim will not be loaded.",
+                            "[REGION DB]: Database contains an orphan child prim {0} {1} in region {2} pointing to missing parent {3}.  This prim will not be loaded.",
                             prim.Name, prim.UUID, regionID, prim.ParentUUID);
                     }
                 }
-- 
cgit v1.1