aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs1
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 518ba09..7b93bfb 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Communications.Local
122 122
123 private Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+)&(?<y>\d+)&(?<z>\d+)$"); 123 private Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+)&(?<y>\d+)&(?<z>\d+)$");
124 124
125 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest) 125 public override bool CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest)
126 { 126 {
127 ulong currentRegion = 0; 127 ulong currentRegion = 0;
128 128
@@ -145,7 +145,6 @@ namespace OpenSim.Region.Communications.Local
145 { 145 {
146 currentRegion = theUser.HomeRegion; 146 currentRegion = theUser.HomeRegion;
147 response.StartLocation = "home"; 147 response.StartLocation = "home";
148
149 } 148 }
150 else 149 else
151 { 150 {
@@ -264,7 +263,10 @@ namespace OpenSim.Region.Communications.Local
264 else 263 else
265 { 264 {
266 m_log.Warn("[LOGIN]: Not found region " + currentRegion); 265 m_log.Warn("[LOGIN]: Not found region " + currentRegion);
266 return false;
267 } 267 }
268
269 return true;
268 } 270 }
269 271
270 private LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL) 272 private LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL)
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 4443de9..aaeca4b 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -89,6 +89,7 @@ namespace OpenSim.Region.Communications.OGS1
89 { 89 {
90 serversInfo = servers_info; 90 serversInfo = servers_info;
91 httpServer = httpServe; 91 httpServer = httpServe;
92
92 //Respond to Grid Services requests 93 //Respond to Grid Services requests
93 httpServer.AddXmlRPCHandler("expect_user", ExpectUser); 94 httpServer.AddXmlRPCHandler("expect_user", ExpectUser);
94 httpServer.AddXmlRPCHandler("logoff_user", LogOffUser); 95 httpServer.AddXmlRPCHandler("logoff_user", LogOffUser);