aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities
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/Capabilities
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 '')
-rw-r--r--OpenSim/Capabilities/CapsHandlers.cs30
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Capabilities/CapsHandlers.cs b/OpenSim/Capabilities/CapsHandlers.cs
index e1c800e..a0e9ebc 100644
--- a/OpenSim/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Capabilities/CapsHandlers.cs
@@ -147,25 +147,25 @@ namespace OpenSim.Framework.Capabilities
147 /// Return an LLSD-serializable Hashtable describing the 147 /// Return an LLSD-serializable Hashtable describing the
148 /// capabilities and their handler details. 148 /// capabilities and their handler details.
149 /// </summary> 149 /// </summary>
150 public Hashtable CapsDetails 150 /// <param name="excludeSeed">If true, then exclude the seed cap.</param>
151 public Hashtable GetCapsDetails(bool excludeSeed)
151 { 152 {
152 get 153 Hashtable caps = new Hashtable();
154 string protocol = "http://";
155
156 if (m_useSSL)
157 protocol = "https://";
158
159 string baseUrl = protocol + m_httpListenerHostName + ":" + m_httpListenerPort.ToString();
160 foreach (string capsName in m_capsHandlers.Keys)
153 { 161 {
154 Hashtable caps = new Hashtable(); 162 if (excludeSeed && "SEED" == capsName)
155 string protocol = "http://"; 163 continue;
156
157 if (m_useSSL)
158 protocol = "https://";
159 164
160 string baseUrl = protocol + m_httpListenerHostName + ":" + m_httpListenerPort.ToString(); 165 caps[capsName] = baseUrl + m_capsHandlers[capsName].Path;
161 foreach (string capsName in m_capsHandlers.Keys)
162 {
163 // skip SEED cap
164 if ("SEED" == capsName) continue;
165 caps[capsName] = baseUrl + m_capsHandlers[capsName].Path;
166 }
167 return caps;
168 } 166 }
167
168 return caps;
169 } 169 }
170 } 170 }
171} 171}