summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-03-14 19:27:38 +0000
committerJosh Bell <josh@lindenlab.com>2008-03-14 19:27:38 +0000
commit133a7b5fe2bcaaec8389b209cb5bd774ebc2ab63 (patch)
treed7a8f7846af7dc948d9e11c5a75dd830fb12465c /indra/newview/llstartup.cpp
parenta1cde743e755d826c86aeb006d2027ad2e5c8ce3 (diff)
svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 --> release
QAR-364 - merge of maint-ui-9
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index e189e28c7d..d2bc8f4100 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2253,8 +2253,9 @@ BOOL idle_startup()
else
{
update_texture_fetch();
- set_startup_status(0.60f + 0.40f * timeout_frac, "Precaching...",
- gAgent.mMOTD.c_str());
+ set_startup_status(0.60f + 0.40f * timeout_frac,
+ "Loading world...",
+ gAgent.mMOTD.c_str());
}
return do_normal_idle;