diff options
author | Justin Clark-Casey (justincc) | 2011-11-24 21:27:35 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-24 21:27:35 +0000 |
commit | 63c137820b44e9d1e248ba32ccd6df5110a2bdb9 (patch) | |
tree | 9d2a11321d2416390c9fa195d156bb0b154371fd /OpenSim/Capabilities/Caps.cs | |
parent | Add a "debug eq" console command for debugging. (diff) | |
download | opensim-SC_OLD-63c137820b44e9d1e248ba32ccd6df5110a2bdb9.zip opensim-SC_OLD-63c137820b44e9d1e248ba32ccd6df5110a2bdb9.tar.gz opensim-SC_OLD-63c137820b44e9d1e248ba32ccd6df5110a2bdb9.tar.bz2 opensim-SC_OLD-63c137820b44e9d1e248ba32ccd6df5110a2bdb9.tar.xz |
Stop passing a request handler to the initial caps.RegisterHandler in EventQueueGetModule since this is immediatley replaced by a poll server handler.
This allows us to comment out a bunch of code and simplify the codebase and readability.
Diffstat (limited to 'OpenSim/Capabilities/Caps.cs')
-rw-r--r-- | OpenSim/Capabilities/Caps.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs index 56ccfd6..bc6f6f9 100644 --- a/OpenSim/Capabilities/Caps.cs +++ b/OpenSim/Capabilities/Caps.cs | |||
@@ -98,14 +98,17 @@ namespace OpenSim.Framework.Capabilities | |||
98 | { | 98 | { |
99 | get { return m_httpListener.UseSSL; } | 99 | get { return m_httpListener.UseSSL; } |
100 | } | 100 | } |
101 | |||
101 | public string SSLCommonName | 102 | public string SSLCommonName |
102 | { | 103 | { |
103 | get { return m_httpListener.SSLCommonName; } | 104 | get { return m_httpListener.SSLCommonName; } |
104 | } | 105 | } |
106 | |||
105 | public CapsHandlers CapsHandlers | 107 | public CapsHandlers CapsHandlers |
106 | { | 108 | { |
107 | get { return m_capsHandlers; } | 109 | get { return m_capsHandlers; } |
108 | } | 110 | } |
111 | |||
109 | public Dictionary<string, string> ExternalCapsHandlers | 112 | public Dictionary<string, string> ExternalCapsHandlers |
110 | { | 113 | { |
111 | get { return m_externalCapsHandlers; } | 114 | get { return m_externalCapsHandlers; } |
@@ -157,11 +160,7 @@ namespace OpenSim.Framework.Capabilities | |||
157 | 160 | ||
158 | /// <summary> | 161 | /// <summary> |
159 | /// Remove all CAPS service handlers. | 162 | /// Remove all CAPS service handlers. |
160 | /// | ||
161 | /// </summary> | 163 | /// </summary> |
162 | /// <param name="httpListener"></param> | ||
163 | /// <param name="path"></param> | ||
164 | /// <param name="restMethod"></param> | ||
165 | public void DeregisterHandlers() | 164 | public void DeregisterHandlers() |
166 | { | 165 | { |
167 | if (m_capsHandlers != null) | 166 | if (m_capsHandlers != null) |