From 427191118e65605e03a5369bdebf2c998e54f851 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 19 Jan 2015 17:52:06 +0200
Subject: MAINT-4169 ShowGreyQueryInUrls debug setting was removed and the grey
part of the link always appears.
---
indra/llui/lltextbase.cpp | 3 +--
indra/llui/llurlentry.cpp | 8 ++------
indra/llui/llurlentry.h | 1 -
3 files changed, 3 insertions(+), 9 deletions(-)
(limited to 'indra/llui')
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 3193300ebb..103c5b6047 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2065,8 +2065,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
// output the styled Url
appendAndHighlightTextImpl(match.getLabel(), part, link_params, match.underlineOnHoverOnly());
- // show query part of url with gray color if enabled in global settings in "ShowGreyQueryInUrls"
- // and only for LLUrlEntryHTTP and LLUrlEntryHTTPNoProtocol url entries
+ // show query part of url with gray color only for LLUrlEntryHTTP and LLUrlEntryHTTPNoProtocol url entries
std::string label = match.getQuery();
if (label.size())
{
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index acc8fdacfb..e18d7405ab 100755
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -49,7 +49,6 @@ std::string localize_slapp_label(const std::string& url, const std::string& full
LLUrlEntryBase::LLUrlEntryBase()
{
- mGreyQuery = LLUI::sSettingGroups["config"]->getBOOL("ShowGreyQueryInUrls");
}
LLUrlEntryBase::~LLUrlEntryBase()
@@ -206,11 +205,8 @@ std::string LLUrlEntryBase::urlToGreyQuery(const std::string &url) const
LLUriParser up(unescapeUrl(url));
std::string query;
- if (mGreyQuery)
- {
- up.extractParts();
- up.glueSecond(query);
- }
+ up.extractParts();
+ up.glueSecond(query);
return query;
}
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 57e374f5bd..ddfc33ab78 100755
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -130,7 +130,6 @@ protected:
std::string mMenuName;
std::string mTooltip;
std::multimap<std::string, LLUrlEntryObserver> mObservers;
- bool mGreyQuery;
};
///
--
cgit v1.2.3
From 5724d58f342dbdccdad368b04ac61294437d108b Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 12 Feb 2015 12:38:16 +0200
Subject: MAINT-4847 FIXED Select new texture tab on clicking arrow buttons.
---
indra/llui/lltabcontainer.cpp | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
(limited to 'indra/llui')
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 6f858cdeb3..308e83963d 100755
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -1775,6 +1775,11 @@ void LLTabContainer::onNextBtn( const LLSD& data )
scrollNext();
}
mScrolled = FALSE;
+
+ if(mCurrentTabIdx < mTabList.size()-1)
+ {
+ selectNextTab();
+ }
}
void LLTabContainer::onNextBtnHeld( const LLSD& data )
@@ -1783,6 +1788,11 @@ void LLTabContainer::onNextBtnHeld( const LLSD& data )
{
mScrollTimer.reset();
scrollNext();
+
+ if(mCurrentTabIdx < mTabList.size()-1)
+ {
+ selectNextTab();
+ }
mScrolled = TRUE;
}
}
@@ -1794,6 +1804,11 @@ void LLTabContainer::onPrevBtn( const LLSD& data )
scrollPrev();
}
mScrolled = FALSE;
+
+ if(mCurrentTabIdx > 0)
+ {
+ selectPrevTab();
+ }
}
void LLTabContainer::onJumpFirstBtn( const LLSD& data )
@@ -1812,6 +1827,11 @@ void LLTabContainer::onPrevBtnHeld( const LLSD& data )
{
mScrollTimer.reset();
scrollPrev();
+
+ if(mCurrentTabIdx > 0)
+ {
+ selectPrevTab();
+ }
mScrolled = TRUE;
}
}
--
cgit v1.2.3
From adc48a7effd3394dd5c17ccb63f4589f5b94f7f2 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 27 Feb 2015 11:40:57 +0200
Subject: MAINT-2781 FIXED Reset pressed state on focus lost.
---
indra/llui/llcombobox.cpp | 1 +
1 file changed, 1 insertion(+)
(limited to 'indra/llui')
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 56be52f69a..5b0f34aaa3 100755
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -443,6 +443,7 @@ void LLComboBox::onFocusLost()
{
mTextEntry->selectAll();
}
+ mButton->setForcePressedState(false);
LLUICtrl::onFocusLost();
}
--
cgit v1.2.3