diff options
| author | Melanie | 2011-11-19 22:39:15 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-19 22:39:15 +0000 |
| commit | bdb5ac96d9432eb568ed3e3bb46b012365f884bc (patch) | |
| tree | fe2ce2636be7e750b3f235a6c04b9f3a5cf2f8af /OpenSim/Services/Connectors/Simulation | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCre... (diff) | |
| download | opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.zip opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.gz opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.bz2 opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 6fb583c..24a23dd 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
| @@ -371,7 +371,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
| 371 | 371 | ||
| 372 | private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly) | 372 | private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly) |
| 373 | { | 373 | { |
| 374 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); | 374 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); |
| 375 | 375 | ||
| 376 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | 376 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; |
| 377 | 377 | ||