Commit Graph

19185 Commits (04e806036ff6fe9246f7c1ab91f162cb5168bb07)

Author SHA1 Message Date
BlueWall (James Hughes) 5f11b4658e Fix module pathname handling for Windows 2012-12-13 13:15:57 -05:00
BlueWall 203b492fce Update mono addins
Push a small fix for the mono addins
2012-12-13 00:05:34 -05:00
BlueWall 7a87c35f94 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-12-12 23:34:20 -05:00
Justin Clark-Casey (justincc) 8e8da20af2 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-12-13 01:12:12 +00:00
Justin Clark-Casey (justincc) 6fca93f0b1 Fix sounds so that they play from inventory after teleport rather than only on initial login region.
Regression from commit ed162a10 (Fri Oct 5 13:50:12 2012)
We had started listening for the client login event for attaching the sound trigger event rather than OnNewClient
Addresses http://opensimulator.org/mantis/view.php?id=6453
Many thanks to danbanner for identifying the exact commit where this went wrong, which made identifying the fix easy.
2012-12-13 01:03:35 +00:00
Robert Adams e1814aa827 BulletSim: fix problem of avatar's floating off the ground after unsitting. Reworked size/scale logic so physical scale is kept in Bullet and physObject scale is the preferred size -- usually same as size but avatars are computed differently. 2012-12-12 16:51:43 -08:00
Robert Adams 6f1f7f0206 BulletSim: non-functional commenting and reorganization of material attribute specifications. 2012-12-12 16:51:36 -08:00
Robert Adams 7bb5613dc6 BulletSim: updates and rearrangement of the TODO list. 2012-12-12 16:51:29 -08:00
Justin Clark-Casey (justincc) 512e4c9313 Log situations where workitem event threads are aborted on stop request because they failed to complete event processing within the given timeout.
This is for bug hunting purposes where thread aborts may be causing dangling lock issues and subsequent vm crashes on mono (with ReaderWriterLockSlim, etc.)
2012-12-12 23:30:26 +00:00
Justin Clark-Casey (justincc) 047270bdc8 Add "debug script log" command to allow setting a numeric debug level on individual IScriptInstances for debugging purposes.
Current, state changes and event fires can be logged for individual scripts.
See command help for more details.
2012-12-12 23:13:34 +00:00
BlueWall 7be13d16c8 Move setting to correct locations in ini 2012-12-12 17:11:30 -05:00
Justin Clark-Casey (justincc) 418c0cb01d Add asset id to "show script" and "show scripts" command output to make it easier to extract and inspect the script's asset via "dump asset" 2012-12-12 22:06:09 +00:00
BlueWall c5d333c16c Merge branch 'master' of /home/opensim/var/repo/opensim 2012-12-12 16:15:32 -05:00
Robert Adams bb6eeb5429 BulletSim: do not return the current velocity for targetVelocity. 2012-12-12 11:01:36 -08: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
Robert Adams a082ce9da7 BulletSim: fix crash caused by the creation of a linkset child that is under the terrain. Users can sure find some interesting corner conditions. 2012-12-11 14:27:09 -08:00
BlueWall b1849e7fde Hide some console output when initializing addin repository
We do this in OpenSim.exe to hide output when unmanaged dll are scanned by mono addins. Libomv has hard-coded path to "." for the openjpeg libraries, causing output to the console when they are scanned. We will cover this up for now, then look at getting libomv to look for the libs outside the "." later.
2012-12-11 17:03:42 -05:00
Robert Adams d4e0e98c00 BulletSim: protect character property setting to remove crash from taints setting properties after the destroy character taint. 2012-12-11 13:54:26 -08:00
Robert Adams 63099184db BulletSim: protect prim property setting to remove crash from taints setting properties after the destroy object taint has happened. 2012-12-11 13:42:23 -08:00
Robert Adams 905d7c43ad BulletSim: modify LIMIT_MOTOR_UP to limit BOAT types to be at water rather than ground level. This makes boats float at water level better but not perfectly. There probably needs to be some interaction between HOVER and LIMIT_MOTOR_UP. 2012-12-11 00:35:16 -08:00
Robert Adams 8b861e880a BulletSim: add ini file and command line parameters to control
dumping of physical vehicle parameters (out of Bullet) on each
simulation step and to optionally scale vehicle angular velocity
by the time step. The latter looks to be part of a difference
between angular parameters for ODE and BulletSim. SL docs say
angular velocity is measured in radians/timeScale. Not sure if this
is different than what ODE does.
2012-12-11 00:13:13 -08:00
Robert Adams ebf30e7ba6 BulletSim: set mass for single prim linksets when going physical. This fixes single prim vehicles not working (the surf board now zooms). 2012-12-11 00:02:20 -08:00
Robert Adams 93393fb975 BulletSim: comment out some chatty debug logging. Rearrange some code in BSDynamics to make velocity vs force calculation clearer. 2012-12-10 16:46:12 -08:00
Robert Adams 9df85eadf4 BulletSim: Fix crash on the destruction of physical linksets.
While fixing the above, add methods to physical body and shape pointer
wrapper so routines won't have to know that IntPtr.Zero means no
physical instance.
Fix problem with physical linksets failing after a few sits and
unsits by properly restoring child prom positions for compound
linksets after multiple selection and deselections.
2012-12-10 15:35:53 -08:00
Robert Adams a19896cc56 BulletSim: some comments about rebuilding linksets (having to recompute and restore a child's position in the world based on its position in the moved linkset). 2012-12-09 22:32:46 -08:00
Robert Adams ce5083a504 BulletSim: adjust friction and restitution based on material type. 2012-12-09 22:32:46 -08:00
Diva Canto af8d53657d HGAssetMapper: Get wasn't really working. It's true that some assets are copied in the process of being gathered their UUID, but not all. Specifically, terminal assets like textures aren't copied. We have to go one more time through the ids. 2012-12-09 22:05:12 -08:00
Diva Canto b8178f5a50 Switched the order by which foreign inventory and foreign assets are brought in, to avoid race conditions on the client. 2012-12-09 22:03:21 -08:00
Diva Canto 39b388a094 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-12-09 15:31:50 -08:00
Diva Canto cb80d8a29c UserManagementModule: search the local cache for names too.
Inventory transfers: don't do async on asset transfers or now.
2012-12-09 15:31:11 -08:00
Diva Canto 5732ce9184 Replaced Mono.Addins dlls with ones compiled in Windows 64-bit. 2012-12-09 15:28:56 -08:00
BlueWall 8efae93b51 Restrict IPresenceData.VerifyAgent
Restrict IPresenceData.VerifyAgent to only return bool result
2012-12-09 15:08:32 -05:00
BlueWall a37040d07a Merge branch 'master' of /home/opensim/var/repo/opensim 2012-12-08 17:34:08 -05:00
BlueWall f85b23edea Add agent verification to Presence 2012-12-08 17:33:03 -05: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
Robert Adams 04e64d73df BulletSim: set material properties for static objects. Move Linkset.MakeStatic() after call to ForceActivationState2() since linkset might change activation state. Make BSPrim.CreateGeomAndObject public as linkset rebuilding might need access to it. Only rebuild prim if selection state is actually changes -- OpenSimulator calls PhysObject.Selected() multiple times whenever a prim is selected or deselected. 2012-12-08 09:14:40 -08:00
Robert Adams 216c121935 BulletSim: fix small problem with setting size/scale of native shapes which caused the native shapes to be rebuilt when not necessary. 2012-12-08 09:14:34 -08:00
Robert Adams addb791f3d BulletSim: update comments and add more to TODO list. 2012-12-08 09:14:28 -08:00
Justin Clark-Casey (justincc) 8de9f9dd4a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-12-08 01:37:10 +00:00
Justin Clark-Casey (justincc) 63cff49bce Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message to nominate a non-root destination folder.
This is in relation to http://opensimulator.org/mantis/view.php?id=6311
This is after further analysis which shows the viewer expects the server to move the folder for #RLV give but then should be renaming the folder itself.
For some reason this is not happening, possibly because we are not sending BulkUpdates or because we are not using transaction IDs properly.
This needs to be fixed in the future.
However, moving the folder even if the rename isn't correctly triggered in the viewer seems preferable to disabling this code altogether.
2012-12-08 01:29:58 +00:00
BlueWall 77e88fab06 Format change
Removed some white space in a line, looking to trigger a build
2012-12-07 20:19:16 -05:00
BlueWall 063f37cf73 One more time...
needed one more "../" in the path (copy paste): Thanks BrucePatton for catching that one
2012-12-07 20:03:15 -05:00
BlueWall a6e5a2f4df Prebuild fix
Had moved the class to a different namespace but failed to add the reference
2012-12-07 19:41:07 -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
Diva Canto 3c9f8c9c46 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-12-06 20:04:59 -08:00
Diva Canto 8b29db98bd Trying to prevent old route of sending attachments, simulator version unknown maybe due to timeout. mantis #6450 2012-12-06 20:04:32 -08:00
Justin Clark-Casey (justincc) 4e622f6816 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-12-07 00:53:47 +00:00
Justin Clark-Casey (justincc) 0568c76a88 Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the aim of avoiding OpenSimulator problems due to script thread aborts.
When an object is removed, its scripts are stopped and then the thread running them is aborted if stop takes too long.
However, it appears that aborting a thread at just the wrong moment when it is obtaining a ReaderWriterLockSlim lock can leave this lock in an inconsistent state.
One symptom of this is that mono leaps to 100% cpu and a vm thread dump reveals lots of threads waiting for a ReaderWriterLockSlim lock without any thread actually holding it.
This is probably the same problem as encountered originally in commit 12cebb12
This commit looks to plaster this problem by putting lock obtaining methods inside finally blocks which should be uninterruptible by thread aborts.
2012-12-07 00:47:04 +00:00