From 4fcf31e20319fbbfdd76240b351753e5de726eb5 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Fri, 15 Nov 2019 17:58:32 +0200 Subject: SL-12287 FIXED [Project Copy/Paste] Unable to paste texture from "local" storage --- indra/newview/lllocalbitmaps.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/lllocalbitmaps.h') diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h index f6cc1e919e..c15ba9caa4 100644 --- a/indra/newview/lllocalbitmaps.h +++ b/indra/newview/lllocalbitmaps.h @@ -122,6 +122,8 @@ public: LLUUID getWorldID(LLUUID tracking_id); std::string getFilename(LLUUID tracking_id); + bool isLocalBitmap(LLUUID texture_id); + void feedScrollList(LLScrollListCtrl* ctrl); void doUpdates(); void setNeedsRebake(); -- cgit v1.2.3 From f4c7c8aff55d0cd8f044d5b7c8cddb2be750dde5 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Sun, 26 Apr 2020 21:15:54 +0300 Subject: Post-merge build fixes --- indra/newview/lllocalbitmaps.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/lllocalbitmaps.h') diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h index 8dba73f001..def5a6bd6e 100644 --- a/indra/newview/lllocalbitmaps.h +++ b/indra/newview/lllocalbitmaps.h @@ -122,9 +122,7 @@ public: LLUUID getWorldID(LLUUID tracking_id); bool isLocal(LLUUID world_id); std::string getFilename(LLUUID tracking_id); - - bool isLocalBitmap(LLUUID texture_id); - + void feedScrollList(LLScrollListCtrl* ctrl); void doUpdates(); void setNeedsRebake(); -- cgit v1.2.3