diff options
| author | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
| commit | d219317074ae8ff1665118988cecb8168ae0085e (patch) | |
| tree | 89a6b01925b24f83272ec36f0b6a9c378f235d59 /OpenSim/Client/VWoHTTP | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Configuration of persistent baked textures and save/send delays. (diff) | |
| download | opensim-SC-d219317074ae8ff1665118988cecb8168ae0085e.zip opensim-SC-d219317074ae8ff1665118988cecb8168ae0085e.tar.gz opensim-SC-d219317074ae8ff1665118988cecb8168ae0085e.tar.bz2 opensim-SC-d219317074ae8ff1665118988cecb8168ae0085e.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
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 99a46dc..0d23232 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 { }; |