OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change region gettexture response if presence not found

0.9.1.0-post-fixes
UbitUmarov 2018-11-07 05:11:36 +00:00
parent 41df4d7da4
commit afd3852a36
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
View File

@ -241,15 +241,10 @@ namespace OpenSim.Region.ClientStack.Linden
lock (responses) lock (responses)
{ {
if (responses.Count > 0) if (responses.Count > 0 && m_queue.Count > 32)
{ reqinfo.send503 = true;
if (m_queue.Count >= 4)
{
// Never allow more than 4 fetches to wait
reqinfo.send503 = true;
}
}
} }
m_queue.Add(reqinfo); m_queue.Add(reqinfo);
}; };
@ -266,7 +261,7 @@ namespace OpenSim.Region.ClientStack.Linden
Hashtable response = new Hashtable(); Hashtable response = new Hashtable();
response["int_response_code"] = 500; response["int_response_code"] = 500;
response["str_response_string"] = "Script timeout"; response["str_response_string"] = "timeout";
response["content_type"] = "text/plain"; response["content_type"] = "text/plain";
response["keepalive"] = false; response["keepalive"] = false;
return response; return response;
@ -293,6 +288,12 @@ namespace OpenSim.Region.ClientStack.Linden
} }
} }
if (m_presence == null)
m_presence = m_scene.GetScenePresence(Id);
if (m_presence == null || m_presence.IsDeleted)
requestinfo.send503 = true;
if (requestinfo.send503) if (requestinfo.send503)
{ {
response = new Hashtable(); response = new Hashtable();
@ -303,26 +304,10 @@ namespace OpenSim.Region.ClientStack.Linden
response["keepalive"] = false; response["keepalive"] = false;
Hashtable headers = new Hashtable(); Hashtable headers = new Hashtable();
headers["Retry-After"] = 30; headers["Retry-After"] = 20;
response["headers"] = headers; response["headers"] = headers;
responses[requestID] = new APollResponse() {bytes = 0, response = response}; responses[requestID] = new APollResponse() { bytes = 0, response = response };
return;
}
// If the avatar is gone, don't bother to get the texture
if (m_scene.GetScenePresence(Id) == null)
{
response = new Hashtable();
response["int_response_code"] = 500;
response["str_response_string"] = "Script timeout";
response["content_type"] = "text/plain";
response["keepalive"] = false;
responses[requestID] = new APollResponse() {bytes = 0, response = response};
return; return;
} }
} }