From 628e3a955374e11279aae7924fa62941b3bd362e Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Sat, 11 Oct 2008 16:58:05 +0000
Subject: - Patching a symptom of the failed WP start. We really need to find
the reason for that...
---
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 1204cd4..2c3e767 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -239,7 +239,14 @@ namespace OpenSim.Region.Environment.Scenes
public override UUID UUID
{
- get { return m_rootPart.UUID; }
+ get {
+ if (m_rootPart == null)
+ {
+ m_log.Error("Got a null rootpart while requesting UUID. Called from: ", new Exception());
+ return UUID.Zero;
+ }
+ else return m_rootPart.UUID;
+ }
set { m_rootPart.UUID = value; }
}
--
cgit v1.1