diff options
| author | Jacek Antonelli | 2010-03-18 16:41:31 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2010-04-28 02:02:04 -0500 |
| commit | 022ecc41b0a5de294f0ea2b449113b602a706c85 (patch) | |
| tree | a57a04a03b86cdb121d0ff4d50599e2fa8d2709f /linden/indra | |
| parent | Added a notification to say that textures were not exported on SL. (diff) | |
| download | meta-impy-022ecc41b0a5de294f0ea2b449113b602a706c85.zip meta-impy-022ecc41b0a5de294f0ea2b449113b602a706c85.tar.gz meta-impy-022ecc41b0a5de294f0ea2b449113b602a706c85.tar.bz2 meta-impy-022ecc41b0a5de294f0ea2b449113b602a706c85.tar.xz | |
Load login page using Imprudence version instead of SL version.
(cherry picked from commit 8cd94404e0d20361667aae5d18cad256a733b72c)
@nochangelog
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/llpanellogin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp index 1a17b20..75f9653 100644 --- a/linden/indra/newview/llpanellogin.cpp +++ b/linden/indra/newview/llpanellogin.cpp | |||
| @@ -920,8 +920,9 @@ void LLPanelLogin::loadLoginPage() | |||
| 920 | } | 920 | } |
| 921 | 921 | ||
| 922 | // Channel and Version | 922 | // Channel and Version |
| 923 | std::string version = llformat("%d.%d.%d (%d)", | 923 | std::string version = llformat("%d.%d.%d %s", |
| 924 | LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD); | 924 | IMP_VERSION_MAJOR, IMP_VERSION_MINOR, |
| 925 | IMP_VERSION_PATCH, IMP_VERSION_TEST); | ||
| 925 | 926 | ||
| 926 | char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0); | 927 | char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0); |
| 927 | char* curl_version = curl_escape(version.c_str(), 0); | 928 | char* curl_version = curl_escape(version.c_str(), 0); |