diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-09-07 15:36:45 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-09-07 15:36:45 -0400 |
| commit | de2b7cd28c8e8669291b7ca21ecc9602f2044eeb (patch) | |
| tree | ef49168d82db407383c64ea1d4f21f96512b15e0 /indra/newview/llviewerwindow.h | |
| parent | 8c6f752982e83a50e328b9c83f762721f38836d7 (diff) | |
| parent | b59c0a668009e696295a194e118b91469b09d32e (diff) | |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-storm-1541
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; |