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 | |
| parent | 7a60a12531769629ba20914128581498256f3e2f (diff) | |
| parent | d3d19ba02cb4f8faaef5b96db7e3c1068e06ee27 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
| -rw-r--r-- | autobuild.xml | 12 | ||||
| -rw-r--r-- | indra/llrender/llrendernavprim.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/llrendernavprim.h | 4 | ||||
| -rw-r--r-- | indra/newview/llpathfindingpathtool.cpp | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/autobuild.xml b/autobuild.xml index 11f0cf4b66..e4121f496d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1110,9 +1110,9 @@ <key>archive</key> <map> <key>hash</key> - <string>8e17ced77750d284ccf7fa707429dbad</string> + <string>db1b0bc66cd36cea75c02c663ed148cd</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/253348/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120409.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/253482/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120410.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -1122,9 +1122,9 @@ <key>archive</key> <map> <key>hash</key> - <string>30a6958667476cbffc61e907e16c5ebb</string> + <string>dd17cda94c7006a7caf6dd211c25716c</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/253348/arch/Linux/installer/llphysicsextensions-0.1-linux-20120409.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/253482/arch/Linux/installer/llphysicsextensions-0.1-linux-20120410.tar.bz2</string> </map> <key>name</key> <string>linux</string> @@ -1134,9 +1134,9 @@ <key>archive</key> <map> <key>hash</key> - <string>f8e1f36c14aae6e538e0df670e3b09e8</string> + <string>989cf12383f055d5c79f1defa7ec851c</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/253348/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120409.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/253482/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120410.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index 100b614aae..c24a09028f 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -62,7 +62,7 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L gGL.end(); } //============================================================================= -void LLRenderNavPrim::renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color, const LLVector3& n ) const +void LLRenderNavPrim::renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color ) const { LLColor4 cV(color); gGL.color4fv( cV.mV ); diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index 97d1c805af..eb45e259d2 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -43,8 +43,8 @@ public: void renderLLSegment( const LLVector3& start, const LLVector3& end, const LLColor4U& color ) const; //Draw simple tri void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ) const; - //Draw simple tri - void renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color, const LLVector3& n ) const; + //Draw simple tri + void renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color ) const; //Draw the contents of vertex buffer void renderNavMeshVB( U32 mode, LLVertexBuffer* pVBO, int vertCnt ); //Draw a star 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;
|