| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+6 |
| |\ \
| | |/ |
|
| | * | Reattaching a region was failing if the estate name had not changed (issue 50... | Kevin Houlihan | 2011-09-16 | 1 | -1/+6 |
| * | | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+3 |
| |\ \
| | |/ |
|
| | * | Pass any region scope through to the CreateUser() method | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -2/+3 |
| * | | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+3 |
| |\ \
| | |/ |
|
| | * | Correctly create a freshly created estate owner's default items and avatar en... | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -1/+3 |
| * | | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge | Melanie | 2011-10-11 | 1 | -7/+145 |
| |\ \
| | |/ |
|
| | * | Write code to create minimum necessary body parts/clothing and avatar entries... | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -7/+145 |
* | | | Merge branch 'careminster-presence-refactor' into bigmerge | Melanie | 2011-10-06 | 1 | -8/+61 |
|\ \ \
| |/ /
|/| | |
|
| * | | Change the asset connector to allow connection to different asset servers | Melanie | 2011-10-06 | 1 | -7/+61 |
* | | | Bring us up to date. | Tom | 2011-09-14 | 2 | -15/+13 |
|\ \ \
| | |/
| |/| |
|
| * | | Increase information in logging for UserAgentServiceConnector. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -12/+12 |
| * | | In SetAttachment, if the existing attachment has no asset id then carry on ra... | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -3/+1 |
* | | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 19 | -103/+230 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | minor: comment out friends number logging from login for now | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -1/+1 |
| * | Fix bug in persisting saved appearances for npcs | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -2/+7 |
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -3/+1 |
| * | Don't need to try both AssetService.Get and GetCached in GetMesh since Get al... | Justin Clark-Casey (justincc) | 2011-08-18 | 1 | -2/+6 |
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-08-17 | 1 | -1/+1 |
| * | In the asset service, check that an asset exists before attempting to store it. | Justin Clark-Casey (justincc) | 2011-08-17 | 1 | -4/+6 |
| * | Added optional Login Service parameter "Currency" to be able to change the cu... | Snoopy Pfeffer | 2011-08-14 | 2 | -2/+21 |
| * | comment out some of the currently less useful debug log messages | Justin Clark-Casey (justincc) | 2011-08-11 | 1 | -1/+1 |
| * | Do proper locking of m_localScenes list in SceneManager | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -4/+3 |
| * | Get "show region" command in GridService to show grid co-ordinates rather tha... | Justin Clark-Casey (justincc) | 2011-08-05 | 1 | -2/+3 |
| * | If GetRegionByName can't match something in the local db, then search the hyp... | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -6/+27 |