diff options
author | Don Kjer <don@lindenlab.com> | 2011-01-28 18:05:10 -0800 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-01-28 18:05:10 -0800 |
commit | f2a1f0df3a3c8ce18179ea06992f5e5d07f2f773 (patch) | |
tree | cd571814ec2e9d11ef05f8107e068ca6702df2a6 /indra/newview/llpanellogin.cpp | |
parent | 4a083db6c52d2cc5c1cd1f908270f5952ace6505 (diff) | |
parent | b4b3f78c455a614d7738c29cdc6383e857d6028d (diff) |
Merge from viewer-development
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
-rw-r--r-- | indra/newview/llpanellogin.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index c143aff2d4..8d3b1fd7a0 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -35,6 +35,7 @@ #include "llsecondlifeurls.h" #include "v4color.h" +#include "llappviewer.h" #include "llbutton.h" #include "llcheckboxctrl.h" #include "llcommandhandler.h" // for secondlife:///app/login/ @@ -859,6 +860,13 @@ void LLPanelLogin::loadLoginPage() char* curl_grid = curl_escape(LLGridManager::getInstance()->getGridLabel().c_str(), 0); oStr << "&grid=" << curl_grid; curl_free(curl_grid); + + // add OS info + char * os_info = curl_escape(LLAppViewer::instance()->getOSInfo().getOSStringSimple().c_str(), 0); + oStr << "&os=" << os_info; + curl_free(os_info); + + gViewerWindow->setMenuBackgroundColor(false, !LLGridManager::getInstance()->isInProductionGrid()); gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor()); |