Melanie f39e4abf0e Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs

2013-03-03 13:24:37 +00:00

..

EntityTransferModule.cs

Merge branch 'avination' into careminster

2013-03-03 13:24:37 +00:00

EntityTransferStateMachine.cs

Wait longer for arrival cofirmation to aid tps into laggy regions

2012-09-14 00:13:08 +02:00

HGEntityTransferModule.cs

Merge branch 'master' into careminster

2013-01-16 17:05:37 +00:00