aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2008-03-23 07:10:04 +0000
committerTeravus Ovares2008-03-23 07:10:04 +0000
commitf82227a1865e95ebc86a43c732bfd77ef97d3814 (patch)
tree556f3f309b537dbaf43b9f00d65a18671a19b284 /OpenSim/Region/Environment/Scenes
parent* Implements Oriented Bounding Box raytracing. (diff)
downloadopensim-SC_OLD-f82227a1865e95ebc86a43c732bfd77ef97d3814.zip
opensim-SC_OLD-f82227a1865e95ebc86a43c732bfd77ef97d3814.tar.gz
opensim-SC_OLD-f82227a1865e95ebc86a43c732bfd77ef97d3814.tar.bz2
opensim-SC_OLD-f82227a1865e95ebc86a43c732bfd77ef97d3814.tar.xz
* Added a little more stability for getting the object list from the parcel box. (previously it crashed my simulator)
* Found and gracefully handled a few situations where null references occur. (m_rootPart again!)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs16
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 1e63ae7..2875874 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -161,7 +161,14 @@ namespace OpenSim.Region.Environment.Scenes
161 161
162 public override uint LocalId 162 public override uint LocalId
163 { 163 {
164 get { return m_rootPart.LocalId; } 164 get {
165 if (m_rootPart == null)
166 {
167 m_log.Error("[PRIMGROUP]: Unable to find the rootpart for a LocalId Request!");
168 return 0;
169 }
170
171 return m_rootPart.LocalId; }
165 set { m_rootPart.LocalId = value; } 172 set { m_rootPart.LocalId = value; }
166 } 173 }
167 174
@@ -173,7 +180,12 @@ namespace OpenSim.Region.Environment.Scenes
173 180
174 public LLUUID OwnerID 181 public LLUUID OwnerID
175 { 182 {
176 get { return m_rootPart.OwnerID; } 183 get {
184 if (m_rootPart == null)
185 return LLUUID.Zero;
186
187 return m_rootPart.OwnerID;
188 }
177 set { m_rootPart.OwnerID = value; } 189 set { m_rootPart.OwnerID = value; }
178 } 190 }
179 191