aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-12 16:57:56 +0000
committerJustin Clarke Casey2008-05-12 16:57:56 +0000
commitd3fb6039cad7b828dec8a1d7aef66aa10e6afdf2 (patch)
treec7e3a49e79878e4ea2958ee6ce188b2f0559be80 /OpenSim/Grid/GridServer
parent* Minor: Change 'delete region' message to region logout message (diff)
downloadopensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.zip
opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.gz
opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.bz2
opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.xz
* If a region running in grid mode fails to login to the grid service, startup will now terminate instead of carrying on (and thus burying the error message)
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 8ed619c..284ac0c 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -388,7 +388,7 @@ namespace OpenSim.Grid.GridServer
388 " " + sim.regionLocY + " currently occupied by " + existingSim.regionName); 388 " " + sim.regionLocY + " currently occupied by " + existingSim.regionName);
389 } 389 }
390 390
391 return ErrorResponse("The key required to login your region did not match. Please check your send and receive keys."); 391 return ErrorResponse("The key required to login your region did not match. Please check your grid send and receive keys.");
392 } 392 }
393 } 393 }
394 else 394 else