opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into careminster	Melanie	2012-08-01	2	-0/+0
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
\| *	BulletSim: fix problem where resizing a primary shape (cube or sphere) would ↵	Robert Adams	2012-07-31	2	-0/+0
\| \| \| \| \| \| \| \|	not rebuild the physics mesh. Update the DLLs and SOs to latest version.
* \|	Merge branch 'master' into careminster	Melanie	2012-08-01	2	-0/+0
\|\ \ \| \|/
\| *	BulletSim: update the DLLs and SOs. This fixes the exception on shutdown	Robert Adams	2012-07-31	2	-0/+0
\| \|
* \|	Merge branch 'master' into careminster	Melanie	2012-07-28	2	-0/+0
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
\| *	BulletSim: update BulletSim DLLs and SOs	Robert Adams	2012-07-25	2	-0/+0
\| \|
* \|	Merge branch 'master' into careminster	Melanie	2012-07-25	2	-0/+0
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
\| *	BulletSim: update BulletSim.dlls and so's	Robert Adams	2012-07-23	2	-0/+0
\| \|
* \|	Merge branch 'master' into careminster	Melanie	2012-07-23	2	-0/+0
\|\ \ \| \|/ \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
\| *	Update BulletSim DLLs and SOs	Robert Adams	2012-07-20	1	-0/+0
\| \|
\| *	BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs ↵	Robert Adams	2012-07-20	2	-0/+0
\| \| \| \| \| \| \| \|	attempting to fix a mono compile error.
* \|	Merge branch 'avination' into careminster	Melanie	2012-07-11	2	-0/+0
\|\ \ \| \|/ \|/\| \| \| \| \|	Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
\| *	changed ODE lib for win32 to version 0.12	UbitUmarov	2012-07-10	1	-0/+0
\| \|
\| *	change linux 32bit libode.so to ode version 0.12	ubit	2012-07-10	1	-0/+0
\| \|
* \|	BulletSim: update the binaries to the current sources	Robert Adams	2012-07-06	2	-0/+0
\|/
*	BulletSim: update 64 bit libraries and change Linux configuration to use the ↵	Robert Adams	2012-03-28	2	-0/+0
\| \| \| \|	files in the lib32 and lib64 directories as needed.
*	BulletSim: update BulletSim binaries and configuration fixing a crash which ↵	Robert Adams	2012-03-26	2	-0/+0
\| \| \| \|	happens when there are more than a few hundred physical objects.
*	BulletSim: update BulletSim.dll and libBulletSim.so with latest versions	Robert Adams	2012-03-26	2	-0/+0
\|
*	BulletSim: add updated (but not working) BulletSim dlls	Robert Adams	2012-03-23	2	-0/+0
\|
*	BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to ↵	Robert Adams	2012-03-23	2	-0/+0
\| \| \| \|	the new lib32 and lib64 binary directories
*	Move libopenjpeg native libraries into lib32 and lib64 as appropriate.	Justin Clark-Casey (justincc)	2012-02-25	2	-0/+0
\|
*	Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as ↵	Justin Clark-Casey (justincc)	2012-02-25	3	-0/+1
\| \| \| \|	appropriate.
*	Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.	Justin Clark-Casey (justincc)	2012-02-21	1	-0/+0
\| \| \| \| \|	This uses the same approach as ODE. radams, if this doesn't work for you please feel free to revert.
*	Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.	Justin Clark-Casey (justincc)	2012-02-21	1	-0/+0
\|
*	On Windows automatically load the correct native ODE library depending on ↵	Justin Clark-Casey (justincc)	2012-02-18	1	-0/+0
	whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works.