From 4dabd9c0472deb49573fdafef2fa413e59703f19 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 2 Mar 2007 21:25:50 +0000
Subject: merge release@58699 beta-1-14-0@58707 -> release

---
 indra/newview/llprogressview.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llprogressview.cpp')

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 ";
-- 
cgit v1.2.3