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

diff options

author	Mic Bowman	2011-04-11 08:41:36 -0700
committer	Mic Bowman	2011-04-11 08:41:36 -0700
commit	72a24cf0237a64f09f58dbd7ea1cdf42a472fe58 (patch)
tree	a2ea89c1f044f1c1f89de34e9b9fd86d782aaff7 /OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
parent	Removed some priority queue debugging code (diff)
parent	Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu... (diff)
download	opensim-SC_OLD-72a24cf0237a64f09f58dbd7ea1cdf42a472fe58.zip opensim-SC_OLD-72a24cf0237a64f09f58dbd7ea1cdf42a472fe58.tar.gz opensim-SC_OLD-72a24cf0237a64f09f58dbd7ea1cdf42a472fe58.tar.bz2 opensim-SC_OLD-72a24cf0237a64f09f58dbd7ea1cdf42a472fe58.tar.xz

Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest

Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/Prioritizer.cs

Diffstat (limited to 'OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs')

0 files changed, 0 insertions, 0 deletions