OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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!)
0.6.0-stable
Teravus Ovares 2008-03-23 07:10:04 +00:00
parent dc850df50a
commit f82227a186
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
View File

@ -763,11 +763,25 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
foreach (SceneObjectGroup obj in primsOverMe) foreach (SceneObjectGroup obj in primsOverMe)
{ {
if (!ownersAndCount.ContainsKey(obj.OwnerID)) try
{ {
ownersAndCount.Add(obj.OwnerID, 0); if (!ownersAndCount.ContainsKey(obj.OwnerID))
{
ownersAndCount.Add(obj.OwnerID, 0);
}
}
catch (NullReferenceException)
{
m_log.Info("[LAND]: " + "Got Null Reference when searching land owners from the parcel panel");
}
try
{
ownersAndCount[obj.OwnerID] += obj.PrimCount;
}
catch (KeyNotFoundException)
{
m_log.Error("[LAND]: Unable to match a prim with it's owner.");
} }
ownersAndCount[obj.OwnerID] += obj.PrimCount;
} }
if (ownersAndCount.Count > 0) if (ownersAndCount.Count > 0)
{ {

16
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -161,7 +161,14 @@ namespace OpenSim.Region.Environment.Scenes
public override uint LocalId public override uint LocalId
{ {
get { return m_rootPart.LocalId; } get {
if (m_rootPart == null)
{
m_log.Error("[PRIMGROUP]: Unable to find the rootpart for a LocalId Request!");
return 0;
}
return m_rootPart.LocalId; }
set { m_rootPart.LocalId = value; } set { m_rootPart.LocalId = value; }
} }
@ -173,7 +180,12 @@ namespace OpenSim.Region.Environment.Scenes
public LLUUID OwnerID public LLUUID OwnerID
{ {
get { return m_rootPart.OwnerID; } get {
if (m_rootPart == null)
return LLUUID.Zero;
return m_rootPart.OwnerID;
}
set { m_rootPart.OwnerID = value; } set { m_rootPart.OwnerID = value; }
} }