aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2013-01-241-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | Implement get version RemoteAdmin callMelanie2013-01-231-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-01-232-4/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-192-4/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-165-0/+298
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-12-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-255-176/+116
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-11-222-332/+547
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-222-25/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-201-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-201-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-091-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-11-152-0/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-301-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-231-9/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-121-28/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-09-273-38/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create a new PollServiceHttpRequest req per loop since they can be sent toUbitUmarov2012-09-271-5/+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
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-243-131/+228
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-09-163-18/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-143-17/+36
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow setting max connections for an endpointMelanie2012-09-141-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-09-162-13/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix background inventory loading (Viewer 3) so it won't lag out the simMelanie2012-08-242-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-07-284-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' into avinationMelanie2012-07-171-10/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix PollServiceRequestManagerUbitUmarov2012-07-171-10/+47
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-171-7/+6
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-07-161-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate a spurious exception report when a https url is accessed with a wrongMelanie2012-07-151-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-07-121-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-07-063-2/+251
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the slow request queue into a regular queue and add some cleanupMelanie2012-07-061-4/+18
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the boo-booMelanie2012-07-051-3/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an EventType enum and Type field to the poll service event args. This allowsMelanie2012-07-052-11/+34
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use the pollEvent timeout paramenter on poolingUbitUmarov2012-07-041-4/+7
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a timeout paramenter to PollServiceEventArgs, so each type can define ...UbitUmarov2012-07-041-1/+4