Merge back viewer-lion, which has viewer-development and down-stream fixes

1 files changed, 63 insertions, 0 deletions

diff --git a/indra/newview/llpathfindingcharacter.h b/indra/newview/llpathfindingcharacter.h
new file mode 100644
index 0000000000..7cf9f401b0
--- /dev/null
+++ b/indra/newview/llpathfindingcharacter.h
@@ -0,0 +1,63 @@
+/** 
+* @file   llpathfindingcharacter.h
+* @brief  Definition of a pathfinding character that contains various properties required for havok pathfinding.
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPATHFINDINGCHARACTER_H
+#define LL_LLPATHFINDINGCHARACTER_H
+
+#include <string>
+
+#include "llpathfindingobject.h"
+
+class LLSD;
+
+class LLPathfindingCharacter : public LLPathfindingObject
+{
+public:
+	LLPathfindingCharacter(const std::string &pUUID, const LLSD &pCharacterData);
+	LLPathfindingCharacter(const LLPathfindingCharacter& pOther);
+	virtual ~LLPathfindingCharacter();
+
+	LLPathfindingCharacter& operator =(const LLPathfindingCharacter& pOther);
+
+	inline F32  getCPUTime() const   {return mCPUTime;};
+
+	inline BOOL isHorizontal() const {return mIsHorizontal;};
+	inline F32  getLength() const    {return mLength;};
+	inline F32  getRadius() const    {return mRadius;};
+
+protected:
+
+private:
+	void parseCharacterData(const LLSD &pCharacterData);
+
+	F32  mCPUTime;
+
+	BOOL mIsHorizontal;
+	F32  mLength;
+	F32  mRadius;
+};
+
+#endif // LL_LLPATHFINDINGCHARACTER_H