summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolgun.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-06-21 08:04:56 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-06-21 08:04:56 +0000
commit9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch)
tree4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/lltoolgun.cpp
parent351ebe9fcb76f3b99c2957004bb8493a904869ee (diff)
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/lltoolgun.cpp')
-rw-r--r--indra/newview/lltoolgun.cpp5
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);