aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorHomer Horwitz2008-10-11 16:58:05 +0000
committerHomer Horwitz2008-10-11 16:58:05 +0000
commit628e3a955374e11279aae7924fa62941b3bd362e (patch)
tree1068e03fc9db8b1b279de10145a3ddb99235eb93 /OpenSim/Region/Environment
parent2nd stab at that prim loading nasty (diff)
downloadopensim-SC_OLD-628e3a955374e11279aae7924fa62941b3bd362e.zip
opensim-SC_OLD-628e3a955374e11279aae7924fa62941b3bd362e.tar.gz
opensim-SC_OLD-628e3a955374e11279aae7924fa62941b3bd362e.tar.bz2
opensim-SC_OLD-628e3a955374e11279aae7924fa62941b3bd362e.tar.xz
- Patching a symptom of the failed WP start. We really need to find the reason
for that...
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs9
1 files changed, 8 insertions, 1 deletions
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
239 239
240 public override UUID UUID 240 public override UUID UUID
241 { 241 {
242 get { return m_rootPart.UUID; } 242 get {
243 if (m_rootPart == null)
244 {
245 m_log.Error("Got a null rootpart while requesting UUID. Called from: ", new Exception());
246 return UUID.Zero;
247 }
248 else return m_rootPart.UUID;
249 }
243 set { m_rootPart.UUID = value; } 250 set { m_rootPart.UUID = value; }
244 } 251 }
245 252