Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into httptests | UbitUmarov | 2017-05-27 | 4 | -41/+76 |
|\ | |||||
| * | cleanup (grid)region info endpoint; add log to try to find some xml decode ↵ | UbitUmarov | 2017-05-26 | 2 | -36/+61 |
| | | | | | | | | issues | ||||
| * | missing file change.. actually use watchdog threads on assetsconnector and | UbitUmarov | 2017-05-26 | 1 | -2/+5 |
| | | | | | | | | avoid null refs on JobEngine | ||||
| * | change wrong watchdog stopped thread check code, and don't log it | UbitUmarov | 2017-05-26 | 1 | -3/+10 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-25 | 5 | -8/+43 |
|\ \ | |/ | |||||
| * | move assetsconnector threads to whatchdog; Abort all alive threads known to ↵ | UbitUmarov | 2017-05-25 | 3 | -1/+27 |
| | | | | | | | | watchdog before exit | ||||
| * | use threads from main pool on assetsconnector | UbitUmarov | 2017-05-25 | 1 | -1/+0 |
| | | |||||
| * | make a few more threads background ones | UbitUmarov | 2017-05-25 | 1 | -2/+2 |
| | | |||||
| * | add a bit more pre exit cleanup | UbitUmarov | 2017-05-24 | 2 | -4/+14 |
| | | |||||
* | | merge master | UbitUmarov | 2017-05-23 | 5 | -15/+41 |
|\ \ | |/ | |||||
| * | stop a few more threads on exit | UbitUmarov | 2017-05-23 | 2 | -1/+7 |
| | | |||||
| * | please DIE! PLEASE?? | UbitUmarov | 2017-05-23 | 3 | -6/+26 |
| | | |||||
| * | fix IClientIPEndpoint broken by justin long ago.. but stop using it | UbitUmarov | 2017-05-22 | 1 | -1/+1 |
| | | | | | | | | | | except on SceneBanner, later it my be also removed from there and everywhere | ||||
| * | make sure we drop requests if DoHTTPGruntWork fails | UbitUmarov | 2017-05-22 | 1 | -4/+9 |
| | | |||||
* | | reenqueue poll events while conn is open, and not expired | UbitUmarov | 2017-05-21 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-21 | 2 | -35/+3 |
|\ \ | |/ | |||||
| * | remove LongPoll type and queues. Events should now have reduced latency ↵ | UbitUmarov | 2017-05-21 | 2 | -35/+3 |
| | | | | | | | | also. About previus commit, it maybe a modified ingen-e3s-v1.33 script that is broken, and not the original version, can't tell | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-19 | 1 | -39/+9 |
|\ \ | |/ | |||||
| * | remove a Paralell.For (actually not used). That kind of fine gained ↵ | UbitUmarov | 2017-05-15 | 1 | -39/+9 |
| | | | | | | | | multitask makes no sense on already heavy multitasked server application like opensim. CPU cores are already busy or needed elsewhere. | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-14 | 4 | -34/+46 |
|\ \ | |/ | |||||
| * | clear land object on delete | UbitUmarov | 2017-05-14 | 1 | -0/+2 |
| | | |||||
| * | fix some issue on parcels loading and make parcels dwell show something. ↵ | UbitUmarov | 2017-05-14 | 1 | -4/+8 |
| | | | | | | | | Resolution is 2.5min aprox. | ||||
| * | find parcels by GlobalID.. well most time | UbitUmarov | 2017-05-13 | 1 | -0/+2 |
| | | |||||
| * | we can't allow abort to change only one dic | UbitUmarov | 2017-05-13 | 1 | -29/+33 |
| | | |||||
| * | fix wrong locking on unused path it case it does get uses. Thanks LaNani Sundara | UbitUmarov | 2017-05-13 | 1 | -1/+1 |
| | | |||||
| * | some conditional dispose on http requests inputstream | UbitUmarov | 2017-05-08 | 2 | -1/+8 |
| | | |||||
* | | some conditional dispose on http requests inputstream | UbitUmarov | 2017-05-08 | 2 | -1/+8 |
| | | |||||
* | | fix merge | UbitUmarov | 2017-05-07 | 2 | -20/+16 |
|\ \ | |/ | |||||
| * | let StreamReader be in using statements | UbitUmarov | 2017-05-07 | 2 | -31/+18 |
| | | |||||
* | | fix merge | UbitUmarov | 2017-05-03 | 3 | -4/+54 |
|\ \ | |/ | |||||
| * | having the file open then let PermissionsToString know about Export | UbitUmarov | 2017-04-30 | 1 | -0/+2 |
| | | |||||
| * | save some nanoseconds if unfolding will not change anything ( export default ↵ | UbitUmarov | 2017-04-30 | 1 | -2/+2 |
| | | | | | | | | mks it rare, but looks nice) | ||||
| * | remove a redundant operation | UbitUmarov | 2017-04-30 | 1 | -2/+0 |
| | | |||||
| * | update folded permitions if taking from world, or after unfold | UbitUmarov | 2017-04-29 | 1 | -6/+22 |
| | | |||||
| * | recover PermissionsUtil.ApplyFoldedPermissions (well my version). its use ↵ | UbitUmarov | 2017-04-29 | 2 | -2/+34 |
| | | | | | | | | easys code readability | ||||
| * | a few changes to permissions folding... we are testing. at this point only ↵ | UbitUmarov | 2017-04-28 | 1 | -1/+4 |
| | | | | | | | | use master for TESTING also | ||||
| * | give more information on Fatal Error during region startup | UbitUmarov | 2017-04-26 | 1 | -2/+1 |
| | | |||||
* | | fix merge | UbitUmarov | 2017-04-25 | 10 | -26/+421 |
|\ \ | |/ | |||||
| * | move mesh pbs creation code out of mesh upload code into to ↵ | UbitUmarov | 2017-04-25 | 1 | -0/+64 |
| | | | | | | | | PrimitiveBaseShape.cs | ||||
| * | several changes for osTeleportObject | UbitUmarov | 2017-04-15 | 1 | -4/+4 |
| | | |||||
| * | add functions to send entity updates imediatly, except for avatars (or now) ↵ | UbitUmarov | 2017-04-14 | 1 | -4/+6 |
| | | | | | | | | they should be use to bypass normal delayed updates, for debug | ||||
| * | store the physics inertia override in Mysql and add it to serializer. run ↵ | UbitUmarov | 2017-04-01 | 1 | -0/+262 |
| | | | | | | | | prebuild is required | ||||
| * | Merge branch 'melanie' | Melanie Thielker | 2017-03-31 | 3 | -3/+43 |
| |\ | |||||
| | * | If a DNS resolution fails on an outbound request, simply allow it | Melanie Thielker | 2017-03-31 | 1 | -2/+12 |
| | | | |||||
| | * | Allow setting the stats log file location in OpenSim.ini rather than ↵ | Melanie Thielker | 2017-03-31 | 2 | -1/+31 |
| | | | | | | | | | | | | app.exe.config | ||||
| * | | Merge branch 'melanie' | Melanie Thielker | 2017-02-01 | 3 | -3/+18 |
| |\ \ | | |/ | |||||
| | * | Refactor asset handling as per Ubit's suggestion | Melanie Thielker | 2017-02-01 | 2 | -4/+5 |
| | | | |||||
| | * | Secure sim stats with an (optional) password. | Melanie Thielker | 2017-02-01 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | There is way too much in these stats to expose them to the world, at least for some of us. | ||||
| | * | Make negative asset caching actually work | Melanie Thielker | 2017-01-30 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | Also fixes some merge artefacts in HGAssetBroker where cached assets were requested but not actually used and completely squelch a materials debug message because there is nothing the user can do to fix it anyway. | ||||
| * | | several changes relative to objects return and parcel prim counts: avoid ↵ | UbitUmarov | 2017-01-27 | 1 | -1/+1 |
| | | | | | | | | | | | | null refs, report correct count of returned objects, make obkects counts by ownership coerent with return rules, etc |