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/Framework | |
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 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 7 insertions, 1 deletions
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( |