diff options
| author | Melanie | 2013-05-01 21:39:49 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-01 21:39:49 +0100 |
| commit | 8c5445b774c602a13a7b49db1630b5f9fb9ff438 (patch) | |
| tree | 6e829d2903b589c0c703793fb804632ea2324d62 /OpenSim/Region/CoreModules/Framework/Caps | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-8c5445b774c602a13a7b49db1630b5f9fb9ff438.zip opensim-SC_OLD-8c5445b774c602a13a7b49db1630b5f9fb9ff438.tar.gz opensim-SC_OLD-8c5445b774c602a13a7b49db1630b5f9fb9ff438.tar.bz2 opensim-SC_OLD-8c5445b774c602a13a7b49db1630b5f9fb9ff438.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
ThirdParty/SmartThreadPool/SmartThreadPool.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/Caps')
| -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); |