diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:43:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:43:55 -0500 |
| commit | ce284c28d8134fd92854bfd910841da6780cf4f9 (patch) | |
| tree | a6f66c15eb18f82e2f5a2618a323d3c40b9157f2 /indra/newview/llinventorybridge.h | |
| parent | dec487cd7f04f00d4aa6428d190ffbf978ea57da (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
merge changes for 3.7.2-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 |