aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
diff options
context:
space:
mode:
authorMelanie2013-07-13 00:57:03 +0100
committerMelanie2013-07-13 00:57:03 +0100
commitc6d75cda974a69cd9fe3276bac182aa4c6bb1f17 (patch)
tree9d5abfecd2cce676a25cd94a3ca29daf62f2e608 /OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
parentMerge branch 'master' into careminster (diff)
parentReinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() in... (diff)
downloadopensim-SC-c6d75cda974a69cd9fe3276bac182aa4c6bb1f17.zip
opensim-SC-c6d75cda974a69cd9fe3276bac182aa4c6bb1f17.tar.gz
opensim-SC-c6d75cda974a69cd9fe3276bac182aa4c6bb1f17.tar.bz2
opensim-SC-c6d75cda974a69cd9fe3276bac182aa4c6bb1f17.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-22 16:55:33 +0000