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/Framework/Interfaces | |
| 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/Framework/Interfaces/IEventQueue.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs index 7af56cb..7edd75a 100644 --- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs +++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |||
| @@ -39,7 +39,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 39 | bool Enqueue(OSD o, UUID avatarID); | 39 | bool Enqueue(OSD o, UUID avatarID); |
| 40 | 40 | ||
| 41 | // These are required to decouple Scenes from EventQueueHelper | 41 | // These are required to decouple Scenes from EventQueueHelper |
| 42 | void DisableSimulator(ulong handle, UUID avatarID); | 42 | // void DisableSimulator(ulong handle, UUID avatarID); |
| 43 | void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY); | 43 | void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY); |
| 44 | void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, | 44 | void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, |
| 45 | string capsPath, ulong regionHandle, int regionSizeX, int regionSizeY); | 45 | string capsPath, ulong regionHandle, int regionSizeX, int regionSizeY); |