aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
diff options
context:
space:
mode:
authorMelanie2012-10-16 04:30:01 +0100
committerMelanie2012-10-16 04:30:01 +0100
commitfa52effb279355ef731725c04c3b659f972f3903 (patch)
tree7d9029b0ded43814206112d5e5b2115b9b463fc7 /OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
parentFix a merge issue (diff)
parentminor: Comment out log message on every FRIENDS SIM CONNECTOR request for now. (diff)
downloadopensim-SC-fa52effb279355ef731725c04c3b659f972f3903.zip
opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.gz
opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.bz2
opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-14 22:41:11 +0000