opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

diff options

author	Melanie	2011-10-12 07:02:15 +0100
committer	Melanie	2011-10-12 07:02:15 +0100
commit	b2090e711f8af8e9f4fc0f8332635624620fde91 (patch)
tree	bfe22d792890498751932464e5f95b8d66c84c1d /OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
parent	HACK: Remove advanced property resending until it is fixed properly in core. (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC_OLD-b2090e711f8af8e9f4fc0f8332635624620fde91.zip opensim-SC_OLD-b2090e711f8af8e9f4fc0f8332635624620fde91.tar.gz opensim-SC_OLD-b2090e711f8af8e9f4fc0f8332635624620fde91.tar.bz2 opensim-SC_OLD-b2090e711f8af8e9f4fc0f8332635624620fde91.tar.xz

Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge

Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs

Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs')

0 files changed, 0 insertions, 0 deletions