From ea1bfae838c59e24ec1a962f7d015d609b63d083 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Mon, 19 Oct 2009 02:17:01 +0000
Subject: Merging revisions 2070-2084 of
 https://svn.aws.productengine.com/secondlife/pe/stable-2 into
 P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-792 EXT-1519 EXT-1514
 EXT-1245 EXT-1600 EXT-1535 EXT-1174 EXT-1241 * Dev: EXT-1271 EXT-1601
 EXT-1154

---
 indra/newview/llpanelplaceinfo.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llpanelplaceinfo.h')

diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
index 3e8344ff12..06fee2224e 100644
--- a/indra/newview/llpanelplaceinfo.h
+++ b/indra/newview/llpanelplaceinfo.h
@@ -45,7 +45,7 @@ class LLButton;
 class LLComboBox;
 class LLInventoryItem;
 class LLLineEditor;
-class LLPanelPick;
+class LLPanelPickEdit;
 class LLParcel;
 class LLIconCtrl;
 class LLTextBox;
@@ -89,7 +89,7 @@ public:
 	
 	// Create a pick for the location specified
 	// by global_pos.
-	void createPick(const LLVector3d& pos_global, LLPanelPick* pick_panel);
+	void createPick(const LLVector3d& pos_global, LLPanelPickEdit* pick_panel);
 
 	BOOL isMediaPanelVisible();
 	void toggleMediaPanel(BOOL visible);
-- 
cgit v1.2.3