From 525343b9e5f39dafafe2a16e8173ad7f69acb0d6 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Thu, 2 Feb 2012 18:30:35 -0800 Subject: PATH-245: First pass at laying out the characters floater. Functionality is mostly stubbed in. The data is currently tied to the same cap service as the linkset data, so that will need to change as soon as the new service is available. --- indra/newview/llpathfindingcharacter.cpp | 98 ++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 indra/newview/llpathfindingcharacter.cpp (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp new file mode 100644 index 0000000000..efbb3606e1 --- /dev/null +++ b/indra/newview/llpathfindingcharacter.cpp @@ -0,0 +1,98 @@ +/** + * @file llpathfindinglinksets.cpp + * @author William Todd Stinson + * @brief Definition of a pathfinding character that contains various properties required for havok pathfinding. + * + * $LicenseInfo:firstyear=2002&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, 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$ + */ + +#include "llviewerprecompiledheaders.h" +#include "llpathfindingcharacter.h" +#include "llsd.h" +#include "v3math.h" +#include "lluuid.h" + +#define CHARACTER_NAME_FIELD "name" +#define CHARACTER_DESCRIPTION_FIELD "description" +#define CHARACTER_OWNER_FIELD "description" +#define CHARACTER_CPU_TIME_FIELD "landimpact" +#define CHARACTER_POSITION_FIELD "position" + +//--------------------------------------------------------------------------- +// LLPathfindingCharacter +//--------------------------------------------------------------------------- + +LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const LLSD& pCharacterItem) + : mUUID(pUUID), + mName(), + mDescription(), + mOwner(), + mCPUTime(0U), + mLocation() +{ + llassert(pCharacterItem.has(CHARACTER_NAME_FIELD)); + llassert(pCharacterItem.get(CHARACTER_NAME_FIELD).isString()); + mName = pCharacterItem.get(CHARACTER_NAME_FIELD).asString(); + + llassert(pCharacterItem.has(CHARACTER_DESCRIPTION_FIELD)); + llassert(pCharacterItem.get(CHARACTER_DESCRIPTION_FIELD).isString()); + mDescription = pCharacterItem.get(CHARACTER_DESCRIPTION_FIELD).asString(); + + llassert(pCharacterItem.has(CHARACTER_OWNER_FIELD)); + llassert(pCharacterItem.get(CHARACTER_OWNER_FIELD).isString()); + mOwner = pCharacterItem.get(CHARACTER_OWNER_FIELD).asString(); + + llassert(pCharacterItem.has(CHARACTER_CPU_TIME_FIELD)); + llassert(pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).isInteger()); + llassert(pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).asInteger() >= 0); + mCPUTime = pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).asInteger(); + + llassert(pCharacterItem.has(CHARACTER_POSITION_FIELD)); + llassert(pCharacterItem.get(CHARACTER_POSITION_FIELD).isArray()); + mLocation.setValue(pCharacterItem.get(CHARACTER_POSITION_FIELD)); +} + +LLPathfindingCharacter::LLPathfindingCharacter(const LLPathfindingCharacter& pOther) + : mUUID(pOther.mUUID), + mName(pOther.mName), + mDescription(pOther.mDescription), + mOwner(pOther.mOwner), + mCPUTime(pOther.mCPUTime), + mLocation(pOther.mLocation) +{ +} + +LLPathfindingCharacter::~LLPathfindingCharacter() +{ +} + +LLPathfindingCharacter& LLPathfindingCharacter::operator =(const LLPathfindingCharacter& pOther) +{ + mUUID = pOther.mUUID; + mName = pOther.mName; + mDescription = pOther.mDescription; + mOwner = pOther.mOwner; + mCPUTime = pOther.mCPUTime; + mLocation = pOther.mLocation; + + return *this; +} -- cgit v1.2.3 From fa46459cdb6d63fea6a76d8c11eee5503edf5bb1 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Tue, 7 Feb 2012 14:13:57 -0800 Subject: PATH-245: Hooking the characters floater up to the character service. Also, adding in an additional state to handle the floater when the service does not exist. --- indra/newview/llpathfindingcharacter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index efbb3606e1..99e23c546f 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -33,8 +33,8 @@ #define CHARACTER_NAME_FIELD "name" #define CHARACTER_DESCRIPTION_FIELD "description" -#define CHARACTER_OWNER_FIELD "description" -#define CHARACTER_CPU_TIME_FIELD "landimpact" +#define CHARACTER_OWNER_FIELD "owner" +#define CHARACTER_CPU_TIME_FIELD "cpu_time" #define CHARACTER_POSITION_FIELD "position" //--------------------------------------------------------------------------- -- cgit v1.2.3 From e64ec7e60c9f24cc3dff21f4215624a86670b8d6 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Tue, 7 Feb 2012 17:09:44 -0800 Subject: PATH-245: Integrating with the working sim-side cap service. --- indra/newview/llpathfindingcharacter.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index 99e23c546f..e603356889 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -30,6 +30,8 @@ #include "llsd.h" #include "v3math.h" #include "lluuid.h" +#include "llavatarname.h" +#include "llavatarnamecache.h" #define CHARACTER_NAME_FIELD "name" #define CHARACTER_DESCRIPTION_FIELD "description" @@ -45,7 +47,8 @@ LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const L : mUUID(pUUID), mName(), mDescription(), - mOwner(), + mOwnerUUID(), + mOwnerName(), mCPUTime(0U), mLocation() { @@ -58,8 +61,9 @@ LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const L mDescription = pCharacterItem.get(CHARACTER_DESCRIPTION_FIELD).asString(); llassert(pCharacterItem.has(CHARACTER_OWNER_FIELD)); - llassert(pCharacterItem.get(CHARACTER_OWNER_FIELD).isString()); - mOwner = pCharacterItem.get(CHARACTER_OWNER_FIELD).asString(); + llassert(pCharacterItem.get(CHARACTER_OWNER_FIELD).isUUID()); + mOwnerUUID = pCharacterItem.get(CHARACTER_OWNER_FIELD).asUUID(); + LLAvatarNameCache::get(mOwnerUUID, &mOwnerName); llassert(pCharacterItem.has(CHARACTER_CPU_TIME_FIELD)); llassert(pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).isInteger()); @@ -75,7 +79,8 @@ LLPathfindingCharacter::LLPathfindingCharacter(const LLPathfindingCharacter& pOt : mUUID(pOther.mUUID), mName(pOther.mName), mDescription(pOther.mDescription), - mOwner(pOther.mOwner), + mOwnerUUID(pOther.mOwnerUUID), + mOwnerName(pOther.mOwnerName), mCPUTime(pOther.mCPUTime), mLocation(pOther.mLocation) { @@ -90,7 +95,8 @@ LLPathfindingCharacter& LLPathfindingCharacter::operator =(const LLPathfindingCh mUUID = pOther.mUUID; mName = pOther.mName; mDescription = pOther.mDescription; - mOwner = pOther.mOwner; + mOwnerUUID = pOther.mOwnerUUID; + mOwnerName = pOther.mOwnerName; mCPUTime = pOther.mCPUTime; mLocation = pOther.mLocation; -- cgit v1.2.3 From 9181229b34e1374f1b564fed637088bca4535ae0 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 13 Feb 2012 18:39:41 -0800 Subject: Updating the pathfinding character initialization to match the new data type for CPU time. --- indra/newview/llpathfindingcharacter.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index e603356889..2fb48b0eea 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -66,9 +66,8 @@ LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const L LLAvatarNameCache::get(mOwnerUUID, &mOwnerName); llassert(pCharacterItem.has(CHARACTER_CPU_TIME_FIELD)); - llassert(pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).isInteger()); - llassert(pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).asInteger() >= 0); - mCPUTime = pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).asInteger(); + llassert(pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).isReal()); + mCPUTime = pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).asReal(); llassert(pCharacterItem.has(CHARACTER_POSITION_FIELD)); llassert(pCharacterItem.get(CHARACTER_POSITION_FIELD).isArray()); -- cgit v1.2.3 From 516ad5b3c234321daf01294d6e03bdc4be019d36 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Fri, 17 Feb 2012 19:03:16 -0800 Subject: PATH-292: Implementing the new freeze/unfreeze functionality on the basic panel. --- indra/newview/llpathfindingcharacter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index 2fb48b0eea..afa07457bc 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -1,5 +1,5 @@ /** - * @file llpathfindinglinksets.cpp + * @file llpathfindingcharacter.cpp * @author William Todd Stinson * @brief Definition of a pathfinding character that contains various properties required for havok pathfinding. * -- cgit v1.2.3 From 473da43c1bbc20245b3a74c1adc7c92f91d25807 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Tue, 27 Mar 2012 19:05:29 -0700 Subject: Refactoring the characters floater code. --- indra/newview/llpathfindingcharacter.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index afa07457bc..4600f661f8 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -33,11 +33,11 @@ #include "llavatarname.h" #include "llavatarnamecache.h" -#define CHARACTER_NAME_FIELD "name" -#define CHARACTER_DESCRIPTION_FIELD "description" -#define CHARACTER_OWNER_FIELD "owner" -#define CHARACTER_CPU_TIME_FIELD "cpu_time" -#define CHARACTER_POSITION_FIELD "position" +#define CHARACTER_NAME_FIELD "name" +#define CHARACTER_DESCRIPTION_FIELD "description" +#define CHARACTER_OWNER_FIELD "owner" +#define CHARACTER_CPU_TIME_FIELD "cpu_time" +#define CHARACTER_POSITION_FIELD "position" //--------------------------------------------------------------------------- // LLPathfindingCharacter @@ -50,7 +50,7 @@ LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const L mOwnerUUID(), mOwnerName(), mCPUTime(0U), - mLocation() + mLocation(LLVector3::zero) { llassert(pCharacterItem.has(CHARACTER_NAME_FIELD)); llassert(pCharacterItem.get(CHARACTER_NAME_FIELD).isString()); -- cgit v1.2.3 From cbebd682f7b9b0cff120bc36d9db9bb170dc1b2a Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 25 Apr 2012 13:04:13 -0700 Subject: Removing windows line endings from .h and .cpp files. --- indra/newview/llpathfindingcharacter.cpp | 206 +++++++++++++++---------------- 1 file changed, 103 insertions(+), 103 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index 4600f661f8..0a3d737b73 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -1,103 +1,103 @@ -/** - * @file llpathfindingcharacter.cpp - * @author William Todd Stinson - * @brief Definition of a pathfinding character that contains various properties required for havok pathfinding. - * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, 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$ - */ - -#include "llviewerprecompiledheaders.h" -#include "llpathfindingcharacter.h" -#include "llsd.h" -#include "v3math.h" -#include "lluuid.h" -#include "llavatarname.h" -#include "llavatarnamecache.h" - -#define CHARACTER_NAME_FIELD "name" -#define CHARACTER_DESCRIPTION_FIELD "description" -#define CHARACTER_OWNER_FIELD "owner" -#define CHARACTER_CPU_TIME_FIELD "cpu_time" -#define CHARACTER_POSITION_FIELD "position" - -//--------------------------------------------------------------------------- -// LLPathfindingCharacter -//--------------------------------------------------------------------------- - -LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const LLSD& pCharacterItem) - : mUUID(pUUID), - mName(), - mDescription(), - mOwnerUUID(), - mOwnerName(), - mCPUTime(0U), - mLocation(LLVector3::zero) -{ - llassert(pCharacterItem.has(CHARACTER_NAME_FIELD)); - llassert(pCharacterItem.get(CHARACTER_NAME_FIELD).isString()); - mName = pCharacterItem.get(CHARACTER_NAME_FIELD).asString(); - - llassert(pCharacterItem.has(CHARACTER_DESCRIPTION_FIELD)); - llassert(pCharacterItem.get(CHARACTER_DESCRIPTION_FIELD).isString()); - mDescription = pCharacterItem.get(CHARACTER_DESCRIPTION_FIELD).asString(); - - llassert(pCharacterItem.has(CHARACTER_OWNER_FIELD)); - llassert(pCharacterItem.get(CHARACTER_OWNER_FIELD).isUUID()); - mOwnerUUID = pCharacterItem.get(CHARACTER_OWNER_FIELD).asUUID(); - LLAvatarNameCache::get(mOwnerUUID, &mOwnerName); - - llassert(pCharacterItem.has(CHARACTER_CPU_TIME_FIELD)); - llassert(pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).isReal()); - mCPUTime = pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).asReal(); - - llassert(pCharacterItem.has(CHARACTER_POSITION_FIELD)); - llassert(pCharacterItem.get(CHARACTER_POSITION_FIELD).isArray()); - mLocation.setValue(pCharacterItem.get(CHARACTER_POSITION_FIELD)); -} - -LLPathfindingCharacter::LLPathfindingCharacter(const LLPathfindingCharacter& pOther) - : mUUID(pOther.mUUID), - mName(pOther.mName), - mDescription(pOther.mDescription), - mOwnerUUID(pOther.mOwnerUUID), - mOwnerName(pOther.mOwnerName), - mCPUTime(pOther.mCPUTime), - mLocation(pOther.mLocation) -{ -} - -LLPathfindingCharacter::~LLPathfindingCharacter() -{ -} - -LLPathfindingCharacter& LLPathfindingCharacter::operator =(const LLPathfindingCharacter& pOther) -{ - mUUID = pOther.mUUID; - mName = pOther.mName; - mDescription = pOther.mDescription; - mOwnerUUID = pOther.mOwnerUUID; - mOwnerName = pOther.mOwnerName; - mCPUTime = pOther.mCPUTime; - mLocation = pOther.mLocation; - - return *this; -} +/** + * @file llpathfindingcharacter.cpp + * @author William Todd Stinson + * @brief Definition of a pathfinding character that contains various properties required for havok pathfinding. + * + * $LicenseInfo:firstyear=2002&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, 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$ + */ + +#include "llviewerprecompiledheaders.h" +#include "llpathfindingcharacter.h" +#include "llsd.h" +#include "v3math.h" +#include "lluuid.h" +#include "llavatarname.h" +#include "llavatarnamecache.h" + +#define CHARACTER_NAME_FIELD "name" +#define CHARACTER_DESCRIPTION_FIELD "description" +#define CHARACTER_OWNER_FIELD "owner" +#define CHARACTER_CPU_TIME_FIELD "cpu_time" +#define CHARACTER_POSITION_FIELD "position" + +//--------------------------------------------------------------------------- +// LLPathfindingCharacter +//--------------------------------------------------------------------------- + +LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const LLSD& pCharacterItem) + : mUUID(pUUID), + mName(), + mDescription(), + mOwnerUUID(), + mOwnerName(), + mCPUTime(0U), + mLocation(LLVector3::zero) +{ + llassert(pCharacterItem.has(CHARACTER_NAME_FIELD)); + llassert(pCharacterItem.get(CHARACTER_NAME_FIELD).isString()); + mName = pCharacterItem.get(CHARACTER_NAME_FIELD).asString(); + + llassert(pCharacterItem.has(CHARACTER_DESCRIPTION_FIELD)); + llassert(pCharacterItem.get(CHARACTER_DESCRIPTION_FIELD).isString()); + mDescription = pCharacterItem.get(CHARACTER_DESCRIPTION_FIELD).asString(); + + llassert(pCharacterItem.has(CHARACTER_OWNER_FIELD)); + llassert(pCharacterItem.get(CHARACTER_OWNER_FIELD).isUUID()); + mOwnerUUID = pCharacterItem.get(CHARACTER_OWNER_FIELD).asUUID(); + LLAvatarNameCache::get(mOwnerUUID, &mOwnerName); + + llassert(pCharacterItem.has(CHARACTER_CPU_TIME_FIELD)); + llassert(pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).isReal()); + mCPUTime = pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).asReal(); + + llassert(pCharacterItem.has(CHARACTER_POSITION_FIELD)); + llassert(pCharacterItem.get(CHARACTER_POSITION_FIELD).isArray()); + mLocation.setValue(pCharacterItem.get(CHARACTER_POSITION_FIELD)); +} + +LLPathfindingCharacter::LLPathfindingCharacter(const LLPathfindingCharacter& pOther) + : mUUID(pOther.mUUID), + mName(pOther.mName), + mDescription(pOther.mDescription), + mOwnerUUID(pOther.mOwnerUUID), + mOwnerName(pOther.mOwnerName), + mCPUTime(pOther.mCPUTime), + mLocation(pOther.mLocation) +{ +} + +LLPathfindingCharacter::~LLPathfindingCharacter() +{ +} + +LLPathfindingCharacter& LLPathfindingCharacter::operator =(const LLPathfindingCharacter& pOther) +{ + mUUID = pOther.mUUID; + mName = pOther.mName; + mDescription = pOther.mDescription; + mOwnerUUID = pOther.mOwnerUUID; + mOwnerName = pOther.mOwnerName; + mCPUTime = pOther.mCPUTime; + mLocation = pOther.mLocation; + + return *this; +} -- cgit v1.2.3 From 3c2be426e5e905076d00b9492c0e66c8b31caf19 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 30 May 2012 18:47:12 -0700 Subject: First pass at refactoring the pathfinding linksets and pathfinding characters classes to reduce code duplication, as both functionalities were heavily duplicated. --- indra/newview/llpathfindingcharacter.cpp | 73 +++++++++----------------------- 1 file changed, 21 insertions(+), 52 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index 0a3d737b73..61c2e39d63 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -3,9 +3,9 @@ * @author William Todd Stinson * @brief Definition of a pathfinding character that contains various properties required for havok pathfinding. * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ + * $LicenseInfo:firstyear=2012&license=viewerlgpl$ * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. + * 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 @@ -26,62 +26,28 @@ */ #include "llviewerprecompiledheaders.h" + #include "llpathfindingcharacter.h" + +#include "llpathfindingobject.h" #include "llsd.h" -#include "v3math.h" -#include "lluuid.h" -#include "llavatarname.h" -#include "llavatarnamecache.h" -#define CHARACTER_NAME_FIELD "name" -#define CHARACTER_DESCRIPTION_FIELD "description" -#define CHARACTER_OWNER_FIELD "owner" -#define CHARACTER_CPU_TIME_FIELD "cpu_time" -#define CHARACTER_POSITION_FIELD "position" +#define CHARACTER_CPU_TIME_FIELD "cpu_time" //--------------------------------------------------------------------------- // LLPathfindingCharacter //--------------------------------------------------------------------------- -LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const LLSD& pCharacterItem) - : mUUID(pUUID), - mName(), - mDescription(), - mOwnerUUID(), - mOwnerName(), - mCPUTime(0U), - mLocation(LLVector3::zero) +LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const LLSD& pCharacterData) + : LLPathfindingObject(pUUID, pCharacterData), + mCPUTime(0U) { - llassert(pCharacterItem.has(CHARACTER_NAME_FIELD)); - llassert(pCharacterItem.get(CHARACTER_NAME_FIELD).isString()); - mName = pCharacterItem.get(CHARACTER_NAME_FIELD).asString(); - - llassert(pCharacterItem.has(CHARACTER_DESCRIPTION_FIELD)); - llassert(pCharacterItem.get(CHARACTER_DESCRIPTION_FIELD).isString()); - mDescription = pCharacterItem.get(CHARACTER_DESCRIPTION_FIELD).asString(); - - llassert(pCharacterItem.has(CHARACTER_OWNER_FIELD)); - llassert(pCharacterItem.get(CHARACTER_OWNER_FIELD).isUUID()); - mOwnerUUID = pCharacterItem.get(CHARACTER_OWNER_FIELD).asUUID(); - LLAvatarNameCache::get(mOwnerUUID, &mOwnerName); - - llassert(pCharacterItem.has(CHARACTER_CPU_TIME_FIELD)); - llassert(pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).isReal()); - mCPUTime = pCharacterItem.get(CHARACTER_CPU_TIME_FIELD).asReal(); - - llassert(pCharacterItem.has(CHARACTER_POSITION_FIELD)); - llassert(pCharacterItem.get(CHARACTER_POSITION_FIELD).isArray()); - mLocation.setValue(pCharacterItem.get(CHARACTER_POSITION_FIELD)); + parseCharacterData(pCharacterData); } LLPathfindingCharacter::LLPathfindingCharacter(const LLPathfindingCharacter& pOther) - : mUUID(pOther.mUUID), - mName(pOther.mName), - mDescription(pOther.mDescription), - mOwnerUUID(pOther.mOwnerUUID), - mOwnerName(pOther.mOwnerName), - mCPUTime(pOther.mCPUTime), - mLocation(pOther.mLocation) + : LLPathfindingObject(pOther), + mCPUTime(pOther.mCPUTime) { } @@ -91,13 +57,16 @@ LLPathfindingCharacter::~LLPathfindingCharacter() LLPathfindingCharacter& LLPathfindingCharacter::operator =(const LLPathfindingCharacter& pOther) { - mUUID = pOther.mUUID; - mName = pOther.mName; - mDescription = pOther.mDescription; - mOwnerUUID = pOther.mOwnerUUID; - mOwnerName = pOther.mOwnerName; + dynamic_cast(*this) = pOther; + mCPUTime = pOther.mCPUTime; - mLocation = pOther.mLocation; return *this; } + +void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData) +{ + llassert(pCharacterData.has(CHARACTER_CPU_TIME_FIELD)); + llassert(pCharacterData.get(CHARACTER_CPU_TIME_FIELD).isReal()); + mCPUTime = pCharacterData.get(CHARACTER_CPU_TIME_FIELD).asReal(); +} -- cgit v1.2.3 From d00192c9cbeaace7c1b7c09bfb86a5b5d8dff458 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 30 May 2012 20:05:57 -0700 Subject: Pulling in the new character fields from the CharacterProperties service. --- indra/newview/llpathfindingcharacter.cpp | 57 ++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index 61c2e39d63..0696783bf7 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -32,7 +32,10 @@ #include "llpathfindingobject.h" #include "llsd.h" -#define CHARACTER_CPU_TIME_FIELD "cpu_time" +#define CHARACTER_CPU_TIME_FIELD "cpu_time" +#define CHARACTER_HORIZONTAL_FIELD "horizontal" +#define CHARACTER_LENGTH_FIELD "length" +#define CHARACTER_RADIUS_FIELD "radius" //--------------------------------------------------------------------------- // LLPathfindingCharacter @@ -40,14 +43,26 @@ LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const LLSD& pCharacterData) : LLPathfindingObject(pUUID, pCharacterData), - mCPUTime(0U) + mCPUTime(0U), +#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE + mHasShapeData(false), +#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE + mIsHorizontal(FALSE), + mLength(0.0f), + mRadius(0.0f) { parseCharacterData(pCharacterData); } LLPathfindingCharacter::LLPathfindingCharacter(const LLPathfindingCharacter& pOther) : LLPathfindingObject(pOther), - mCPUTime(pOther.mCPUTime) + mCPUTime(pOther.mCPUTime), +#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE + mHasShapeData(pOther.mHasShapeData), +#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE + mIsHorizontal(pOther.mIsHorizontal), + mLength(pOther.mLength), + mRadius(pOther.mRadius) { } @@ -60,6 +75,12 @@ LLPathfindingCharacter& LLPathfindingCharacter::operator =(const LLPathfindingCh dynamic_cast(*this) = pOther; mCPUTime = pOther.mCPUTime; +#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE + mHasShapeData = pOther.mHasShapeData; +#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE + mIsHorizontal = pOther.mIsHorizontal; + mLength = pOther.mLength; + mRadius = pOther.mRadius; return *this; } @@ -69,4 +90,34 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData) llassert(pCharacterData.has(CHARACTER_CPU_TIME_FIELD)); llassert(pCharacterData.get(CHARACTER_CPU_TIME_FIELD).isReal()); mCPUTime = pCharacterData.get(CHARACTER_CPU_TIME_FIELD).asReal(); + +#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE + mHasShapeData = pCharacterData.has(CHARACTER_HORIZONTAL_FIELD); + if (mHasShapeData) + { + llassert(pCharacterData.has(CHARACTER_HORIZONTAL_FIELD)); + llassert(pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).isBoolean()); + mIsHorizontal = pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).asBoolean(); + + llassert(pCharacterData.has(CHARACTER_LENGTH_FIELD)); + llassert(pCharacterData.get(CHARACTER_LENGTH_FIELD).isReal()); + mLength = pCharacterData.get(CHARACTER_LENGTH_FIELD).asReal(); + + llassert(pCharacterData.has(CHARACTER_RADIUS_FIELD)); + llassert(pCharacterData.get(CHARACTER_RADIUS_FIELD).isReal()); + mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal(); + } +#else // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE + llassert(pCharacterData.has(CHARACTER_HORIZONTAL_FIELD)); + llassert(pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).isBoolean()); + mIsHorizontal = pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).asBoolean(); + + llassert(pCharacterData.has(CHARACTER_LENGTH_FIELD)); + llassert(pCharacterData.get(CHARACTER_LENGTH_FIELD).isReal()); + mLength = pCharacterData.get(CHARACTER_LENGTH_FIELD).asReal(); + + llassert(pCharacterData.has(CHARACTER_RADIUS_FIELD)); + llassert(pCharacterData.get(CHARACTER_RADIUS_FIELD).isReal()); + mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal(); +#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE } -- cgit v1.2.3 From ef75a2e07ec4f26c9126c04af1adfbd28d7eaa9b Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 31 May 2012 16:38:19 -0400 Subject: WIP:Displaying physics capsule for a character - it is currently disabled. --- indra/newview/llpathfindingcharacter.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index 0696783bf7..011a736568 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -31,12 +31,16 @@ #include "llpathfindingobject.h" #include "llsd.h" +#include "llpathinglib.h" #define CHARACTER_CPU_TIME_FIELD "cpu_time" #define CHARACTER_HORIZONTAL_FIELD "horizontal" #define CHARACTER_LENGTH_FIELD "length" #define CHARACTER_RADIUS_FIELD "radius" +//prep# +#define SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE + //--------------------------------------------------------------------------- // LLPathfindingCharacter //--------------------------------------------------------------------------- @@ -119,5 +123,9 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData) llassert(pCharacterData.has(CHARACTER_RADIUS_FIELD)); llassert(pCharacterData.get(CHARACTER_RADIUS_FIELD).isReal()); mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal(); + + //Create the rep inside the pathing library + LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, LLVector3(0,0,0), getUUID() ); + #endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE } -- cgit v1.2.3 From 0a10ff0f78ae779ff52e9bd475b4bca534ea1f30 Mon Sep 17 00:00:00 2001 From: prep linden Date: Thu, 31 May 2012 17:50:33 -0400 Subject: WIP:build fix --- indra/newview/llpathfindingcharacter.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index 011a736568..c7843b8fee 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -125,7 +125,9 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData) mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal(); //Create the rep inside the pathing library - LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, LLVector3(0,0,0), getUUID() ); + LLVector3 empty(0,0,0); + const LLUUID id = getUUID(); + LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, empty, id ); #endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE } -- cgit v1.2.3 From c17d967d796b2bd735d3d8eea340c3541aa86d63 Mon Sep 17 00:00:00 2001 From: prep linden Date: Fri, 1 Jun 2012 09:44:24 -0400 Subject: Removed unneeded alloc --- indra/newview/llpathfindingcharacter.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index c7843b8fee..d43a0664f8 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -126,8 +126,7 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData) //Create the rep inside the pathing library LLVector3 empty(0,0,0); - const LLUUID id = getUUID(); - LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, empty, id ); + LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, empty, getUUID() ); #endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE } -- cgit v1.2.3 From 9d615c1e1d0e52b619972d6003d97681c791711f Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 4 Jun 2012 18:08:46 -0700 Subject: BUGFIX: Ensuring that the viewer will still work on regions that have older pathfinding server code with the character shape data. --- indra/newview/llpathfindingcharacter.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index d43a0664f8..e3889522f3 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -38,9 +38,6 @@ #define CHARACTER_LENGTH_FIELD "length" #define CHARACTER_RADIUS_FIELD "radius" -//prep# -#define SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE - //--------------------------------------------------------------------------- // LLPathfindingCharacter //--------------------------------------------------------------------------- -- cgit v1.2.3 From 9db2061e1db177f8e13e9c94b672b27bc325ec81 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 4 Jun 2012 18:36:22 -0700 Subject: BUGFIX: Ensuring that the physics capsule is built for each character. --- indra/newview/llpathfindingcharacter.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index e3889522f3..42130d9fde 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -107,6 +107,10 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData) llassert(pCharacterData.has(CHARACTER_RADIUS_FIELD)); llassert(pCharacterData.get(CHARACTER_RADIUS_FIELD).isReal()); mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal(); + + //Create the rep inside the pathing library + LLVector3 empty(0,0,0); + LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, empty, getUUID() ); } #else // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE llassert(pCharacterData.has(CHARACTER_HORIZONTAL_FIELD)); @@ -124,6 +128,5 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData) //Create the rep inside the pathing library LLVector3 empty(0,0,0); LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, empty, getUUID() ); - #endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE } -- cgit v1.2.3 From f5949aaba91d3feb2a56ad40f8d1d34bf07ad388 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 20 Jun 2012 12:34:16 -0700 Subject: PATH-738: Removing SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE ifdef. --- indra/newview/llpathfindingcharacter.cpp | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index 42130d9fde..98e9141043 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -45,9 +45,6 @@ LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const LLSD& pCharacterData) : LLPathfindingObject(pUUID, pCharacterData), mCPUTime(0U), -#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE - mHasShapeData(false), -#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE mIsHorizontal(FALSE), mLength(0.0f), mRadius(0.0f) @@ -58,9 +55,6 @@ LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const L LLPathfindingCharacter::LLPathfindingCharacter(const LLPathfindingCharacter& pOther) : LLPathfindingObject(pOther), mCPUTime(pOther.mCPUTime), -#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE - mHasShapeData(pOther.mHasShapeData), -#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE mIsHorizontal(pOther.mIsHorizontal), mLength(pOther.mLength), mRadius(pOther.mRadius) @@ -76,9 +70,6 @@ LLPathfindingCharacter& LLPathfindingCharacter::operator =(const LLPathfindingCh dynamic_cast(*this) = pOther; mCPUTime = pOther.mCPUTime; -#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE - mHasShapeData = pOther.mHasShapeData; -#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE mIsHorizontal = pOther.mIsHorizontal; mLength = pOther.mLength; mRadius = pOther.mRadius; @@ -92,27 +83,6 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData) llassert(pCharacterData.get(CHARACTER_CPU_TIME_FIELD).isReal()); mCPUTime = pCharacterData.get(CHARACTER_CPU_TIME_FIELD).asReal(); -#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE - mHasShapeData = pCharacterData.has(CHARACTER_HORIZONTAL_FIELD); - if (mHasShapeData) - { - llassert(pCharacterData.has(CHARACTER_HORIZONTAL_FIELD)); - llassert(pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).isBoolean()); - mIsHorizontal = pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).asBoolean(); - - llassert(pCharacterData.has(CHARACTER_LENGTH_FIELD)); - llassert(pCharacterData.get(CHARACTER_LENGTH_FIELD).isReal()); - mLength = pCharacterData.get(CHARACTER_LENGTH_FIELD).asReal(); - - llassert(pCharacterData.has(CHARACTER_RADIUS_FIELD)); - llassert(pCharacterData.get(CHARACTER_RADIUS_FIELD).isReal()); - mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal(); - - //Create the rep inside the pathing library - LLVector3 empty(0,0,0); - LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, empty, getUUID() ); - } -#else // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE llassert(pCharacterData.has(CHARACTER_HORIZONTAL_FIELD)); llassert(pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).isBoolean()); mIsHorizontal = pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).asBoolean(); @@ -128,5 +98,4 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData) //Create the rep inside the pathing library LLVector3 empty(0,0,0); LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, empty, getUUID() ); -#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE } -- cgit v1.2.3 From ce101172954c9cbc9a089d8796643d545bdee9d5 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 25 Jun 2012 18:02:41 -0700 Subject: PATH-718: Ensuring that the characters panel will work correctly with a stubbed physicsextension library. --- indra/newview/llpathfindingcharacter.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index 98e9141043..c9f3555e9c 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -31,7 +31,6 @@ #include "llpathfindingobject.h" #include "llsd.h" -#include "llpathinglib.h" #define CHARACTER_CPU_TIME_FIELD "cpu_time" #define CHARACTER_HORIZONTAL_FIELD "horizontal" @@ -94,8 +93,4 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData) llassert(pCharacterData.has(CHARACTER_RADIUS_FIELD)); llassert(pCharacterData.get(CHARACTER_RADIUS_FIELD).isReal()); mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal(); - - //Create the rep inside the pathing library - LLVector3 empty(0,0,0); - LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, empty, getUUID() ); } -- cgit v1.2.3 From 78910cf3016fc55eaf8214640b348df0f8bcdeda Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Tue, 26 Jun 2012 18:04:19 -0700 Subject: Updating the header licensing comments. --- indra/newview/llpathfindingcharacter.cpp | 51 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 25 deletions(-) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index c9f3555e9c..9dd9fa503b 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -1,29 +1,30 @@ /** - * @file llpathfindingcharacter.cpp - * @author William Todd Stinson - * @brief Definition of a pathfinding character that contains various properties required for havok pathfinding. - * - * $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$ - */ +* @file llpathfindingcharacter.cpp +* @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$ +*/ + #include "llviewerprecompiledheaders.h" -- cgit v1.2.3 From 685a672b74550ca0dbf8a816257c84c9c44fd34d Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Thu, 28 Jun 2012 15:37:55 -0700 Subject: Cleaning up new files in preparation for merge into viewer-release. --- indra/newview/llpathfindingcharacter.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llpathfindingcharacter.cpp') diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index 9dd9fa503b..00f2ebc4bb 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -30,6 +30,8 @@ #include "llpathfindingcharacter.h" +#include + #include "llpathfindingobject.h" #include "llsd.h" -- cgit v1.2.3