aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar
diff options
context:
space:
mode:
authorDiva Canto2013-07-26 21:14:21 -0700
committerDiva Canto2013-07-26 21:14:21 -0700
commit428916a64d27e5f00e74d34fd4b0453f32c3d2de (patch)
treeecf786c166e2542627f8e103ae3bebf41ba3f0c6 /OpenSim/Region/OptionalModules/Avatar
parentFix regression from 056a6ee7 because the RemoteSimulationConnector uses a cop... (diff)
downloadopensim-SC-428916a64d27e5f00e74d34fd4b0453f32c3d2de.zip
opensim-SC-428916a64d27e5f00e74d34fd4b0453f32c3d2de.tar.gz
opensim-SC-428916a64d27e5f00e74d34fd4b0453f32c3d2de.tar.bz2
opensim-SC-428916a64d27e5f00e74d34fd4b0453f32c3d2de.tar.xz
Commented out ChatSessionRequest capability in Vivox and Freeswitch. We aren't processing it in any meaningful way, and it seems to get invoked everytime someone types a message in group chat.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs18
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs18
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 ef1b92e..5a5a70c 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 2d65530..cdab116 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>