diff options
author | UbitUmarov | 2016-11-22 22:24:54 +0000 |
---|---|---|
committer | UbitUmarov | 2016-11-22 22:24:54 +0000 |
commit | f4745e5a354871c5b248d10bb57f40cae5cc788c (patch) | |
tree | 5b13f965a77ba6e0fbf6a3c3b7a62389bbde607d /OpenSim/Region/CoreModules/Framework/UserManagement | |
parent | Minor fix to region default landing point sanity check (diff) | |
download | opensim-SC_OLD-f4745e5a354871c5b248d10bb57f40cae5cc788c.zip opensim-SC_OLD-f4745e5a354871c5b248d10bb57f40cae5cc788c.tar.gz opensim-SC_OLD-f4745e5a354871c5b248d10bb57f40cae5cc788c.tar.bz2 opensim-SC_OLD-f4745e5a354871c5b248d10bb57f40cae5cc788c.tar.xz |
full change ServiceThrottleModule. Let it still service RegionHandleRequest and UUIDNameRequest but this wrong since they are diferent services. Keeping gambling about not having 2 much overlaps of the 2 kind of requests. Remove double thottling of RegionHandleRequest
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 72fff22..5507526 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
206 | } | 206 | } |
207 | 207 | ||
208 | // Not found in cache, queue continuation | 208 | // Not found in cache, queue continuation |
209 | m_ServiceThrottle.Enqueue("name", uuid.ToString(), delegate | 209 | m_ServiceThrottle.Enqueue("uuidname", uuid.ToString(), delegate |
210 | { | 210 | { |
211 | //m_log.DebugFormat("[YYY]: Name request {0}", uuid); | 211 | //m_log.DebugFormat("[YYY]: Name request {0}", uuid); |
212 | 212 | ||
@@ -216,9 +216,12 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
216 | // So to avoid clients | 216 | // So to avoid clients |
217 | // (particularly Hypergrid clients) permanently binding "Unknown User" to a given UUID, we will | 217 | // (particularly Hypergrid clients) permanently binding "Unknown User" to a given UUID, we will |
218 | // instead drop the request entirely. | 218 | // instead drop the request entirely. |
219 | if(!client.IsActive) | ||
220 | return; | ||
219 | if (GetUser(uuid, out user)) | 221 | if (GetUser(uuid, out user)) |
220 | { | 222 | { |
221 | client.SendNameReply(uuid, user.FirstName, user.LastName); | 223 | if(client.IsActive) |
224 | client.SendNameReply(uuid, user.FirstName, user.LastName); | ||
222 | } | 225 | } |
223 | // else | 226 | // else |
224 | // m_log.DebugFormat( | 227 | // m_log.DebugFormat( |