diff options
author | Justin Clark-Casey (justincc) | 2013-01-02 22:31:18 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-02 22:31:18 +0000 |
commit | 2db1f22b8930a4350f06b11f76fceb359c31d54d (patch) | |
tree | 2a2896f32a3cff0154ade164717f93bce0f0724a /OpenSim/Region/CoreModules | |
parent | Changed locks to prevent deadlocks (especially during multi-region Load OAR) (diff) | |
download | opensim-SC-2db1f22b8930a4350f06b11f76fceb359c31d54d.zip opensim-SC-2db1f22b8930a4350f06b11f76fceb359c31d54d.tar.gz opensim-SC-2db1f22b8930a4350f06b11f76fceb359c31d54d.tar.bz2 opensim-SC-2db1f22b8930a4350f06b11f76fceb359c31d54d.tar.xz |
minor: minor code and log formatting fixes to recent changes in LandManagementModule
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 4b1e6b9..6e0c007 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1413,7 +1413,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1413 | m_landList.TryGetValue(localID, out selectedParcel); | 1413 | m_landList.TryGetValue(localID, out selectedParcel); |
1414 | } | 1414 | } |
1415 | 1415 | ||
1416 | if (selectedParcel == null) return; | 1416 | if (selectedParcel == null) |
1417 | return; | ||
1417 | 1418 | ||
1418 | selectedParcel.ReturnLandObjects(returnType, agentIDs, taskIDs, remoteClient); | 1419 | selectedParcel.ReturnLandObjects(returnType, agentIDs, taskIDs, remoteClient); |
1419 | } | 1420 | } |
@@ -1421,7 +1422,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1421 | { | 1422 | { |
1422 | if (returnType != 1) | 1423 | if (returnType != 1) |
1423 | { | 1424 | { |
1424 | m_log.WarnFormat("[LAND MANAGEMENT MODULE] ReturnObjectsInParcel: unknown return type {0}", returnType); | 1425 | m_log.WarnFormat("[LAND MANAGEMENT MODULE]: ReturnObjectsInParcel: unknown return type {0}", returnType); |
1425 | return; | 1426 | return; |
1426 | } | 1427 | } |
1427 | 1428 | ||
@@ -1441,14 +1442,14 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1441 | } | 1442 | } |
1442 | else | 1443 | else |
1443 | { | 1444 | { |
1444 | m_log.WarnFormat("[LAND MANAGEMENT MODULE] ReturnObjectsInParcel: unknown object {0}", groupID); | 1445 | m_log.WarnFormat("[LAND MANAGEMENT MODULE]: ReturnObjectsInParcel: unknown object {0}", groupID); |
1445 | } | 1446 | } |
1446 | } | 1447 | } |
1447 | 1448 | ||
1448 | int num = 0; | 1449 | int num = 0; |
1449 | foreach (HashSet<SceneObjectGroup> objs in returns.Values) | 1450 | foreach (HashSet<SceneObjectGroup> objs in returns.Values) |
1450 | num += objs.Count; | 1451 | num += objs.Count; |
1451 | m_log.DebugFormat("[LAND MANAGEMENT MODULE] Returning {0} specific object(s)", num); | 1452 | m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Returning {0} specific object(s)", num); |
1452 | 1453 | ||
1453 | foreach (HashSet<SceneObjectGroup> objs in returns.Values) | 1454 | foreach (HashSet<SceneObjectGroup> objs in returns.Values) |
1454 | { | 1455 | { |
@@ -1459,7 +1460,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1459 | } | 1460 | } |
1460 | else | 1461 | else |
1461 | { | 1462 | { |
1462 | m_log.WarnFormat("[LAND MANAGEMENT MODULE] ReturnObjectsInParcel: not permitted to return {0} object(s) belonging to user {1}", | 1463 | m_log.WarnFormat("[LAND MANAGEMENT MODULE]: ReturnObjectsInParcel: not permitted to return {0} object(s) belonging to user {1}", |
1463 | objs2.Count, objs2[0].OwnerID); | 1464 | objs2.Count, objs2[0].OwnerID); |
1464 | } | 1465 | } |
1465 | } | 1466 | } |