aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-203-2/+96
|\
| * Fix small typoJustin Clark-Casey (justincc)2012-03-201-1/+1
| * Fix configuration problems where XAssetDatabasePlugin was picked up accidenta...Justin Clark-Casey (justincc)2012-03-192-1/+95
* | Merge branch 'master' into careminsterMelanie2012-03-141-1/+1
|\ \ | |/
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-121-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-091-3/+7
|\ \ | |/
| * More on inventory transfer hold ups:Diva Canto2012-03-091-3/+7
* | Merge branch 'master' into careminsterMelanie2012-03-091-1/+20
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-081-0/+213
| |\
| * | HG inventory/asset transfers: serialize asset posts. I'm using the same patte...Diva Canto2012-03-081-1/+20
* | | Merge branch 'master' into careminsterMelanie2012-03-092-2/+216
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-091-2/+3
| |\ \ | | |/
| | * Fixes mantis #5923Diva Canto2012-03-081-2/+3
| * | Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-091-0/+213
| |\ \ | | |/ | |/|
| | * Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-021-0/+213
* | | Merge branch 'master' into careminsterMelanie2012-03-083-9/+9
|\ \ \ | |/ /
| * | Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-083-9/+9
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-041-0/+10
|\ \ \
| * | | Add a cache on GridService requestsMelanie2012-02-241-0/+10
* | | | Merge branch 'master' into careminsterMelanie2012-03-042-2/+42
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | OpenID auth needs hashing before authenticatingBlueWall2012-03-021-1/+1
| * | Merge branch 'master' into v3_supportBlueWall2012-03-021-2/+2
| |\ \ | | |/
| | * Revert "Fix authentication for OpenID provider"BlueWall2012-02-291-2/+2
| * | Merge branch 'master' of /home/opensim/src/opensim into v3_supportBlueWall2012-02-291-2/+2
| |\ \ | | |/
| | * Fix authentication for OpenID providerBlueWall2012-02-291-2/+2
| * | Merge branch 'master' into v3_supportBlueWall2012-02-222-2/+3
| |\ \ | | |/
| * | V3 SupportBlueWall2012-02-222-2/+22
| * | V3 Support:BlueWall2012-02-212-2/+22
* | | Merge branch 'master' into careminsterMelanie2012-02-232-2/+3
|\ \ \ | | |/ | |/|
| * | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-232-2/+3
| |/
* | Merge branch 'master' into careminsterMelanie2012-02-201-6/+17
|\ \ | |/
| * Amend to last commit: synchronize access to queues.Diva Canto2012-02-201-2/+5
| * More improvements on agent position updates: if the target sims fail, blackli...Diva Canto2012-02-201-6/+14
* | Merge branch 'master' into careminsterMelanie2012-02-183-3/+9
|\ \ | |/
| * Propagate our teleport flags on loginsBlueWall2012-02-182-2/+8
| * Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends gr...Justin Clark-Casey (justincc)2012-02-161-1/+1
* | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-141-1/+4
* | Merge branch 'master' into careminsterMelanie2012-02-079-103/+120
|\ \ | |/
| * Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an ex...Justin Clark-Casey (justincc)2012-02-079-103/+120
* | Merge branch 'master' into careminsterMelanie2012-02-041-1/+1
|\ \ | |/
| * Supply correct parameters to detailed authentication login fail messageJustin Clark-Casey (justincc)2012-02-041-1/+1
* | Merge branch 'master' into careminsterMelanie2012-01-301-1/+8
|\ \ | |/
| * Next step for world map overlaysMelanie2012-01-301-1/+8
* | Merge branch 'master' into careminsterMelanie2012-01-271-6/+7
|\ \ | |/
| * HG Inventoty: Guard against items not found.Diva Canto2012-01-261-6/+7
| * Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-164-2/+77
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-164-2/+77
* | 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-071-1/+1
|\ \ | |/