aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Friends/FriendsService.cs
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-29 23:46:53 -0400
committerJonathan Freedman2010-10-29 23:46:53 -0400
commit594f23ff225b4c4d438a89eefd6337cf281e093c (patch)
treef617129f759c91ff27b07f2e8f23712a9800c45e /OpenSim/Services/Friends/FriendsService.cs
parentMerge branch 'master' into mantis5110 (diff)
parentHypergridLinker optimizations and enable use of owner_uuid/EstateOwner with l... (diff)
downloadopensim-SC-594f23ff225b4c4d438a89eefd6337cf281e093c.zip
opensim-SC-594f23ff225b4c4d438a89eefd6337cf281e093c.tar.gz
opensim-SC-594f23ff225b4c4d438a89eefd6337cf281e093c.tar.bz2
opensim-SC-594f23ff225b4c4d438a89eefd6337cf281e093c.tar.xz
Merge branch 'master' into mantis5110
Conflicts: OpenSim/Services/GridService/HypergridLinker.cs
Diffstat (limited to 'OpenSim/Services/Friends/FriendsService.cs')
0 files changed, 0 insertions, 0 deletions