aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces/IAssetService.cs
diff options
context:
space:
mode:
authorMelanie2012-04-25 02:33:39 +0100
committerMelanie2012-04-25 02:33:39 +0100
commit9a235018247cb8dfe07043c354b31da155d19e1f (patch)
treedb8c223bc505a0bf9437d3550f4a101d24874545 /OpenSim/Services/Interfaces/IAssetService.cs
parentMerge branch 'master' into careminster (diff)
parentrefactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() (diff)
downloadopensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.zip
opensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.tar.gz
opensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.tar.bz2
opensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Services/Interfaces/IAssetService.cs')
0 files changed, 0 insertions, 0 deletions