diff options
| author | Melanie | 2011-12-01 12:16:59 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-01 12:16:59 +0000 |
| commit | b60ff651a3912f7d7830cac40752218efba858d8 (patch) | |
| tree | ba22de2341b996cfeb1f7da31f650e206cb1d76f /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Provide more user feedback when "debug http" is set (diff) | |
| download | opensim-SC-b60ff651a3912f7d7830cac40752218efba858d8.zip opensim-SC-b60ff651a3912f7d7830cac40752218efba858d8.tar.gz opensim-SC-b60ff651a3912f7d7830cac40752218efba858d8.tar.bz2 opensim-SC-b60ff651a3912f7d7830cac40752218efba858d8.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 8f0ae76..07b4df3 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -238,7 +238,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 238 | return string.Empty; | 238 | return string.Empty; |
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | Hashtable caps = m_HostCapsObj.CapsHandlers.CapsDetails; | 241 | Hashtable caps = m_HostCapsObj.CapsHandlers.GetCapsDetails(true); |
| 242 | |||
| 242 | // Add the external too | 243 | // Add the external too |
| 243 | foreach (KeyValuePair<string, string> kvp in m_HostCapsObj.ExternalCapsHandlers) | 244 | foreach (KeyValuePair<string, string> kvp in m_HostCapsObj.ExternalCapsHandlers) |
| 244 | caps[kvp.Key] = kvp.Value; | 245 | caps[kvp.Key] = kvp.Value; |