diff options
author | Dr Scofield | 2008-05-20 16:51:45 +0000 |
---|---|---|
committer | Dr Scofield | 2008-05-20 16:51:45 +0000 |
commit | a53cea6b7e4094ea51339c80ab5fe160a19a9f6b (patch) | |
tree | 7294600ad7bbec50ff34e35b1c46a380d2d7d549 /OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs | |
parent | From: Jeremy Bongio <jbongio@us.ibm.com> (diff) | |
download | opensim-SC_OLD-a53cea6b7e4094ea51339c80ab5fe160a19a9f6b.zip opensim-SC_OLD-a53cea6b7e4094ea51339c80ab5fe160a19a9f6b.tar.gz opensim-SC_OLD-a53cea6b7e4094ea51339c80ab5fe160a19a9f6b.tar.bz2 opensim-SC_OLD-a53cea6b7e4094ea51339c80ab5fe160a19a9f6b.tar.xz |
i'm extending the RestStreamHandler.Handler(...) signature to actually
provide OSHttpRequest and OSHttpResponse to our REST handler.
also, this adds proper RestPlugin.IsGod() checking against the X-OpenSim-Godkey
HTTP request header.
last, i added XML doc comments to RestPlugin.cs
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs index feb716e..77f761f 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs | |||
@@ -104,14 +104,16 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice | |||
104 | string capsBase = "/CAPS/" + caps.CapsObjectPath; | 104 | string capsBase = "/CAPS/" + caps.CapsObjectPath; |
105 | caps.RegisterHandler("ParcelVoiceInfoRequest", | 105 | caps.RegisterHandler("ParcelVoiceInfoRequest", |
106 | new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, | 106 | new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, |
107 | delegate(string request, string path, string param) | 107 | delegate(string request, string path, string param, |
108 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
108 | { | 109 | { |
109 | return ParcelVoiceInfoRequest(request, path, param, | 110 | return ParcelVoiceInfoRequest(request, path, param, |
110 | agentID, caps); | 111 | agentID, caps); |
111 | })); | 112 | })); |
112 | caps.RegisterHandler("ProvisionVoiceAccountRequest", | 113 | caps.RegisterHandler("ProvisionVoiceAccountRequest", |
113 | new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, | 114 | new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, |
114 | delegate(string request, string path, string param) | 115 | delegate(string request, string path, string param, |
116 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
115 | { | 117 | { |
116 | return ProvisionVoiceAccountRequest(request, path, param, | 118 | return ProvisionVoiceAccountRequest(request, path, param, |
117 | agentID, caps); | 119 | agentID, caps); |