diff options
| author | Melanie | 2012-09-16 04:21:18 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-16 04:21:18 +0100 |
| commit | 66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba (patch) | |
| tree | f5ce10e917fa3ab24ed98cc10ca5a87057da71a9 /OpenSim/Framework/Servers/MainServer.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revamp the HTTP textures handler to allow a maximum of four fetches (diff) | |
| download | opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.zip opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.gz opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.bz2 opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
Diffstat (limited to 'OpenSim/Framework/Servers/MainServer.cs')
0 files changed, 0 insertions, 0 deletions