From fb20751330204ea63973c5f10b0f536d6a4a3e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Sun, 17 Nov 2019 22:42:53 -0500 Subject: [PATCH] Create LFIDBearer default virtual functions for IDs and counts for 0/1 ID --- indra/llui/lfidbearer.h | 4 ++-- indra/newview/llnameui.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/indra/llui/lfidbearer.h b/indra/llui/lfidbearer.h index 8b4c7684d..90a485b30 100644 --- a/indra/llui/lfidbearer.h +++ b/indra/llui/lfidbearer.h @@ -28,8 +28,8 @@ struct LFIDBearer { virtual ~LFIDBearer() { if (sActive == this) sActive = nullptr; } virtual LLUUID getStringUUIDSelectedItem() const = 0; - virtual uuid_vec_t getSelectedIDs() const = 0; - virtual S32 getNumSelected() const = 0; + virtual uuid_vec_t getSelectedIDs() const { return { getStringUUIDSelectedItem() }; } + virtual S32 getNumSelected() const { return getStringUUIDSelectedItem().notNull(); } template static T* getActive() { return static_cast(sActive); } static LLUUID getActiveSelectedID() { return sActive->getStringUUIDSelectedItem(); } diff --git a/indra/newview/llnameui.h b/indra/newview/llnameui.h index 4bf53ae46..15012fd08 100644 --- a/indra/newview/llnameui.h +++ b/indra/newview/llnameui.h @@ -48,7 +48,6 @@ struct LLNameUI : public LFIDBearer } LLUUID getStringUUIDSelectedItem() const override final { return mNameID; } - uuid_vec_t getSelectedIDs() const override final { return { mNameID }; } S32 getNumSelected() const override final { return 1; } void setIsGroup(bool is_group);