diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
| commit | baa73fddd9287ddafd2d31551cb253b355ed910a (patch) | |
| tree | e3f0986617fe6c0ee0a14df6aac13c6bb6f92507 /indra/newview/lltoolobjpicker.cpp | |
| parent | dc3833f31b8a20220ddb1775e1625c016c397435 (diff) | |
| parent | fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (diff) | |
Merge with viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/lltoolobjpicker.cpp')
| -rw-r--r-- | indra/newview/lltoolobjpicker.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoolobjpicker.cpp b/indra/newview/lltoolobjpicker.cpp index 8a66069584..b2088a8232 100644 --- a/indra/newview/lltoolobjpicker.cpp +++ b/indra/newview/lltoolobjpicker.cpp @@ -48,6 +48,7 @@ #include "llviewercamera.h" #include "llviewerwindow.h" #include "lldrawable.h" +#include "llrootview.h" LLToolObjPicker::LLToolObjPicker() @@ -62,7 +63,7 @@ LLToolObjPicker::LLToolObjPicker() // returns TRUE if an object was selected BOOL LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask) { - LLView* viewp = gViewerWindow->getRootView(); + LLRootView* viewp = gViewerWindow->getRootView(); BOOL handled = viewp->handleMouseDown(x, y, mask); mHitObjectID.setNull(); |