aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into httptestsUbitUmarov2018-01-168-17/+11
|\
| * give up on a property that old monos do compile, but then smore ok execUbitUmarov2018-01-098-9/+3
| |
| * fall back to a obsolete property since several monos in use (include our ↵UbitUmarov2018-01-088-9/+9
| | | | | | | | own) do not suporte the proper .net4.0 one
* | shut up some pesty warningsUbitUmarov2018-01-152-2/+3
| |
* | change version to 0.9.1.1 so we can see it inworldUbitUmarov2018-01-131-2/+2
| |
* | Merge branch 'master' into httptestsUbitUmarov2018-01-059-9/+30
|\ \ | |/
| * a few more xml thingsUbitUmarov2018-01-058-9/+28
| |
| * disable some XmlResolverUbitUmarov2018-01-042-0/+2
| |
* | fix mergeUbitUmarov2017-12-301-8/+35
|\ \ | |/
| * mantis 8271: work around missing encoding of estate bans on the pseudo url ↵UbitUmarov2017-12-301-8/+35
| | | | | | | | encode used on POST, without changing the xml also used elsewhere. Possible this can be used in other case
* | Merge branch 'master' into httptestsUbitUmarov2017-12-123-1/+181
|\ \ | |/ | | | | | | # Conflicts: # prebuild.xml
| * move some sharable items out of Xmute to Framework; add another test ↵UbitUmarov2017-11-172-0/+180
| | | | | | | | mutelistmodule, ignore it
| * add missing part of mutes list protocolUbitUmarov2017-11-161-1/+1
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-10-301-0/+2
|\ \ | |/
| * mantis 8258: change Mesh basic shape pathScaleY in case of TorusUbitUmarov2017-10-301-0/+2
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-09-161-1/+1
|\ \ | |/
| * bug fix: Of course i had to pick a wrong number for profileBeginUbitUmarov2017-09-161-1/+1
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-09-162-6/+6
|\ \ | |/
| * double request.ReadWriteTimeoutUbitUmarov2017-09-161-2/+2
| |
| * bug fix. Increase the values of profileHollow and profileBegin used to match ↵UbitUmarov2017-09-161-4/+4
| | | | | | | | pbs number of faces and the Mesh number of faces. The small values i used before seem to be randomly lost.
* | Merge branch 'master' into httptestsUbitUmarov2017-08-291-10/+14
|\ \ | |/
| * fix cache.cs (used on parcels info)UbitUmarov2017-08-291-10/+14
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-08-181-1/+1
|\ \ | |/
| * Make VERSION_FLAVOUR public too, per request. I question the practice of ↵Diva Canto2017-08-171-1/+1
| | | | | | | | insulating modules against OS versions this way, but hey! -- different folks, different styles. Given that all other components of the version info are public, there's no reason for keeping this one different.
* | Merge branch 'master' into httptestsUbitUmarov2017-08-163-3/+22
|\ \ | |/
| * mantis 8222UbitUmarov2017-07-291-1/+1
| |
| * partial mantis 8219; on creating or updating items (animationsets, ↵UbitUmarov2017-07-281-2/+20
| | | | | | | | wearables) that reference assets, and user does not have permissions on those, abort and warn, instead of silent invalition of the references to those assets, creating a broken item
| * add new funtion bool MoveMoney(UUID fromUser, UUID toUser, int amount, ↵UbitUmarov2017-07-261-0/+1
| | | | | | | | MoneyTransactionType type, string text). this should be called async allowing time for money module to process it. If returns true, the transation did sucess, so if its use was to pay something, the payed item/service must be provided without fail, otherwise another method is needed so a refund is possible
* | mergeUbitUmarov2017-07-204-16/+44
|\ \ | |/
| * add Util.GetTimeStamp() that returns the stamp in seconds; use it on ubOde; ↵UbitUmarov2017-07-131-1/+8
| | | | | | | | separed land collsions dispatch from the others...
| * replace the wrong libOMV user modifiable Utils.EnUSCulture by our own no ↵UbitUmarov2017-07-131-8/+8
| | | | | | | | User modifiable Culture.FormatProvider, and also for internal coerence. We do use the libomv on other code paths, so that must be fixed
| * osSetParcelDetails: add more land update codeUbitUmarov2017-07-121-0/+1
| |
| * SimpleAngularDistance update prioritization scheme ameks no sense without ↵UbitUmarov2017-07-101-0/+21
| | | | | | | | ordered dequeue of the updates
| * BUG FIX: change lludp hovertext utf-8 cut point. Thx djphilUbitUmarov2017-06-281-3/+3
| |
| * revert EnvironmentTick back to orignal clock, since change may cause issues ↵UbitUmarov2017-06-191-4/+3
| | | | | | | | on some code paths. Clean a bit get mesh and get texture throttle
* | Merge branch 'master' into httptestsUbitUmarov2017-06-192-24/+45
|\ \ | |/
| * framework main thread pool is always active and in use ( even id hard to ↵UbitUmarov2017-06-162-24/+45
| | | | | | | | catch) so show in on show stats. Disable ServerStatsCollector by default, since most don't use it, Adicionally it uses shared framework performance counters system that may be affected if a region crashs
* | Merge branch 'master' into httptestsUbitUmarov2017-06-162-18/+10
|\ \ | |/
| * change the clock source for EnvironmentTickCount so it does get a bit more ↵UbitUmarov2017-06-151-8/+10
| | | | | | | | resolution if avaiable (1ms) specially on windows. This until all calls to this are removed. Coment out some stats in workpool/threads creation path
| * some cleanup.. remove some stats that only some do look at once on a lifetimeUbitUmarov2017-06-141-10/+0
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-06-144-65/+64
|\ \ | |/
| * main generic use JobEngine also does not need a permanent thread.. actually ↵UbitUmarov2017-06-141-1/+1
| | | | | | | | doesn't even seem to be in use
| * make JobEngine be a workitem of mail pool (smartThread), with the option to ↵UbitUmarov2017-06-131-48/+41
| | | | | | | | release thread after a idle time, so is free to do other service elsewhere
| * add option for Fireandforget not timeout (our access to main smartThreadPool)UbitUmarov2017-06-132-9/+9
| |
| * make some web request errors visible, so cause of later asset not found is clearUbitUmarov2017-06-121-7/+13
| |
* | revert. The .net concurrent objects look nice, but mono5 cpu load with them ↵UbitUmarov2017-06-101-32/+30
| | | | | | | | does not
* | replace some locked objects by .net4.0 concurrent objectsUbitUmarov2017-06-101-30/+32
| |
* | mergeUbitUmarov2017-06-102-19/+30
|\ \ | |/
| * only silent remove threads from watch list if they stopped ( ie still ↵UbitUmarov2017-06-091-4/+2
| | | | | | | | consider aborted etc )
| * keep the reverted code, that does work. Our code likes to have pbs.Media == ↵UbitUmarov2017-06-081-15/+28
| | | | | | | | null when there is no MOAD defined, so handle possible odd oars that may have llsd <array /> on that case