diff options
| author | Melanie | 2013-02-18 21:09:14 +0100 |
|---|---|---|
| committer | Melanie | 2013-02-18 21:09:14 +0100 |
| commit | 8c0b9080a4fb013d559966fc8c8175fb16162c2d (patch) | |
| tree | 85c27f85105afcc6f9e6427550a1090c6a43f0c3 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |
| parent | Correctly remove https:// URLs from the http server. (diff) | |
| download | opensim-SC-8c0b9080a4fb013d559966fc8c8175fb16162c2d.zip opensim-SC-8c0b9080a4fb013d559966fc8c8175fb16162c2d.tar.gz opensim-SC-8c0b9080a4fb013d559966fc8c8175fb16162c2d.tar.bz2 opensim-SC-8c0b9080a4fb013d559966fc8c8175fb16162c2d.tar.xz | |
Fix an issue where the viewer would request the seed cap before
there was a handler for it.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 2bb3d38..248eab6 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -343,6 +343,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 343 | m_log.DebugFormat( | 343 | m_log.DebugFormat( |
| 344 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); | 344 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); |
| 345 | 345 | ||
| 346 | if (!m_HostCapsObj.WaitForActivation()) | ||
| 347 | return string.Empty; | ||
| 348 | |||
| 346 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) | 349 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) |
| 347 | { | 350 | { |
| 348 | m_log.WarnFormat( | 351 | m_log.WarnFormat( |