aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-29 20:37:03 +0000
committerJustin Clark-Casey (justincc)2011-11-29 20:37:03 +0000
commitfa63054c4f5cf970922c2fef386b084272c5491c (patch)
treef8c8e596a9818a5335ec5fa3c92afa633ac2c4be /OpenSim/Region
parentWith "debug http 1", show the path with the query string instead of just the ... (diff)
downloadopensim-SC_OLD-fa63054c4f5cf970922c2fef386b084272c5491c.zip
opensim-SC_OLD-fa63054c4f5cf970922c2fef386b084272c5491c.tar.gz
opensim-SC_OLD-fa63054c4f5cf970922c2fef386b084272c5491c.tar.bz2
opensim-SC_OLD-fa63054c4f5cf970922c2fef386b084272c5491c.tar.xz
On "show caps", stop excluding the seed cap but do exclude it elsewhere
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs3
-rw-r--r--OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs2
2 files changed, 3 insertions, 2 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;
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 780411f..9d1538f 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -239,7 +239,7 @@ namespace OpenSim.Region.CoreModules.Framework
239 { 239 {
240 caps.AppendFormat("** User {0}:\n", kvp.Key); 240 caps.AppendFormat("** User {0}:\n", kvp.Key);
241 241
242 for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.CapsDetails.GetEnumerator(); kvp2.MoveNext(); ) 242 for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false).GetEnumerator(); kvp2.MoveNext(); )
243 { 243 {
244 Uri uri = new Uri(kvp2.Value.ToString()); 244 Uri uri = new Uri(kvp2.Value.ToString());
245 caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery); 245 caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery);