aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
diff options
context:
space:
mode:
authorMelanie2012-05-19 13:34:44 +0100
committerMelanie2012-05-19 13:34:44 +0100
commitebd9d2618bc88eafdc0bbf86c9f1755476cc68e4 (patch)
tree2d63da14ca345487a27f2202b2490eae0d86b60c /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
parentMerge branch 'avination' into careminster (diff)
parentRemove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ... (diff)
downloadopensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.zip
opensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.gz
opensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.bz2
opensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-18 03:13:23 +0000