aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
diff options
context:
space:
mode:
authorMelanie2012-04-17 01:54:54 +0100
committerMelanie2012-04-17 01:54:54 +0100
commit74aa8eee1255d457d0c865682a7c5466ae8d640e (patch)
treed7fed81841ad48e09836ee3582b7161921339f9e /OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentAdd test TestGetChildPartPosition() (diff)
downloadopensim-SC-74aa8eee1255d457d0c865682a7c5466ae8d640e.zip
opensim-SC-74aa8eee1255d457d0c865682a7c5466ae8d640e.tar.gz
opensim-SC-74aa8eee1255d457d0c865682a7c5466ae8d640e.tar.bz2
opensim-SC-74aa8eee1255d457d0c865682a7c5466ae8d640e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs')
0 files changed, 0 insertions, 0 deletions