| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-05-10 | 1 | -0/+0 |
| |\ | |||||
| | * | Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect ↵ | Justin Clark-Casey (justincc) | 2012-05-09 | 1 | -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 careminster | Melanie | 2012-03-09 | 1 | -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 Canto | 2012-03-08 | 1 | -1/+20 |
| | | | | | | | | | pattern as suggested in the patch mantis #5921. Testing it in this smaller context to see how it works. | ||||
| * | | 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 |
| |\ \ | |/ | | | | | | | 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-05 | 1 | -43/+2 |
| | | | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 1 | -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-02 | 1 | -0/+6 |
| | | | | | | | | | hunting. No functional changes. | ||||
| * | | 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 |
| | | | | | | | | | | | | | depending on the first two digits of the asset id. | ||||
| * | | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -8/+48 |
| |\ \ \ | |/ / |/| / | |/ | |||||
| | * | When an uncached asset is requested multiple times concurrently, only load ↵ | Oren Hurvitz | 2011-07-21 | 1 | -9/+49 |
| | | | | | | | | | | | | | it once Signed-off-by: root <root@grid00001.t-data.com> | ||||
| * | | 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 ↵ | Diva Canto | 2011-04-12 | 1 | -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-refactor | Melanie | 2010-09-13 | 1 | -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 Canto | 2010-09-08 | 1 | -8/+15 |
| | | | | | | | | | instantiate the right network connectors. Tested on Robust only. | ||||
| | * | * Adds IAssetService.GetCached() to allow asset fetching from the local ↵ | John Hurliman | 2010-04-08 | 2 | -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-request | Tom Grimshaw | 2010-07-04 | 1 | -3/+3 |
| | | | |||||
| * | | Make sure the AssetServiceConnector times out within 30 seconds. If it ↵ | Tom Grimshaw | 2010-07-03 | 1 | -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 Grimshaw | 2010-07-01 | 1 | -3/+2 |
| | | | | | | | | | if it enters a retry queue | ||||
| * | | 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 ↵ | Tom Grimshaw | 2010-07-01 | 1 | -0/+4 |
| | | | | | | | | | (seems a connection failure does not throw an exception) | ||||
| * | | The other half of the asset fix. Implement an exponentially incrementing ↵ | Tom Grimshaw | 2010-06-29 | 1 | -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-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 |
| | | | | | | | | | * Performance improvement in the expensive GenerateClientFlags() | ||||
| * | | 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 ↵ | John Hurliman | 2010-02-22 | 1 | -1/+1 |
| |\ \ | |/ | | | | | into presence-refactor | ||||
| | * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 1 | -1/+1 |
| | | | |||||
| * | | * Adds CreatorID to asset metadata. This is just the plumbing to support ↵ | John Hurliman | 2010-02-22 | 1 | -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=4224 | Justin Clark-Casey (justincc) | 2010-02-12 | 1 | -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 Hurliman | 2009-11-05 | 1 | -1/+1 |
| | | | | | unknown asset type, and log an error if it ever does happen | ||||
| * | * minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-10-14 | 1 | -1/+1 |
| | | |||||
| * | Make the asset connector async Get overload return false if the asset | Melanie | 2009-10-05 | 1 | -0/+4 |
| | | | | | retrieval was not synchronous. | ||||
| * | Just trying a few things. This one will reduce the number of async calls. | Diva Canto | 2009-10-04 | 1 | -1/+2 |
| | | |||||
| * | Add "dump asset" command to remote asset connector (the only one that uses a | Melanie | 2009-10-01 | 1 | -0/+44 |
| | | | | | cache at all) | ||||
| * | Fixes seven leaky .BeginInvoke() calls | John Hurliman | 2009-09-03 | 1 | -1/+1 |
| | | |||||
| * | Update svn properties. | Jeff Ames | 2009-06-22 | 1 | -178/+178 |
| | | |||||
| * | Moving these nice HG connectors to their homes. | diva | 2009-06-15 | 1 | -0/+178 |
| | | |||||
| * | Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵ | Jeff Ames | 2009-06-01 | 1 | -1/+1 |
| | | | | | LICENSE.txt. | ||||
| * | Slashing trailing slashes. | diva | 2009-05-30 | 1 | -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. ↵ | diva | 2009-05-29 | 1 | -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. | ||||
| * | Catching exceptions on Store, including timeout. Store may fail, for ↵ | diva | 2009-05-26 | 1 | -2/+10 |
| | | | | | | | | | whatever reason, but it won't crash the sim. Addresses mantis #3707, mantis #3713, mantis #3686. | ||||
| * | Move the connectors under services for reasons of application logic. Remove | Melanie Thielker | 2009-05-18 | 1 | -0/+260 |
| the user server skeleton in preparation for introducing a generic server | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |