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

diff options

author	Melanie	2012-10-26 21:13:01 +0100
committer	Melanie	2012-10-26 21:13:01 +0100
commit	26cc57b6cafda5168baab49cabe34d96f01dbd6d (patch)
tree	94e078a75ab68825e64b15498f67d82988858dc9 /ThirdParty/SmartThreadPool/PriorityQueue.cs
parent	Merge branch 'master' into careminster (diff)
parent	minor: Make the error thrown logged when a simulator in grid mode is trying t... (diff)
download	opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.zip opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.gz opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.bz2 opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs

Diffstat (limited to 'ThirdParty/SmartThreadPool/PriorityQueue.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: