livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge 

--HG--
branch : product-engine
meow-7.2.2
Vadim Savchuk 2010-02-24 16:36:15 +02:00
parent 4ad0d181db 7bb3d97110
commit df29381dc0
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llgroupmgr.cpp
View File

@ -56,6 +56,16 @@
#include "lluictrlfactory.h"
#include <boost/regex.hpp>
#if LL_MSVC
// disable boost::lexical_cast warning
#pragma warning (disable:4702)
#endif
#include <boost/lexical_cast.hpp>
#if LL_MSVC
#pragma warning(pop) // Restore all warnings to the previous state
#endif
const U32 MAX_CACHED_GROUPS = 10;
@ -833,13 +843,13 @@ static void formatDateString(std::string &date_string)
const regex expression("([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})");
if (regex_match(date_string.c_str(), result, expression))
{
std::string year = result[3];
std::string month = result[1];
std::string day = result[2];
// convert matches to integers so that we can pad them with zeroes on Linux
S32 year = boost::lexical_cast<S32>(result[3]);
S32 month = boost::lexical_cast<S32>(result[1]);
S32 day = boost::lexical_cast<S32>(result[2]);
// ISO 8601 date format
//date_string = llformat("%02s/%02s/%04s", month.c_str(), day.c_str(), year.c_str());
date_string = llformat("%04s/%02s/%04s", year.c_str(), month.c_str(), day.c_str());
date_string = llformat("%04d/%02d/%02d", year, month, day);
}
}