aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice
diff options
context:
space:
mode:
authorMelanie2013-05-12 03:24:57 +0100
committerMelanie2013-05-12 03:24:57 +0100
commite8f4c7128fc65f12ef33b152e14b072809667642 (patch)
treea1708d78fa0ef078bf4d47233477fe531149e1ad /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice
parentMerge branch 'master' into careminster (diff)
parentFinalize the logic for SetHome. See comments in Land/LandManagementModule.cs ... (diff)
downloadopensim-SC-e8f4c7128fc65f12ef33b152e14b072809667642.zip
opensim-SC-e8f4c7128fc65f12ef33b152e14b072809667642.tar.gz
opensim-SC-e8f4c7128fc65f12ef33b152e14b072809667642.tar.bz2
opensim-SC-e8f4c7128fc65f12ef33b152e14b072809667642.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice')
0 files changed, 0 insertions, 0 deletions