Useful fixies from upstream

This commit is contained in:
Inusaito Sayori
2014-09-26 12:10:14 -04:00
parent 01f2e70f1d
commit da2d80d23a
4 changed files with 22 additions and 5 deletions

View File

@@ -3103,7 +3103,7 @@ void LLFolderBridge::pasteFromClipboard(bool only_copies)
{
if (move_is_into_current_outfit || move_is_into_outfit)
{
if (can_move_to_outfit(item, move_is_into_current_outfit))
if (item && can_move_to_outfit(item, move_is_into_current_outfit))
{
dropToOutfit(item, move_is_into_current_outfit);
}