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

properly refresh object owner list when refresh button is hit on land parcel object tab

0.7.1-dev
Justin Clark-Casey (justincc) 2011-04-05 22:15:06 +01:00
parent 0e465da187
commit acacee98c6
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -62,8 +62,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public class LandManagementModule : INonSharedRegionModule public class LandManagementModule : INonSharedRegionModule
{ {
private static readonly ILog m_log = private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly string remoteParcelRequestPath = "0009/"; private static readonly string remoteParcelRequestPath = "0009/";
@ -307,8 +306,8 @@ namespace OpenSim.Region.CoreModules.World.Land
/// <returns>The parcel created.</returns> /// <returns>The parcel created.</returns>
protected ILandObject CreateDefaultParcel() protected ILandObject CreateDefaultParcel()
{ {
// m_log.DebugFormat( m_log.DebugFormat(
// "[LAND MANAGEMENT MODULE]: Creating default parcel for region {0}", m_scene.RegionInfo.RegionName); "[LAND MANAGEMENT MODULE]: Creating default parcel for region {0}", m_scene.RegionInfo.RegionName);
ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene);
fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
@ -778,7 +777,7 @@ namespace OpenSim.Region.CoreModules.World.Land
#region Parcel Modification #region Parcel Modification
public void ResetOverMeRecord() public void ResetOverMeRecords()
{ {
lock (m_landList) lock (m_landList)
{ {
@ -855,7 +854,7 @@ namespace OpenSim.Region.CoreModules.World.Land
// "[LAND MANAGEMENT MODULE]: Triggered EventManagerOnParcelPrimCountUpdate() for {0}", // "[LAND MANAGEMENT MODULE]: Triggered EventManagerOnParcelPrimCountUpdate() for {0}",
// m_scene.RegionInfo.RegionName); // m_scene.RegionInfo.RegionName);
ResetOverMeRecord(); ResetOverMeRecords();
EntityBase[] entities = m_scene.Entities.GetEntities(); EntityBase[] entities = m_scene.Entities.GetEntities();
foreach (EntityBase obj in entities) foreach (EntityBase obj in entities)
{ {
@ -872,7 +871,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public void EventManagerOnRequestParcelPrimCountUpdate() public void EventManagerOnRequestParcelPrimCountUpdate()
{ {
ResetOverMeRecord(); ResetOverMeRecords();
m_scene.EventManager.TriggerParcelPrimCountUpdate(); m_scene.EventManager.TriggerParcelPrimCountUpdate();
FinalizeLandPrimCountUpdate(); FinalizeLandPrimCountUpdate();
} }
@ -1193,6 +1192,7 @@ namespace OpenSim.Region.CoreModules.World.Land
if (land != null) if (land != null)
{ {
m_scene.EventManager.TriggerParcelPrimCountUpdate();
m_landList[local_id].SendLandObjectOwners(remote_client); m_landList[local_id].SendLandObjectOwners(remote_client);
} }
else else
@ -1424,7 +1424,8 @@ namespace OpenSim.Region.CoreModules.World.Land
private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps) private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps)
{ {
IClientAPI client; IClientAPI client;
if (! m_scene.TryGetClient(agentID, out client)) { if (!m_scene.TryGetClient(agentID, out client))
{
m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to retrieve IClientAPI for {0}", agentID); m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to retrieve IClientAPI for {0}", agentID);
return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty()); return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty());
} }

6
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -925,7 +925,7 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
catch (NullReferenceException) catch (NullReferenceException)
{ {
m_log.Info("[LAND]: " + "Got Null Reference when searching land owners from the parcel panel"); m_log.Error("[LAND]: " + "Got Null Reference when searching land owners from the parcel panel");
} }
try try
{ {
@ -1073,12 +1073,16 @@ namespace OpenSim.Region.CoreModules.World.Land
public void AddPrimOverMe(SceneObjectGroup obj) public void AddPrimOverMe(SceneObjectGroup obj)
{ {
// m_log.DebugFormat("[LAND OBJECT]: Adding scene object {0} {1} over {2}", obj.Name, obj.LocalId, LandData.Name);
lock (primsOverMe) lock (primsOverMe)
primsOverMe.Add(obj); primsOverMe.Add(obj);
} }
public void RemovePrimFromOverMe(SceneObjectGroup obj) public void RemovePrimFromOverMe(SceneObjectGroup obj)
{ {
// m_log.DebugFormat("[LAND OBJECT]: Removing scene object {0} {1} from over {2}", obj.Name, obj.LocalId, LandData.Name);
lock (primsOverMe) lock (primsOverMe)
primsOverMe.Remove(obj); primsOverMe.Remove(obj);
} }