diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/lltoolgun.cpp | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/lltoolgun.cpp')
| -rw-r--r-- | indra/newview/lltoolgun.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp index d21fd49647..72fd8b3bac 100644 --- a/indra/newview/lltoolgun.cpp +++ b/indra/newview/lltoolgun.cpp @@ -48,6 +48,9 @@ #include "lltoolmgr.h" #include "lltoolgrab.h" +// Linden library includes +#include "llwindow.h" // setMouseClipping() + LLToolGun::LLToolGun( LLToolComposite* composite ) : LLTool( std::string("gun"), composite ) { @@ -132,7 +135,7 @@ void LLToolGun::draw() { if( gSavedSettings.getBOOL("ShowCrosshairs") ) { - LLUIImagePtr crosshair = LLUI::getUIImage("UIImgCrosshairsUUID"); + LLUIImagePtr crosshair = LLUI::getUIImage("crosshairs.tga"); crosshair->draw( ( gViewerWindow->getWindowWidth() - crosshair->getWidth() ) / 2, ( gViewerWindow->getWindowHeight() - crosshair->getHeight() ) / 2); |