d06c85ea77
Reinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() in order to avoid a race condition.
...
A separate PhysicsActor variable is used in case some other thread removes the PhysicsActor whilst this code is executing.
If this is now impossible please revert - just adding this now whilst I remember.
Also makes method comment into proper method doc.
2013-07-13 00:29:07 +01:00
b4cb644a05
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-13 00:03:23 +01:00
3d118fb580
In co-op termination, extend EventWaitHandle to give this an indefinite lifetime in order to avoid a later RemotingException if scripts are being loaded into their own domains.
...
This is necessary because XEngineScriptBase now retains a reference to an EventWaitHandle when co-op termination is active.
Aims to address http://opensimulator.org/mantis/view.php?id=6634
2013-07-13 00:02:54 +01:00
fa02f28dbf
Add ToOSDMap() overrides to the Stat subclass CounterStat.
...
Add a GetStatsAsOSDMap method to StatsManager which allows the filtered
fetching of stats for eventual returning over the internets.
2013-07-12 14:04:14 -07:00
3d700bb42c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-12 12:54:29 -07:00
29f6ae199e
Changed UploadBakedTextureModule so that it uses the same pattern as the others, in preparation for experiments to direct baked texture uploads to a robust instance. No functional or configuration changes -- should work exactly as before.
2013-07-12 12:53:58 -07:00
65239b059f
Enhance NullEstateData to remember stored estate values and return
...
them next time asked. This keeps any estate settings from being reset
when the estate dialog is opened in a region with null estate storage.
2013-07-11 20:55:32 -07:00
1909ee70f8
Centralize duplicated code in SceneObjectPart for subscribing to
...
collision events. Improve logic for knowing when to add processing
routine to physics actor.
2013-07-11 16:57:07 -07:00
83d1680057
Added a few more thingies to the asset client test to poke the threadpool.
2013-07-11 16:43:43 -07:00
ba8f9c9d0a
Try naming the materials handlers again, this time registering the POST as RenderMaterials
...
This was probably the mistake.
The other handlers are named RenderMaterials as well but this actully has no affect apart from on stats, due to a (counterintuitive) disconnect between the registration name and the name of the request handler.
Will be tested very soon and reverted if this still does not work.
2013-07-11 23:51:10 +01:00
7c2e4786ce
minor: remove some regression test logging switches accidentally left uncommented.
2013-07-11 23:19:55 +01:00
e15a15688b
minor: Take out unnecessary clumsy sleep at the end of regression Test404Response().
...
This wasn't actually necessary in the end but was accidentally left in.
2013-07-11 23:11:35 +01:00
f57f49eede
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-11 23:05:10 +01:00
44e9849ed1
Fix regression where llHTTPRequests which did not get an OK response returned 499 and the exception message in the http_response event rather than the actual response code and body.
...
This was a regression since commit 831e4c3http://opensimulator.org/mantis/view.php?id=6704
2013-07-11 23:02:30 +01:00
ee51a9f9c9
Added property to make for more flexible testing.
2013-07-11 14:23:37 -07:00
51d106cff8
Added a test for the asset service
2013-07-11 14:21:57 -07:00
c4f1ec1fd6
Changed the UserProfileModule so that it's less greedy in terms of thread usage.
2013-07-11 10:21:20 -07:00
ea371a6f54
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-11 09:48:15 -07:00
604967b31e
Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they are also non-blocking handlers.
2013-07-11 09:47:46 -07:00
3b48b6a792
Switched TransferRequest (UDP packet handler) to sync. The permissions checks may block, so they get a FireAndForget. Everything else is non-blocking.
2013-07-11 09:44:48 -07:00
0120e858b7
remove names from Capability handlers (added by justincc in commit 013710168b) as they seem to disable the use of multiple access methods for a single Capability in MaterialsDemoModule
2013-07-10 22:30:41 -07:00
9173130fde
Switched RegionHandshakeReply to Sync, because it's not doing anything blocking.
2013-07-10 20:48:13 -07:00
fe5da43d15
EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of async. This _shouldn't_ screw things up, given that all this does is to dump the request in a queue.
2013-07-10 19:29:14 -07:00
bdaeb02863
show client stats: Fixed the requests/min. Also changed the spelling of the command, not without the dash.
2013-07-10 17:14:20 -07:00
864a86983e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-10 16:10:04 -07:00
1b265b213b
Added show client-stats [first last] command to expose what viewers are requesting.
2013-07-10 16:09:45 -07:00
59d19f038a
Remove a null reference exception in SimianPresenceServiceConnector that
...
occurs when GetGridUserInfo cannot find the requested user info.
2013-07-10 08:55:54 -07:00
38e6da5522
Comment out old inbound UDP throttling hack. This would cause the UDP
...
reception thread to sleep for 30ms if the number of available user worker
threads got low. It doesn't look like any of the UDP packet types are
marked async so this check is 1) unnecessary and 2) really crazy since
it stops up the reception thread under heavy load without any indication.
2013-07-09 18:34:24 -07:00
bb6fb65392
Revert "minor: remove some mono compiler warnings in UserProfileModule"
...
Revert until we understand why all the calls to GetUserProfileServerURI were also
commented out.
This reverts commit 5f58b9b552
2013-07-09 18:24:39 -07:00
cec8e6d0f7
If a sensor is in an attachment, avoid throwing an exception if the attachee is removed from the scene before we try to retrieve them.
2013-07-09 23:52:47 +01:00
095066b1ce
Handle UUIDNameRequest UDP packet processing async instead of within the main inbound UDP processing loop, to avoid any chance that this is delaying the main udp in loop.
...
The potential impact of this should be lower now that these requests are being placed on a queue.
2013-07-09 23:39:29 +01:00
d0dfb744b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-09 14:13:51 -07:00
67e500383e
Put guards on a bunch of exception-inducing code, as seen in logs from load test.
2013-07-09 14:12:52 -07:00
2c761cef19
BulletSim: add parameter to optionally disable vehicle linear deflection.
...
Add parameter to not apply vehicle linear deflection Z forces if
vehicle is not colliding. This defaults to 'true' so vehicles will fall
even if there is some linear deflection to apply.
2013-07-09 09:37:42 -07:00
065f8f56a2
remove some cruft and trigger a rebuild
2013-07-08 19:18:01 -07:00
33eea62606
remove an invalid null UUID check which caused a warning
2013-07-08 17:12:39 -07:00
fad4241e4e
BulletSim: make all the different angularVerticalAttraction algorithms
...
selectable from configuration paramters.
Changed default algorithm to "1" from previous default as it seems to
handle Y axis correction a little better.
Add config file independent enablement of vehicle angular forces to
make debugging easier (independent testing of forces).
2013-07-08 16:24:31 -07:00
76b2b20f7e
minor: remove mono compiler warnings from HGSuitcaseInventoryService
2013-07-09 00:06:22 +01:00
5f58b9b552
minor: remove some mono compiler warnings in UserProfileModule
2013-07-09 00:04:46 +01:00
83da14008f
minor: remove some mono compiler warnings in new groups code
2013-07-08 23:57:05 +01:00
af9b17c545
minor: remove mono compiler warnings related to keyframe code
2013-07-08 23:52:40 +01:00
2025dd25f6
Add missing file BaseOutputStreamHandler.cs from recent commit e19defd
2013-07-08 23:50:40 +01:00
047ef9c2a5
minor: remove some mono compiler warnings in OdePlugin
2013-07-08 23:36:57 +01:00
eccec4f8f6
minor: remove now unused migration-hack bool from DAMap
2013-07-08 23:32:19 +01:00
8be59829d1
minor: Add back commented out logging message in Caps.RegisterHandler() that I accidentally removed.
2013-07-08 22:41:24 +01:00
013710168b
For stat purposes, add names to capability request handlers where these were not set
2013-07-08 22:39:07 +01:00
dc54581700
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-08 22:19:37 +01:00
b2d4b8b1da
BaseHttpServer: if the handler sets the content length, don't override it. This happens in HEAD handlers.
2013-07-08 14:12:11 -07:00
c3db595944
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-08 22:07:27 +01:00
e19defde36
Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap
...
This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected.
This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle()
However, existing inheriting classes overriding Handle() will still work, albeit without stats recording.
"show caps" becomes "show caps list" to disambiguate between show caps commands
2013-07-08 22:03:07 +01:00
Justin Clark-Casey (justincc)