diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
| commit | 4dabd9c0472deb49573fdafef2fa413e59703f19 (patch) | |
| tree | 06c680d6a2047e03838d6548bccd26c7baf9d652 /indra/newview/llprogressview.cpp | |
| parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) | |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/newview/llprogressview.cpp')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 2faa9ba351..1172bd8cf0 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -20,8 +20,9 @@ #include "llglheaders.h" #include "llagent.h" -#include "llfocusmgr.h" #include "llbutton.h" +#include "llfocusmgr.h" +#include "llstartup.h" #include "llviewercontrol.h" #include "llviewerimagelist.h" #include "llviewerwindow.h" @@ -29,9 +30,8 @@ LLProgressView* LLProgressView::sInstance = NULL; -LLPointer<LLImageGL> gStartImageGL = NULL; -S32 gStartImageWidth = 1; -S32 gStartImageHeight = 1; +S32 gStartImageWidth = 1; +S32 gStartImageHeight = 1; const F32 FADE_IN_TIME = 1.f; const LLString ANIMATION_FILENAME = "Login Sequence "; |