aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-1/+0
|\
| * Deleted OpenSim.Framework.Communications. Moved its two remaining files to Op...Diva Canto2015-09-041-1/+0
* | at last we can login and see objects ( friends is dead and disable inUbitUmarov2015-09-031-1/+1
* | seems to compile ( tests comented out)UbitUmarov2015-09-021-58/+2
* | bad merge?UbitUmarov2015-09-011-41/+306
|\ \ | |/ |/|
| * dont give a ring to each asset request, just one to rule them all, i meanUbitUmarov2014-09-181-8/+15
| * and another oneUbitUmarov2014-09-171-1/+6
| * 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
| |\ \ | | |/ | |/|
| * | 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
| |\ \ \ | | |/ / | |/| |
| * | | 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
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' into careminsterMelanie2012-03-091-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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-021-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2011-12-281-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
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-171-1/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-8/+15
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Backported GetTextureModule and IAssetService.GetCached()John Hurliman2010-04-082-0/+22
* | | | | | | | | | | | | Close streams immediately when we finish using themOren Hurvitz2014-07-211-15/+17
* | | | | | | | | | | | | Adds optional HTTP Basic Authentication to Robust service connectors.Diva Canto2014-05-231-9/+10
* | | | | | | | | | | | | Fix recent asset request timeout issue by commenting out (for now) the m_maxA...Justin Clark-Casey (justincc)2014-05-141-10/+14
* | | | | | | | | | | | | Workaround for SRAS: if Store Asset returns 'null' then assume the asset alre...Oren Hurvitz2014-04-231-0/+7
* | | | | | | | | | | | | Better error-handling when storing assets: recognize that 'null' is an error ...Oren Hurvitz2014-04-201-12/+11
generated by cgit v1.1 at 2024-12-26 11:18:19 +0000