PATH-225: Replacing the Fixed and Walkable columns with a single State column.

1 files changed, 2 insertions, 5 deletions

diff --git a/indra/newview/llfloaterpathfindinglinksets.h b/indra/newview/llfloaterpathfindinglinksets.h
index 02d90accf1..915d799079 100644
--- a/indra/newview/llfloaterpathfindinglinksets.h
+++ b/indra/newview/llfloaterpathfindinglinksets.h
@@ -64,12 +64,10 @@ public:
 

 	EPathState         getPathState() const;

 	void               setPathState(EPathState pPathState);

+	static EPathState  getPathState(bool pIsPermanent, bool pIsWalkable);

 	static BOOL        isPermanent(EPathState pPathState);

 	static BOOL        isWalkable(EPathState pPathState);

 

-	BOOL               isPermanent() const;

-	BOOL               isWalkable() const;

-

 	BOOL               isPhantom() const;

 	void               setPhantom(BOOL pIsPhantom);

 

@@ -93,8 +91,7 @@ private:
 	std::string mDescription;

 	U32         mLandImpact;

 	LLVector3   mLocation;

-	BOOL        mIsPermanent;

-	BOOL        mIsWalkable;

+	EPathState  mPathState;

 	BOOL        mIsPhantom;

 	S32         mA;

 	S32         mB;