aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorJacek Antonelli2010-03-18 16:41:31 -0500
committerJacek Antonelli2010-03-27 20:07:20 -0500
commit8cd94404e0d20361667aae5d18cad256a733b72c (patch)
treef109a86474419365324701318159fd84c5033a57 /linden
parentImproved make_changelog.py. (diff)
downloadmeta-impy-8cd94404e0d20361667aae5d18cad256a733b72c.zip
meta-impy-8cd94404e0d20361667aae5d18cad256a733b72c.tar.gz
meta-impy-8cd94404e0d20361667aae5d18cad256a733b72c.tar.bz2
meta-impy-8cd94404e0d20361667aae5d18cad256a733b72c.tar.xz
Load login page using Imprudence version instead of SL version.
This will enable us to notify users of updates via the login page.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpanellogin.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index e0acd34..d3e295d 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -826,8 +826,9 @@ void LLPanelLogin::loadLoginPage()
826 } 826 }
827 827
828 // Channel and Version 828 // Channel and Version
829 std::string version = llformat("%d.%d.%d (%d)", 829 std::string version = llformat("%d.%d.%d %s",
830 LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD); 830 IMP_VERSION_MAJOR, IMP_VERSION_MINOR,
831 IMP_VERSION_PATCH, IMP_VERSION_TEST);
831 832
832 char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0); 833 char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0);
833 char* curl_version = curl_escape(version.c_str(), 0); 834 char* curl_version = curl_escape(version.c_str(), 0);