aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-274-5/+26
|\
| * Reverse a conditional in XInventory that made updating system folder evrsion ...Melanie2012-03-271-1/+1
| * 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-275-44/+38
|\ \ | |/
| * Send the config section name up to the service classes themselves (XInventory...Diva Canto2012-03-275-44/+38
* | Replace HG linker with core versionMelanie2012-03-271-13/+49
* | Merge branch 'master' into careminsterMelanie2012-03-226-2/+173
|\ \ | |/
| * Updated the UserAccountsClient a little bit, plus some more sanity checks on ...Diva Canto2012-03-211-1/+8
| * HG Friends: reroute the status notifications to the HGFriends service, so tha...Diva Canto2012-03-215-1/+165
* | Merge branch 'master' into careminsterMelanie2012-03-216-12/+460
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-203-2/+96
| |\
| * | HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-204-11/+388
| * | Added GetUUID(first, last) on UserAgentsService so that we can finally make d...Diva Canto2012-03-173-1/+72
* | | 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