diff options
| author | UbitUmarov | 2017-06-02 06:26:20 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-06-02 06:26:20 +0100 |
| commit | de153c2b622c73e9388152d79a6c7fdf1f3d9c44 (patch) | |
| tree | 2add7d12ee6b03f96120c85dfcb80162e81b0c40 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | avoi null refs on tests simple clients (diff) | |
| download | opensim-SC-de153c2b622c73e9388152d79a6c7fdf1f3d9c44.zip opensim-SC-de153c2b622c73e9388152d79a6c7fdf1f3d9c44.tar.gz opensim-SC-de153c2b622c73e9388152d79a6c7fdf1f3d9c44.tar.bz2 opensim-SC-de153c2b622c73e9388152d79a6c7fdf1f3d9c44.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index aced734..51f9049 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
| @@ -500,13 +500,13 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 500 | responsedata["http_protocol_version"] = "HTTP/1.0"; | 500 | responsedata["http_protocol_version"] = "HTTP/1.0"; |
| 501 | return responsedata; | 501 | return responsedata; |
| 502 | } | 502 | } |
| 503 | 503 | /* this is not a event message | |
| 504 | public void DisableSimulator(ulong handle, UUID avatarID) | 504 | public void DisableSimulator(ulong handle, UUID avatarID) |
| 505 | { | 505 | { |
| 506 | OSD item = EventQueueHelper.DisableSimulator(handle); | 506 | OSD item = EventQueueHelper.DisableSimulator(handle); |
| 507 | Enqueue(item, avatarID); | 507 | Enqueue(item, avatarID); |
| 508 | } | 508 | } |
| 509 | 509 | */ | |
| 510 | public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY) | 510 | public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY) |
| 511 | { | 511 | { |
| 512 | if (DebugLevel > 0) | 512 | if (DebugLevel > 0) |