diff options
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationDataService.cs | 5 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs index 504fcaf..96c02d9 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs | |||
@@ -164,6 +164,11 @@ namespace OpenSim.Services.Connectors | |||
164 | m_database.RemoveRegionEnvironmentSettings(regionUUID); | 164 | m_database.RemoveRegionEnvironmentSettings(regionUUID); |
165 | } | 165 | } |
166 | 166 | ||
167 | public UUID[] GetObjectIDs(UUID regionID) | ||
168 | { | ||
169 | return m_database.GetObjectIDs(regionID); | ||
170 | } | ||
171 | |||
167 | public void SaveExtra(UUID regionID, string name, string val) | 172 | public void SaveExtra(UUID regionID, string name, string val) |
168 | { | 173 | { |
169 | m_database.SaveExtra(regionID, name, val); | 174 | m_database.SaveExtra(regionID, name, val); |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index aca414b..0e74073 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -102,6 +102,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
102 | 102 | ||
103 | if (destination == null) | 103 | if (destination == null) |
104 | { | 104 | { |
105 | reason = "Destination not found"; | ||
105 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null"); | 106 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null"); |
106 | return false; | 107 | return false; |
107 | } | 108 | } |
@@ -337,6 +338,10 @@ namespace OpenSim.Services.Connectors.Simulation | |||
337 | return false; | 338 | return false; |
338 | } | 339 | } |
339 | 340 | ||
341 | OSDMap resp = (OSDMap)result["_Result"]; | ||
342 | success = resp["success"].AsBoolean(); | ||
343 | reason = resp["reason"].AsString(); | ||
344 | |||
340 | return success; | 345 | return success; |
341 | } | 346 | } |
342 | catch (Exception e) | 347 | catch (Exception e) |
@@ -421,11 +426,14 @@ namespace OpenSim.Services.Connectors.Simulation | |||
421 | args["destination_name"] = OSD.FromString(destination.RegionName); | 426 | args["destination_name"] = OSD.FromString(destination.RegionName); |
422 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 427 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
423 | 428 | ||
424 | WebUtil.PostToService(uri, args, 40000); | 429 | OSDMap response = WebUtil.PostToService(uri, args, 40000); |
430 | if (response["Success"] == "False") | ||
431 | return false; | ||
425 | } | 432 | } |
426 | catch (Exception e) | 433 | catch (Exception e) |
427 | { | 434 | { |
428 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CreateObject failed with exception; {0}",e.ToString()); | 435 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CreateObject failed with exception; {0}",e.ToString()); |
436 | return false; | ||
429 | } | 437 | } |
430 | 438 | ||
431 | return true; | 439 | return true; |