aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination-current' into careminsterMelanie2013-09-161-1/+7
|\
| * Fix exception when brokering HG asset idsMelanie Thielker2013-09-081-1/+7
* | Merge branch 'master' into careminsterMelanie2013-07-181-0/+6
|\ \ | |/ |/|
| * Added property to make for more flexible testing.Diva Canto2013-07-111-0/+5
| * Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-101-1/+1
* | Merge branch 'avination' into careminsterMelanie2012-10-071-16/+21
|\ \
| * | Fix threading in remote asset connectorMelanie2012-10-051-16/+21
* | | Merge branch 'master' into careminsterMelanie2012-10-071-2/+8
|\ \ \ | |/ / |/| / | |/
| * Make the asset retrieval concurrency a config switch. The current valueMic Bowman2012-10-041-3/+8
| * Allow setting max connections for an endpointMelanie2012-09-301-3/+3
* | Sequence/throttle asset retrievals.Melanie2012-09-141-37/+67
* | Allow setting max connections for an endpointMelanie2012-09-141-2/+2
* | Prevent double slashes, try #4UbitUmarov2012-09-061-1/+1
* | Prevent double slashes, try #3Melanie2012-09-061-0/+3
* | Revert "Change string concatenation to Path.Combine to eliminate extra slashes."Melanie2012-09-061-8/+6
* | Change string concatenation to Path.Combine to eliminate extra slashes.Melanie2012-09-061-6/+8
* | Revert " remove extra '/' in assets url"Melanie2012-09-061-13/+6
* | remove extra '/' in assets urlUbitUmarov2012-09-061-6/+13
* | Merge branch 'avination' into careminsterMelanie2012-07-161-5/+29
|\ \
| * | be paranoic (?)UbitUmarov2012-07-111-0/+6
| * | Replace a Multicast Delegate by a simple list of delegates in access GetUbitUmarov2012-07-111-5/+23
* | | Merge branch 'master' into careminsterMelanie2012-05-101-0/+0
|\ \ \ | |/ / |/| / | |/
| * Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the...Justin Clark-Casey (justincc)2012-05-091-0/+0
* | Merge branch 'master' into careminsterMelanie2012-03-091-1/+20
|\ \ | |/
| * HG inventory/asset transfers: serialize asset posts. I'm using the same patte...Diva Canto2012-03-081-1/+20
* | Fix up asset stuffMelanie2012-01-061-0/+3
* | Remove a dangling command registrationMelanie2012-01-051-4/+0
* | Merge branch 'master' into careminsterMelanie2012-01-061-39/+0
|\ \ | |/
| * Move simulator asset info commands to an optional module from the connector. ...Justin Clark-Casey (justincc)2012-01-051-43/+2
* | Merge branch 'master' into careminsterMelanie2012-01-021-0/+2
|\ \ | |/
| * Adding commented out log messages and some minor formatting for future bug hu...Justin Clark-Casey (justincc)2012-01-021-0/+6
* | Merge branch 'master' into careminsterMelanie2011-12-281-2/+19
|\ \ | |/
| * HG: more / love for XmasDiva Canto2011-12-241-2/+19
* | Merge branch 'careminster-presence-refactor' into bigmergeMelanie2011-10-061-8/+61
|\ \
| * | Change the asset connector to allow connection to different asset serversMelanie2011-10-061-7/+61
* | | Resolve merge commits, stage 1Tom2011-09-041-8/+48
|\ \ \ | |/ / |/| / | |/
| * When an uncached asset is requested multiple times concurrently, only load it...Oren Hurvitz2011-07-211-9/+49
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-171-1/+0
|\ \ | |/
| * Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open...Diva Canto2011-04-121-1/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-8/+15
|\ \ | |/
| * Made the HG asset and inventory brokers use the Helo service in order to inst...Diva Canto2010-09-081-8/+15
| * * Adds IAssetService.GetCached() to allow asset fetching from the local cache...John Hurliman2010-04-082-0/+22
* | Check cached asset to make sure it contains data, and if not, re-requestTom Grimshaw2010-07-041-3/+3
* | Make sure the AssetServiceConnector times out within 30 seconds. If it doesn'...Tom Grimshaw2010-07-031-2/+2
* | Cache all assets on upload so that the client can still retrieve the asset if...Tom Grimshaw2010-07-011-3/+2
* | Fix build breakTom Grimshaw2010-07-011-1/+1
* | Report asset upload success if it has previously failedTom Grimshaw2010-07-011-0/+4
* | Catch newid == null which is what happens if the asset service is offline (se...Tom Grimshaw2010-07-011-0/+4
* | The other half of the asset fix. Implement an exponentially incrementing retr...Tom Grimshaw2010-06-291-11/+88
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-132-0/+22
|\ \ | |/ |/|