summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.h
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-02-13 16:16:24 -0800
committerCallum Prentice <callum@lindenlab.com>2014-02-13 16:16:24 -0800
commit95f859dc22724611f4a1d2dc91e0c1769ec1e632 (patch)
tree3083719871df0fa6627b7a30514bfef3ad5de816 /indra/newview/llinventorybridge.h
parentc5fff11a76613b366216bcd262dfddfd0cc2a6a3 (diff)
parent413be91cf5044889ade97dcbec4b17fceff122e3 (diff)
Merge with viewer-release
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rwxr-xr-xindra/newview/llinventorybridge.h4
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