diff options
author | John Hurliman | 2010-03-10 14:06:12 -0800 |
---|---|---|
committer | John Hurliman | 2010-03-10 14:06:12 -0800 |
commit | b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a (patch) | |
tree | c20d8f5be598d70caff0589629427f6450573cf4 /OpenSim/Region/ClientStack/LindenUDP | |
parent | * Cleaned up and commented the messy SendInventoryUpdate, fixed a broken debu... (diff) | |
parent | Reintroduce a check that was dropped from permissions (diff) | |
download | opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.zip opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.gz opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.bz2 opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 2e59457..a9b5c2b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -127,6 +127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
127 | public event ObjectDeselect OnObjectDetach; | 127 | public event ObjectDeselect OnObjectDetach; |
128 | public event ObjectDrop OnObjectDrop; | 128 | public event ObjectDrop OnObjectDrop; |
129 | public event GenericCall1 OnCompleteMovementToRegion; | 129 | public event GenericCall1 OnCompleteMovementToRegion; |
130 | public event UpdateAgent OnPreAgentUpdate; | ||
130 | public event UpdateAgent OnAgentUpdate; | 131 | public event UpdateAgent OnAgentUpdate; |
131 | public event AgentRequestSit OnAgentRequestSit; | 132 | public event AgentRequestSit OnAgentRequestSit; |
132 | public event AgentSit OnAgentSit; | 133 | public event AgentSit OnAgentSit; |
@@ -4893,7 +4894,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4893 | UpdateAgent handlerAgentUpdate = OnAgentUpdate; | 4894 | UpdateAgent handlerAgentUpdate = OnAgentUpdate; |
4894 | lastarg = arg; // save this set of arguments for nexttime | 4895 | lastarg = arg; // save this set of arguments for nexttime |
4895 | if (handlerAgentUpdate != null) | 4896 | if (handlerAgentUpdate != null) |
4897 | { | ||
4898 | OnPreAgentUpdate(this, arg); | ||
4896 | OnAgentUpdate(this, arg); | 4899 | OnAgentUpdate(this, arg); |
4900 | } | ||
4897 | 4901 | ||
4898 | handlerAgentUpdate = null; | 4902 | handlerAgentUpdate = null; |
4899 | } | 4903 | } |