diff options
author | Diva Canto | 2010-01-03 09:35:12 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-03 09:35:12 -0800 |
commit | c268e342d19b6cc5969b1c1d94f20a3f4eb844ef (patch) | |
tree | 713af45648bd51675b087af23b0ea0df9ab0f72c /OpenSim/Server/Handlers/Simulation/Utils.cs | |
parent | Applied fix for avatar connectors similar to yesterday's fix of user account ... (diff) | |
download | opensim-SC_OLD-c268e342d19b6cc5969b1c1d94f20a3f4eb844ef.zip opensim-SC_OLD-c268e342d19b6cc5969b1c1d94f20a3f4eb844ef.tar.gz opensim-SC_OLD-c268e342d19b6cc5969b1c1d94f20a3f4eb844ef.tar.bz2 opensim-SC_OLD-c268e342d19b6cc5969b1c1d94f20a3f4eb844ef.tar.xz |
* Changed ISimulation interface to take a GridRegion as input arg instead of a regionHandle.
* Added the RemoteSimulationConnectorModule, which is the replacement for RESTComms. Scenes is not using this yet, only (standalone) Login uses these region modules for now.
* Completed SimulationServiceConnector and corresponding handlers.
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation/Utils.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/Utils.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/Utils.cs b/OpenSim/Server/Handlers/Simulation/Utils.cs index 1f2f851..ed379da 100644 --- a/OpenSim/Server/Handlers/Simulation/Utils.cs +++ b/OpenSim/Server/Handlers/Simulation/Utils.cs | |||
@@ -46,11 +46,11 @@ namespace OpenSim.Server.Handlers.Simulation | |||
46 | /// <param name="uri">Something like this: /agent/uuid/ or /agent/uuid/handle/release</param> | 46 | /// <param name="uri">Something like this: /agent/uuid/ or /agent/uuid/handle/release</param> |
47 | /// <param name="uri">uuid on uuid field</param> | 47 | /// <param name="uri">uuid on uuid field</param> |
48 | /// <param name="action">optional action</param> | 48 | /// <param name="action">optional action</param> |
49 | public static bool GetParams(string uri, out UUID uuid, out ulong regionHandle, out string action) | 49 | public static bool GetParams(string uri, out UUID uuid, out UUID regionID, out string action) |
50 | { | 50 | { |
51 | uuid = UUID.Zero; | 51 | uuid = UUID.Zero; |
52 | regionID = UUID.Zero; | ||
52 | action = ""; | 53 | action = ""; |
53 | regionHandle = 0; | ||
54 | 54 | ||
55 | uri = uri.Trim(new char[] { '/' }); | 55 | uri = uri.Trim(new char[] { '/' }); |
56 | string[] parts = uri.Split('/'); | 56 | string[] parts = uri.Split('/'); |
@@ -64,7 +64,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
64 | return false; | 64 | return false; |
65 | 65 | ||
66 | if (parts.Length >= 3) | 66 | if (parts.Length >= 3) |
67 | UInt64.TryParse(parts[2], out regionHandle); | 67 | UUID.TryParse(parts[2], out regionID); |
68 | if (parts.Length >= 4) | 68 | if (parts.Length >= 4) |
69 | action = parts[3]; | 69 | action = parts[3]; |
70 | 70 | ||