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

diff options

author	Melanie	2013-03-08 01:07:05 +0000
committer	Melanie	2013-03-08 01:07:05 +0000
commit	70f0587558a30d61b311af8de6aa8baeb7a498f8 (patch)
tree	9a9b09125f0b6cdd54ac1874fda2b39851d465a0 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
parent	* Separate two if trees that got merged into one if tree with borked logic. (diff)
parent	* Just another one of those new packet blocks causing a null ref. Defaultin... (diff)
download	opensim-SC_OLD-70f0587558a30d61b311af8de6aa8baeb7a498f8.zip opensim-SC_OLD-70f0587558a30d61b311af8de6aa8baeb7a498f8.tar.gz opensim-SC_OLD-70f0587558a30d61b311af8de6aa8baeb7a498f8.tar.bz2 opensim-SC_OLD-70f0587558a30d61b311af8de6aa8baeb7a498f8.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs')

0 files changed, 0 insertions, 0 deletions