aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
diff options
context:
space:
mode:
authorMelanie2013-01-19 02:38:04 +0000
committerMelanie2013-01-19 02:38:04 +0000
commit12efac494a6f55d85b778bf752a9b6c37c1b0ced (patch)
tree4adec2a3f235f54e47a2216f7c9abaffdfac0c53 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
parentMerge branch 'master' into careminster (diff)
parentExplicitly stop PollServiceRequestManager() rather than relying on its destru... (diff)
downloadopensim-SC-12efac494a6f55d85b778bf752a9b6c37c1b0ced.zip
opensim-SC-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.gz
opensim-SC-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.bz2
opensim-SC-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-22 19:42:49 +0000