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

diff options

author	Melanie	2012-06-14 00:10:52 +0100
committer	Melanie	2012-06-14 00:10:52 +0100
commit	d893e54f4b4d3b4a8f6bfa3c8744487527a194a0 (patch)
tree	1601e04322dba9c6c4ae2412c92821f93aca5c7b /OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
parent	Merge branch 'master' into careminster (diff)
parent	minor: refactor part of LLClientView.ProcessEntityUpdates() to remove duplica... (diff)
download	opensim-SC-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.zip opensim-SC-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.gz opensim-SC-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.bz2 opensim-SC-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs')

0 files changed, 0 insertions, 0 deletions