diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-08 07:30:46 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-08 07:37:27 +0800 |
| commit | cfc4f075a82f9dc1156fce6994083143de6727a8 (patch) | |
| tree | 2948ea5c6ebfbbc15721a2838804d6a766742887 /indra/newview/llviewerinventory.h | |
| parent | 73fdef6693017f1160875d1f7a79875945df3929 (diff) | |
| parent | 55f1c8b9797836c9816528bb5b772eb83b083b50 (diff) | |
Merge tag 'Second_Life_Release#55f1c8b9-2025.06' into 2025.06
Diffstat (limited to 'indra/newview/llviewerinventory.h')
| -rw-r--r-- | indra/newview/llviewerinventory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 5cd31353f8..0dfbf0cced 100644 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -233,7 +233,7 @@ public: S32 getViewerDescendentCount() const; virtual void exportLLSD(LLSD &sd) const; - virtual bool importLLSD(const LLSD& cat_data); + virtual bool importLLSD(const std::string& label, const LLSD& value); void determineFolderType(); void changeType(LLFolderType::EType new_folder_type); |