aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-021-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-021-8/+8
| | | | | | | | to reduce potential code complexity and make code reading easier.
* | Merge branch 'master' into careminsterMelanie2011-12-281-2/+5
|\ \ | |/
| * HG: more / love for XmasDiva Canto2011-12-241-2/+5
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-051-0/+3
|/
* First stab at cleaning up Caps. Compiles. Untested.Diva Canto2011-04-301-0/+398