aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-126-56/+273
|\
| * Get Watchdog to log thread removalJustin Clark-Casey (justincc)2012-10-121-1/+19
| * Fix percentage stats to multiply by 100. Adjust container name for packetpoo...Justin Clark-Casey (justincc)2012-10-121-2/+2
| * Fix build break by moving OpenSim.Framework.Console back below HttpServer in ...Justin Clark-Casey (justincc)2012-10-121-2/+1
| * Fix packetpool for ImprovedTerseObjectUpdate packets.Justin Clark-Casey (justincc)2012-10-111-3/+13
| * Extend "show stats" command to "show stats [list|all|<category name>]"Justin Clark-Casey (justincc)2012-10-113-52/+189
| * Add "delete object pos <start-coord> to <end-coord>" console command.Justin Clark-Casey (justincc)2012-10-101-2/+2
| * minor: Add documentation to IGridService.GetRegionFlags()Justin Clark-Casey (justincc)2012-10-091-0/+1
| * Once again, forgot to add a file.Justin Clark-Casey (justincc)2012-10-091-0/+52
* | Merge branch 'master' into careminsterMelanie2012-10-074-251/+132
|\ \ | |/
| * On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-061-4/+5
| * Add Vector3.Zero return on TryParseConsoleVector() which fails on mono 2.4.3 ...Justin Clark-Casey (justincc)2012-10-051-0/+3
| * Add missing ConsoleUtil from last commitJustin Clark-Casey (justincc)2012-10-051-0/+111
| * Add "show object pos <start-coord> to <end-coord>" command to simulator console.Justin Clark-Casey (justincc)2012-10-051-0/+13
| * refactor: Move OpenSim.Framework.PacketPool to OpenSim.Region.Clientstack.Lin...Justin Clark-Casey (justincc)2012-10-051-247/+0
* | Merge branch 'master' into careminsterMelanie2012-10-042-2/+156
|\ \ | |/
| * Add generic PercentageStat.Justin Clark-Casey (justincc)2012-10-041-2/+33
| * Add experimental "slow frames" stat, available in "show stats" and via the mo...Justin Clark-Casey (justincc)2012-10-042-2/+125
| * Allow setting connection limits, part 2Melanie2012-09-301-1/+26
| * Allow setting max connections for an endpointMelanie2012-09-301-1/+1
| * Revert "Added request.Proxy=null everywhere, as discussed in http://stackover...Diva Canto2012-09-308-14/+0
| * Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com...Diva Canto2012-09-308-0/+14
* | Merge branch 'avination' into careminsterMelanie2012-09-291-0/+4
|\ \
| * | Update the Http server with a few additional properties. Adapt the testMelanie2012-09-271-0/+4
* | | Merge branch 'master' into careminsterMelanie2012-09-292-5/+5
|\ \ \ | | |/ | |/|
| * | Fix bug where debug http level 6 could not be specified. Also converts newli...Justin Clark-Casey (justincc)2012-09-292-5/+5
* | | 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