aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Linden/LLStandaloneLoginService.cs
diff options
context:
space:
mode:
authorMelanie2010-01-10 04:16:06 +0000
committerMelanie2010-01-10 04:16:06 +0000
commit1676e70dfe322381495b08ac1187ae9685f94e69 (patch)
treeb0b949af491811972dd866bff09f037e335c2b2b /OpenSim/Client/Linden/LLStandaloneLoginService.cs
parentMerge branch 'master' into careminster (diff)
parentFix a small bug in login disable code (diff)
downloadopensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.zip
opensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.tar.gz
opensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.tar.bz2
opensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Client/Linden/LLStandaloneLoginService.cs')
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginService.cs19
1 files changed, 7 insertions, 12 deletions
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
index 122110d..9ab043a 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
@@ -202,20 +202,15 @@ namespace OpenSim.Client.Linden
202 agent.Appearance = new AvatarAppearance(agent.AgentID); 202 agent.Appearance = new AvatarAppearance(agent.AgentID);
203 } 203 }
204 204
205 if (m_regionsConnector.RegionLoginsEnabled) 205 string reason;
206 bool success = m_regionsConnector.NewUserConnection(regionInfo.RegionHandle, agent, out reason);
207 if (!success)
206 { 208 {
207 string reason; 209 response.ErrorReason = "key";
208 bool success = m_regionsConnector.NewUserConnection(regionInfo.RegionHandle, agent, out reason); 210 response.ErrorMessage = reason;
209 if (!success)
210 {
211 response.ErrorReason = "key";
212 response.ErrorMessage = reason;
213 }
214 return success;
215 // return m_regionsConnector.NewUserConnection(regionInfo.RegionHandle, agent, out reason);
216 } 211 }
217 212 return success;
218 return false; 213 // return m_regionsConnector.NewUserConnection(regionInfo.RegionHandle, agent, out reason);
219 } 214 }
220 215
221 public override void LogOffUser(UserProfileData theUser, string message) 216 public override void LogOffUser(UserProfileData theUser, string message)