Melanie 72c925a6c9 Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/Physics/OdePlugin/OdeScene.cs

2012-10-18 20:56:34 +01:00

..

BunchOfCaps.cs

Merge branch 'avination' into careminster

2012-10-18 20:56:34 +01:00

BunchOfCapsModule.cs

minor: remove some mono compiler warnings

2011-08-04 01:46:34 +01:00

MeshCost.cs

more upload changes (plus untouch prebuild.xml)

2012-09-24 22:57:33 +01:00