diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-11 13:38:19 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-11 13:38:19 -0400 |
| commit | f1e907ecbeb43d56066bc365a4550931dfc5e7eb (patch) | |
| tree | 5642c656a58e6c68897b6196c2991892c4009d00 /indra/newview/llviewerwindow.h | |
| parent | d7f123ab526df7dbef153e0de71f325ab1b69571 (diff) | |
| parent | be251b06eb785a2d301115f9c231eb5f3c906224 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.h')
| -rw-r--r-- | indra/newview/llviewerwindow.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index edd241a742..d35feb4667 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -62,6 +62,7 @@ class LLImageFormatted; class LLHUDIcon; class LLWindow; class LLRootView; +class LLWindowListener; class LLViewerWindowListener; class LLPopupView; @@ -456,7 +457,8 @@ protected: bool mStatesDirty; U32 mCurrResolutionIndex; - boost::scoped_ptr<LLViewerWindowListener> mViewerWindowListener; + boost::scoped_ptr<LLWindowListener> mWindowListener; + boost::scoped_ptr<LLViewerWindowListener> mViewerWindowListener; protected: static std::string sSnapshotBaseName; |