aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-081-50/+56
|\
| * A few more minor improvements on Suitcase inventory service.Diva Canto2012-04-071-7/+6
| * Better Suitcase Inventory Service.Diva Canto2012-04-061-48/+55
* | Merge branch 'master' into careminsterMelanie2012-04-072-105/+193
|\ \ | |/
| * Deleted the unused and commented code from 2 commits ago.Diva Canto2012-04-061-594/+0
| * WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on purpose...Diva Canto2012-04-061-36/+712
| * Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-061-0/+6
* | Merge branch 'master' into careminsterMelanie2012-03-311-120/+218
|\ \ | |/
| * Finish up the SuitcaseInventory service.Diva Canto2012-03-291-120/+218
* | Merge branch 'master' into careminsterMelanie2012-03-291-0/+368
|\ \ | |/
| * HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hac...Diva Canto2012-03-281-0/+368
* | Merge branch 'master' into careminsterMelanie2012-03-273-4/+25
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-272-2/+25
| |\
| | * User level based restrictions for HyperGrid teleports, asset uploads, group c...Snoopy Pfeffer2012-03-272-2/+25
| * | Amend to previous commit regarding the config name. Bugs bite.Diva Canto2012-03-271-2/+0
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-272-36/+8
|\ \ | |/
| * Send the config section name up to the service classes themselves (XInventory...Diva Canto2012-03-272-36/+8
* | Merge branch 'master' into careminsterMelanie2012-03-222-0/+109
|\ \ | |/
| * HG Friends: reroute the status notifications to the HGFriends service, so tha...Diva Canto2012-03-212-0/+109
* | Merge branch 'master' into careminsterMelanie2012-03-212-0/+311
|\ \ | |/
| * HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-201-0/+301
| * Added GetUUID(first, last) on UserAgentsService so that we can finally make d...Diva Canto2012-03-171-0/+10
* | Merge branch 'master' into careminsterMelanie2012-03-091-2/+3
|\ \ | |/
| * Fixes mantis #5923Diva Canto2012-03-081-2/+3
* | Merge branch 'master' into careminsterMelanie2012-02-181-2/+6
|\ \ | |/
| * Propagate our teleport flags on loginsBlueWall2012-02-181-2/+6
* | Merge branch 'master' into careminsterMelanie2012-01-271-6/+7
|\ \ | |/
| * HG Inventoty: Guard against items not found.Diva Canto2012-01-261-6/+7
* | Merge branch 'master' into careminsterMelanie2012-01-122-7/+13
|\ \ | |/
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the locatio...Diva Canto2012-01-122-7/+13
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+25
|\ \ | |/
| * Profile UpdatesBlueWall2012-01-031-0/+25
* | Merge branch 'master' into careminsterMelanie2011-12-221-0/+8
|\ \ | |/
| * HG: Verify that the user is localDiva Canto2011-12-211-0/+8
* | Merge branch 'master' into bigmergeMelanie2011-12-052-2/+2
|\ \ | |/
| * HG: Renamed one methodDiva Canto2011-12-042-2/+2
* | Merge branch 'master' into bigmergeMelanie2011-11-171-11/+10
|\ \ | |/
| * Dont' bother with a userAgentService != null check right after we've construc...Justin Clark-Casey (justincc)2011-11-151-11/+10
* | Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmergeMelanie2011-10-251-0/+3
|\ \ | |/
| * Guard HGAssetService against uninitialized variables and null arguments.Diva Canto2011-10-151-0/+3
* | Resolve merge commits, stage 1Tom2011-09-041-10/+7
|\ \ | |/
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-171-1/+1
| * Do proper locking of m_localScenes list in SceneManagerJustin Clark-Casey (justincc)2011-08-061-4/+3
| * refactor: Move all callers of the obsoleted SychronousRestObjectPoster.BeginP...Justin Clark-Casey (justincc)2011-07-131-5/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-111-2/+4
|\ \ | |/
| * Removing special casing on failures. This may also fix reports of this issue:Diva Canto2011-06-081-2/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-093-6/+597
|\ \ | |/
| * Deleted wrong debug message.Diva Canto2011-06-081-1/+0
| * Added error message to help understand http://opensimulator.org/mantis/view.p...Diva Canto2011-06-071-0/+5
| * This hopefully fixes all issues with online/offline notifications across grid...Diva Canto2011-06-071-7/+21