aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
diff options
context:
space:
mode:
authorMelanie2013-05-16 21:59:14 +0100
committerMelanie2013-05-16 21:59:14 +0100
commit42c82b564ea0fe58376bffae2731bcedf4b842c7 (patch)
tree7ed5d564f320c1dcf6b709a1436b584a59e74a5e /OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
parentMerge branch 'master' into careminster (diff)
parentminor: remove long commented out scene cache clearing code in EntityTransferM... (diff)
downloadopensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.zip
opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.gz
opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.bz2
opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs')
0 files changed, 0 insertions, 0 deletions