Potential Fix #1 for 0001392: Shift+Drag now causes an unhandled 'Object reference not set to an instance of object' exception
parent
990225a4ba
commit
cde42cdbfd
|
@ -583,13 +583,19 @@ namespace OpenSim.Region.Environment.Modules.World.Land
|
||||||
public void UpdateLandPrimCounts()
|
public void UpdateLandPrimCounts()
|
||||||
{
|
{
|
||||||
ResetAllLandPrimCounts();
|
ResetAllLandPrimCounts();
|
||||||
|
lock (m_scene.Entities)
|
||||||
|
{
|
||||||
foreach (EntityBase obj in m_scene.Entities.Values)
|
foreach (EntityBase obj in m_scene.Entities.Values)
|
||||||
|
{
|
||||||
|
if (obj != null)
|
||||||
{
|
{
|
||||||
if (obj is SceneObjectGroup)
|
if (obj is SceneObjectGroup)
|
||||||
{
|
{
|
||||||
m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj);
|
m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
FinalizeLandPrimCountUpdate();
|
FinalizeLandPrimCountUpdate();
|
||||||
landPrimCountTainted = false;
|
landPrimCountTainted = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -234,7 +234,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
{
|
{
|
||||||
if (Entities.ContainsKey(uuid))
|
if (Entities.ContainsKey(uuid))
|
||||||
{
|
{
|
||||||
Console.WriteLine("REMOVED " + ((SceneObjectGroup)Entities[uuid]).Children.Count + "!");
|
|
||||||
if (!resultOfObjectLinked)
|
if (!resultOfObjectLinked)
|
||||||
{
|
{
|
||||||
m_numPrim -= ((SceneObjectGroup)Entities[uuid]).Children.Count;
|
m_numPrim -= ((SceneObjectGroup)Entities[uuid]).Children.Count;
|
||||||
|
|
Loading…
Reference in New Issue