aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorMelanie2010-06-04 21:11:15 +0100
committerMelanie2010-06-04 21:11:15 +0100
commitc5878b6610d4a729752fddf15ad6c99c302375a3 (patch)
tree12c570c68ed6f49965ce42fa0147b79ca21d9f96 /OpenSim/Server/Handlers
parentChange the admin kick message to something more generic, "OpenSim Manager" is... (diff)
parentbring TestLoadIarV0_1AbsentUsers() back online (diff)
downloadopensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.zip
opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.gz
opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.bz2
opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs2
-rw-r--r--OpenSim/Server/Handlers/Login/LLLoginHandlers.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index b0fee6d..6e580f1 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Server.Handlers.Asset
149 } 149 }
150 catch (Exception e) 150 catch (Exception e)
151 { 151 {
152 m_log.Debug("[XINVENTORY HANDLER]: Exception {0}" + e); 152 m_log.Debug("[XINVENTORY HANDLER]: Exception {0}", e);
153 } 153 }
154 154
155 return FailureResult(); 155 return FailureResult();
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
index c9bf996..5bb529c 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Server.Handlers.Login
83 clientVersion = requestData["version"].ToString(); 83 clientVersion = requestData["version"].ToString();
84 // We should do something interesting with the client version... 84 // We should do something interesting with the client version...
85 85
86 m_log.InfoFormat("[LOGIN]: XMLRPC Login Requested for {0} {1}, starting in {2}, using {3}", first, last, startLocation, clientVersion); 86 //m_log.InfoFormat("[LOGIN]: XMLRPC Login Requested for {0} {1}, starting in {2}, using {3}", first, last, startLocation, clientVersion);
87 87
88 LoginResponse reply = null; 88 LoginResponse reply = null;
89 reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, remoteClient); 89 reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, remoteClient);