opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

diff options

author	Melanie	2013-05-12 03:24:57 +0100
committer	Melanie	2013-05-12 03:24:57 +0100
commit	e8f4c7128fc65f12ef33b152e14b072809667642 (patch)
tree	a1708d78fa0ef078bf4d47233477fe531149e1ad /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ... (diff)
download	opensim-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/VivoxVoiceModule.cs')

0 files changed, 0 insertions, 0 deletions