diff options
author | Melanie Thielker | 2008-08-20 01:48:51 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-20 01:48:51 +0000 |
commit | f206ffd5a8cd0ef362e972abf7375eb739f82e5b (patch) | |
tree | e05c17a865f02beecddbe2c9c04705bc08c03db1 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | Remove trailing whitespace in prebuild.xml. (diff) | |
download | opensim-SC_OLD-f206ffd5a8cd0ef362e972abf7375eb739f82e5b.zip opensim-SC_OLD-f206ffd5a8cd0ef362e972abf7375eb739f82e5b.tar.gz opensim-SC_OLD-f206ffd5a8cd0ef362e972abf7375eb739f82e5b.tar.bz2 opensim-SC_OLD-f206ffd5a8cd0ef362e972abf7375eb739f82e5b.tar.xz |
Mantis #2003 - thank you, SachaMagne, for a patch that implements
the first part of gesture persistence.
----------------------------------------------------------
Attachments no longer vanish on walking crossing. Teleport is still
problematic, but will now be blocked with message "Inconsistent
attachment state" rather than losing the attachment. Detach to be
able to TP in that case.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 059255f..83a1181 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -247,6 +247,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
247 | private GetScriptRunning handlerGetScriptRunning = null; | 247 | private GetScriptRunning handlerGetScriptRunning = null; |
248 | private SetScriptRunning handlerSetScriptRunning = null; | 248 | private SetScriptRunning handlerSetScriptRunning = null; |
249 | private UpdateVector handlerAutoPilotGo = null; | 249 | private UpdateVector handlerAutoPilotGo = null; |
250 | //Gesture | ||
251 | private ActivateGesture handlerActivateGesture = null; | ||
252 | private DeactivateGesture handlerDeactivateGesture = null; | ||
250 | 253 | ||
251 | //private TerrainUnacked handlerUnackedTerrain = null; | 254 | //private TerrainUnacked handlerUnackedTerrain = null; |
252 | 255 | ||
@@ -931,6 +934,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
931 | 934 | ||
932 | public event TerrainUnacked OnUnackedTerrain; | 935 | public event TerrainUnacked OnUnackedTerrain; |
933 | 936 | ||
937 | public event ActivateGesture OnActivateGesture; | ||
938 | public event DeactivateGesture OnDeactivateGesture; | ||
939 | |||
940 | |||
941 | // voire si c'est necessaire | ||
942 | public void ActivateGesture(LLUUID assetId, LLUUID gestureId) | ||
943 | { | ||
944 | } | ||
945 | public void DeactivateGesture(LLUUID assetId, LLUUID gestureId) | ||
946 | { | ||
947 | } | ||
934 | #region Scene/Avatar to Client | 948 | #region Scene/Avatar to Client |
935 | 949 | ||
936 | /// <summary> | 950 | /// <summary> |
@@ -2065,6 +2079,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2065 | 2079 | ||
2066 | #endregion | 2080 | #endregion |
2067 | 2081 | ||
2082 | // Gesture | ||
2083 | |||
2084 | |||
2085 | |||
2068 | #region Appearance/ Wearables Methods | 2086 | #region Appearance/ Wearables Methods |
2069 | 2087 | ||
2070 | /// <summary> | 2088 | /// <summary> |
@@ -5879,6 +5897,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5879 | 5897 | ||
5880 | #endregion | 5898 | #endregion |
5881 | 5899 | ||
5900 | #region Gesture Managment | ||
5901 | |||
5902 | case PacketType.ActivateGestures: | ||
5903 | ActivateGesturesPacket activateGesturePacket = (ActivateGesturesPacket)Pack; | ||
5904 | handlerActivateGesture = OnActivateGesture; | ||
5905 | if (handlerActivateGesture != null) | ||
5906 | { | ||
5907 | handlerActivateGesture(this, | ||
5908 | activateGesturePacket.Data[0].AssetID, | ||
5909 | activateGesturePacket.Data[0].ItemID); | ||
5910 | } | ||
5911 | else m_log.Error("Null pointer for activateGesture"); | ||
5912 | |||
5913 | break; | ||
5914 | |||
5915 | case PacketType.DeactivateGestures: | ||
5916 | DeactivateGesturesPacket deactivateGesturePacket = (DeactivateGesturesPacket)Pack; | ||
5917 | handlerDeactivateGesture = OnDeactivateGesture; | ||
5918 | if (handlerDeactivateGesture != null) | ||
5919 | { | ||
5920 | handlerDeactivateGesture(this, deactivateGesturePacket.Data[0].ItemID); | ||
5921 | } | ||
5922 | break; | ||
5923 | |||
5924 | #endregion | ||
5925 | |||
5926 | |||
5882 | #region unimplemented handlers | 5927 | #region unimplemented handlers |
5883 | 5928 | ||
5884 | case PacketType.StartPingCheck: | 5929 | case PacketType.StartPingCheck: |