diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-10 15:32:57 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-10 15:32:57 -0400 |
| commit | d65d451448573f95b065a9be7c88ff239d5ed8be (patch) | |
| tree | 7734e1017a9bb81f4073ffa7839bba39dbde7ab1 /indra/newview/llviewerwindow.h | |
| parent | 22795e0a8da1bd99a5bb0e4df62b684eb2fc3931 (diff) | |
| parent | a15701de33007f60994181d8e7300d1e624de373 (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; |