aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorOren Hurvitz2013-11-25 18:28:23 +0200
committerOren Hurvitz2014-03-24 18:24:50 +0100
commit6a477e044dfee014ff99b1ac56a39bd5e629283a (patch)
treeeba2933f53dbcbe8f426cc4fdb5c30c3e1b603b8 /OpenSim/Services
parentFixed parsing of coalesced objects if the XML starts with an XML Declaration ... (diff)
downloadopensim-SC_OLD-6a477e044dfee014ff99b1ac56a39bd5e629283a.zip
opensim-SC_OLD-6a477e044dfee014ff99b1ac56a39bd5e629283a.tar.gz
opensim-SC_OLD-6a477e044dfee014ff99b1ac56a39bd5e629283a.tar.bz2
opensim-SC_OLD-6a477e044dfee014ff99b1ac56a39bd5e629283a.tar.xz
If prim region crossing fails then don't delete the prim from the original region
Resolves http://opensimulator.org/mantis/view.php?id=6946
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index aca414b..171beaa 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -421,11 +421,18 @@ namespace OpenSim.Services.Connectors.Simulation
421 args["destination_name"] = OSD.FromString(destination.RegionName); 421 args["destination_name"] = OSD.FromString(destination.RegionName);
422 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); 422 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
423 423
424 WebUtil.PostToService(uri, args, 40000); 424 OSDMap result = WebUtil.PostToService(uri, args, 40000);
425
426 if (result == null)
427 return false;
428 bool success = result["success"].AsBoolean();
429 if (!success)
430 return false;
425 } 431 }
426 catch (Exception e) 432 catch (Exception e)
427 { 433 {
428 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CreateObject failed with exception; {0}",e.ToString()); 434 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CreateObject failed with exception; {0}",e.ToString());
435 return false;
429 } 436 }
430 437
431 return true; 438 return true;