| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'avination' into careminster | Melanie | 2012-10-07 | 1 | -16/+21 |
|\ |
|
| * | Fix threading in remote asset connector | Melanie | 2012-10-05 | 1 | -16/+21 |
* | | Merge branch 'master' into careminster | Melanie | 2012-10-07 | 1 | -2/+8 |
|\ \
| |/
|/| |
|
| * | Make the asset retrieval concurrency a config switch. The current value | Mic Bowman | 2012-10-04 | 1 | -3/+8 |
| * | Allow setting max connections for an endpoint | Melanie | 2012-09-30 | 1 | -3/+3 |
* | | Sequence/throttle asset retrievals. | Melanie | 2012-09-14 | 1 | -37/+67 |
* | | Allow setting max connections for an endpoint | Melanie | 2012-09-14 | 1 | -2/+2 |
* | | Prevent double slashes, try #4 | UbitUmarov | 2012-09-06 | 1 | -1/+1 |
* | | Prevent double slashes, try #3 | Melanie | 2012-09-06 | 1 | -0/+3 |
* | | Revert "Change string concatenation to Path.Combine to eliminate extra slashes." | Melanie | 2012-09-06 | 1 | -8/+6 |
* | | Change string concatenation to Path.Combine to eliminate extra slashes. | Melanie | 2012-09-06 | 1 | -6/+8 |
* | | Revert " remove extra '/' in assets url" | Melanie | 2012-09-06 | 1 | -13/+6 |
* | | remove extra '/' in assets url | UbitUmarov | 2012-09-06 | 1 | -6/+13 |
* | | Merge branch 'avination' into careminster | Melanie | 2012-07-16 | 1 | -5/+29 |
|\ \ |
|
| * | | be paranoic (?) | UbitUmarov | 2012-07-11 | 1 | -0/+6 |
| * | | Replace a Multicast Delegate by a simple list of delegates in access Get | UbitUmarov | 2012-07-11 | 1 | -5/+23 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-10 | 1 | -0/+0 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the... | Justin Clark-Casey (justincc) | 2012-05-09 | 1 | -0/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-09 | 1 | -1/+20 |
|\ \
| |/ |
|
| * | HG inventory/asset transfers: serialize asset posts. I'm using the same patte... | Diva Canto | 2012-03-08 | 1 | -1/+20 |
* | | Fix up asset stuff | Melanie | 2012-01-06 | 1 | -0/+3 |
* | | Remove a dangling command registration | Melanie | 2012-01-05 | 1 | -4/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -39/+0 |
|\ \
| |/ |
|
| * | Move simulator asset info commands to an optional module from the connector. ... | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -43/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | Adding commented out log messages and some minor formatting for future bug hu... | Justin Clark-Casey (justincc) | 2012-01-02 | 1 | -0/+6 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-28 | 1 | -2/+19 |
|\ \
| |/ |
|
| * | HG: more / love for Xmas | Diva Canto | 2011-12-24 | 1 | -2/+19 |
* | | Merge branch 'careminster-presence-refactor' into bigmerge | Melanie | 2011-10-06 | 1 | -8/+61 |
|\ \ |
|
| * | | Change the asset connector to allow connection to different asset servers | Melanie | 2011-10-06 | 1 | -7/+61 |
* | | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -8/+48 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | When an uncached asset is requested multiple times concurrently, only load it... | Oren Hurvitz | 2011-07-21 | 1 | -9/+49 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -1/+0 |
|\ \
| |/ |
|
| * | Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open... | Diva Canto | 2011-04-12 | 1 | -1/+0 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -8/+15 |
|\ \
| |/ |
|
| * | Made the HG asset and inventory brokers use the Helo service in order to inst... | Diva Canto | 2010-09-08 | 1 | -8/+15 |
| * | * Adds IAssetService.GetCached() to allow asset fetching from the local cache... | John Hurliman | 2010-04-08 | 2 | -0/+22 |
* | | Check cached asset to make sure it contains data, and if not, re-request | Tom Grimshaw | 2010-07-04 | 1 | -3/+3 |
* | | Make sure the AssetServiceConnector times out within 30 seconds. If it doesn'... | Tom Grimshaw | 2010-07-03 | 1 | -2/+2 |
* | | Cache all assets on upload so that the client can still retrieve the asset if... | Tom Grimshaw | 2010-07-01 | 1 | -3/+2 |
* | | Fix build break | Tom Grimshaw | 2010-07-01 | 1 | -1/+1 |
* | | Report asset upload success if it has previously failed | Tom Grimshaw | 2010-07-01 | 1 | -0/+4 |
* | | Catch newid == null which is what happens if the asset service is offline (se... | Tom Grimshaw | 2010-07-01 | 1 | -0/+4 |
* | | The other half of the asset fix. Implement an exponentially incrementing retr... | Tom Grimshaw | 2010-06-29 | 1 | -11/+88 |
* | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-13 | 2 | -0/+22 |
|\ \
| |/
|/| |
|
| * | Backported GetTextureModule and IAssetService.GetCached() | John Hurliman | 2010-04-08 | 2 | -0/+22 |
* | | * Typo fixes | John Hurliman | 2010-03-09 | 1 | -1/+1 |
* | | Changed asset CreatorID to a string | John Hurliman | 2010-02-22 | 1 | -1/+1 |
* | | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i... | John Hurliman | 2010-02-22 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 1 | -1/+1 |