diff options
Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework/AvatarPickerReplyDataArgs.cs')
0 files changed, 0 insertions, 0 deletions