diff options
author | PixelTomsen | 2012-03-14 23:33:22 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-31 01:01:59 +0100 |
commit | 874140f950add3b698a3c75ab24727e62e83f329 (patch) | |
tree | 0f5c37c4d776174390f3ca318c079a5829183ca5 /OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |
parent | Add Extended flavour option to opensim version information. (diff) | |
download | opensim-SC_OLD-874140f950add3b698a3c75ab24727e62e83f329.zip opensim-SC_OLD-874140f950add3b698a3c75ab24727e62e83f329.tar.gz opensim-SC_OLD-874140f950add3b698a3c75ab24727e62e83f329.tar.bz2 opensim-SC_OLD-874140f950add3b698a3c75ab24727e62e83f329.tar.xz |
fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index d320af4..1c84e77 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -935,6 +935,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
935 | if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!isAttachment)) | 935 | if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!isAttachment)) |
936 | remoteClient.SendBulkUpdateInventory(item); | 936 | remoteClient.SendBulkUpdateInventory(item); |
937 | 937 | ||
938 | ILandObject land = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y); | ||
939 | remoteClient.SendAlertMessage(string.Format( | ||
940 | "Can't rez object '{0}' at <{1:F3}, {2:F3}, {3:F3}> on parcel '{4}' in region {5}.", | ||
941 | item.Name, pos.X, pos.Y, pos.Z, land != null ? land.LandData.Name : "Unknow", m_Scene.RegionInfo.RegionName)); | ||
942 | |||
938 | return false; | 943 | return false; |
939 | } | 944 | } |
940 | 945 | ||