aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorAdam Frisby2008-11-18 00:47:30 +0000
committerAdam Frisby2008-11-18 00:47:30 +0000
commit434afaf717eef01f26b6b95ba8b4ae50fc470a4c (patch)
tree149637356d5a88ea2320fb3f56fd157c40cd41b1 /OpenSim/Framework
parentPrevent the texture downloader from locking a null object when a download (diff)
downloadopensim-SC_OLD-434afaf717eef01f26b6b95ba8b4ae50fc470a4c.zip
opensim-SC_OLD-434afaf717eef01f26b6b95ba8b4ae50fc470a4c.tar.gz
opensim-SC_OLD-434afaf717eef01f26b6b95ba8b4ae50fc470a4c.tar.bz2
opensim-SC_OLD-434afaf717eef01f26b6b95ba8b4ae50fc470a4c.tar.xz
* Added and removed debug information relating to client connections
* Minor client fixes * Added the ability for a client to login without a UserProfile, allowing certain alternate clients to connect to the region.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ClientManager.cs3
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs2
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 1bb9836..cdccf0e 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -49,8 +49,7 @@ namespace OpenSim.Framework
49 49
50 public void ForEachClient(ForEachClientDelegate whatToDo) 50 public void ForEachClient(ForEachClientDelegate whatToDo)
51 { 51 {
52 // Wasteful, I know 52 IClientAPI[] LocalClients;
53 IClientAPI[] LocalClients = new IClientAPI[0];
54 lock (m_clients) 53 lock (m_clients)
55 { 54 {
56 LocalClients = new IClientAPI[m_clients.Count]; 55 LocalClients = new IClientAPI[m_clients.Count];
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index c569a71..b4ee069 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Framework.Communications
166 } 166 }
167 else if (requestData.Contains("web_login_key")) 167 else if (requestData.Contains("web_login_key"))
168 { 168 {
169 UUID webloginkey = UUID.Zero; 169 UUID webloginkey;
170 try 170 try
171 { 171 {
172 webloginkey = new UUID((string)requestData["web_login_key"]); 172 webloginkey = new UUID((string)requestData["web_login_key"]);