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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \|	Add check so Ode does not try to simulate after it has been Dispose()'ed. ↵	Robert Adams	2012-07-26	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes exception that happens when shutting down region (improvements from last patch)
\| * \|	BulletSim: remove unused, commented out code in BSConstraint	Robert Adams	2012-07-25	1	-8/+0
\| \| \|
\| * \|	BulletSim: fix line endings in newly added files (Is it DOS or is it UNIX? ↵	Robert Adams	2012-07-25	2	-301/+301
\| \| \| \| \| \| \| \| \| \| \| \|	Only it's hairdresser knows for sure)
\| * \|	BulletSim: add parameters for setting linkset constraint factors	Robert Adams	2012-07-25	2	-17/+32
\| \| \|
\| * \|	BulletSim: small change to use the pointer to the bullet object for zeroing ↵	Robert Adams	2012-07-25	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \|	forces.
\| * \|	BulletSim: Redo parameter specification so only one place has	Robert Adams	2012-07-25	1	-248/+378
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to change to have a parameter show up in the ini file and command line. Will make it much easier for the next person.
\| * \|	BulletSim: Add C# classes for storing and tracking constraints.	Robert Adams	2012-07-25	2	-0/+301
\| \| \|
\| * \|	BulletSim: Move constraint tracking from C++ code to C# code	Robert Adams	2012-07-25	2	-18/+83
\| \| \| \| \| \| \| \| \| \| \| \|	for more flexibility.
* \| \|	Merge branch 'master' into careminster	Melanie	2012-07-25	3	-96/+265
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
\| * \|	BulletSim: change how prim mass is saved so it is always calculated but zero ↵	Robert Adams	2012-07-23	1	-20/+23
\| \| \| \| \| \| \| \| \| \| \| \|	is given if not physical.
\| * \|	BulletSim: small optimizations for link and unlink code	Robert Adams	2012-07-23	1	-12/+8
\| \| \|
\| * \|	BulletSim: add Dispose() code to free up resources and close log files.	Robert Adams	2012-07-23	1	-0/+21
\| \| \|
\| * \|	BulletSim: add all the new functions to BulletSimAPI.	Robert Adams	2012-07-23	2	-6/+139
\| \| \| \| \| \| \| \| \| \| \| \|	Modify ZeroMotion() to not make tainting calls and to use new API calls.
\| * \|	BulletSim: improve linking to add each link individually rather than ↵	Robert Adams	2012-07-23	1	-60/+76
\| \| \| \| \| \| \| \| \| \| \| \|	rebuilding the object each time. Makes it an O(n) operation rather than O(n\!).
* \| \|	Merge branch 'master' into careminster	Melanie	2012-07-23	5	-242/+533
\|\ \ \ \| \|/ / \| \| / \| \|/ \|/\| \| \|	Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
\| *	BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs ↵	Robert Adams	2012-07-20	1	-1/+2
\| \| \| \| \| \| \| \|	attempting to fix a mono compile error.
\| *	BulletSim: more detail logging for vehicle and general physics debugging.	Robert Adams	2012-07-20	4	-75/+244
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Physical linksets are fully functional. Tweeking of the vehicle code to make it semi-work. Utilize the new API2 for some setting operations. Add GetOrientation() API call for proper reporting of children of linksets. Changes the interface between C# and C++ code so old DLLs won't work!
\| *	BulletSim: fix compile errors from last commit. Clean up passing of physics ↵	Robert Adams	2012-07-20	2	-15/+14
\| \| \| \| \| \| \| \|	scene into vehicle dynamics code.
\| *	BulletSim: Add very detailed logging to BSDynamics for vehicle debugging	Robert Adams	2012-07-20	3	-45/+146
\| \|
\| *	BulletSim: Add PID variables to physical scene. Not PIDing yet, but soon.	Robert Adams	2012-07-20	3	-101/+97
\| \| \| \| \| \| \| \|	Cleaned up code and got rid of compile warnings.
\| *	BulletSim: Add detailed and voluminous debug logging that is enabled	Robert Adams	2012-07-20	2	-40/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	with an ini configuration parameter. Correct computation of relative offsets of children in a linkset. Remove a prim from any link relationship before deleting it. Minor code flow cleanups.
* \|	Update ubitMesh primMesher with new Dahlia version on core ( reckick git	UbitUmarov	2012-07-19	1	-143/+183
\| \| \| \| \| \| \| \|	back)
* \|	Merge branch 'avination' into ubitwork	UbitUmarov	2012-07-17	12	-570/+1267
\|\ \
\| * \	Merge branch 'avination' into careminster	Melanie	2012-07-16	6	-136/+84
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
\| * \ \	Merge branch 'master' into careminster	Melanie	2012-07-16	1	-143/+183
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| \| * \|	update PrimMesher.cs to dll version r72 which fixes some path errors in ↵	dahlia	2012-07-13	1	-143/+183
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sliced linear prims. Addresses Mantis #6085
\| * \| \|	Merge branch 'avination' into careminster	Melanie	2012-07-11	5	-62/+140
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
\| * \ \ \	Merge branch 'master' into careminster	Melanie	2012-07-11	4	-58/+107
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
\| \| * \| \|	Clean up collision reporting code so they are properly passed to	Robert Adams	2012-07-06	4	-58/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the simulator in batches. More comments.
\| * \| \| \|	Merge branch 'avination' into careminster	Melanie	2012-07-06	1	-11/+38
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| * \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-07-01	1	-2/+3
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Remove some mono compiler warnings	Justin Clark-Casey (justincc)	2012-06-30	1	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-06-29	2	-16/+16
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
\| \| * \| \| \|	Move update of the final optional ODE total frame stat inside the OdeLock ↵	Justin Clark-Casey (justincc)	2012-06-29	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rather than outside to avoid a very occasional race condition with the stat collection thread
\| \| * \| \| \|	refactor: rename _collisionEventPrim to m_collisionEventActors and ↵	Justin Clark-Casey (justincc)	2012-06-29	1	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	_collisionEventPrimChanges to m_collisionEventActorsChanges to reflect their actual contents. These dictionaries handle all actor types, not just physical prims.
\| \| * \| \| \|	Fix a regression where we stopped removing avatars from collision event ↵	Justin Clark-Casey (justincc)	2012-06-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reporting on logout, rather than stopping clearing their collision events. This occurred in b18c8c8 (Thu May 17 2012). This was a cause of very occasional race conditions and likely memory leakage as clients came and went from the region.
\| * \| \| \| \|	Merge branch 'avination' into careminster	Melanie	2012-06-06	1	-3/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| * \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-06-02	1	-60/+256
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
\| \| * \| \| \| \|	Add optional total avatars, total prims and active prims stats to ODE plugin.	Justin Clark-Casey (justincc)	2012-06-01	1	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These will act as a sanity check with the main scene stats, to show that physics scene entities are being managed properly. Total prims will not match scene total prims since physics total does not include phantom prims
\| \| * \| \| \| \|	If OdeScene.Near() returns no collision contacts, then exit as early as ↵	Justin Clark-Casey (justincc)	2012-06-01	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	possible. All subsequent code is only relevant if there are contacts.
\| \| * \| \| \| \|	Add optional stat for the other collision time per frame not spent in ODE ↵	Justin Clark-Casey (justincc)	2012-06-01	1	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	native spaces or geom collision code
\| \| * \| \| \| \|	Add avatar forces calculation, prim force and raycasting per frame ↵	Justin Clark-Casey (justincc)	2012-06-01	1	-7/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	millisecond optional stats
\| \| * \| \| \| \|	Collection optional avatar and prim taint frame millisecond times	Justin Clark-Casey (justincc)	2012-06-01	1	-7/+36
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove recent optional native collision frame milliseconds stat	Justin Clark-Casey (justincc)	2012-06-01	1	-13/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unnecessary since this has now been broken down into space collisions and geom collisions
\| \| * \| \| \| \|	Add optional stat that records milliseconds spent notifying collision ↵	Justin Clark-Casey (justincc)	2012-06-01	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	listeners in physics frames
\| \| * \| \| \| \|	Add avatar and prim update milliseconds per frame optional stats	Justin Clark-Casey (justincc)	2012-06-01	1	-7/+31
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add option native step frame ms stat	Justin Clark-Casey (justincc)	2012-06-01	1	-9/+21
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add total ODE frame time optional stat, as a sanity check on the main scene ↵	Justin Clark-Casey (justincc)	2012-06-01	1	-7/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	physics stat
\| \| * \| \| \| \|	Break down native ODE collision frame time stat into native space collision ↵	Justin Clark-Casey (justincc)	2012-06-01	1	-4/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and geom collision stats
\| \| * \| \| \| \|	Rename new collision stats to 'contacts' - there are/can be multiple ↵	Justin Clark-Casey (justincc)	2012-06-01	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	contacts per collision and this is what is actually being measured.