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

minor: minor code and log formatting fixes to recent changes in LandManagementModule

user_profiles
Justin Clark-Casey (justincc) 2013-01-02 22:31:18 +00:00
parent 9784e4e07d
commit 2db1f22b89
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1413,7 +1413,8 @@ namespace OpenSim.Region.CoreModules.World.Land
m_landList.TryGetValue(localID, out selectedParcel); m_landList.TryGetValue(localID, out selectedParcel);
} }
if (selectedParcel == null) return; if (selectedParcel == null)
return;
selectedParcel.ReturnLandObjects(returnType, agentIDs, taskIDs, remoteClient); selectedParcel.ReturnLandObjects(returnType, agentIDs, taskIDs, remoteClient);
} }
@ -1421,7 +1422,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{ {
if (returnType != 1) if (returnType != 1)
{ {
m_log.WarnFormat("[LAND MANAGEMENT MODULE] ReturnObjectsInParcel: unknown return type {0}", returnType); m_log.WarnFormat("[LAND MANAGEMENT MODULE]: ReturnObjectsInParcel: unknown return type {0}", returnType);
return; return;
} }
@ -1441,14 +1442,14 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
else else
{ {
m_log.WarnFormat("[LAND MANAGEMENT MODULE] ReturnObjectsInParcel: unknown object {0}", groupID); m_log.WarnFormat("[LAND MANAGEMENT MODULE]: ReturnObjectsInParcel: unknown object {0}", groupID);
} }
} }
int num = 0; int num = 0;
foreach (HashSet<SceneObjectGroup> objs in returns.Values) foreach (HashSet<SceneObjectGroup> objs in returns.Values)
num += objs.Count; num += objs.Count;
m_log.DebugFormat("[LAND MANAGEMENT MODULE] Returning {0} specific object(s)", num); m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Returning {0} specific object(s)", num);
foreach (HashSet<SceneObjectGroup> objs in returns.Values) foreach (HashSet<SceneObjectGroup> objs in returns.Values)
{ {
@ -1459,7 +1460,7 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
else else
{ {
m_log.WarnFormat("[LAND MANAGEMENT MODULE] ReturnObjectsInParcel: not permitted to return {0} object(s) belonging to user {1}", m_log.WarnFormat("[LAND MANAGEMENT MODULE]: ReturnObjectsInParcel: not permitted to return {0} object(s) belonging to user {1}",
objs2.Count, objs2[0].OwnerID); objs2.Count, objs2[0].OwnerID);
} }
} }