diff options
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 6 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 68cec4b..e7544b5 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -174,6 +174,12 @@ namespace OpenSim.Server.Handlers.Simulation | |||
174 | resp["reason"] = OSD.FromString(reason); | 174 | resp["reason"] = OSD.FromString(reason); |
175 | resp["version"] = OSD.FromString(version); | 175 | resp["version"] = OSD.FromString(version); |
176 | 176 | ||
177 | OSDArray featuresWanted = new OSDArray(); | ||
178 | foreach (UUID feature in features) | ||
179 | featuresWanted.Add(OSD.FromString(feature.ToString())); | ||
180 | |||
181 | resp["features"] = featuresWanted; | ||
182 | |||
177 | // We must preserve defaults here, otherwise a false "success" will not be put into the JSON map! | 183 | // We must preserve defaults here, otherwise a false "success" will not be put into the JSON map! |
178 | responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp, true); | 184 | responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp, true); |
179 | 185 | ||
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index a6f90b4..1eedbef 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -356,6 +356,17 @@ namespace OpenSim.Services.Connectors.Simulation | |||
356 | return false; | 356 | return false; |
357 | } | 357 | } |
358 | 358 | ||
359 | |||
360 | featuresAvailable.Clear(); | ||
361 | |||
362 | if (result.ContainsKey("features")) | ||
363 | { | ||
364 | OSDArray array = (OSDArray)result["features"]; | ||
365 | |||
366 | foreach (OSD o in array) | ||
367 | featuresAvailable.Add(new UUID(o.AsString())); | ||
368 | } | ||
369 | |||
359 | return success; | 370 | return success; |
360 | } | 371 | } |
361 | catch (Exception e) | 372 | catch (Exception e) |