diff options
| author | Melanie | 2013-07-29 02:08:05 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-29 02:08:05 +0100 |
| commit | bf283208df4a6936de85b2746112bb568d9c9d25 (patch) | |
| tree | dafe50ad8e55ac30c41f5e7ebd11992f2772c294 /OpenSim/Region/OptionalModules/Avatar/Voice | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Same issue. (diff) | |
| download | opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.zip opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.gz opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.bz2 opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 18 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 0cec959..2b33084 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
| @@ -326,15 +326,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
| 326 | "ParcelVoiceInfoRequest", | 326 | "ParcelVoiceInfoRequest", |
| 327 | agentID.ToString())); | 327 | agentID.ToString())); |
| 328 | 328 | ||
| 329 | caps.RegisterHandler( | 329 | //caps.RegisterHandler( |
| 330 | "ChatSessionRequest", | 330 | // "ChatSessionRequest", |
| 331 | new RestStreamHandler( | 331 | // new RestStreamHandler( |
| 332 | "POST", | 332 | // "POST", |
| 333 | capsBase + m_chatSessionRequestPath, | 333 | // capsBase + m_chatSessionRequestPath, |
| 334 | (request, path, param, httpRequest, httpResponse) | 334 | // (request, path, param, httpRequest, httpResponse) |
| 335 | => ChatSessionRequest(scene, request, path, param, agentID, caps), | 335 | // => ChatSessionRequest(scene, request, path, param, agentID, caps), |
| 336 | "ChatSessionRequest", | 336 | // "ChatSessionRequest", |
| 337 | agentID.ToString())); | 337 | // agentID.ToString())); |
| 338 | } | 338 | } |
| 339 | 339 | ||
| 340 | /// <summary> | 340 | /// <summary> |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 2f07c42..349c0d0 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
| @@ -433,15 +433,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
| 433 | "ParcelVoiceInfoRequest", | 433 | "ParcelVoiceInfoRequest", |
| 434 | agentID.ToString())); | 434 | agentID.ToString())); |
| 435 | 435 | ||
| 436 | caps.RegisterHandler( | 436 | //caps.RegisterHandler( |
| 437 | "ChatSessionRequest", | 437 | // "ChatSessionRequest", |
| 438 | new RestStreamHandler( | 438 | // new RestStreamHandler( |
| 439 | "POST", | 439 | // "POST", |
| 440 | capsBase + m_chatSessionRequestPath, | 440 | // capsBase + m_chatSessionRequestPath, |
| 441 | (request, path, param, httpRequest, httpResponse) | 441 | // (request, path, param, httpRequest, httpResponse) |
| 442 | => ChatSessionRequest(scene, request, path, param, agentID, caps), | 442 | // => ChatSessionRequest(scene, request, path, param, agentID, caps), |
| 443 | "ChatSessionRequest", | 443 | // "ChatSessionRequest", |
| 444 | agentID.ToString())); | 444 | // agentID.ToString())); |
| 445 | } | 445 | } |
| 446 | 446 | ||
| 447 | /// <summary> | 447 | /// <summary> |