aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService
diff options
context:
space:
mode:
authorMelanie2010-03-04 10:43:12 +0000
committerMelanie2010-03-04 10:43:12 +0000
commit31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca (patch)
treee351c23bd3f773e0ceb4cae518987c73edc90f6d /OpenSim/Services/LLLoginService
parentRemove a superfluous array creation (diff)
parentcompiler warnings revealed that public PlaySoundSlavePrims properties were ch... (diff)
downloadopensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.zip
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.gz
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.bz2
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 1d734eb..ee93f73 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -247,6 +247,7 @@ namespace OpenSim.Services.LLLoginService
247 LLLoginResponse response = new LLLoginResponse(account, aCircuit, presence, destination, inventorySkel, friendsList, m_LibraryService, 247 LLLoginResponse response = new LLLoginResponse(account, aCircuit, presence, destination, inventorySkel, friendsList, m_LibraryService,
248 where, startLocation, position, lookAt, m_WelcomeMessage, home, clientIP); 248 where, startLocation, position, lookAt, m_WelcomeMessage, home, clientIP);
249 249
250 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
250 return response; 251 return response;
251 } 252 }
252 catch (Exception e) 253 catch (Exception e)