Melanie a022ee5766 Merge branch 'master' into careminster ... Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs		2013-06-11 01:03:15 +01:00
..
BasicPhysicsPlugin	Add regression test for presence crossing between regions on the same simulator.	2013-03-06 21:37:53 +00:00
BulletSPlugin	Merge branch 'master' into careminster	2013-06-11 01:03:15 +01:00
ChOdePlugin	Merge branch 'master' into careminster	2012-11-30 01:54:13 +00:00
ConvexDecompositionDotNet	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00
Manager	Merge branch 'master' into careminster	2013-02-08 23:29:47 +00:00
Meshing	Merge branch 'master' into careminster	2013-05-25 02:00:22 +01:00
OdePlugin	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00
POSPlugin	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00
UbitMeshing	Merge branch 'master' into careminster	2013-02-06 02:22:12 +00:00
UbitOdePlugin	* This fixes the avatar stuck in objects on login and teleport by gently applying an upward motion when stuck in things on the Z	2013-05-14 20:55:56 -04:00