aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanellogin.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-10-01 20:21:57 -0500
committerJacek Antonelli2008-10-08 00:52:09 -0500
commit061abd8263b1fa91c344b8de7e254221cf3b4d58 (patch)
treed4426976022f100a8e41d69016e0c2977c7821cb /linden/indra/newview/llpanellogin.cpp
parentChanged viewer and channel name to "Imprudence". (diff)
downloadmeta-impy-061abd8263b1fa91c344b8de7e254221cf3b4d58.zip
meta-impy-061abd8263b1fa91c344b8de7e254221cf3b4d58.tar.gz
meta-impy-061abd8263b1fa91c344b8de7e254221cf3b4d58.tar.bz2
meta-impy-061abd8263b1fa91c344b8de7e254221cf3b4d58.tar.xz
Added Imprudence-specific version numbers.
Diffstat (limited to 'linden/indra/newview/llpanellogin.cpp')
-rw-r--r--linden/indra/newview/llpanellogin.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index ffee058..61bf215 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -419,15 +419,24 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
419 419
420 // childSetAction("quit_btn", onClickQuit, this); 420 // childSetAction("quit_btn", onClickQuit, this);
421 421
422 std::string channel = gSavedSettings.getString("VersionChannelName"); 422 std::string imp_channel = gSavedSettings.getString("VersionChannelName");
423 std::string version = llformat("%d.%d.%d (%d)", 423 std::string imp_version = llformat("%d.%d.%d",
424 IMP_VERSION_MAJOR,
425 IMP_VERSION_MINOR,
426 IMP_VERSION_PATCH );
427
428 std::string ll_channel = LL_VIEWER_NAME;
429 std::string ll_version = llformat("%d.%d.%d (%d)",
424 LL_VERSION_MAJOR, 430 LL_VERSION_MAJOR,
425 LL_VERSION_MINOR, 431 LL_VERSION_MINOR,
426 LL_VERSION_PATCH, 432 LL_VERSION_PATCH,
427 LL_VIEWER_BUILD ); 433 LL_VIEWER_BUILD );
434
428 LLTextBox* channel_text = getChild<LLTextBox>("channel_text"); 435 LLTextBox* channel_text = getChild<LLTextBox>("channel_text");
429 channel_text->setTextArg("[CHANNEL]", channel); 436 channel_text->setTextArg("[CHANNEL]", imp_channel);
430 channel_text->setTextArg("[VERSION]", version); 437 channel_text->setTextArg("[VERSION]", imp_version);
438 channel_text->setTextArg("[ALT_CHANNEL]", ll_channel);
439 channel_text->setTextArg("[ALT_VERSION]", ll_version);
431 channel_text->setClickedCallback(onClickVersion); 440 channel_text->setClickedCallback(onClickVersion);
432 channel_text->setCallbackUserData(this); 441 channel_text->setCallbackUserData(this);
433 442