| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | Change GridService.GetRegionByName() to only return info if there is an exact... | Justin Clark-Casey (justincc) | 2011-08-02 | 2 | -1/+7 |
| * | Revert "In GridService, have GetRegionByName() call GetRegionsByName() with a... | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -5/+4 |
| * | In GridService, have GetRegionByName() call GetRegionsByName() with a max ret... | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -4/+5 |
| * | Get rid of AvatarAppearance.Owner to simplify the code. | Justin Clark-Casey (justincc) | 2011-08-02 | 5 | -7/+7 |
| * | Temporary code to change bad AvatarHeight values in the AvatarService to the ... | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -1/+27 |
| * | Pass the first name and last name from the agent circuit data to the authoriz... | Justin Clark-Casey (justincc) | 2011-07-23 | 2 | -16/+21 |
| * | For default everyone permissions on library items, make notecards and scripts... | Justin Clark-Casey (justincc) | 2011-07-23 | 1 | -1/+2 |
| * | Remove manually permissions settings on all current library items so that the... | Justin Clark-Casey (justincc) | 2011-07-23 | 1 | -4/+4 |
| * | Revert "Don't load current/next/everyone/base permissions from the library it... | Justin Clark-Casey (justincc) | 2011-07-23 | 1 | -11/+26 |
| * | Don't load current/next/everyone/base permissions from the library item xml f... | Justin Clark-Casey (justincc) | 2011-07-23 | 1 | -26/+11 |
| * | When an uncached asset is requested multiple times concurrently, only load it... | Oren Hurvitz | 2011-07-21 | 1 | -9/+49 |
| * | add test for resizing one part in a group | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -1/+0 |
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -35/+36 |
| * | refactor: Move all callers of the obsoleted SychronousRestObjectPoster.BeginP... | Justin Clark-Casey (justincc) | 2011-07-13 | 1 | -5/+3 |
* | | Fix failure to find avatars due to trainling spaces being sent by viewers. | Melanie | 2011-07-23 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-09 | 1 | -3/+12 |
|\ \
| |/ |
|
| * | When loading library asset set, only store an asset if it's different from an... | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -3/+12 |
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-06-30 | 2 | -61/+151 |
|\ \
| |/ |
|