diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-04-10 12:19:33 -0700 | 
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-04-10 12:19:33 -0700 | 
| commit | da5601baee84e12895b557e06ee17664d0c93c66 (patch) | |
| tree | 64c2c28b4f1d41dea4dd6082b6cb62d9f24dd7be /indra/newview | |
| parent | 7a60a12531769629ba20914128581498256f3e2f (diff) | |
| parent | d3d19ba02cb4f8faaef5b96db7e3c1068e06ee27 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpathfindingpathtool.cpp | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/indra/newview/llpathfindingpathtool.cpp b/indra/newview/llpathfindingpathtool.cpp index 5825f3d392..11759f5523 100644 --- a/indra/newview/llpathfindingpathtool.cpp +++ b/indra/newview/llpathfindingpathtool.cpp @@ -57,6 +57,8 @@ LLPathfindingPathTool::LLPathfindingPathTool()  	{
  		LLPathingLib::initSystem();
  	}	
 +
 +	mFinalPathData.mCharacterWidth = mCharacterWidth;
  }
  LLPathfindingPathTool::~LLPathfindingPathTool()
 @@ -115,7 +117,7 @@ BOOL LLPathfindingPathTool::handleHover(S32 pX, S32 pY, MASK pMask)  			mTempPathData.mStartPointB = mFinalPathData.mStartPointB;
  			mTempPathData.mEndPointB = mFinalPathData.mEndPointB;
  			mHasTempEndPoint = mHasFinalEndPoint;
 -		}
 +	}
  		else if (isEndPathToolModKeys(pMask))
  		{
  			mTempPathData.mStartPointB = rayStart;
 | 
