aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
diff options
context:
space:
mode:
authorMelanie2012-11-15 03:46:10 +0000
committerMelanie2012-11-15 03:46:10 +0000
commit5895c4cc6f698bcb415b08a96322f06fb44413ca (patch)
tree5b223f297b27ac3966c65526f422fc82095b9b86 /OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
parentMerge branch 'master' into careminster (diff)
parentImprove inventory folder version updating for mssql database plugin. (diff)
downloadopensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.zip
opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.gz
opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.bz2
opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs')
0 files changed, 0 insertions, 0 deletions