From a8ff37b95609148c60ddda9acfca65b2b89d6b9d Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Fri, 1 Jun 2012 15:48:19 -0400
Subject: Migrated physics capsule logic into pathing character object

---
 indra/newview/llfloaterpathfindingobjects.h | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/llfloaterpathfindingobjects.h b/indra/newview/llfloaterpathfindingobjects.h
index fc096a7c31..e0f3c12419 100644
--- a/indra/newview/llfloaterpathfindingobjects.h
+++ b/indra/newview/llfloaterpathfindingobjects.h
@@ -50,6 +50,7 @@ public:
 	virtual void onOpen(const LLSD &pKey);
 	virtual void onClose(bool pIsAppQuitting);
 	virtual void draw();
+	virtual void updateStateOnEditFields();
 
 protected:
 	friend class LLFloaterReg;
@@ -98,11 +99,6 @@ protected:
 
 	EMessagingState                    getMessagingState() const;
 
-public:
-	LLUUID getUUIDFromSelection( LLVector3& pos );
-	BOOL isPhysicsCapsuleEnabled( LLUUID& id, LLVector3& pos );
-	void onShowPhysicsCapsuleClicked();
-
 private:
 	LLFloaterPathfindingObjects(const LLFloaterPathfindingObjects &pOther);
 
@@ -124,18 +120,20 @@ private:
 
 	void updateMessagingStatus();
 	void updateStateOnListActionControls();
-	void updateStateOnEditFields();
 	void                   updateOnScrollListChange();
 
 	LLPathfindingObjectPtr findObject(const LLScrollListItem *pListItem) const;
 
+	void unhideAnyCharacters( );
+
+protected:
 	LLScrollListCtrl                   *mObjectsScrollList;
 	LLTextBase                         *mMessagingStatus;
 	LLButton                           *mRefreshListButton;
 	LLButton                           *mSelectAllButton;
 	LLButton                           *mSelectNoneButton;
 	LLCheckBoxCtrl                     *mShowBeaconCheckBox;
-	LLCheckBoxCtrl                     *mShowPhysicsCapsuleCheckBox;
+	
 	LLButton                           *mTakeButton;
 	LLButton                           *mTakeCopyButton;
 	LLButton                           *mReturnButton;
@@ -157,11 +155,7 @@ private:
 	boost::signals2::connection        mSelectionUpdateSlot;
 	boost::signals2::connection        mRegionBoundaryCrossingSlot;
 	LLAgent::god_level_change_slot_t   mGodLevelChangeSlot;
-public:
-	
-	LLRootHandle<LLFloaterPathfindingObjects>     mSelfHandle;
-	static LLHandle<LLFloaterPathfindingObjects>  sInstanceHandle;
-	static LLHandle<LLFloaterPathfindingObjects> getInstanceHandle();
+
 };
 
 #endif // LL_LLFLOATERPATHFINDINGOBJECTS_H
-- 
cgit v1.2.3