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

diff options

author	Melanie	2012-06-06 13:07:05 +0100
committer	Melanie	2012-06-06 13:07:05 +0100
commit	e733fb32cf76672cfddc25b3c9c02c50c025e2db (patch)
tree	1535c9e7d70cdb5f2e0779db8fc85fb98ede7ca5 /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice
parent	Merge branch 'master' into careminster (diff)
parent	minor: Change log messages on Warp3DImageModule to show they are from this mo... (diff)
download	opensim-SC_OLD-e733fb32cf76672cfddc25b3c9c02c50c025e2db.zip opensim-SC_OLD-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.gz opensim-SC_OLD-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.bz2 opensim-SC_OLD-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs

Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: