aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-09-277-50/+52
|\
| * create a new PollServiceHttpRequest req per loop since they can be sent toUbitUmarov2012-09-271-5/+1
| * add assettype mesh to list of binary assetsUbitUmarov2012-09-261-1/+2
| * missing fileUbitUmarov2012-09-261-1/+1
| * just remove the damm thingUbitUmarov2012-09-263-25/+3
| * Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-262-3/+10
| * keep watchdog happy using it to kill his threadsUbitUmarov2012-09-261-9/+1
| * more changes to PollServiceUbitUmarov2012-09-262-24/+18
| * fix priorityQueue to correctly use the fairness counts starting at 8 forUbitUmarov2012-09-261-10/+10
| * add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-0/+1
| * Change the poll service to use a thread pool for replies to make sure theMelanie2012-09-231-7/+38
| * Catch a nullref in the code to suppress GetTexture warnign spam we can'tMelanie2012-09-161-1/+1
| * Sequence/throttle asset retrievals.Melanie2012-09-141-0/+2
* | Merge branch 'master' into careminsterMelanie2012-09-246-151/+381
|\ \
| * | Make BaseHttpServer throws say something useful.Diva Canto2012-09-221-2/+2
| * | Minor: may avoid crashes of sims that still don't have this configuration sec...Diva Canto2012-09-211-0/+3
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-214-113/+136
| |\ \
| | * | minor: Make slow outgoing request log messages consistent with other log mess...Justin Clark-Casey (justincc)2012-09-211-7/+7
| | * | Comment out the long unused afaik HTTP agent handlers.Justin Clark-Casey (justincc)2012-09-213-87/+87
| | * | Add request number counting to incoming HTTP requests in the same way that th...Justin Clark-Casey (justincc)2012-09-212-19/+42
| * | | Improvement over last commit: refactor the asset permissions code, so that it...Diva Canto2012-09-201-0/+81
| |/ /
| * | Insert a new log level 4 for HTTP IN and HTTP OUT that will log how long the ...Justin Clark-Casey (justincc)2012-09-203-32/+87
| * | Add ability to turn on/off logging of outgoing HTTP requests flowing through ...Justin Clark-Casey (justincc)2012-09-203-35/+103
| * | Fix some inconsistencies in configurartion: NonPhys primsBlueWall2012-09-181-4/+4
* | | Merge branch 'avination' into careminsterMelanie2012-09-164-18/+57
|\ \ \ | | |/ | |/|
| * | Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-143-17/+36
| * | Allow setting connection limits, part 2Melanie2012-09-141-0/+20
| * | Allow setting max connections for an endpointMelanie2012-09-141-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-09-165-20/+154
|\ \ \ | | |/ | |/|
| * | Support multi-region OAR filesOren Hurvitz2012-09-141-0/+5
| * | Fix usage statement on "debug http" console command since max level is now 5 ...Justin Clark-Casey (justincc)2012-09-121-1/+1
| * | Fix bug in logging sample input at debug http level 4.Justin Clark-Casey (justincc)2012-09-121-1/+1
| * | mathematically & hypothetically speaking we want to avoid negative values bei...SignpostMarv2012-09-121-7/+7
| * | Make "show http-handlers" command available for ROBUST instances as well as t...Justin Clark-Casey (justincc)2012-09-121-0/+51
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-121-1/+19
| |\ \
| * | | Add levels 4 and 5 to "debug http" console command that will log a sample of ...Justin Clark-Casey (justincc)2012-09-113-12/+90
* | | | Merge branch 'avination' into careminsterMelanie2012-09-101-1/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | add a extra httppool thread to compensate for webfetchinventoryUbitUmarov2012-09-101-1/+2
* | | | Merge branch 'master' into careminsterMelanie2012-09-092-0/+19
|\ \ \ \ | | |_|/ | |/| |
| * | | implementing per-region configuration of limits on the number of prims one ca...SignpostMarv2012-09-091-1/+19
| | |/ | |/|
| * | 4096 is used in various places as the maximum height of a region, refactoring...SignpostMarv2012-09-081-0/+1
* | | Merge branch 'master' into careminsterMelanie2012-09-071-1/+1
|\ \ \ | |/ /
| * | Bump master code up to 0.7.5 now that 0.7.4 is out.Justin Clark-Casey (justincc)2012-09-041-1/+1
* | | Merge branch 'avination' into careminsterMelanie2012-08-312-2/+4
|\ \ \ | | |/ | |/|
| * | Fix background inventory loading (Viewer 3) so it won't lag out the simMelanie2012-08-242-2/+4
* | | Merge branch 'master' into careminsterMelanie2012-08-292-15/+17
|\ \ \ | | |/ | |/|
| * | Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where folder...Justin Clark-Casey (justincc)2012-08-292-15/+17
* | | Merge branch 'master' into careminsterMelanie2012-08-232-31/+67
|\ \ \ | |/ /
| * | Tighten up OpenSim.Framework.Cache locking to avoid race conditions.Justin Clark-Casey (justincc)2012-08-201-30/+53
| * | Add --force flag to "kick user" console command to allow bypassing of recent ...Justin Clark-Casey (justincc)2012-08-201-0/+14