diff options
| author | Richard Linden <none@none> | 2010-03-05 15:41:15 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-03-05 15:41:15 -0800 |
| commit | 27919e106a383ea873b9bf73d2974b40cbe2e603 (patch) | |
| tree | f85615a574ffe2f3e663a9328640f3fbe5d98e0c /indra/newview | |
| parent | 931ff555bdfe109e18a85a005bbe340f1951da40 (diff) | |
fix for merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index a6b4ed3df4..6c8900df21 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -131,6 +131,7 @@ #include "llmorphview.h" #include "llmoveview.h" #include "llnavigationbar.h" +#include "llpopupview.h" #include "llpreviewtexture.h" #include "llprogressview.h" #include "llresmgr.h" |