diff options
author | Melanie | 2013-04-30 23:35:59 +0200 |
---|---|---|
committer | Melanie | 2013-04-30 23:35:59 +0200 |
commit | 0af1d8fe196e403c066f7fc3dbc9f4b897b4da2c (patch) | |
tree | 85470dbf911738d3e52c07a84e4f197947096cac /OpenSim/Region/CoreModules | |
parent | Merge branch 'ubitwork' into avination-current (diff) | |
download | opensim-SC-0af1d8fe196e403c066f7fc3dbc9f4b897b4da2c.zip opensim-SC-0af1d8fe196e403c066f7fc3dbc9f4b897b4da2c.tar.gz opensim-SC-0af1d8fe196e403c066f7fc3dbc9f4b897b4da2c.tar.bz2 opensim-SC-0af1d8fe196e403c066f7fc3dbc9f4b897b4da2c.tar.xz |
Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list.
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs index 2eb9bfb..fff86d5 100644 --- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | |||
@@ -252,7 +252,7 @@ namespace OpenSim.Region.CoreModules.Framework | |||
252 | { | 252 | { |
253 | caps.AppendFormat("** Circuit {0}:\n", kvp.Key); | 253 | caps.AppendFormat("** Circuit {0}:\n", kvp.Key); |
254 | 254 | ||
255 | for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false).GetEnumerator(); kvp2.MoveNext(); ) | 255 | for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false, null).GetEnumerator(); kvp2.MoveNext(); ) |
256 | { | 256 | { |
257 | Uri uri = new Uri(kvp2.Value.ToString()); | 257 | Uri uri = new Uri(kvp2.Value.ToString()); |
258 | caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery); | 258 | caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery); |