fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932
parent
e5343bccdf
commit
874140f950
|
@ -935,6 +935,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
|
||||||
if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!isAttachment))
|
if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!isAttachment))
|
||||||
remoteClient.SendBulkUpdateInventory(item);
|
remoteClient.SendBulkUpdateInventory(item);
|
||||||
|
|
||||||
|
ILandObject land = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y);
|
||||||
|
remoteClient.SendAlertMessage(string.Format(
|
||||||
|
"Can't rez object '{0}' at <{1:F3}, {2:F3}, {3:F3}> on parcel '{4}' in region {5}.",
|
||||||
|
item.Name, pos.X, pos.Y, pos.Z, land != null ? land.LandData.Name : "Unknow", m_Scene.RegionInfo.RegionName));
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1971,10 +1971,16 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
if (Permissions.CanRezObject(1, ownerID, pos))
|
if (Permissions.CanRezObject(1, ownerID, pos))
|
||||||
{
|
{
|
||||||
// rez ON the ground, not IN the ground
|
// rez ON the ground, not IN the ground
|
||||||
// pos.Z += 0.25F; The rez point should now be correct so that its not in the ground
|
// pos.Z += 0.25F; The rez point should now be correct so that its not in the ground
|
||||||
|
|
||||||
AddNewPrim(ownerID, groupID, pos, rot, shape);
|
AddNewPrim(ownerID, groupID, pos, rot, shape);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
IClientAPI client = null;
|
||||||
|
if (this.TryGetClient(ownerID, out client))
|
||||||
|
client.SendAlertMessage("You cannot create objects here.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual SceneObjectGroup AddNewPrim(
|
public virtual SceneObjectGroup AddNewPrim(
|
||||||
|
|
Loading…
Reference in New Issue