| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-11-17 | 21 | -783/+745 |
|\ |
|
| * | Remove old InventoryService, which has for a long time been replaced by XInve... | Justin Clark-Casey (justincc) | 2012-11-17 | 2 | -782/+0 |
| * | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid | Justin Clark-Casey (justincc) | 2012-11-17 | 1 | -1/+0 |
| * | Do not allow invariants to change on calls to XInventoryService.UpdateItem() | Justin Clark-Casey (justincc) | 2012-11-17 | 2 | -10/+140 |
| * | Add basic XInventoryServicesTests.TestAddItem() regression test. | Justin Clark-Casey (justincc) | 2012-11-17 | 1 | -0/+87 |
| * | The last few AssemblyInfos. Finished! | Diva Canto | 2012-11-14 | 16 | -0/+528 |
* | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 7 | -7/+7 |
|\ \
| |/ |
|
| * | Cleanup on region modules: gave short node id's to all of them. | Diva Canto | 2012-11-12 | 7 | -7/+7 |
* | | Merge branch 'master' into careminster | Melanie | 2012-11-09 | 3 | -12/+24 |
|\ \
| |/ |
|
| * | Update parent inventory folder version numbers when folders are moved/created... | Justin Clark-Casey (justincc) | 2012-11-09 | 1 | -10/+1 |
| * | HG: Hopefully this fixes the issues with port 80 once and for all. | Diva Canto | 2012-11-07 | 2 | -2/+23 |
* | | Merge branch 'master' into careminster | Melanie | 2012-11-04 | 1 | -0/+9 |
|\ \
| |/ |
|
| * | HG Suitcase Inventory: if RootFolder type doesn't work, look for any folder w... | Diva Canto | 2012-11-03 | 1 | -0/+9 |
* | | Merge branch 'avination' into careminster | Melanie | 2012-11-04 | 1 | -4/+4 |
|\ \ |
|
| * | | Squash reporting HelloNeighbor exception - it simply means the other sim | Melanie | 2012-11-02 | 1 | -4/+4 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-03 | 3 | -36/+9 |
|\ \ \
| | |/
| |/| |
|
| * | | HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ... | Diva Canto | 2012-11-02 | 1 | -5/+5 |
| * | | Move check to allow only deletion of maptiles up to AssetServerDeleteHandler ... | Justin Clark-Casey (justincc) | 2012-11-02 | 2 | -31/+4 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-31 | 1 | -1/+5 |
|\ \ \
| |/ / |
|
| * | | Add method doc to IAssetService.Get(string, object, AssetRetrieved) outlining... | Justin Clark-Casey (justincc) | 2012-10-30 | 1 | -1/+5 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-20 | 4 | -5/+41 |
|\ \ \
| |/ / |
|
| * | | Add method doc for IPresenceService | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -1/+37 |
| * | | Improve efficiency of friends notification by only make one PresenceService c... | Justin Clark-Casey (justincc) | 2012-10-20 | 3 | -4/+4 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-16 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now. | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -1/+1 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 4 | -29/+42 |
|\ \ \
| |/ / |
|
| * | | minor: Add documentation to IGridService.GetRegionFlags() | Justin Clark-Casey (justincc) | 2012-10-09 | 1 | -0/+13 |
| * | | Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it eas... | Justin Clark-Casey (justincc) | 2012-10-09 | 3 | -29/+29 |
* | | | Merge branch 'avination' into careminster | Melanie | 2012-10-07 | 1 | -16/+21 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix threading in remote asset connector | Melanie | 2012-10-05 | 1 | -16/+21 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-07 | 2 | -4/+15 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-10-04 | 2 | -4/+9 |
| |\ \ |
|
| | * | | Make the asset retrieval concurrency a config switch. The current value | Mic Bowman | 2012-10-04 | 1 | -3/+8 |
| * | | | One more abstraction for GridUser so that it can be overridden in a sub-class. | Diva Canto | 2012-10-04 | 1 | -2/+7 |
* | | | | Merge branch 'master' into careminster | Melanie | 2012-10-03 | 1 | -1/+1 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | string format arguments in wrong order | SignpostMarv | 2012-10-02 | 1 | -1/+1 |
| |/ / |
|
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-02 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | On more virtual method | Diva Canto | 2012-10-01 | 1 | -1/+1 |
| * | | Allow setting max connections for an endpoint | Melanie | 2012-09-30 | 1 | -3/+3 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-30 | 1 | -12/+1 |
|\ \ \
| |/ / |
|
| * | | Revert "Added request.Proxy=null everywhere, as discussed in http://stackover... | Diva Canto | 2012-09-30 | 5 | -9/+1 |
| * | | Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com... | Diva Canto | 2012-09-30 | 5 | -1/+9 |
| * | | Made a method of GridUserService virtual so it can be overridden. | Diva Canto | 2012-09-30 | 1 | -12/+1 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-29 | 2 | -11/+0 |
|\ \ \
| |/ / |
|
| * | | Removed the bits about the TOSModule. That module doesn't go into core. WARNI... | Diva Canto | 2012-09-27 | 2 | -11/+0 |
* | | | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 1 | -37/+67 |
|\ \ \
| | |/
| |/| |
|
| * | | Sequence/throttle asset retrievals. | Melanie | 2012-09-14 | 1 | -37/+67 |
* | | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster | Melanie | 2012-09-27 | 3 | -4/+37 |
|\ \ \
| | |/
| |/| |
|
| * | | Use GridUser properly for foreign users. | Diva Canto | 2012-09-26 | 1 | -4/+27 |
| * | | TOS module. WARNING: migration in GridUser table. | Diva Canto | 2012-09-25 | 2 | -0/+10 |