diff options
| author | Richard Linden <none@none> | 2011-03-14 13:37:35 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-14 13:37:35 -0700 |
| commit | 0b653187e0fa7f36142ba92020762404005c765f (patch) | |
| tree | e1738d299004bdd4798135808a220848a9aa4a87 /indra/newview/lltoolpie.h | |
| parent | 9c2a19b833e071ca90e1e7840f6646200b07402a (diff) | |
| parent | efc1d76aeb4dfd55131e503e70d883b79c528446 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index dca661d26d..01e74a20d7 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -108,7 +108,7 @@ private: LLUUID mMediaMouseCaptureID; LLPickInfo mPick; LLPickInfo mHoverPick; - LLPickInfo mDragPick; + LLPickInfo mSteerPick; LLPointer<LLViewerObject> mClickActionObject; U8 mClickAction; LLSafeHandle<LLObjectSelection> mLeftClickSelection; |