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

diff options

author	Melanie	2013-05-30 21:48:09 +0100
committer	Melanie	2013-05-30 21:48:09 +0100
commit	669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch)
tree	6ea7f58cc6365595281f823f3994d2d22299ee40 /OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
parent	Merge branch 'master' into careminster (diff)
parent	Try caching the user name for a new agent earlier on in the process of establ... (diff)
download	opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2 opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs

Diffstat (limited to '')

0 files changed, 0 insertions, 0 deletions