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/EventQueueHelper.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 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs index e1e88ae..461f776 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs | |||
| @@ -90,7 +90,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 90 | 90 | ||
| 91 | return BuildEvent("EnableSimulator", llsdBody); | 91 | return BuildEvent("EnableSimulator", llsdBody); |
| 92 | } | 92 | } |
| 93 | 93 | /* | |
| 94 | public static OSD DisableSimulator(ulong handle) | 94 | public static OSD DisableSimulator(ulong handle) |
| 95 | { | 95 | { |
| 96 | //OSDMap llsdSimInfo = new OSDMap(1); | 96 | //OSDMap llsdSimInfo = new OSDMap(1); |
| @@ -105,7 +105,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 105 | 105 | ||
| 106 | return BuildEvent("DisableSimulator", llsdBody); | 106 | return BuildEvent("DisableSimulator", llsdBody); |
| 107 | } | 107 | } |
| 108 | 108 | */ | |
| 109 | public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, | 109 | public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, |
| 110 | IPEndPoint newRegionExternalEndPoint, | 110 | IPEndPoint newRegionExternalEndPoint, |
| 111 | string capsURL, UUID agentID, UUID sessionID, | 111 | string capsURL, UUID agentID, UUID sessionID, |