diff options
| author | Melanie | 2011-12-05 17:10:51 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-05 17:10:51 +0000 |
| commit | 5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc (patch) | |
| tree | 537b010672277073530cf013434fa046aabfec7e /OpenSim/Framework/ICnmCache.cs | |
| parent | Strip CR from http responses and limit them to 2048 chars (diff) | |
| parent | HG: Added HEAD method to Helo service. This is the preferred method, but its ... (diff) | |
| download | opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.zip opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.gz opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.bz2 opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework/ICnmCache.cs')
0 files changed, 0 insertions, 0 deletions