aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
diff options
context:
space:
mode:
authorMelanie2013-03-29 02:19:12 +0000
committerMelanie2013-03-29 02:19:12 +0000
commite7d76c91c227ccd40af5067d28b5f08dfbcbc093 (patch)
treeb7f91898700fe85567a4ba1c9783631daafd3a2b /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
parentMerge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster (diff)
parentEliminate code which tries to restart attachment scripts in ScenePresence.Mak... (diff)
downloadopensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.zip
opensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.tar.gz
opensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.tar.bz2
opensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-14 21:12:35 +0000