diff options
| author | root | 2011-06-30 00:26:03 +0100 |
|---|---|---|
| committer | root | 2011-06-30 00:26:03 +0100 |
| commit | 5f927dc104aac48707c0ea2ff77a3410c3857ecc (patch) | |
| tree | 123324ae910db49349e7b07749f49cd172a3d037 /OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice | |
| parent | Remove friends debug spam (diff) | |
| parent | Don't follow inventory links of links. (diff) | |
| download | opensim-SC-5f927dc104aac48707c0ea2ff77a3410c3857ecc.zip opensim-SC-5f927dc104aac48707c0ea2ff77a3410c3857ecc.tar.gz opensim-SC-5f927dc104aac48707c0ea2ff77a3410c3857ecc.tar.bz2 opensim-SC-5f927dc104aac48707c0ea2ff77a3410c3857ecc.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 4f1097e..4f86e42 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
| @@ -417,9 +417,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
| 417 | public string ParcelVoiceInfoRequest(Scene scene, string request, string path, string param, | 417 | public string ParcelVoiceInfoRequest(Scene scene, string request, string path, string param, |
| 418 | UUID agentID, Caps caps) | 418 | UUID agentID, Caps caps) |
| 419 | { | 419 | { |
| 420 | // m_log.DebugFormat( | 420 | m_log.DebugFormat( |
| 421 | // "[FreeSwitchVoice][PARCELVOICE]: ParcelVoiceInfoRequest() on {0} for {1}", | 421 | "[FreeSwitchVoice][PARCELVOICE]: ParcelVoiceInfoRequest() on {0} for {1}", |
| 422 | // scene.RegionInfo.RegionName, agentID); | 422 | scene.RegionInfo.RegionName, agentID); |
| 423 | 423 | ||
| 424 | ScenePresence avatar = scene.GetScenePresence(agentID); | 424 | ScenePresence avatar = scene.GetScenePresence(agentID); |
| 425 | string avatarName = avatar.Name; | 425 | string avatarName = avatar.Name; |