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/Client | |
| 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 'OpenSim/Client')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 7b435f5..2dec72d 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -598,6 +598,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 598 | public event Action<IClientAPI> OnRegionHandShakeReply; | 598 | public event Action<IClientAPI> OnRegionHandShakeReply; |
| 599 | public event GenericCall2 OnRequestWearables; | 599 | public event GenericCall2 OnRequestWearables; |
| 600 | public event GenericCall1 OnCompleteMovementToRegion; | 600 | public event GenericCall1 OnCompleteMovementToRegion; |
| 601 | public event UpdateAgent OnPreAgentUpdate; | ||
| 601 | public event UpdateAgent OnAgentUpdate; | 602 | public event UpdateAgent OnAgentUpdate; |
| 602 | public event AgentRequestSit OnAgentRequestSit; | 603 | public event AgentRequestSit OnAgentRequestSit; |
| 603 | public event AgentSit OnAgentSit; | 604 | public event AgentSit OnAgentSit; |
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index e2986d9..9cb2172 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
| @@ -244,6 +244,7 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
| 244 | public event Action<IClientAPI> OnRegionHandShakeReply; | 244 | public event Action<IClientAPI> OnRegionHandShakeReply; |
| 245 | public event GenericCall2 OnRequestWearables; | 245 | public event GenericCall2 OnRequestWearables; |
| 246 | public event GenericCall1 OnCompleteMovementToRegion; | 246 | public event GenericCall1 OnCompleteMovementToRegion; |
| 247 | public event UpdateAgent OnPreAgentUpdate; | ||
| 247 | public event UpdateAgent OnAgentUpdate; | 248 | public event UpdateAgent OnAgentUpdate; |
| 248 | public event AgentRequestSit OnAgentRequestSit; | 249 | public event AgentRequestSit OnAgentRequestSit; |
| 249 | public event AgentSit OnAgentSit; | 250 | public event AgentSit OnAgentSit; |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index c4f2016..a427dd3 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -247,6 +247,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 247 | public event Action<IClientAPI> OnRegionHandShakeReply = delegate { }; | 247 | public event Action<IClientAPI> OnRegionHandShakeReply = delegate { }; |
| 248 | public event GenericCall2 OnRequestWearables = delegate { }; | 248 | public event GenericCall2 OnRequestWearables = delegate { }; |
| 249 | public event GenericCall1 OnCompleteMovementToRegion = delegate { }; | 249 | public event GenericCall1 OnCompleteMovementToRegion = delegate { }; |
| 250 | public event UpdateAgent OnPreAgentUpdate; | ||
| 250 | public event UpdateAgent OnAgentUpdate = delegate { }; | 251 | public event UpdateAgent OnAgentUpdate = delegate { }; |
| 251 | public event AgentRequestSit OnAgentRequestSit = delegate { }; | 252 | public event AgentRequestSit OnAgentRequestSit = delegate { }; |
| 252 | public event AgentSit OnAgentSit = delegate { }; | 253 | public event AgentSit OnAgentSit = delegate { }; |