summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplaceinfo.h
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-07-21 00:57:23 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-07-21 00:57:23 +0000
commit73a97010e6c8c7874fdc1778ab46e492f77d9394 (patch)
treef0c8efb1cebcc6157c8e6678cf0eb39b5792a1d7 /indra/newview/llpanelplaceinfo.h
parentdedb5be906b53d1ea8601ff6b9c4b726fda02da8 (diff)
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llpanelplaceinfo.h')
-rw-r--r--indra/newview/llpanelplaceinfo.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
index 8b00507ba0..7f98b6cb76 100644
--- a/indra/newview/llpanelplaceinfo.h
+++ b/indra/newview/llpanelplaceinfo.h
@@ -56,7 +56,8 @@ public:
enum INFO_TYPE
{
PLACE,
- LANDMARK
+ LANDMARK,
+ TELEPORT_HISTORY
};
LLPanelPlaceInfo();
@@ -77,7 +78,8 @@ public:
// sets a corresponding title and contents.
void setInfoType(INFO_TYPE type);
- void toggleMediaPanel();
+ BOOL isMediaPanelVisible();
+ void toggleMediaPanel(BOOL visible);
void displayItemInfo(const LLInventoryItem* pItem);
/*virtual*/ void setErrorStatus(U32 status, const std::string& reason);