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

diff options

author	Melanie	2013-04-10 13:20:55 +0100
committer	Melanie	2013-04-10 13:20:55 +0100
commit	7cf377fff02de4504965420baaabd56b9a5379ee (patch)
tree	5dde9202c352446232e53af9ce85efad4735a572 /OpenSim/Services/Connectors/Land/LandServicesConnector.cs
parent	Merge branch 'master' into careminster (diff)
parent	BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. (diff)
download	opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.zip opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.tar.gz opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.tar.bz2 opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs

Diffstat (limited to 'OpenSim/Services/Connectors/Land/LandServicesConnector.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: