aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
diff options
context:
space:
mode:
authorMelanie2012-06-29 22:24:53 +0100
committerMelanie2012-06-29 22:24:53 +0100
commit6137f37028a798f87af3f8afb71ec4856b2a5ad8 (patch)
tree39289035f883415b5ccae36a9b2af1ad60c7acf6 /OpenSim/Region/Framework/Scenes/UuidGatherer.cs
parentMerge branch 'avination' into careminster (diff)
parentMove update of the final optional ODE total frame stat inside the OdeLock rat... (diff)
downloadopensim-SC_OLD-6137f37028a798f87af3f8afb71ec4856b2a5ad8.zip
opensim-SC_OLD-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.gz
opensim-SC_OLD-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.bz2
opensim-SC_OLD-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-10-28 21:35:58 +0000