aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
diff options
context:
space:
mode:
authorMelanie2013-11-08 17:55:01 +0000
committerMelanie2013-11-08 17:55:01 +0000
commit91b70bf3fe382729a94d9a0855be8b07ef67c360 (patch)
tree3e42c4c536da6c7eaaf1a72ecdbd2a24de4d1658 /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
parentMerge branch 'master' into careminster (diff)
parentIf the LSL state_entry() event definition contains any parameters, then gener... (diff)
downloadopensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.zip
opensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.gz
opensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.bz2
opensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-22 05:11:01 +0000