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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge	Melanie	2011-10-25	1	-3/+0
\|\
\| *	remove unnecessary null check on _collisionEventPrim	Justin Clark-Casey (justincc)	2011-10-20	1	-3/+0
* \|	Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge	Melanie	2011-10-25	1	-22/+23
\|\ \ \| \|/
\| *	Get OdeScene to use passed in time step rather than hard-coded 0.089	Justin Clark-Casey (justincc)	2011-10-20	1	-22/+23
* \|	Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge	Melanie	2011-10-25	2	-13/+5
\|\ \ \| \|/
\| *	For now, stop passing timeStep into methods where it's not actually used.	Justin Clark-Casey (justincc)	2011-10-20	2	-13/+5
* \|	Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge	Melanie	2011-10-25	1	-0/+6
\|\ \ \| \|/
\| *	Temporarily put in log lines to record time taken to set terrain in OdeScene.	Justin Clark-Casey (justincc)	2011-10-18	1	-0/+6
* \|	Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge	Melanie	2011-10-25	2	-2/+10
\|\ \ \| \|/
\| *	Store scene identifier passed in to OdeScene for later debug messages	Justin Clark-Casey (justincc)	2011-10-18	2	-2/+10
* \|	Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge	Melanie	2011-10-25	1	-16/+13
\|\ \ \| \|/
\| *	Don't bother taking OdeLock during OdeScene construction, since there can be ...	Justin Clark-Casey (justincc)	2011-10-18	1	-16/+13
* \|	Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmerge	Melanie	2011-10-25	1	-18/+13
\|\ \ \| \|/
\| *	Remove unnecessary lock of OdeLock in OdePrim.changeadd()	Justin Clark-Casey (justincc)	2011-10-18	1	-18/+13
* \|	Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmerge	Melanie	2011-10-25	2	-1/+3
\|\ \ \| \|/
\| *	minor: method doc to explain a lock of OdeLock	Justin Clark-Casey (justincc)	2011-10-18	2	-1/+3
* \|	Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmerge	Melanie	2011-10-25	4	-97/+81
\|\ \ \| \|/
\| *	Remove the unused CollisionLocker from ODE	Justin Clark-Casey (justincc)	2011-10-18	4	-97/+81
* \|	Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge	Melanie	2011-10-25	1	-0/+1
\|\ \ \| \|/
\| *	Implement osNpcSit(). This is still in development so don't trust it	Justin Clark-Casey (justincc)	2011-10-17	1	-0/+1
* \|	Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmerge	Melanie	2011-10-25	2	-53/+36
\|\ \ \| \|/
\| *	reduce access to ODECharacter methods to make code analysis easier. Eliminat...	Justin Clark-Casey (justincc)	2011-10-15	2	-54/+36
* \|	Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmerge	Melanie	2011-10-25	1	-19/+17
\|\ \ \| \|/
\| *	restrict unnecessary access levels on ODEPrim fields/properties	Justin Clark-Casey (justincc)	2011-10-15	1	-19/+17
* \|	Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge	Melanie	2011-10-25	3	-129/+195
\|\ \ \| \|/
\| *	refactor: make methods that do not need to be public in ODE private or intern...	Justin Clark-Casey (justincc)	2011-10-15	3	-129/+195
* \|	Merge commit '4bfc2f5cdea4b739110cae3b37945d88ad527334' into bigmerge	Melanie	2011-10-25	1	-1/+1
\|\ \ \| \|/
\| *	Change hardcoded ODE total frame time to match the default total frame time (...	Justin Clark-Casey (justincc)	2011-10-14	1	-1/+1
* \|	Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmerge	Melanie	2011-10-25	2	-88/+125
\|\ \ \| \|/
\| *	Extract NullPhysicsScene from PhysicsScene to improve code readability	Justin Clark-Casey (justincc)	2011-10-14	2	-88/+125
* \|	Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge	Melanie	2011-10-25	2	-8/+33
\|\ \ \| \|/
\| *	More method doc and formatting changes. Makes DestroyOdeStructures() private	Justin Clark-Casey (justincc)	2011-10-13	2	-8/+33
* \|	Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge	Melanie	2011-10-25	2	-91/+79
\|\ \ \| \|/
\| *	refactor: move 3x copy/pasted ode structure removal code in ODECharacter into...	Justin Clark-Casey (justincc)	2011-10-13	2	-91/+79
* \|	Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmerge	Melanie	2011-10-12	1	-3/+0
\|\ \ \| \|/
\| *	Remove unused local variable i from OdeScene.Simulate()	Justin Clark-Casey (justincc)	2011-10-05	1	-3/+0
* \|	Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge	Melanie	2011-10-11	1	-2/+2
\|\ \ \| \|/
\| *	adjust some whitespace to trigger another build, to check the last failure wa...	Justin Clark-Casey (justincc)	2011-09-17	1	-2/+2
* \|	Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge	Melanie	2011-10-11	9	-7026/+0
\|\ \ \| \|/
\| *	Remove old bullet DotNET and X libraries in preparation for BulletS	Justin Clark-Casey (justincc)	2011-09-17	9	-7027/+0
* \|	Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge	Melanie	2011-10-11	1	-6/+13
\|\ \ \| \|/
\| *	Stop the avatar stalling on its first boarder cross when using the ODE plugin	Justin Clark-Casey (justincc)	2011-09-16	1	-6/+13
* \|	Resolve merge commits, stage 1	Tom	2011-09-04	39	-925/+10812
\|\ \ \| \|/
\| *	Use GetMeshKey from PrimitiveBaseShape.	Robert Adams	2011-08-29	2	-15/+23
\| *	Merge branch 'master' into bulletsim	Mic Bowman	2011-08-29	2	-67/+43
\| \|\
\| \| *	Move GetMeshKey from buried inside Meshmerizer to a public method on Primitiv...	Robert Adams	2011-08-28	1	-62/+1
\| \| *	Add level of detail specification to optionally reduce the number of vertices...	Robert Adams	2011-08-28	2	-5/+42
\| * \|	BulletSim: add mesh representation. Use meshes for static objects and switch ...	Robert Adams	2011-08-26	3	-129/+228
\| * \|	Merge branch 'master' into bulletsim	Mic Bowman	2011-08-19	1	-1/+7
\| \|\ \ \| \| \|/
\| \| *	If SP.MoveToTarget has been called with a force walk, begin by landing the av...	Justin Clark-Casey (justincc)	2011-08-11	1	-1/+5