diff options
| author | Melanie | 2010-10-29 20:40:48 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-29 20:40:48 +0100 |
| commit | 9331898c320d7d6046c6d1ad467cdee0e32c8b71 (patch) | |
| tree | 917ff7facdeb38d96f5f69576a134cbad4776eae /OpenSim/Client/VWoHTTP | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Merge branch 'dev-appearance' (diff) | |
| download | opensim-SC_OLD-9331898c320d7d6046c6d1ad467cdee0e32c8b71.zip opensim-SC_OLD-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.gz opensim-SC_OLD-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.bz2 opensim-SC_OLD-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Client/VWoHTTP')
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index 26be5d9..1b4c0c5 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -245,7 +245,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 245 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest = delegate { }; | 245 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest = delegate { }; |
| 246 | public event DeRezObject OnDeRezObject = delegate { }; | 246 | public event DeRezObject OnDeRezObject = delegate { }; |
| 247 | public event Action<IClientAPI> OnRegionHandShakeReply = delegate { }; | 247 | public event Action<IClientAPI> OnRegionHandShakeReply = delegate { }; |
| 248 | public event GenericCall2 OnRequestWearables = delegate { }; | 248 | public event GenericCall1 OnRequestWearables = delegate { }; |
| 249 | public event GenericCall1 OnCompleteMovementToRegion = delegate { }; | 249 | public event GenericCall1 OnCompleteMovementToRegion = delegate { }; |
| 250 | public event UpdateAgent OnPreAgentUpdate; | 250 | public event UpdateAgent OnPreAgentUpdate; |
| 251 | public event UpdateAgent OnAgentUpdate = delegate { }; | 251 | public event UpdateAgent OnAgentUpdate = delegate { }; |