summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.h
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-05-29 12:14:38 +0800
committerErik Kundiman <erik@megapahit.org>2025-05-29 12:14:38 +0800
commit6641e36082f27faa282a0af6f88f381ffc97e179 (patch)
tree3c316421d1ad30c9061094bf7dd814522b28bc1c /indra/newview/llviewerinventory.h
parent481b6bb4c4dfd57a509bd73e51ca57338ad4d860 (diff)
parentb9ab6c3644da02bed6941dc8df433fb1c626f8c7 (diff)
Merge tag 'Second_Life_Project#b9ab6c36-2025.05' into 2025.05
Diffstat (limited to 'indra/newview/llviewerinventory.h')
-rw-r--r--indra/newview/llviewerinventory.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 18daa368d9..5cd31353f8 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -232,8 +232,8 @@ public:
// How many descendents do we currently have information for in the InventoryModel?
S32 getViewerDescendentCount() const;
- LLSD exportLLSD() const;
- bool importLLSD(const LLSD& cat_data);
+ virtual void exportLLSD(LLSD &sd) const;
+ virtual bool importLLSD(const LLSD& cat_data);
void determineFolderType();
void changeType(LLFolderType::EType new_folder_type);