diff options
| author | prep <prep@lindenlab.com> | 2013-03-11 15:05:47 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-11 15:05:47 -0400 |
| commit | e0c9174609e2457fab7fe6d7291c6ebbd030397c (patch) | |
| tree | a6f43767b2c3254e501c4ce0af628dfd159ad600 /indra/newview/llviewerinventory.h | |
| parent | 9514210beb1ae2ec49f1cf15e5a4f7af5ae56657 (diff) | |
| parent | 207d9fd767895a3470722fb298eeef4f338e479a (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerinventory.h')
| -rwxr-xr-x | indra/newview/llviewerinventory.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 6fb0fd0153..61b1b8d846 100755 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -34,6 +34,7 @@ #include <boost/signals2.hpp> // boost::signals2::trackable +class LLInventoryPanel; class LLFolderView; class LLFolderBridge; class LLViewerInventoryCategory; @@ -61,7 +62,7 @@ public: virtual const LLUUID& getProtectedAssetUUID() const; // returns LLUUID::null if current agent does not have permission to expose this asset's UUID to the user virtual const std::string& getName() const; virtual S32 getSortField() const; - virtual void setSortField(S32 sortField); + //virtual void setSortField(S32 sortField); virtual void getSLURL(); //Caches SLURL for landmark. //*TODO: Find a better way to do it and remove this method from here. virtual const LLPermissions& getPermissions() const; virtual const bool getIsFullPerm() const; // 'fullperm' in the popular sense: modify-ok & copy-ok & transfer-ok, no special god rules applied @@ -373,7 +374,7 @@ void copy_inventory_from_notecard(const LLUUID& destination_id, U32 callback_id = 0); -void menu_create_inventory_item(LLFolderView* root, +void menu_create_inventory_item(LLInventoryPanel* root, LLFolderBridge* bridge, const LLSD& userdata, const LLUUID& default_parent_uuid = LLUUID::null); |