| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 2 | -20/+49 |
|\ \
| |/ |
|
| * | Append asset ID to URL for storage requests to allow caching proxies to work ... | Dan Lake | 2011-11-23 | 1 | -1/+3 |
| * | Improve the error messages returned if the HelloNeighbour call fails. | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -19/+46 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 5 | -10/+31 |
|\ \
| |/ |
|
| * | Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff... | Justin Clark-Casey (justincc) | 2011-11-19 | 2 | -3/+3 |
| * | Improve some grid region log messages to express regions at co-ordinate (e.g.... | Justin Clark-Casey (justincc) | 2011-11-19 | 3 | -8/+21 |
| * | improve region deregistration log message | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -1/+4 |
| * | Don't register a region twice on both official registration and maptile regen... | Justin Clark-Casey (justincc) | 2011-11-19 | 3 | -1/+6 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 3 | -28/+27 |
|\ \
| |/ |
|
| * | distinguish between FriendsSimConnector and FriendsServiceConnector in log | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -17/+17 |
| * | Dont' bother with a userAgentService != null check right after we've construc... | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -11/+10 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 1 | -0/+7 |
|\ \
| |/ |
|
| * | Make log messages on authentication failure more explicit | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -13/+26 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 1 | -1/+9 |
|\ \
| |/ |
|
| * | Damaged assets, especially appearance textures, could crash the region server... | Snoopy Pfeffer | 2011-11-06 | 1 | -1/+9 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 1 | -0/+3 |
|\ \
| |/ |
|
| * | Multiple lines in welcome message use '\n' in the welcome message to | nebadon | 2011-11-05 | 1 | -0/+3 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-04 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size | Mic Bowman | 2011-11-02 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Revert "fix CopyTo call that was breaking under mono 2.10" | Melanie | 2011-11-03 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | fix CopyTo call that was breaking under mono 2.10 | Mic Bowman | 2011-11-02 | 1 | -1/+1 |
* | | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge | Melanie | 2011-10-25 | 4 | -1/+93 |
|\ \
| |/ |
|
| * | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 4 | -1/+94 |
* | | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+11 |
|\ \
| |/ |
|
| * | Provide an option to allow remote calls to the CreateUser method on the UserA... | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -3/+11 |
* | | Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+0 |
|\ \
| |/ |
|
| * | Bug fix on the bug fix on UserAccountService.cs | Diva Canto | 2011-10-16 | 1 | -1/+0 |
* | | Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+3 |
|\ \
| |/ |
|
| * | Guard HGAssetService against uninitialized variables and null arguments. | Diva Canto | 2011-10-15 | 1 | -0/+3 |
* | | Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmerge | Melanie | 2011-10-25 | 1 | -46/+44 |
|\ \
| |/ |
|
| * | Bug fix -- Test User on first run standalone might not be created properly: l... | Diva Canto | 2011-10-13 | 1 | -46/+44 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+7 |
|\ \
| |/ |
|
| * | Make it possible to disable the HG linker. On non-HG systems it spits yellow | Melanie | 2011-10-12 | 1 | -0/+7 |
* | | Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmerge | Melanie | 2011-10-12 | 1 | -2/+4 |
|\ \
| |/ |
|
| * | Tweak to language of last commit in rejecting UUID.Zero in GridService.Regist... | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -2/+4 |
* | | Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | GridService - Region UUID can not be NULL | Pixel Tomsen | 2011-10-08 | 1 | -0/+2 |
* | | Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+17 |
|\ \
| |/ |
|
| * | Add note to docs | BlueWall | 2011-10-07 | 1 | -0/+17 |
* | | Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+11 |
|\ \
| |/ |
|
| * | Added back UserAccount that creates random UUID for new account. | BlueWall | 2011-10-05 | 1 | -0/+11 |
* | | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge | Melanie | 2011-10-12 | 2 | -6/+17 |
|\ \
| |/ |
|
| * | When creating a new user on the comand line, give the option of allowing a UU... | Justin Clark-Casey (justincc) | 2011-10-04 | 2 | -6/+17 |
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-12 | 3 | -15/+165 |
|\ \ |
|
| * \ | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge | Melanie | 2011-10-11 | 1 | -5/+9 |
| |\ \
| | |/ |
|
| | * | Fix avatar parameter updating for viewer 3 and maybe 2. | Justin Clark-Casey (justincc) | 2011-09-23 | 1 | -5/+9 |