summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelteleporthistory.cpp
diff options
context:
space:
mode:
authorSergei Litovchuk <slitovchuk@productengine.com>2009-12-01 20:25:01 +0200
committerSergei Litovchuk <slitovchuk@productengine.com>2009-12-01 20:25:01 +0200
commit56504054d8e0cba815c25035ed7dd71015cf3222 (patch)
tree40d9d3a349390437d736560ac51b52f590f81d78 /indra/newview/llpanelteleporthistory.cpp
parent857bc15a39018a75b04ed39430466880c24b3f48 (diff)
Fixed normal bug EXT-2346 "My Landmarks accordion panels shouldn't be displayed if there are no landmarks in respective folders".
- Added updating accordions contents in idle routine. - Removed inventory observer. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llpanelteleporthistory.cpp')
-rw-r--r--indra/newview/llpanelteleporthistory.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 327048d4f3..523487fa14 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -220,7 +220,6 @@ void LLTeleportHistoryPanel::ContextMenu::onCopyToClipboard()
LLTeleportHistoryPanel::LLTeleportHistoryPanel()
: LLPanelPlacesTab(),
- mFilterSubString(LLStringUtil::null),
mDirty(true),
mCurrentItem(0),
mTeleportHistory(NULL),
@@ -317,9 +316,9 @@ void LLTeleportHistoryPanel::draw()
// virtual
void LLTeleportHistoryPanel::onSearchEdit(const std::string& string)
{
- if (mFilterSubString != string)
+ if (sFilterSubString != string)
{
- mFilterSubString = string;
+ sFilterSubString = string;
showTeleportHistory();
}
}
@@ -482,8 +481,8 @@ void LLTeleportHistoryPanel::refresh()
std::string landmark_title = items[mCurrentItem].mTitle;
LLStringUtil::toUpper(landmark_title);
- std::string::size_type match_offset = mFilterSubString.size() ? landmark_title.find(mFilterSubString) : std::string::npos;
- bool passed = mFilterSubString.size() == 0 || match_offset != std::string::npos;
+ std::string::size_type match_offset = sFilterSubString.size() ? landmark_title.find(sFilterSubString) : std::string::npos;
+ bool passed = sFilterSubString.size() == 0 || match_offset != std::string::npos;
if (!passed)
{