From e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 30 Jul 2009 23:22:41 +0000
Subject: merge
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170
https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 ->
viewer-2.0.0-3
---
indra/newview/llpanelplaceinfo.h | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'indra/newview/llpanelplaceinfo.h')
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
index 7f98b6cb76..f06a2d1fb7 100644
--- a/indra/newview/llpanelplaceinfo.h
+++ b/indra/newview/llpanelplaceinfo.h
@@ -55,6 +55,7 @@ class LLPanelPlaceInfo : public LLPanel, LLRemoteParcelInfoObserver
public:
enum INFO_TYPE
{
+ CREATE_LANDMARK,
PLACE,
LANDMARK,
TELEPORT_HISTORY
@@ -84,9 +85,17 @@ public:
/*virtual*/ void setErrorStatus(U32 status, const std::string& reason);
void sendParcelInfoRequest();
+
+ // Displays information about a remote parcel.
+ // Sends a request to the server.
void displayParcelInfo(const LLVector3& pos_region,
const LLUUID& region_id,
const LLVector3d& pos_global);
+
+ // Displays information about the parcel the agent is currently on
+ // without sending a request to the server.
+ void displayAgentParcelInfo();
+
void nameUpdatedCallback(LLTextBox* text,
const std::string& first,
const std::string& last);
--
cgit v1.2.3