From 66793abc716d86660e2fa4c7731e235881525c69 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Fri, 2 Jul 2021 16:11:39 +0300 Subject: SL-14075 allow exporting multiple textures with the same name --- indra/newview/llinventorybridge.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llinventorybridge.h') diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 9af8664388..7db9c640f2 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -403,6 +403,9 @@ public: virtual void buildContextMenu(LLMenuGL& menu, U32 flags); virtual void performAction(LLInventoryModel* model, std::string action); bool canSaveTexture(void); + void setFileName(std::string& file_name) { mFileName = file_name; } +protected: + std::string mFileName; }; class LLSoundBridge : public LLItemBridge -- cgit v1.2.3 From d53055406ea82f57edc7d5f59ed73ca1cda90621 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 12 Jul 2021 20:32:48 +0300 Subject: DRTVWR-521 xcode buildfix --- indra/newview/llinventorybridge.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llinventorybridge.h') diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 7db9c640f2..5d938bbc70 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -403,7 +403,7 @@ public: virtual void buildContextMenu(LLMenuGL& menu, U32 flags); virtual void performAction(LLInventoryModel* model, std::string action); bool canSaveTexture(void); - void setFileName(std::string& file_name) { mFileName = file_name; } + void setFileName(std::string file_name) { mFileName = file_name; } protected: std::string mFileName; }; -- cgit v1.2.3 From 3bdabd80de15d7dcadb460d8fa37af6674692ebd Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Thu, 15 Jul 2021 19:33:42 +0300 Subject: DRTVWR-521 improvement --- indra/newview/llinventorybridge.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llinventorybridge.h') diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 5d938bbc70..c21bfbd02d 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -403,7 +403,7 @@ public: virtual void buildContextMenu(LLMenuGL& menu, U32 flags); virtual void performAction(LLInventoryModel* model, std::string action); bool canSaveTexture(void); - void setFileName(std::string file_name) { mFileName = file_name; } + void setFileName(const std::string& file_name) { mFileName = file_name; } protected: std::string mFileName; }; -- cgit v1.2.3