diff options
| author | Melanie | 2013-03-03 13:24:37 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-03 13:24:37 +0000 |
| commit | f39e4abf0ed67e3101286651f7a5efdf7140e4e4 (patch) | |
| tree | a5e30b220b66136ec3812db84d962d54193944a8 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make Keyframe motion cross regions again (diff) | |
| download | opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.zip opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.gz opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.bz2 opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps')
| -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 9b945f4..eadca9b 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -342,6 +342,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 342 | m_log.DebugFormat( | 342 | m_log.DebugFormat( |
| 343 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); | 343 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); |
| 344 | 344 | ||
| 345 | if (!m_HostCapsObj.WaitForActivation()) | ||
| 346 | return string.Empty; | ||
| 347 | |||
| 345 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) | 348 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) |
| 346 | { | 349 | { |
| 347 | m_log.WarnFormat( | 350 | m_log.WarnFormat( |