diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-11-30 11:42:49 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-11-30 11:42:49 -0800 |
| commit | 1df10afa2a7802763330475e1a90547c3cff7c06 (patch) | |
| tree | 8a8cdb8c02f1e18e8cfacefc1efbc2ab43c6157e /indra/newview/llviewerdisplay.cpp | |
| parent | d7dd10b88bc3fda88f6528ecc5936e4889f019f3 (diff) | |
| parent | e3a2c5e3217ae74a0277f2e6d4e1e708fe398a1c (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 0c073f6be9..46a8d75595 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -440,6 +440,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) gAgent.setTeleportMessage( LLAgent::sTeleportProgressMessages["requesting"]); gViewerWindow->setProgressString(LLAgent::sTeleportProgressMessages["requesting"]); + gViewerWindow->setProgressMessage(gAgent.mMOTD); break; case LLAgent::TELEPORT_REQUESTED: @@ -517,6 +518,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) } gViewerWindow->setProgressPercent( percent_done ); + gViewerWindow->setProgressMessage(std::string()); } else if (gRestoreGL) @@ -538,6 +540,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) gViewerWindow->setProgressPercent( percent_done ); } + gViewerWindow->setProgressMessage(std::string()); } ////////////////////////// |