diff options
author | onefang | 2020-09-09 22:59:24 +1000 |
---|---|---|
committer | onefang | 2020-09-09 22:59:24 +1000 |
commit | aaef497afbedef9382c9afdcb9f8d0d5b0a0e0bc (patch) | |
tree | 0cca9608b28ec503f045a26b0f664a176a061d1f /OpenSim/Framework | |
parent | Use F1 instead of ? as the in command help key. (diff) | |
download | opensim-SC-aaef497afbedef9382c9afdcb9f8d0d5b0a0e0bc.zip opensim-SC-aaef497afbedef9382c9afdcb9f8d0d5b0a0e0bc.tar.gz opensim-SC-aaef497afbedef9382c9afdcb9f8d0d5b0a0e0bc.tar.bz2 opensim-SC-aaef497afbedef9382c9afdcb9f8d0d5b0a0e0bc.tar.xz |
Various teleport fixes.
TPs from scripts avoid all that silly raycasting nonsense, just go where
we ask.
For the "teleport from above" case, do the right thing.
Which includes looking for designated floor prims, which have ^ as
the first character of their description.
Don't do "teleport from above" when we have proper coords.
Teleport home from off grid shouldn't land on roofs either.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Constants.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs index ea89db3..e399e27 100644 --- a/OpenSim/Framework/Constants.cs +++ b/OpenSim/Framework/Constants.cs | |||
@@ -63,6 +63,7 @@ namespace OpenSim.Framework | |||
63 | EstateManagers = 10 | 63 | EstateManagers = 10 |
64 | } | 64 | } |
65 | 65 | ||
66 | // Identical to the one in OpenMetaverse, except I'm extending it now, and OpenSim decided to copy it here, making life hard. | ||
66 | [Flags]public enum TeleportFlags : uint | 67 | [Flags]public enum TeleportFlags : uint |
67 | { | 68 | { |
68 | /// <summary>No flags set, or teleport failed</summary> | 69 | /// <summary>No flags set, or teleport failed</summary> |
@@ -75,7 +76,7 @@ namespace OpenSim.Framework | |||
75 | ViaLure = 1 << 2, | 76 | ViaLure = 1 << 2, |
76 | /// <summary>Via Landmark</summary> | 77 | /// <summary>Via Landmark</summary> |
77 | ViaLandmark = 1 << 3, | 78 | ViaLandmark = 1 << 3, |
78 | /// <summary>Via Location</summary> | 79 | /// <summary>Via Location, seems to be a catch all, includes scripted TPs.</summary> |
79 | ViaLocation = 1 << 4, | 80 | ViaLocation = 1 << 4, |
80 | /// <summary>Via Home</summary> | 81 | /// <summary>Via Home</summary> |
81 | ViaHome = 1 << 5, | 82 | ViaHome = 1 << 5, |
@@ -99,6 +100,10 @@ namespace OpenSim.Framework | |||
99 | ResetHome = 1 << 14, | 100 | ResetHome = 1 << 14, |
100 | /// <summary>forced to new location for example when avatar is banned or ejected</summary> | 101 | /// <summary>forced to new location for example when avatar is banned or ejected</summary> |
101 | ForceRedirect = 1 << 15, | 102 | ForceRedirect = 1 << 15, |
103 | /// <summary>Via script.</summary> | ||
104 | ViaScript = 1 << 16, | ||
105 | /// <summary>Via map, though this is a guess.</summary> | ||
106 | ViaMap = 1 << 17, | ||
102 | /// <summary>Teleport Finished via a Lure</summary> | 107 | /// <summary>Teleport Finished via a Lure</summary> |
103 | FinishedViaLure = 1 << 26, | 108 | FinishedViaLure = 1 << 26, |
104 | /// <summary>Finished, Sim Changed</summary> | 109 | /// <summary>Finished, Sim Changed</summary> |