| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-07-01 | 3 | -17/+15 |
|\ |
|
| * | Remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-06-30 | 3 | -17/+15 |
* | | Merge branch 'master' into careminster | Melanie | 2012-04-08 | 1 | -50/+56 |
|\ \
| |/ |
|
| * | A few more minor improvements on Suitcase inventory service. | Diva Canto | 2012-04-07 | 1 | -7/+6 |
| * | Better Suitcase Inventory Service. | Diva Canto | 2012-04-06 | 1 | -48/+55 |
* | | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 2 | -105/+193 |
|\ \
| |/ |
|
| * | Deleted the unused and commented code from 2 commits ago. | Diva Canto | 2012-04-06 | 1 | -594/+0 |
| * | WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on purpose... | Diva Canto | 2012-04-06 | 1 | -36/+712 |
| * | Finish the implementation of GetUserInventory, even though it's still not used. | Diva Canto | 2012-04-06 | 1 | -0/+6 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 1 | -120/+218 |
|\ \
| |/ |
|
| * | Finish up the SuitcaseInventory service. | Diva Canto | 2012-03-29 | 1 | -120/+218 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 1 | -0/+368 |
|\ \
| |/ |
|
| * | HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hac... | Diva Canto | 2012-03-28 | 1 | -0/+368 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 3 | -4/+25 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 2 | -2/+25 |
| |\ |
|
| | * | User level based restrictions for HyperGrid teleports, asset uploads, group c... | Snoopy Pfeffer | 2012-03-27 | 2 | -2/+25 |
| * | | Amend to previous commit regarding the config name. Bugs bite. | Diva Canto | 2012-03-27 | 1 | -2/+0 |
| |/ |
|
* | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 2 | -36/+8 |
|\ \
| |/ |
|
| * | Send the config section name up to the service classes themselves (XInventory... | Diva Canto | 2012-03-27 | 2 | -36/+8 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 2 | -0/+109 |
|\ \
| |/ |
|
| * | HG Friends: reroute the status notifications to the HGFriends service, so tha... | Diva Canto | 2012-03-21 | 2 | -0/+109 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 2 | -0/+311 |
|\ \
| |/ |
|
| * | HG Friends: allow the establishment of HG friendships without requiring co-pr... | Diva Canto | 2012-03-20 | 1 | -0/+301 |
| * | Added GetUUID(first, last) on UserAgentsService so that we can finally make d... | Diva Canto | 2012-03-17 | 1 | -0/+10 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-09 | 1 | -2/+3 |
|\ \
| |/ |
|
| * | Fixes mantis #5923 | Diva Canto | 2012-03-08 | 1 | -2/+3 |
* | | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -2/+6 |
|\ \
| |/ |
|
| * | Propagate our teleport flags on logins | BlueWall | 2012-02-18 | 1 | -2/+6 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-27 | 1 | -6/+7 |
|\ \
| |/ |
|
| * | HG Inventoty: Guard against items not found. | Diva Canto | 2012-01-26 | 1 | -6/+7 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-12 | 2 | -7/+13 |
|\ \
| |/ |
|
| * | HG: normalize all externalized user ULRs to be the Home URL, i.e. the locatio... | Diva Canto | 2012-01-12 | 2 | -7/+13 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 1 | -0/+25 |
|\ \
| |/ |
|
| * | Profile Updates | BlueWall | 2012-01-03 | 1 | -0/+25 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -0/+8 |
|\ \
| |/ |
|
| * | HG: Verify that the user is local | Diva Canto | 2011-12-21 | 1 | -0/+8 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 2 | -2/+2 |
|\ \
| |/ |
|
| * | HG: Renamed one method | Diva Canto | 2011-12-04 | 2 | -2/+2 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -11/+10 |
|\ \
| |/ |
|
| * | Dont' bother with a userAgentService != null check right after we've construc... | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -11/+10 |
* | | 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 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -10/+7 |
|\ \
| |/ |
|
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-08-17 | 1 | -1/+1 |
| * | Do proper locking of m_localScenes list in SceneManager | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -4/+3 |
| * | refactor: Move all callers of the obsoleted SychronousRestObjectPoster.BeginP... | Justin Clark-Casey (justincc) | 2011-07-13 | 1 | -5/+3 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-11 | 1 | -2/+4 |
|\ \
| |/ |
|
| * | Removing special casing on failures. This may also fix reports of this issue: | Diva Canto | 2011-06-08 | 1 | -2/+4 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 3 | -6/+597 |
|\ \
| |/ |
|
| * | Deleted wrong debug message. | Diva Canto | 2011-06-08 | 1 | -1/+0 |