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

diff options

author	Melanie	2012-06-09 16:28:22 +0100
committer	Melanie	2012-06-09 16:28:22 +0100
commit	8c91e761c8ab0f327ab710cf9b0581e42c20374b (patch)
tree	b9e133efe376878064c12b83a4e6d5eef62ceb4e /OpenSim/Region/ClientStack/Linden/Caps/EventQueue
parent	Merge branch 'master' into careminster (diff)
parent	Create avatar entries necessary to stop new v3 avatars being clouds (pants, s... (diff)
download	opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.zip opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.gz opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.bz2 opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue')

0 files changed, 0 insertions, 0 deletions