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
39b388a094
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-09 15:31:50 -08:00
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
5732ce9184
Replaced Mono.Addins dlls with ones compiled in Windows 64-bit.
2012-12-09 15:28:56 -08:00
8efae93b51
Restrict IPresenceData.VerifyAgent
...
Restrict IPresenceData.VerifyAgent to only return bool result
2012-12-09 15:08:32 -05:00
a37040d07a
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-12-08 17:34:08 -05:00
f85b23edea
Add agent verification to Presence
2012-12-08 17:33:03 -05:00
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
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
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
addb791f3d
BulletSim: update comments and add more to TODO list.
2012-12-08 09:14:28 -08:00
8de9f9dd4a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-08 01:37:10 +00:00
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
77e88fab06
Format change
...
Removed some white space in a line, looking to trigger a build
2012-12-07 20:19:16 -05:00
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
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
cba1390ffd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-07 16:56:03 -05:00
16d18afe21
Added missing config var in grided sims.
2012-12-07 12:38:19 -08:00
0b455d2882
Merge branch 'master' into connector_plugin
2012-12-07 15:36:43 -05:00
3c9f8c9c46
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-06 20:04:59 -08:00
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
4e622f6816
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-07 00:53:47 +00:00
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
2012-12-07 00:47:04 +00:00
707e186aa3
BulletSim: update DLLs and SOs with vehicle collision event check
2012-12-06 09:34:30 -08:00
7fd8202ae3
BulletSim: rewrite and improve vehicle angularDeflection, verticalAttraction,
...
linearMotorUp and related vehicle forces.
Fixed problems with downward vehicle position correction forces being too large.
Add vehicle collision flag so can sense whether vehicle is on the ground.
2012-12-06 09:31:12 -08:00
edd1b353a5
BulletSim: update and add to the TODO list.
2012-12-06 09:31:05 -08:00
18fe35906d
BulletSim: add detail logging detail flag so I don't have to comment and uncomment the detail logging when changing the depth of logged info.
2012-12-06 09:30:57 -08:00
cc59e3cbdf
BulletSim: only check position sanity if the prim is physical -- the user can do anything dumb they wish.
2012-12-06 09:30:50 -08:00
2ecd8e6720
BulletSim: add values for material friction and restitution. Fix line endings in material definition file.
2012-12-06 09:30:42 -08:00
6d7f66f781
BulletSim: Don't add gravity to down force -- let Bullet do that. Add VehicleAddForce to set of managed vehicle prim properties.
2012-12-06 09:30:35 -08:00
e599a8b242
BulletSim: Vehicle angular vertical attraction works. Other vehicle angular forces commented out for the moment for debugging.
2012-12-06 09:30:28 -08:00
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
68daeee434
minor: change method doc on GetTextureHandler.TryParseRange(), mainly to trigger another build
2012-12-06 01:36:30 +00:00
acc01bb85d
Allow GetTexture calls with no second value in the range header (e.g. just 5333-)
...
It looks like the latest Kokua is doing this.
As per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html , leaving off the second value is legal
This indicates the caller wants the rest of the entity.
2012-12-06 01:12:12 +00:00
1c9ecc55d3
Instead of printing script errors out to console, put to debug log so that we also get timestamps.
...
This commit also adds script name, part name, uuid, etc. for later identification.
This information has been sent to console since 2009 but may be turned down if it proves too noisy.
However, I still currently need it to investigate some region problems probably triggered by scripting.
2012-12-06 00:22:52 +00:00
e60fe958df
minor: Fix more compiler warnings in CoreModules tests by properly overriding OpenSimTestCase.SetUp()
2012-12-05 23:44:12 +00:00
ec765de7e5
Add engine-wide events queued and events processed numbers to output of "xengine status" console command. For debugging purposes.
2012-12-05 23:41:50 +00:00
66982c8a59
Remove some mono warnings in script tests, chiefly where SetUp() wasn't properly calling to OpenSimTestCase.SetUp()
2012-12-05 23:36:15 +00:00
5ba99cbf55
Add IScriptInstance.EventsQueued to match EventsProcessed instead of asking callers to lock and directly inspect the EventQueue
2012-12-05 23:33:48 +00:00
652f4bcb42
For now, sort "show scripts" output in descending order sorted by events processed.
...
For debug purposes - should later add options to allow different sorting or show only highest 10, etc.
2012-12-05 23:27:50 +00:00
e8df0f1b4c
Add IScriptInstance.EventsProcessed stat so that we can record this information and display in "show scripts" for debug purposes
2012-12-05 22:33:46 +00:00
0f3ebe0971
Remove very probably unused PrimitiveBaseShape(bool) constructor to reduce code complexity
2012-12-05 22:12:45 +00:00
b60c6bc3f8
Don't pointlessly set ExtraParams = byte[1] in PrimitiveBaseShape since this is ignored by the ExtraParams properly anyway
2012-12-05 22:01:47 +00:00
2342d20a7e
minor: tidy up spacing at bottom of MundaneFrameworkTests
2012-12-05 21:53:25 +00:00
fdf8876e20
In BaseHttpServer.HandleRequest(), use Culture.SetCurrentCulture() rather than creating a new CultureInfo separately
2012-12-05 21:52:10 +00:00
ea786414c2
In XEngine.DoOnRezScript() use Culture.SetCurrentCulture() instead of constructing a new CultureInfo separately
2012-12-05 21:51:08 +00:00
d97440c7cf
On XEngine.ProcessEventHandler(), instead of creating a new CultureInfo on every call use the single one set by Culture.SetCurrentCulture()
...
This is slightly different in that SetCurrentCulture() does not use overridden settings if the system culture matches en-US but some settings there have been changed.
This is what we want - we do not want to use any system overriden settings.
2012-12-05 21:40:28 +00:00
1b5f21f761
minor: also comment out the debug log message which reports searching for child agents in simulator scenes for now.
2012-12-04 23:07:26 +00:00
0d4047e641
minor: Comment out "Delivering IM to..." messages for now.
2012-12-04 23:06:02 +00:00
fb26d32a5c
minor: Put Scene.PhysicsRequestAsset() into standard C# xml format.
2012-12-04 22:33:25 +00:00
Diva Canto