Commit Graph

1932 Commits (7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5)

Author SHA1 Message Date
Melanie 7e98dfd70b Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-12-30 03:43:51 +00:00
Robert Adams 976023366f BulletSim: update values in OpenSimDefaults.ini to reflect the values really used by the code. 2012-12-28 16:31:45 -08:00
Melanie 258588d5b5 Merge branch 'master' into careminster 2012-12-26 01:16:08 +00:00
teravus 1a841dfc59 * Update Example to include BulletSimN option and description. 2012-12-23 15:44:29 -05:00
teravus 92e4f9f412 * Initial commit of BulletSimN (BulletSNPlugin). Purely C# implementation of BulletSim. This is designed to be /as close as possible/ to the BulletSim plugin while still being entirely in the managed space to make keeping it up to date easy as possible (no thinking work). This implementation is /slower/ then the c++ version just because it's fully managed, so it's not appropriate for huge sims, but it will run small ones OK. At the moment, it supports all known features of BulletSim. Think of it like.. POS but everything works. To use this plugin, set the physics plugin to BulletSimN. 2012-12-23 15:21:25 -05:00
Melanie 0a876a305c Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-12-16 21:19:30 +00:00
Robert Adams 4a67b93618 Independently control logging for per region module loading. I just got sick of, when debugging, the zillions of log lines verifying that each module is being added to each region. 2012-12-13 16:31:53 -08:00
Justin Clark-Casey (justincc) 523213060b Add WaitForEventCompletionOnScriptStop [XEngine] config param to OpenSimDefaults.ini to allow change of the wait time for an event to complete on script removal before aborting its thread
Default is 1000, as has previously been the case.
This parameter exists for further debug work concerning mono 2.10 crashes that may be related to locks not being removed on Thread.Abort
2012-12-13 23:21:25 +00:00
BlueWall 203b492fce Update mono addins
Push a small fix for the mono addins
2012-12-13 00:05:34 -05:00
BlueWall 7be13d16c8 Move setting to correct locations in ini 2012-12-12 17:11:30 -05:00
BlueWall d7c4f16928 Replace Mono.Addins libraries
Mono.Addins.Setup uses Ionic.Zip for compression. Libraries Compiled on Win32
2012-12-11 21:54:27 -05:00
Diva Canto 5732ce9184 Replaced Mono.Addins dlls with ones compiled in Windows 64-bit. 2012-12-09 15:28:56 -08:00
Melanie f30d519bcc Merge branch 'master' into careminster 2012-12-09 21:27:32 +00:00
BlueWall bd14fa15e4 Add back openjpeg dll for Windows
May generate some error output during startup on Robust - ignore for now, will fix soon.
2012-12-08 17:15:35 -05:00
BlueWall cba1390ffd Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-12-07 16:56:03 -05:00
Diva Canto 16d18afe21 Added missing config var in grided sims. 2012-12-07 12:38:19 -08:00
BlueWall 0b455d2882 Merge branch 'master' into connector_plugin 2012-12-07 15:36:43 -05:00
Melanie 2cb824d3fc Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-12-07 03:49:04 +00:00
Robert Adams 707e186aa3 BulletSim: update DLLs and SOs with vehicle collision event check 2012-12-06 09:34:30 -08:00
nebadon f1d4e8f792 fix openjpeg on 64 bit OSX we were pointing to a file taht did not
exist.
2012-12-06 09:52:18 -07:00
Melanie 5837e731bf Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
2012-12-04 23:01:18 +00:00
Robert Adams 787636b97a BulletSim: Reduce idle region physics overhead where there are MANY
static objects by more restrictive selection of objects that collide
    with static objects.
Rename collision mask fuctions from 'filter' to 'group' so it is clear
    what is being set.
Rename BulletSimAPI.SetCollisionFilterMask() to SetCollisionGroupMask to match above.
Restore passing of time step to linear and angular motion component routines.
Use buffering vehicle physical parameter get/set routines consistantly.
Make range enforcement clearer by using ClampInRange() function for parameter setting.
Remove commented out experimental vehicle calculations.
2012-12-03 16:25:51 -08:00
Robert Adams b124aae05e BulletSim: Add DumpActivationInfo2 function. Change static objects from DISABLE_SIMULATION to ISLAND_SLEEPING. Update DLLs and SOs to add DumpActivationInfo2 function. 2012-12-01 15:39:13 -08:00
Melanie daa1d99513 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
	OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-11-30 01:19:08 +00:00
Robert Adams 24b3b4df2e BulletSim: update DLLs and SOs to remove simulator crash when calling SetInterpolationAngularVelocity. 2012-11-28 09:48:41 -08:00
BlueWall 88f2fbc8f1 Merge branch 'master' into connector_plugin 2012-11-26 06:55:03 -05:00
Robert Adams bd635e264a BulletSim: update DLLs and SOs with new collision margin setting function. 2012-11-25 20:04:31 -08:00
Robert Adams 9b98011714 BulletSim: update OpenSimDefaults.ini with current default values for friction and collision margin. Remove some of the BulletSim parameters that are very esoteric and dangerous. Most of the remaining parameters are features one can 'see'. 2012-11-25 20:04:30 -08:00
BlueWall c754003944 Merge branch 'master' into connector_plugin
Conflicts:
	OpenSim/Server/Base/ServicesServerBase.cs
2012-11-25 17:03:14 -05:00
Melanie fd7a83f439 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
2012-11-25 14:13:50 +00:00
Justin Clark-Casey (justincc) edbdbd44b9 Enable further client stack packet pooling by default by setting RecycleBaseUDPPackets = true by default.
This reduces base memory churn of every client connection, improving the garbage collection situation.
The effect is a significant portion of base load (an avatar standing still on a completely blank island)
but will probably still be swallowed up by other memory use on active regions.
Tests have shown no noticeable impact on speed of processing incoming packets, though setting remains
in case a switch back is needed.
2012-11-23 04:09:45 +00:00
Justin Clark-Casey (justincc) f473252fa8 Add AllowRegionRestartFromClient setting to [EstateManagement] section of OpenSim.ini.
Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate.
One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules,
though these should be fixed as soon as practicable.
Default is true, as has been the case historically.
2012-11-23 03:56:53 +00:00
Melanie c4c6121752 Merge branch 'master' into careminster 2012-11-22 03:17:33 +00:00
Robert Adams 56ef180c92 BulletSim: update DLLs and SOs. No functional changes. Only the parameter block format changed. 2012-11-21 16:44:02 -08:00
Robert Adams cbc7e7bf85 BulletSim: Make avatar capsule so it is not circular.
Simple attempt to make avatars better shaped.
Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth'
and 'avatarCapsuleDepth'.
More tweeking to avatar height calculation. A little better but
short avatar's feet are above the terrain and tall avatar's feet
are a little below the ground.
2012-11-21 16:43:53 -08:00
Melanie 45eedb635a Merge branch 'master' into careminster 2012-11-20 20:25:15 +00:00
BlueWall 665f79e15c Expose configuration options for the XmlRpcGridRouter
Expose configuration options for the XmlRpcGridRouter to allow simulators to register llRemoteData channels with an external routing service
2012-11-19 21:51:37 -05:00
Melanie 9f2d232c71 Merge branch 'master' into careminster 2012-11-19 22:53:03 +00:00
Robert Adams 079a1e704f BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim libraries with code stripped of the obsolete code. 2012-11-18 18:17:30 -08:00
Melanie 06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Justin Clark-Casey (justincc) 7861090a17 Replace old Prebuild.exe accidentally added back in f977291 with one built without <copy> nant target generation and on mono 2.4.3 2012-11-14 02:44:10 +00:00
Justin Clark-Casey (justincc) f977291a44 Replace previously updated Prebuild.exe with one built directly with mono 2.4.3 2012-11-14 02:40:37 +00:00
Justin Clark-Casey (justincc) 90c6d2e50c Stop Prebuild from generating <copy> statements which unnecessarily copy files into bin/Debug or bin/Release
nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug
However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly https://github.com/nant/nant/pull/39).
Which makes nant time-consumingly copy these files when the aren't actually used.
Tested removal of <copy> on both nant 0.91 and nant 0.92
Will be submitting this patch to prebuild project for comment though I suspect there's nobody there to pay attention.
2012-11-14 02:25:07 +00:00
Melanie d84de8c9b6 Merge branch 'master' into careminster 2012-11-11 21:16:58 +00:00
PixelTomsen a180fef99e remove entry OpenGridProtocol in OpenSimDefaults.ini - module was deleted
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 11:16:52 -08:00
Melanie 389077345f Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2012-11-11 16:31:01 +00:00
Diva Canto 4ac857f902 One more module: EventQueueGetModule. Also making it non-optional for this dll. 2012-11-10 08:48:31 -08:00
Melanie b3e99a4d48 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
2012-11-08 04:51:00 +00:00
Robert Adams 6df9d40d99 BulletSim: update the DLLs and SOs 2012-11-06 18:17:00 -08:00
Melanie c623e35805 Merge branch 'master' into careminster 2012-11-04 22:44:42 +00:00