aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDiva Canto2013-07-04 14:51:18 -0700
committerDiva Canto2013-07-04 14:51:18 -0700
commit8265a88c4a4b1c18f1bc0accfde250fe47b08c50 (patch)
treef2ca5aedd90f0bb304235437d08ff4dc6b2293bd /OpenSim/Region/Framework/Scenes
parentGuard against completely unknown user UUIDs. (diff)
downloadopensim-SC_OLD-8265a88c4a4b1c18f1bc0accfde250fe47b08c50.zip
opensim-SC_OLD-8265a88c4a4b1c18f1bc0accfde250fe47b08c50.tar.gz
opensim-SC_OLD-8265a88c4a4b1c18f1bc0accfde250fe47b08c50.tar.bz2
opensim-SC_OLD-8265a88c4a4b1c18f1bc0accfde250fe47b08c50.tar.xz
Throttle the viewer's requests for region handles. Apparently Kokua is requesting this for all landmarks in inventory. Not sure why. But this seems to be the root cause of the login freeze mentioned before. This commit adds a blocking queue / process thread pattern.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs18
1 files changed, 0 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index aa14529..355e0ee 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3103,7 +3103,6 @@ namespace OpenSim.Region.Framework.Scenes
3103 { 3103 {
3104 //client.OnNameFromUUIDRequest += HandleUUIDNameRequest; 3104 //client.OnNameFromUUIDRequest += HandleUUIDNameRequest;
3105 client.OnMoneyTransferRequest += ProcessMoneyTransferRequest; 3105 client.OnMoneyTransferRequest += ProcessMoneyTransferRequest;
3106 client.OnRegionHandleRequest += RegionHandleRequest;
3107 } 3106 }
3108 3107
3109 public virtual void SubscribeToClientNetworkEvents(IClientAPI client) 3108 public virtual void SubscribeToClientNetworkEvents(IClientAPI client)
@@ -3227,7 +3226,6 @@ namespace OpenSim.Region.Framework.Scenes
3227 { 3226 {
3228 //client.OnNameFromUUIDRequest -= HandleUUIDNameRequest; 3227 //client.OnNameFromUUIDRequest -= HandleUUIDNameRequest;
3229 client.OnMoneyTransferRequest -= ProcessMoneyTransferRequest; 3228 client.OnMoneyTransferRequest -= ProcessMoneyTransferRequest;
3230 client.OnRegionHandleRequest -= RegionHandleRequest;
3231 } 3229 }
3232 3230
3233 public virtual void UnSubscribeToClientNetworkEvents(IClientAPI client) 3231 public virtual void UnSubscribeToClientNetworkEvents(IClientAPI client)
@@ -4887,22 +4885,6 @@ namespace OpenSim.Region.Framework.Scenes
4887 4885
4888 #endregion 4886 #endregion
4889 4887
4890 public void RegionHandleRequest(IClientAPI client, UUID regionID)
4891 {
4892 m_log.DebugFormat("[SCENE]: RegionHandleRequest {0}", regionID);
4893 ulong handle = 0;
4894 if (regionID == RegionInfo.RegionID)
4895 handle = RegionInfo.RegionHandle;
4896 else
4897 {
4898 GridRegion r = GridService.GetRegionByUUID(UUID.Zero, regionID);
4899 if (r != null)
4900 handle = r.RegionHandle;
4901 }
4902
4903 if (handle != 0)
4904 client.SendRegionHandle(regionID, handle);
4905 }
4906 4888
4907// Commented pending deletion since this method no longer appears to do anything at all 4889// Commented pending deletion since this method no longer appears to do anything at all
4908// public bool NeedSceneCacheClear(UUID agentID) 4890// public bool NeedSceneCacheClear(UUID agentID)