Merge remote-tracking branch 'upstream/master' into remove-usings

This commit is contained in:
Dean Herbert
2017-02-24 11:29:34 +09:00
25 changed files with 38 additions and 43 deletions

View File

@ -102,7 +102,7 @@ namespace osu.Game.Overlays.Toolbar
newSprite.FillMode = FillMode.Fit;
newSprite.Preload(game, s =>
newSprite.LoadAsync(game, s =>
{
Sprite?.FadeOut();
Sprite?.Expire();
@ -120,7 +120,6 @@ namespace osu.Game.Overlays.Toolbar
public class OnlineSprite : Sprite
{
private readonly string url;
private readonly int userId;
public OnlineSprite(string url)
{