aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lluploaddialog.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/lluploaddialog.cpp
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lluploaddialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/lluploaddialog.cpp b/linden/indra/newview/lluploaddialog.cpp
index 14128ee..edf5505 100644
--- a/linden/indra/newview/lluploaddialog.cpp
+++ b/linden/indra/newview/lluploaddialog.cpp
@@ -74,7 +74,7 @@ LLUploadDialog::LLUploadDialog( const std::string& msg)
74 } 74 }
75 LLUploadDialog::sDialog = this; 75 LLUploadDialog::sDialog = this;
76 76
77 const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF ); 77 const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
78 LLRect msg_rect; 78 LLRect msg_rect;
79 for (int line_num=0; line_num<16; ++line_num) 79 for (int line_num=0; line_num<16; ++line_num)
80 { 80 {
@@ -90,7 +90,7 @@ LLUploadDialog::LLUploadDialog( const std::string& msg)
90 90
91void LLUploadDialog::setMessage( const std::string& msg) 91void LLUploadDialog::setMessage( const std::string& msg)
92{ 92{
93 const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF ); 93 const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
94 94
95 const S32 VPAD = 16; 95 const S32 VPAD = 16;
96 const S32 HPAD = 25; 96 const S32 HPAD = 25;