From 543df6736fb0ae312b9a5e056a35bf8fffd2b6c9 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Wed, 17 Aug 2011 01:42:21 +0300
Subject: SH-2171 FIXED New prim weights added to weights detail floater. -
 Fixed detecting cross-parcel objects selection. - Various fixes in
 LLAccountingCostManager. - getSelectedObjectRenderCost() moved from
 LLFloaterTools to LLObjectSelection where it used to reside. Previous
 commented out implementation of this method removed.

---
 indra/newview/llfloatertools.h | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index 69636190fc..8c4cb721d3 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -113,7 +113,6 @@ private:
 	static bool multipleFacesSelectedConfirm(const LLSD& notification, const LLSD& response);
 	static void setObjectType( LLPCode pcode );
 	void onClickGridOptions();
-	S32 calcRenderCost();
 
 public:
 	LLButton		*mBtnFocus;
-- 
cgit v1.2.3


From ca8a484f0ee4bcb9b68268f871082d4200062f0e Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Mon, 22 Aug 2011 19:18:36 +0300
Subject: SH-2169 FIXED Land impacts data added to build tools floater. Land
 selection moved from advanced weights floater to build tools floater. Removed
 selection observer from weights floater, selection data update in it is
 initiated from build floater.

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

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

diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index 8c4cb721d3..63ed9dc82b 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -47,6 +47,7 @@ class LLMediaCtrl;
 class LLTool;
 class LLParcelSelection;
 class LLObjectSelection;
+class LLLandImpactsObserver;
 
 typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;
 
@@ -103,6 +104,7 @@ public:
 	void updateMediaTitle();
 	void navigateToTitleMedia( const std::string url );
 	bool selectedMediaEditable();
+	void updateLandImpacts();
 
 private:
 	void refresh();
@@ -180,6 +182,8 @@ public:
 
 	LLTabContainer*			mTabLand;
 
+	LLLandImpactsObserver*  mLandImpactsObserver;
+
 	LLParcelSelectionHandle	mParcelSelection;
 	LLObjectSelectionHandle	mObjectSelection;
 
-- 
cgit v1.2.3