From 75e76ea248ae4674afa7ab2e3e2a018228073dc3 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 4 Aug 2010 16:52:22 +0300
Subject: EXT-8524 FIXED Non-ASCII character corruption in date.
Convert formatted date from system charset to UTF-8 on Windows (other OSes don't require this).
See http://jira.secondlife.com/browse/EXT-8318 for more details.
Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/834/
--HG--
branch : product-engine
---
indra/llcommon/lldate.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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
--
cgit v1.2.3
From 7253c7eeb156f9f6cd75f52b0df856ec8ef165fb Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 4 Aug 2010 21:13:11 +0300
Subject: EXT-7511 FIXED Fixed item selection cropping in Edit Outfit
Restored changeset which was lost after merge 58571b4e704b.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/780/
--HG--
branch : product-engine
---
indra/newview/llinventorylistitem.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
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);
}
--
cgit v1.2.3