aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/IUserService.cs
diff options
context:
space:
mode:
authorMelanie2010-05-23 06:09:54 +0100
committerMelanie2010-05-23 06:09:54 +0100
commita9dad994324122555c436a5db14ff4072fbf6c89 (patch)
tree3b5dfbb8f6d989cff561fd304c822e7cbfc7c61a /OpenSim/Framework/Communications/IUserService.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentApply http://opensimulator.org/mantis/view.php?id=4632 (diff)
downloadopensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.zip
opensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.tar.gz
opensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.tar.bz2
opensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.tar.xz
Merge branch 'master' into careminster-presence-refactor
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework/Communications/IUserService.cs')
0 files changed, 0 insertions, 0 deletions