Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

Conflicts:
	bin/lib32/BulletSim.dll
	bin/lib32/libBulletSim.so
	bin/lib64/BulletSim.dll
	bin/lib64/libBulletSim.so
This commit is contained in:
ubit
2012-08-04 11:42:59 +02:00
24 changed files with 466 additions and 308 deletions

View File

@@ -551,8 +551,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(disable, ThrottleOutPacketType.Unknown);
}
// IsActive = false;
// Shutdown the image manager
ImageManager.Close();