Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |