diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
2 files changed, 12 insertions, 1 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 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 44cd30a..954b76f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1971,10 +1971,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
1971 | if (Permissions.CanRezObject(1, ownerID, pos)) | 1971 | if (Permissions.CanRezObject(1, ownerID, pos)) |
1972 | { | 1972 | { |
1973 | // rez ON the ground, not IN the ground | 1973 | // rez ON the ground, not IN the ground |
1974 | // pos.Z += 0.25F; The rez point should now be correct so that its not in the ground | 1974 | // pos.Z += 0.25F; The rez point should now be correct so that its not in the ground |
1975 | 1975 | ||
1976 | AddNewPrim(ownerID, groupID, pos, rot, shape); | 1976 | AddNewPrim(ownerID, groupID, pos, rot, shape); |
1977 | } | 1977 | } |
1978 | else | ||
1979 | { | ||
1980 | IClientAPI client = null; | ||
1981 | if (this.TryGetClient(ownerID, out client)) | ||
1982 | client.SendAlertMessage("You cannot create objects here."); | ||
1983 | } | ||
1978 | } | 1984 | } |
1979 | 1985 | ||
1980 | public virtual SceneObjectGroup AddNewPrim( | 1986 | public virtual SceneObjectGroup AddNewPrim( |