From 78910cf3016fc55eaf8214640b348df0f8bcdeda Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 26 Jun 2012 18:04:19 -0700
Subject: Updating the header licensing comments.

---
 indra/newview/llpathfindingnavmesh.cpp | 58 ++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 28 deletions(-)

(limited to 'indra/newview/llpathfindingnavmesh.cpp')

diff --git a/indra/newview/llpathfindingnavmesh.cpp b/indra/newview/llpathfindingnavmesh.cpp
index 4e4e9fceef..1a49560712 100644
--- a/indra/newview/llpathfindingnavmesh.cpp
+++ b/indra/newview/llpathfindingnavmesh.cpp
@@ -1,35 +1,38 @@
-/**
- * @file llpathfindingnavmesh.cpp
- * @author William Todd Stinson
- * @brief A class for representing the navmesh of a pathfinding region.
- *
- * $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$
- */
+/** 
+* @file llpathfindingnavmesh.cpp
+* @brief Implementation of llpathfindingnavmesh
+* @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"
-#include "lluuid.h"
+
 #include "llpathfindingnavmesh.h"
+
 #include "llpathfindingnavmeshstatus.h"
 #include "llsdserialize.h"
+#include "lluuid.h"
 
 #include <string>
 
@@ -198,4 +201,3 @@ void LLPathfindingNavMesh::sendStatus()
 {
 	mNavMeshSignal(mNavMeshRequestStatus, mNavMeshStatus, mNavMeshData);
 }
-
-- 
cgit v1.2.3


From 685a672b74550ca0dbf8a816257c84c9c44fd34d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 28 Jun 2012 15:37:55 -0700
Subject: Cleaning up new files in preparation for merge into viewer-release.

---
 indra/newview/llpathfindingnavmesh.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llpathfindingnavmesh.cpp')

diff --git a/indra/newview/llpathfindingnavmesh.cpp b/indra/newview/llpathfindingnavmesh.cpp
index 1a49560712..e01dd3a152 100644
--- a/indra/newview/llpathfindingnavmesh.cpp
+++ b/indra/newview/llpathfindingnavmesh.cpp
@@ -30,12 +30,13 @@
 
 #include "llpathfindingnavmesh.h"
 
+#include <string>
+
 #include "llpathfindingnavmeshstatus.h"
+#include "llsd.h"
 #include "llsdserialize.h"
 #include "lluuid.h"
 
-#include <string>
-
 #define NAVMESH_VERSION_FIELD "navmesh_version"
 #define NAVMESH_DATA_FIELD    "navmesh_data"
 
@@ -119,6 +120,7 @@ void LLPathfindingNavMesh::handleNavMeshStart(const LLPathfindingNavMeshStatus &
 
 void LLPathfindingNavMesh::handleNavMeshResult(const LLSD &pContent, U32 pNavMeshVersion)
 {
+	llassert(pContent.has(NAVMESH_VERSION_FIELD));
 	if (pContent.has(NAVMESH_VERSION_FIELD))
 	{
 		llassert(pContent.get(NAVMESH_VERSION_FIELD).isInteger());
-- 
cgit v1.2.3