diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-04-03 18:56:46 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-04-03 18:56:46 -0400 |
| commit | d7481cd07c3e0b5eed54ff6a3539406d09ed0669 (patch) | |
| tree | 7e0d2a2a9733784f16518b977423deb225021651 /indra/newview/llinventorybridge.h | |
| parent | 076761a03d7cb8b53e6e3d4f2120091eabeba37a (diff) | |
| parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
Merge. Refresh from viewer-release after 3.7.4 release.
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 |