aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-07-161-5/+29
|\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * be paranoic (?)UbitUmarov2012-07-111-0/+6
| |
| * Replace a Multicast Delegate by a simple list of delegates in access GetUbitUmarov2012-07-111-5/+23
| | | | | | | | | | Can't seen more than one evocation on the multicast on this case, even expanding its evocation list (as it should be used in case one fails). With the list i do see what we want.
* | Merge branch 'master' into careminsterMelanie2012-05-101-0/+0
|\ \ | |/ |/|
| * Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect ↵Justin Clark-Casey (justincc)2012-05-091-0/+0
| | | | | | | | | | | | | | | | the actual class names. This is usually because the file name was singular (*Service*) but the class name was plural (*Services*). This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector. This does not affect existing configuration since the files are being renamed rather than the classes.
* | Merge branch 'master' into careminsterMelanie2012-03-091-1/+20
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * HG inventory/asset transfers: serialize asset posts. I'm using the same ↵Diva Canto2012-03-081-1/+20
| | | | | | | | pattern as suggested in the patch mantis #5921. Testing it in this smaller context to see how it works.
* | 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
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Move simulator asset info commands to an optional module from the connector. ↵Justin Clark-Casey (justincc)2012-01-051-43/+2
| | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled.
* | Merge branch 'master' into careminsterMelanie2012-01-021-0/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * Adding commented out log messages and some minor formatting for future bug ↵Justin Clark-Casey (justincc)2012-01-021-0/+6
| | | | | | | | hunting. No functional changes.
* | 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
| | | | | | | | | | | | depending on the first two digits of the asset id.
* | | Resolve merge commits, stage 1Tom2011-09-041-8/+48
|\ \ \ | |/ / |/| / | |/
| * When an uncached asset is requested multiple times concurrently, only load ↵Oren Hurvitz2011-07-211-9/+49
| | | | | | | | | | | | it once Signed-off-by: root <root@grid00001.t-data.com>
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-171-1/+0
|\ \ | |/
| * Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵Diva Canto2011-04-121-1/+0
| | | | | | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-8/+15
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * Made the HG asset and inventory brokers use the Helo service in order to ↵Diva Canto2010-09-081-8/+15
| | | | | | | | instantiate the right network connectors. Tested on Robust only.
| * * Adds IAssetService.GetCached() to allow asset fetching from the local ↵John Hurliman2010-04-082-0/+22
| | | | | | | | | | | | | | cache only * Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer * Sanity check for null reference in LLClientView.RefreshGroupMembership()
* | 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 ↵Tom Grimshaw2010-07-031-2/+2
| | | | | | | | doesn't, the client will get bored and give an upload error, instead of granting success and entering the asset into our retry queue.
* | Cache all assets on upload so that the client can still retrieve the asset ↵Tom Grimshaw2010-07-011-3/+2
| | | | | | | | if it enters a retry queue
* | 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 ↵Tom Grimshaw2010-07-011-0/+4
| | | | | | | | (seems a connection failure does not throw an exception)
* | The other half of the asset fix. Implement an exponentially incrementing ↵Tom Grimshaw2010-06-291-11/+88
| | | | | | | | retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets.
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-132-0/+22
|\ \ | |/ |/|
| * Backported GetTextureModule and IAssetService.GetCached()John Hurliman2010-04-082-0/+22
| |
* | * Typo fixesJohn Hurliman2010-03-091-1/+1
| | | | | | | | * Performance improvement in the expensive GenerateClientFlags()
* | Changed asset CreatorID to a stringJohn Hurliman2010-02-221-1/+1
| |
* | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim ↵John Hurliman2010-02-221-1/+1
|\ \ | |/ | | | | into presence-refactor
| * Formatting cleanup.Jeff Ames2010-02-151-1/+1
| |
* | * Adds CreatorID to asset metadata. This is just the plumbing to support ↵John Hurliman2010-02-221-1/+1
|/ | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
* Fix http://opensimulator.org/mantis/view.php?id=4224Justin Clark-Casey (justincc)2010-02-121-1/+1
| | | | | | | This resolves the problem where eyes and hair would turn white on standalone configurations When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it. This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white. This bug did not affect grids since they use a different service connector.
* Changing the AssetBase constructors to avoid initializing assets with an ↵John Hurliman2009-11-051-1/+1
| | | | unknown asset type, and log an error if it ever does happen
* * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2009-10-141-1/+1
|
* Make the asset connector async Get overload return false if the assetMelanie2009-10-051-0/+4
| | | | retrieval was not synchronous.
* Just trying a few things. This one will reduce the number of async calls.Diva Canto2009-10-041-1/+2
|
* Add "dump asset" command to remote asset connector (the only one that uses aMelanie2009-10-011-0/+44
| | | | cache at all)
* Fixes seven leaky .BeginInvoke() callsJohn Hurliman2009-09-031-1/+1
|
* Update svn properties.Jeff Ames2009-06-221-178/+178
|
* Moving these nice HG connectors to their homes.diva2009-06-151-0/+178
|
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-011-1/+1
| | | | LICENSE.txt.
* Slashing trailing slashes.diva2009-05-301-1/+1
| | | | | | https://lists.berlios.de/pipermail/opensim-dev/2009-May/006673.html
* Making the delegate handlers async in async Get, to make things consistent. ↵diva2009-05-291-1/+1
| | | | Them being synchronous in certain cases (asset in cache, for example) may account for slowness reported by folks in osgrid when they have the cache module on. Turns out that some of the provided handlers do non-trivial processing (the ones coming from J2KImage, for example), which means that the several asset requests that hit the cache end up being synchronous. The jury is still out on this.
generated by cgit v1.1 at 2024-12-18 14:14:04 +0000