aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-051-0/+3
|\
| * Multiple lines in welcome message use '\n' in the welcome message tonebadon2011-11-051-0/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-041-1/+1
|\ \ | |/
| * Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer sizeMic Bowman2011-11-021-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
|\ \ | |/
| * Revert "fix CopyTo call that was breaking under mono 2.10"Melanie2011-11-031-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
|\ \ | |/
| * fix CopyTo call that was breaking under mono 2.10Mic Bowman2011-11-021-1/+1
* | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmergeMelanie2011-10-254-1/+93
|\ \ | |/
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-244-1/+94
* | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmergeMelanie2011-10-251-3/+11
|\ \ | |/
| * Provide an option to allow remote calls to the CreateUser method on the UserA...Justin Clark-Casey (justincc)2011-10-181-3/+11
* | Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmergeMelanie2011-10-251-1/+0
|\ \ | |/
| * Bug fix on the bug fix on UserAccountService.csDiva Canto2011-10-161-1/+0
* | Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmergeMelanie2011-10-251-0/+3
|\ \ | |/
| * Guard HGAssetService against uninitialized variables and null arguments.Diva Canto2011-10-151-0/+3
* | Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmergeMelanie2011-10-251-46/+44
|\ \ | |/
| * Bug fix -- Test User on first run standalone might not be created properly: l...Diva Canto2011-10-131-46/+44
* | Merge branch 'master' into bigmergeMelanie2011-10-121-0/+7
|\ \ | |/
| * Make it possible to disable the HG linker. On non-HG systems it spits yellowMelanie2011-10-121-0/+7
* | Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmergeMelanie2011-10-121-2/+4
|\ \ | |/
| * Tweak to language of last commit in rejecting UUID.Zero in GridService.Regist...Justin Clark-Casey (justincc)2011-10-081-2/+4
* | Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmergeMelanie2011-10-121-0/+2
|\ \ | |/
| * GridService - Region UUID can not be NULLPixel Tomsen2011-10-081-0/+2
* | Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmergeMelanie2011-10-121-0/+17
|\ \ | |/
| * Add note to docsBlueWall2011-10-071-0/+17
* | Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmergeMelanie2011-10-121-0/+11
|\ \ | |/
| * Added back UserAccount that creates random UUID for new account.BlueWall2011-10-051-0/+11
* | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-122-6/+17
|\ \ | |/
| * When creating a new user on the comand line, give the option of allowing a UU...Justin Clark-Casey (justincc)2011-10-042-6/+17
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-123-15/+165
|\ \
| * \ Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-111-5/+9
| |\ \ | | |/
| | * Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-231-5/+9
| * | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-111-1/+6
| |\ \ | | |/
| | * Reattaching a region was failing if the estate name had not changed (issue 50...Kevin Houlihan2011-09-161-1/+6
| * | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmergeMelanie2011-10-111-2/+3
| |\ \ | | |/
| | * Pass any region scope through to the CreateUser() methodJustin Clark-Casey (justincc)2011-09-161-2/+3
| * | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-111-1/+3
| |\ \ | | |/
| | * Correctly create a freshly created estate owner's default items and avatar en...Justin Clark-Casey (justincc)2011-09-161-1/+3
| * | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmergeMelanie2011-10-111-7/+145
| |\ \ | | |/
| | * Write code to create minimum necessary body parts/clothing and avatar entries...Justin Clark-Casey (justincc)2011-09-151-7/+145
* | | Merge branch 'careminster-presence-refactor' into bigmergeMelanie2011-10-061-8/+61
|\ \ \ | |/ / |/| |
| * | Change the asset connector to allow connection to different asset serversMelanie2011-10-061-7/+61
* | | Bring us up to date.Tom2011-09-142-15/+13
|\ \ \ | | |/ | |/|
| * | Increase information in logging for UserAgentServiceConnector.Justin Clark-Casey (justincc)2011-09-081-12/+12
| * | In SetAttachment, if the existing attachment has no asset id then carry on ra...Justin Clark-Casey (justincc)2011-09-061-3/+1
* | | Resolve merge commits, stage 1Tom2011-09-0419-103/+230
|\ \ \ | |/ / | | / | |/ |/|
| * minor: comment out friends number logging from login for nowJustin Clark-Casey (justincc)2011-08-301-1/+1
| * Fix bug in persisting saved appearances for npcsJustin Clark-Casey (justincc)2011-08-301-2/+7
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-221-3/+1