aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
authorMelanie2012-09-16 04:11:20 +0100
committerMelanie2012-09-16 04:11:20 +0100
commitdb774d4292588db1e2ac4a9fafe977ddbec353ee (patch)
tree5fc381d7cb96cc0d2b47e4807821f488c339ec13 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
parentMerge branch 'avination' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.zip
opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.gz
opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.bz2
opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-11-06 01:14:04 +0000