diff options
author | Oz Linden <oz@lindenlab.com> | 2013-12-19 17:30:58 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-12-19 17:30:58 -0500 |
commit | 8b01fd42b0973e9aa5a68761b15a27bdab9e1797 (patch) | |
tree | 6c567aa0d7dab5fc1b717d3e6e793358572a7094 /indra/newview/llinventorybridge.h | |
parent | 9f056c1ddd46aeab83677bca81dba7c8bcb51f99 (diff) | |
parent | e774431783fba010b1ea1daaf4df25ccf292833e (diff) |
merge changes from project qa viewer
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rwxr-xr-x | indra/newview/llinventorybridge.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 517153e171..bc875e8f37 100755 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -36,6 +36,7 @@ #include "llviewercontrol.h" #include "llviewerwearable.h" #include "lltooldraganddrop.h" +#include "lllandmarklist.h" class LLInventoryFilter; class LLInventoryPanel; @@ -239,7 +240,10 @@ protected: BOOL confirmRemoveItem(const LLSD& notification, const LLSD& response); virtual BOOL isItemPermissive() const; virtual void buildDisplayName() const; + void doActionOnCurSelectedLandmark(LLLandmarkList::loaded_callback_t cb); +private: + void doShowOnMap(LLLandmark* landmark); }; class LLFolderBridge : public LLInvFVBridge |