aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
diff options
context:
space:
mode:
authorMelanie2013-06-30 18:27:30 +0100
committerMelanie2013-06-30 18:27:30 +0100
commitffcee82b1d62150b772464841023a29acc334c84 (patch)
tree957d562be1f9e567daabb9bfdd25e779ec2c11a4 /OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
parentMerge branch 'master' into careminster (diff)
parentGroups V2: charge for group creation only after the group has been successful... (diff)
downloadopensim-SC-ffcee82b1d62150b772464841023a29acc334c84.zip
opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.gz
opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.bz2
opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-14 08:15:15 +0000