diff options
| author | Melanie | 2012-07-16 22:22:42 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-16 22:22:42 +0100 |
| commit | c256447f46db1738131763960c9394f03b072c46 (patch) | |
| tree | 277255a693b3ce62366816338482a602d7d979bf /OpenSim/Server/Base/HttpServerBase.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Allow setting linked avatar positions from within a prim not the one sat on (diff) | |
| download | opensim-SC-c256447f46db1738131763960c9394f03b072c46.zip opensim-SC-c256447f46db1738131763960c9394f03b072c46.tar.gz opensim-SC-c256447f46db1738131763960c9394f03b072c46.tar.bz2 opensim-SC-c256447f46db1738131763960c9394f03b072c46.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Server/Base/HttpServerBase.cs')
0 files changed, 0 insertions, 0 deletions