diff options
author | onefang | 2019-07-24 05:49:26 +1000 |
---|---|---|
committer | onefang | 2019-07-24 05:49:26 +1000 |
commit | 15b2a91ffc6d240277a852aa750a0259ae6a2a17 (patch) | |
tree | fb08c599396ba11d5f23b7bca2af21b9cb5af368 /OpenSim/Framework | |
parent | Revert list content type check. (diff) | |
download | opensim-SC_OLD-15b2a91ffc6d240277a852aa750a0259ae6a2a17.zip opensim-SC_OLD-15b2a91ffc6d240277a852aa750a0259ae6a2a17.tar.gz opensim-SC_OLD-15b2a91ffc6d240277a852aa750a0259ae6a2a17.tar.bz2 opensim-SC_OLD-15b2a91ffc6d240277a852aa750a0259ae6a2a17.tar.xz |
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.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Constants.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs index 15da7e6..ac99a92 100644 --- a/OpenSim/Framework/Constants.cs +++ b/OpenSim/Framework/Constants.cs | |||
@@ -60,6 +60,7 @@ namespace OpenSim.Framework | |||
60 | EstateManagers = 10 | 60 | EstateManagers = 10 |
61 | } | 61 | } |
62 | 62 | ||
63 | // Identical to the one in OpenMetaverse, except I'm extending it now, and OpenSim decided to copy it here, making life hard. | ||
63 | [Flags]public enum TeleportFlags : uint | 64 | [Flags]public enum TeleportFlags : uint |
64 | { | 65 | { |
65 | /// <summary>No flags set, or teleport failed</summary> | 66 | /// <summary>No flags set, or teleport failed</summary> |
@@ -98,6 +99,8 @@ namespace OpenSim.Framework | |||
98 | ForceRedirect = 1 << 15, | 99 | ForceRedirect = 1 << 15, |
99 | /// <summary>Via script.</summary> | 100 | /// <summary>Via script.</summary> |
100 | ViaScript = 1 << 16, | 101 | ViaScript = 1 << 16, |
102 | /// <summary>Via map, though this is a guess.</summary> | ||
103 | ViaMap = 1 << 17, | ||
101 | /// <summary>Teleport Finished via a Lure</summary> | 104 | /// <summary>Teleport Finished via a Lure</summary> |
102 | FinishedViaLure = 1 << 26, | 105 | FinishedViaLure = 1 << 26, |
103 | /// <summary>Finished, Sim Changed</summary> | 106 | /// <summary>Finished, Sim Changed</summary> |