diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
commit | 0e6139eb3d3af1e77df20f87deef427993bf2c61 (patch) | |
tree | 2c93f9a8d69f28cec99393b3cacbab85a8aa073d /indra/newview/llinventorybridge.h | |
parent | 6f53b5baeb9e04c20c8fe6f419e09c9604a56497 (diff) | |
parent | 7833ecb58094641d3cd79c6772ad6c9fd4799f92 (diff) |
merging in latest changes
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r-- | indra/newview/llinventorybridge.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index b33972167c..5e96f00920 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -171,10 +171,10 @@ protected: BOOL restamp); void removeBatchNoCheck(std::vector<LLFolderViewModelItem*>& batch); protected: - LLHandle<LLInventoryPanel> mInventoryPanel; - LLFolderView* mRoot; - const LLUUID mUUID; // item id - LLInventoryType::EType mInvType; + LLHandle<LLInventoryPanel> mInventoryPanel; + LLFolderView* mRoot; + const LLUUID mUUID; // item id + LLInventoryType::EType mInvType; bool mIsLink; LLTimer mTimeSinceRequestStart; mutable std::string mDisplayName; @@ -212,6 +212,8 @@ public: const LLUUID& uuid) : LLInvFVBridge(inventory, root, uuid) {} + typedef boost::function<void(std::string& slurl)> slurl_callback_t; + virtual void performAction(LLInventoryModel* model, std::string action); virtual void selectItem(); virtual void restoreItem(); @@ -346,7 +348,7 @@ private: bool mWearables; bool mIsLoading; LLTimer mTimeSinceRequestStart; - LLRootHandle<LLFolderBridge> mHandle; + LLRootHandle<LLFolderBridge> mHandle; }; class LLTextureBridge : public LLItemBridge |