Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() ↵ | Justin Clark-Casey (justincc) | 2013-07-13 | 1 | -8/+12 |
| | | | | | | | | 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. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-07-13 | 5 | -10/+134 |
|\ | |||||
| * | Add ToOSDMap() overrides to the Stat subclass CounterStat. | Robert Adams | 2013-07-12 | 3 | -0/+88 |
| | | | | | | | | | | Add a GetStatsAsOSDMap method to StatsManager which allows the filtered fetching of stats for eventual returning over the internets. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-07-12 | 7 | -106/+312 |
| |\ | |||||
| * | | Changed UploadBakedTextureModule so that it uses the same pattern as the ↵ | Diva Canto | 2013-07-12 | 1 | -8/+27 |
| | | | | | | | | | | | | others, in preparation for experiments to direct baked texture uploads to a robust instance. No functional or configuration changes -- should work exactly as before. | ||||
| * | | Added a few more thingies to the asset client test to poke the threadpool. | Diva Canto | 2013-07-11 | 1 | -2/+19 |
| | | | |||||
* | | | In co-op termination, extend EventWaitHandle to give this an indefinite ↵ | Justin Clark-Casey (justincc) | 2013-07-13 | 1 | -2/+21 |
| |/ |/| | | | | | | | | | | | 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 | ||||
* | | Enhance NullEstateData to remember stored estate values and return | Robert Adams | 2013-07-11 | 1 | -7/+21 |
| | | | | | | | | | | 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. | ||||
* | | Centralize duplicated code in SceneObjectPart for subscribing to | Robert Adams | 2013-07-11 | 1 | -54/+43 |
| | | | | | | | | | | collision events. Improve logic for knowing when to add processing routine to physics actor. | ||||
* | | Try naming the materials handlers again, this time registering the POST as ↵ | Justin Clark-Casey (justincc) | 2013-07-11 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | minor: remove some regression test logging switches accidentally left ↵ | Justin Clark-Casey (justincc) | 2013-07-11 | 2 | -2/+2 |
| | | | | | | | | uncommented. | ||||
* | | minor: Take out unnecessary clumsy sleep at the end of regression ↵ | Justin Clark-Casey (justincc) | 2013-07-11 | 1 | -3/+0 |
| | | | | | | | | | | | | Test404Response(). This wasn't actually necessary in the end but was accidentally left in. | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-07-11 | 3 | -7/+109 |
|\ \ | |/ | |||||
| * | Added property to make for more flexible testing. | Diva Canto | 2013-07-11 | 1 | -0/+5 |
| | | |||||
| * | Added a test for the asset service | Diva Canto | 2013-07-11 | 1 | -0/+99 |
| | | |||||
| * | Changed the UserProfileModule so that it's less greedy in terms of thread usage. | Diva Canto | 2013-07-11 | 1 | -7/+5 |
| | | |||||
* | | Fix regression where llHTTPRequests which did not get an OK response ↵ | Justin Clark-Casey (justincc) | 2013-07-11 | 3 | -41/+244 |
|/ | | | | | | | | 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 831e4c3 (Thu Apr 4 00:36:15 2013) This commit also adds a regression test for this case, though this currently only works with Mono This aims to address http://opensimulator.org/mantis/view.php?id=6704 | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-07-11 | 1 | -7/+4 |
|\ | |||||
| * | remove names from Capability handlers (added by justincc in commit ↵ | dahlia | 2013-07-10 | 1 | -7/+4 |
| | | | | | | | | 013710168b3878fc0a93a92a1c026efb49da9935) as they seem to disable the use of multiple access methods for a single Capability in MaterialsDemoModule | ||||
* | | Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they ↵ | Diva Canto | 2013-07-11 | 1 | -2/+2 |
| | | | | | | | | are also non-blocking handlers. | ||||
* | | Switched TransferRequest (UDP packet handler) to sync. The permissions ↵ | Diva Canto | 2013-07-11 | 1 | -99/+115 |
|/ | | | | checks may block, so they get a FireAndForget. Everything else is non-blocking. | ||||
* | Switched RegionHandshakeReply to Sync, because it's not doing anything blocking. | Diva Canto | 2013-07-10 | 1 | -1/+1 |
| | |||||
* | EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of async. ↵ | Diva Canto | 2013-07-10 | 1 | -1/+1 |
| | | | | This _shouldn't_ screw things up, given that all this does is to dump the request in a queue. | ||||
* | show client stats: Fixed the requests/min. Also changed the spelling of the ↵ | Diva Canto | 2013-07-10 | 1 | -21/+22 |
| | | | | command, not without the dash. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-07-10 | 1 | -4/+8 |
|\ | |||||
| * | Remove a null reference exception in SimianPresenceServiceConnector that | Robert Adams | 2013-07-10 | 1 | -4/+8 |
| | | | | | | | | occurs when GetGridUserInfo cannot find the requested user info. | ||||
* | | Added show client-stats [first last] command to expose what viewers are ↵ | Diva Canto | 2013-07-10 | 4 | -20/+145 |
|/ | | | | requesting. | ||||
* | Comment out old inbound UDP throttling hack. This would cause the UDP | Robert Adams | 2013-07-09 | 1 | -0/+2 |
| | | | | | | | 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. | ||||
* | Revert "minor: remove some mono compiler warnings in UserProfileModule" | Robert Adams | 2013-07-09 | 1 | -13/+16 |
| | | | | | | | Revert until we understand why all the calls to GetUserProfileServerURI were also commented out. This reverts commit 5f58b9b5526c401e039d27b8c92603ff02421fb8. | ||||
* | If a sensor is in an attachment, avoid throwing an exception if the attachee ↵ | Justin Clark-Casey (justincc) | 2013-07-09 | 1 | -0/+10 |
| | | | | is removed from the scene before we try to retrieve them. | ||||
* | Handle UUIDNameRequest UDP packet processing async instead of within the ↵ | Justin Clark-Casey (justincc) | 2013-07-09 | 1 | -1/+1 |
| | | | | | | 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. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-07-09 | 62 | -341/+709 |
|\ | |||||
| * | BulletSim: add parameter to optionally disable vehicle linear deflection. | Robert Adams | 2013-07-09 | 2 | -16/+34 |
| | | | | | | | | | | | | 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. | ||||
| * | remove some cruft and trigger a rebuild | dahlia | 2013-07-08 | 1 | -1/+0 |
| | | |||||
| * | remove an invalid null UUID check which caused a warning | dahlia | 2013-07-08 | 1 | -8/+1 |
| | | |||||
| * | BulletSim: make all the different angularVerticalAttraction algorithms | Robert Adams | 2013-07-08 | 4 | -138/+146 |
| | | | | | | | | | | | | | | | | 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). | ||||
| * | minor: remove mono compiler warnings from HGSuitcaseInventoryService | Justin Clark-Casey (justincc) | 2013-07-09 | 1 | -3/+3 |
| | | |||||
| * | minor: remove some mono compiler warnings in UserProfileModule | Justin Clark-Casey (justincc) | 2013-07-09 | 1 | -16/+13 |
| | | |||||
| * | minor: remove some mono compiler warnings in new groups code | Justin Clark-Casey (justincc) | 2013-07-08 | 4 | -8/+1 |
| | | |||||
| * | minor: remove mono compiler warnings related to keyframe code | Justin Clark-Casey (justincc) | 2013-07-08 | 2 | -8/+3 |
| | | |||||
| * | Add missing file BaseOutputStreamHandler.cs from recent commit e19defd | Justin Clark-Casey (justincc) | 2013-07-08 | 1 | -0/+60 |
| | | |||||
| * | minor: remove some mono compiler warnings in OdePlugin | Justin Clark-Casey (justincc) | 2013-07-08 | 2 | -2/+1 |
| | | |||||
| * | minor: remove now unused migration-hack bool from DAMap | Justin Clark-Casey (justincc) | 2013-07-08 | 1 | -4/+0 |
| | | |||||
| * | minor: Add back commented out logging message in Caps.RegisterHandler() that ↵ | Justin Clark-Casey (justincc) | 2013-07-08 | 1 | -0/+1 |
| | | | | | | | | I accidentally removed. | ||||
| * | For stat purposes, add names to capability request handlers where these were ↵ | Justin Clark-Casey (justincc) | 2013-07-08 | 5 | -11/+20 |
| | | | | | | | | not set | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-07-08 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-07-08 | 26 | -340/+440 |
| |\ \ | |||||
| * | | | Add "show caps stats by user" and "show caps stats by cap" console commands ↵ | Justin Clark-Casey (justincc) | 2013-07-08 | 43 | -80/+346 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Make dictionary read/write locking consistent in CapabilitiesModule, rename ↵ | Justin Clark-Casey (justincc) | 2013-07-08 | 1 | -48/+82 |
| | | | | | | | | | | | | | | | | two dictionary fields to standard m_ format | ||||
* | | | | Put guards on a bunch of exception-inducing code, as seen in logs from load ↵ | Diva Canto | 2013-07-09 | 6 | -6/+20 |
| |_|/ |/| | | | | | | | | test. |