aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-12 21:21:35 +0000
committerJustin Clarke Casey2008-12-12 21:21:35 +0000
commit80f285a2aa78a05e8950fe09a7f90f0c34a85e43 (patch)
treedf0f6a3b2e26f22063c3ef064be57b2526d0c621
parentAdd OpenSim.Framework.IClientFileTransfer. (diff)
downloadopensim-SC_OLD-80f285a2aa78a05e8950fe09a7f90f0c34a85e43.zip
opensim-SC_OLD-80f285a2aa78a05e8950fe09a7f90f0c34a85e43.tar.gz
opensim-SC_OLD-80f285a2aa78a05e8950fe09a7f90f0c34a85e43.tar.bz2
opensim-SC_OLD-80f285a2aa78a05e8950fe09a7f90f0c34a85e43.tar.xz
* minor: Be a little more informative when a region fails to connect because it fails to implement the required OGS interface version
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 5454f03..08d5393 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -409,8 +409,10 @@ namespace OpenSim.Grid.GridServer
409 { 409 {
410 return ErrorResponse( 410 return ErrorResponse(
411 String.Format( 411 String.Format(
412 "Your region is the wrong version to connect to this grid. Try changing to version {0} (interface version {1})", 412 "Your region service implements OGS1 interface version {0}"
413 m_opensimVersion, VersionInfo.MajorInterfaceVersion)); 413 + " but this grid requires that the region implement OGS1 interface version {1} to connect."
414 + " Try changing to OpenSimulator {2}",
415 majorInterfaceVersion, VersionInfo.MajorInterfaceVersion, m_opensimVersion));
414 } 416 }
415 417
416 existingSim = GetRegion(sim.regionHandle); 418 existingSim = GetRegion(sim.regionHandle);