aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie2012-04-09 21:40:41 +0100
committerMelanie2012-04-09 21:40:41 +0100
commita45ff62adb8e44192ffba6ef6ac346a7c3cf98a2 (patch)
treecc2e4d24cc5ea3b48a9521f260bae747bcbbfb14 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'master' into careminster (diff)
parentFix a LSL merge artefact (diff)
downloadopensim-SC_OLD-a45ff62adb8e44192ffba6ef6ac346a7c3cf98a2.zip
opensim-SC_OLD-a45ff62adb8e44192ffba6ef6ac346a7c3cf98a2.tar.gz
opensim-SC_OLD-a45ff62adb8e44192ffba6ef6ac346a7c3cf98a2.tar.bz2
opensim-SC_OLD-a45ff62adb8e44192ffba6ef6ac346a7c3cf98a2.tar.xz
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
0 files changed, 0 insertions, 0 deletions