merge

1 files changed, 20 insertions, 16 deletions

diff --git a/indra/newview/llfloaterobjectweights.h b/indra/newview/llfloaterobjectweights.h
index 50d028909e..9a244573be 100644
--- a/indra/newview/llfloaterobjectweights.h
+++ b/indra/newview/llfloaterobjectweights.h
@@ -30,35 +30,46 @@
 #include "llfloater.h"
 
 #include "llaccountingcostmanager.h"
+#include "llselectmgr.h"
 
-class LLLandImpactsObserver;
-class LLObjectSelection;
-class LLParcelSelection;
+class LLParcel;
 class LLTextBox;
 
+/**
+ * struct LLCrossParcelFunctor
+ *
+ * A functor that checks whether a bounding box for all
+ * selected objects crosses a region or parcel bounds.
+ */
+struct LLCrossParcelFunctor : public LLSelectedObjectFunctor
+{
+	/*virtual*/ bool apply(LLViewerObject* obj);
+
+private:
+	LLBBox	mBoundingBox;
+};
+
+
 class LLFloaterObjectWeights : public LLFloater, LLAccountingCostObserver
 {
 public:
 	LOG_CLASS(LLFloaterObjectWeights);
 
-	typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;
-	typedef LLSafeHandle<LLParcelSelection> LLParcelSelectionHandle;
-
 	LLFloaterObjectWeights(const LLSD& key);
 	~LLFloaterObjectWeights();
 
 	/*virtual*/ BOOL postBuild();
 
 	/*virtual*/ void onOpen(const LLSD& key);
-	/*virtual*/ void onClose(bool app_quitting);
 
 	/*virtual*/ void onWeightsUpdate(const SelectionCost& selection_cost);
 	/*virtual*/ void setErrorStatus(U32 status, const std::string& reason);
 
-	void updateLandImpacts();
+	void updateLandImpacts(const LLParcel* parcel);
+	void refresh();
 
 private:
-	void refresh();
+	/*virtual*/ void generateTransactionID();
 
 	void toggleWeightsLoadingIndicators(bool visible);
 	void toggleLandImpactsLoadingIndicators(bool visible);
@@ -77,13 +88,6 @@ private:
 	LLTextBox		*mRezzedOnLand;
 	LLTextBox		*mRemainingCapacity;
 	LLTextBox		*mTotalCapacity;
-
-	LLLandImpactsObserver		*mLandImpactsObserver;
-
-	LLObjectSelectionHandle		mObjectSelection;
-	LLParcelSelectionHandle		mParcelSelection;
-
-	boost::signals2::connection	mSelectMgrConnection;
 };
 
 #endif //LL_LLFLOATEROBJECTWEIGHTS_H