aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:02:15 +0100
committerMelanie2011-10-12 07:02:15 +0100
commitb2090e711f8af8e9f4fc0f8332635624620fde91 (patch)
treebfe22d792890498751932464e5f95b8d66c84c1d /OpenSim/Region/Framework/Scenes/Scene.cs
parentHACK: Remove advanced property resending until it is fixed properly in core. (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-b2090e711f8af8e9f4fc0f8332635624620fde91.zip
opensim-SC-b2090e711f8af8e9f4fc0f8332635624620fde91.tar.gz
opensim-SC-b2090e711f8af8e9f4fc0f8332635624620fde91.tar.bz2
opensim-SC-b2090e711f8af8e9f4fc0f8332635624620fde91.tar.xz
Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
0 files changed, 0 insertions, 0 deletions