From a904e887bdee8656694551697e860a06bbfe9b6c Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Wed, 27 Jan 2010 19:00:12 +0200
Subject: Fixed normal bug (EXT-4700) Creating a landmark brings up the
 Landmark sidepanel info twice. - Disabled "Close" and "Back" buttons to
 prevent closing "Create Landmark" panel until created landmark is loaded.

--HG--
branch : product-engine
---
 indra/newview/llpanelplaces.h | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
index a098974659..5de78b1595 100644
--- a/indra/newview/llpanelplaces.h
+++ b/indra/newview/llpanelplaces.h
@@ -115,6 +115,8 @@ private:
 	LLToggleableMenu*			mPlaceMenu;
 	LLToggleableMenu*			mLandmarkMenu;
 
+	LLButton*					mPlaceProfileBackBtn;
+	LLButton*					mLandmarkInfoBackBtn;
 	LLButton*					mTeleportBtn;
 	LLButton*					mShowOnMapBtn;
 	LLButton*					mEditBtn;
-- 
cgit v1.2.3


From fbe21db8572c6d0e6a429a3ca209da6e26badf56 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 28 Jan 2010 20:07:25 +0200
Subject: No ticket. Fixed possible build error.

--HG--
branch : product-engine
---
 indra/newview/llpanelplaces.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
index 5de78b1595..110d7a1054 100644
--- a/indra/newview/llpanelplaces.h
+++ b/indra/newview/llpanelplaces.h
@@ -32,9 +32,9 @@
 #ifndef LL_LLPANELPLACES_H
 #define LL_LLPANELPLACES_H
 
-#include "llpanel.h"
+#include "lltimer.h"
 
-class LLTimer;
+#include "llpanel.h"
 
 class LLInventoryItem;
 class LLFilterEditor;
-- 
cgit v1.2.3