aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-08-011-0/+2
|\
| * Include missing reference that probably stops windows build from commit 12995...Justin Clark-Casey (justincc)2013-08-011-0/+1
| * Experimental comment to eneralize the handling of Linden caps when theMic Bowman2013-07-311-0/+1
* | Merge branch 'master' into careminsterMelanie2013-07-181-0/+29
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-111-0/+27
| |\
| | * Added a test for the asset serviceDiva Canto2013-07-111-0/+27
| * | Fix regression where llHTTPRequests which did not get an OK response returned...Justin Clark-Casey (justincc)2013-07-111-0/+1
| |/
| * Fix windows build break fromrecent dd1f95 for real this time - put new dll re...justincc2013-07-061-1/+1
| * Fix build break from recent commit dd15f95 on windowsJustin Clark-Casey (justincc)2013-07-061-0/+1
* | Merge branch 'master' into careminsterMelanie2013-07-041-0/+1
|\ \ | |/
| * Add --default option to "debug lludp packet" command to allow packet logging ...Justin Clark-Casey (justincc)2013-07-041-0/+1
* | Merge branch 'master' into careminsterMelanie2013-06-231-0/+2
|\ \ | |/
| * Make number of inbound http requests handled available as a httpserver.<port>...Justin Clark-Casey (justincc)2013-06-181-0/+1
| * Make general server stats available on the robust console as well as the simu...Justin Clark-Casey (justincc)2013-06-171-0/+1
| * Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-071-0/+1
| * Port Avination's inventory send throttlingMelanie2013-06-051-0/+1
* | Merge branch 'avination-current' into careminsterMelanie2013-06-061-0/+3
|\ \
| * \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...Melanie2013-04-281-124/+210
| |\ \
| * \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-261-0/+1
| |\ \ \
| * \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-031-136/+273
| |\ \ \ \
| * \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-1/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-111-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-111-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | dummy commitubit2012-09-111-1/+2
| * | | | | | | | | | | | try fixing building..ubit2012-08-161-0/+2
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-041-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | UserProfilesBlueWall2013-05-301-0/+38
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-05-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Add HG regression TestCachedUserNameForNewAgent()Justin Clark-Casey (justincc)2013-05-291-0/+1
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-05-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | BulletSim: specify directory for OpenSim.Region.Physics.MeshingRobert Adams2013-05-221-1/+1
| * | | | | | | | | | | | BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-221-0/+1
| * | | | | | | | | | | | Revert "BulletSim: add code to experimentally use asset hull data."Robert Adams2013-05-211-1/+0
| * | | | | | | | | | | | BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-211-0/+1
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-04-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Add regression test for offer, accept and subsequent receiver delete of an it...Justin Clark-Casey (justincc)2013-04-291-0/+1
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-04-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Small fix to prebuild xml for building with mono toolsBlueWall2013-04-201-1/+1
| * | | | | | | | | | | Initial experimental support for materials-capable viewers. This is in a very...dahlia2013-04-181-0/+1
| * | | | | | | | | | | Added missing functionality (mainly custom headers) to llHTTPRequest.Kevin Cozens2013-03-291-0/+1
* | | | | | | | | | | | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-191-115/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Finally remove the 'REST' ApplicationPlugins code which has been non-function...Justin Clark-Casey (justincc)2013-03-151-115/+0
* | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-03-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Make it possible to chain another asset service underneath the de-duplicating...Justin Clark-Casey (justincc)2013-03-151-0/+1
* | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-03-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-061-0/+1