diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-09-12 06:27:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-09-12 06:27:13 +0000 |
| commit | da94c0eaa2ce2711f0ae26968e87ef3e409126a9 (patch) | |
| tree | e0b23896f17e0a0ea60160b2c7e39331f3cb9668 /indra/newview/llpanellogin.cpp | |
| parent | 642cdd95726755b7c24c7f2b25e2fea8e49b5b9b (diff) | |
QAR-855 Viewer 1.21 RC 2
merge viewer_1-21 94770-96059 -> release
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index f7f46b0c30..7a8497aa2e 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -375,7 +375,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, // change z sort of clickable text to be behind buttons sendChildToBack(getChildView("channel_text")); - sendChildToBack(getChildView("version_text")); sendChildToBack(getChildView("forgot_password_text")); LLLineEditor* edit = getChild<LLLineEditor>("password_edit"); @@ -418,20 +417,17 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, setDefaultBtn("connect_btn"); - childSetAction("quit_btn", onClickQuit, this); + // childSetAction("quit_btn", onClickQuit, this); - LLTextBox* version_text = getChild<LLTextBox>("version_text"); + std::string channel = gSavedSettings.getString("VersionChannelName"); std::string version = llformat("%d.%d.%d (%d)", LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD ); - version_text->setText(version); - version_text->setClickedCallback(onClickVersion); - version_text->setCallbackUserData(this); - LLTextBox* channel_text = getChild<LLTextBox>("channel_text"); - channel_text->setText(gSavedSettings.getString("VersionChannelName")); + channel_text->setTextArg("[CHANNEL]", channel); + channel_text->setTextArg("[VERSION]", version); channel_text->setClickedCallback(onClickVersion); channel_text->setCallbackUserData(this); @@ -1106,6 +1102,8 @@ void LLPanelLogin::onClickNewAccount(void*) } +// *NOTE: This function is dead as of 2008 August. I left it here in case +// we suddenly decide to put the Quit button back. JC // static void LLPanelLogin::onClickQuit(void*) { |