diff options
| author | Melanie | 2012-09-09 13:30:24 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-09 13:30:24 +0100 |
| commit | 0d97beefce9eaa675c93504b7cb8230e75e17763 (patch) | |
| tree | 587516c2fdf96179c93a0d37624a8d3a9f7bebdd /OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | implementing per-region configuration of limits on the number of prims one ca... (diff) | |
| download | opensim-SC-0d97beefce9eaa675c93504b7cb8230e75e17763.zip opensim-SC-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.gz opensim-SC-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.bz2 opensim-SC-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs')
0 files changed, 0 insertions, 0 deletions