| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-07-04 | 1 | -1/+1 |
| |\ | |||||
| | * | HG: close a loophole by which if something was wrong with the ServiceURLs it ↵ | Diva Canto | 2013-07-02 | 1 | -1/+1 |
| | | | | | | | | | resulted in never ending asset requests | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-05-16 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | ||||
| | * | Comment out log message about looking for asset data in remove asset service ↵ | Justin Clark-Casey (justincc) | 2013-05-14 | 1 | -1/+1 |
| | | | | | | | | | for now, in order to reduce log levels in a test region with many hg origin avatars | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 1 | -5/+36 |
| |\ \ | |/ | |||||
| | * | Allow a viewer UDP image request retry to trigger another asset fetch if an ↵ | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -2/+30 |
| | | | | | | | | | | | | | existing fetch hasn't responded before a timeout. This is to stop a high priority image/texture request from blocking the entire download queue if its asset fetch got dropped for some reason. | ||||
| | * | Add image not in database test for LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -0/+3 |
| | | | |||||
| | * | Add basic request and send image regression tests for LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 1 | -9/+15 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | Minor formatting changes and commented out log lines for future debugging of ↵ | Justin Clark-Casey (justincc) | 2012-01-04 | 1 | -9/+15 |
| | | | | | | | | | image manager (udp texture fetch). No significant functional changes. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 1 | -9/+9 |
| |\ \ | |/ | | | | | | | | | | | | | 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 | ||||
| | * | Reduce accessibility of some J2KImage/LLImageManager properties and methods ↵ | Justin Clark-Casey (justincc) | 2012-01-02 | 1 | -8/+8 |
| | | | | | | | | | to reduce potential code complexity and make code reading easier. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-28 | 1 | -2/+5 |
| |\ \ | |/ | |||||
| | * | HG: more / love for Xmas | Diva Canto | 2011-12-24 | 1 | -2/+5 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 1 | -0/+3 |
| |/ | |||||
| * | First stab at cleaning up Caps. Compiles. Untested. | Diva Canto | 2011-04-30 | 1 | -0/+398 |
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |