diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-05 12:39:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-05 12:39:08 +0100 |
| commit | eef6ababcdd9ae4c9cbdc5dc295420fa66e753ab (patch) | |
| tree | 05ace450df0d21f24d2f9816f8f64059b3044c02 | |
| parent | 057568bddc178546c112d8223042a0ed2378ab8b (diff) | |
| parent | 7253c7eeb156f9f6cd75f52b0df856ec8ef165fb (diff) | |
merge from PE's viewer-release
| -rw-r--r-- | indra/llcommon/lldate.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llinventorylistitem.cpp | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp index a7ef28b431..04583cdd4a 100644 --- a/indra/llcommon/lldate.cpp +++ b/indra/llcommon/lldate.cpp @@ -121,7 +121,12 @@ std::string LLDate::toHTTPDateString (tm * gmt, std::string fmt) // use strftime() as it appears to be faster than std::time_put char buffer[128]; strftime(buffer, 128, fmt.c_str(), gmt); - return std::string(buffer); + std::string res(buffer); +#if LL_WINDOWS + // Convert from locale-dependant charset to UTF-8 (EXT-8524). + res = ll_convert_string_to_utf8_string(res); +#endif + return res; } void LLDate::toStream(std::ostream& s) const diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp index e4a7a158a3..2546390fcb 100644 --- a/indra/newview/llinventorylistitem.cpp +++ b/indra/newview/llinventorylistitem.cpp @@ -96,9 +96,12 @@ void LLPanelInventoryListItemBase::draw() if (mSeparatorVisible && mSeparatorImage) { - // stretch along bottom of listitem, using image height + // place under bottom of listitem, using image height + // item_pad in list using the item should be >= image height + // to avoid cropping of top of the next item. LLRect separator_rect = getLocalRect(); - separator_rect.mTop = mSeparatorImage->getHeight(); + separator_rect.mTop = separator_rect.mBottom; + separator_rect.mBottom -= mSeparatorImage->getHeight(); mSeparatorImage->draw(separator_rect); } |