aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index ccba1de..041cc88 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -60,7 +60,8 @@ namespace OpenSim.Grid.UserServer
60 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser) 60 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
61 { 61 {
62 bool tryDefault = false; 62 bool tryDefault = false;
63 MainLog.Instance.Verbose("LOGIN", "Load information from the gridserver"); 63 //CFK: Since the try is always "tried", the "Home Location" message should always appear, so comment this one.
64 //CFK: MainLog.Instance.Verbose("LOGIN", "Load information from the gridserver");
64 RegionProfileData SimInfo = new RegionProfileData(); 65 RegionProfileData SimInfo = new RegionProfileData();
65 try 66 try
66 { 67 {
@@ -78,8 +79,10 @@ namespace OpenSim.Grid.UserServer
78 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 79 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
79 80
80 // Destination 81 // Destination
81 MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + 82 //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into
82 SimInfo.regionLocY); 83 //CFK: the next one for X & Y and comment this one.
84 //CFK: MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX +
85 //CFK: "; Region Y: " + SimInfo.regionLocY);
83 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); 86 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString();
84 response.SimPort = (uint) SimInfo.serverPort; 87 response.SimPort = (uint) SimInfo.serverPort;
85 response.RegionX = SimInfo.regionLocX; 88 response.RegionX = SimInfo.regionLocX;
@@ -90,7 +93,8 @@ namespace OpenSim.Grid.UserServer
90 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; 93 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
91 94
92 // Notify the target of an incoming user 95 // Notify the target of an incoming user
93 MainLog.Instance.Verbose("LOGIN", "Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); 96 MainLog.Instance.Verbose("LOGIN", SimInfo.regionName + " (" + SimInfo.serverURI + ") " +
97 SimInfo.regionLocX + "," + SimInfo.regionLocY);
94 98
95 // Prepare notification 99 // Prepare notification
96 Hashtable SimParams = new Hashtable(); 100 Hashtable SimParams = new Hashtable();