aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Expand)AuthorAgeFilesLines
* minor cleanupUbitUmarov2015-12-091-17/+4
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-011-2/+2
|\
| * Testing stage of the new versioning system. Use at own risk. May notMelanie Thielker2015-10-311-3/+3
| * On to 0.8.3!Diva Canto2015-10-181-1/+1
| * Clean up of simulation version, the number that rules the compatibility of te...Diva Canto2015-10-181-1/+2
* | On to 0.8.3!Diva Canto2015-10-181-1/+1
* | Fixed merge conflictsDiva Canto2015-10-181-1/+2
* | dont let http keepalive and context reuse be trueUbitUmarov2015-09-232-3/+16
* | remove duplicated and breaking codeUbitUmarov2015-09-211-3/+0
* | Remove the last proprietary copyright headers, insert BSD ones.Melanie Thielker2015-09-131-1/+1
* | at last we can login and see objects ( friends is dead and disable inUbitUmarov2015-09-031-50/+6
* | seems to compile ( tests comented out)UbitUmarov2015-09-024-175/+31
* | bad merge?UbitUmarov2015-09-017-50/+695
|\ \ | |/ |/|
| * change pollService stop() to send 503 error and no keepalive. ( untested )UbitUmarov2015-08-182-6/+32
| * do keepalive on mesh and texture GET. Dont use reusecontext any where.UbitUmarov2015-08-181-1/+1
| * try to serialize http requests from same connection, so they are processedUbitUmarov2015-08-182-0/+84
| * TEST**** wingridproxy detection at grid login. Untested possible notUbitUmarov2014-10-241-0/+15
| * change/fix previus commitsUbitUmarov2014-10-131-2/+10
| * tune poll smartThreadpool use and give it a nameUbitUmarov2014-10-131-2/+5
| * Comment out stupid XEngine-bound message about script vs non-script startup, ...Melanie Thielker2014-08-091-6/+6
| * change previus code, send a NoEvents response back to http server, evenUbitUmarov2014-07-241-3/+0
| * request.DoHTTPGruntWork(..) is now identical to our version, so useUbitUmarov2014-07-231-40/+5
| * Intermediate commit. Sill errors.Melanie2014-01-051-2/+2
| |\
| * \ Merge branch 'master' into careminsterMelanie2013-11-231-1/+1
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-11-033-0/+317
| |\ \ \
| * \ \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-10-061-0/+1
| |\ \ \ \
| | * | | | * Fixes cases where Last Attachment Point gets overwritten with 0 when it sho...teravus2013-10-051-0/+1
| * | | | | Merge branch 'master' into careminsterMelanie2013-10-063-4/+67
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'master' into careminsterMelanie2013-10-041-1/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-071-2/+152
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-291-0/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-244-4/+65
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-189-17/+112
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-234-52/+139
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-131-3/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination-current' into careminsterMelanie2013-06-112-319/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Clean up poll serviceMelanie2013-06-072-319/+0
| * | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-112-7/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination-current' into careminsterMelanie2013-06-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Send 503 when throttling texturesMelanie2013-04-251-1/+1
| * | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-04-101-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-04-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-191-3/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-152-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-053-1/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-271-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-271-12/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-074-1/+1145
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \