diff options
Diffstat (limited to 'indra/newview/llviewerinventory.h')
| -rw-r--r-- | indra/newview/llviewerinventory.h | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 21a6606253..0dfbf0cced 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 std::string& label, const LLSD& value);      void determineFolderType();      void changeType(LLFolderType::EType new_folder_type); @@ -264,7 +264,7 @@ public:  class LLViewerJointAttachment; -void rez_attachment_cb(const LLUUID& inv_item, LLViewerJointAttachment *attachmentp); +void rez_attachment_cb(const LLUUID& inv_item, LLViewerJointAttachment *attachmentp, bool replace);  void activate_gesture_cb(const LLUUID& inv_item);  | 
