diff options
author | Justin Clark-Casey (justincc) | 2013-07-15 23:28:02 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-15 23:28:02 +0100 |
commit | eb14e5a1756726b1f296591bb1ac385e4b1372d7 (patch) | |
tree | 6a7e5e7489785729a2487a0245e0c7e3a9ee99bd /OpenSim/Region/ClientStack | |
parent | Add request received/handling stats for caps which are served by http poll ha... (diff) | |
parent | Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt" (diff) | |
download | opensim-SC-eb14e5a1756726b1f296591bb1ac385e4b1372d7.zip opensim-SC-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.gz opensim-SC-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.bz2 opensim-SC-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 86a0298..164adeb 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -347,8 +347,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
347 | 347 | ||
348 | aPollRequest poolreq = m_queue.Dequeue(); | 348 | aPollRequest poolreq = m_queue.Dequeue(); |
349 | 349 | ||
350 | poolreq.thepoll.Process(poolreq); | 350 | if (poolreq != null && poolreq.thepoll != null) |
351 | poolreq.thepoll.Process(poolreq); | ||
351 | } | 352 | } |
352 | } | 353 | } |
353 | } | 354 | } |
354 | } \ No newline at end of file | 355 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 2aab4f9..85270a6 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1469,7 +1469,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1469 | { | 1469 | { |
1470 | AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code); | 1470 | AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code); |
1471 | bool tp = (aCircuit.teleportFlags > 0); | 1471 | bool tp = (aCircuit.teleportFlags > 0); |
1472 | // Let's delay this for TP agents, otherwise the viewer doesn't know where to get meshes from | 1472 | // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from |
1473 | if (!tp) | 1473 | if (!tp) |
1474 | client.SceneAgent.SendInitialDataToMe(); | 1474 | client.SceneAgent.SendInitialDataToMe(); |
1475 | } | 1475 | } |