aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorSean Dague2008-07-23 22:14:35 +0000
committerSean Dague2008-07-23 22:14:35 +0000
commitc38b811f5d254765886ba745c0d5f50fb03a13be (patch)
treee2ddf7aed41f232eff21e3a95670dbc75c6b65ba /OpenSim/Region/Environment/Scenes
parentimplemented prim inventories for nhibernate (diff)
downloadopensim-SC_OLD-c38b811f5d254765886ba745c0d5f50fb03a13be.zip
opensim-SC_OLD-c38b811f5d254765886ba745c0d5f50fb03a13be.tar.gz
opensim-SC_OLD-c38b811f5d254765886ba745c0d5f50fb03a13be.tar.bz2
opensim-SC_OLD-c38b811f5d254765886ba745c0d5f50fb03a13be.tar.xz
catch a null case in the convenience RegionID property
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index ac7e8a2..f0b1686 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -923,7 +923,13 @@ namespace OpenSim.Region.Environment.Scenes
923 [XmlIgnore] 923 [XmlIgnore]
924 public virtual LLUUID RegionID 924 public virtual LLUUID RegionID
925 { 925 {
926 get { return ParentGroup.Scene.RegionInfo.RegionID; } 926 get
927 {
928 if (ParentGroup != null && ParentGroup.Scene != null)
929 return ParentGroup.Scene.RegionInfo.RegionID;
930 else
931 return LLUUID.Zero;
932 }
927 set {} // read only 933 set {} // read only
928 } 934 }
929 935