summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-02-05 13:48:48 +0200
committerMike Antipov <mantipov@productengine.com>2010-02-05 13:48:48 +0200
commitb80c6d68874a11292e7dff59b03b1d0f46fad232 (patch)
tree201ad5b53da4698ba4aeac2477dcac5db44731f9
parentcc0895b90039a6446f7c9a0ab71518d445175c0f (diff)
Fixed major bug EXT-4994 (Sidebar Places View Suddenly Shifts While Renaming Favorites)
- overridden default LLFolderView functionality to apply LLSelectFirstFilteredItem functor for Places / Landmarks Inventory panels - this also fixed normal bug EXT-1631 (Landmarks panel: There is selection in the each accordion after filter reset) --HG-- branch : product-engine
-rw-r--r--indra/newview/llplacesinventorypanel.cpp9
-rw-r--r--indra/newview/llplacesinventorypanel.h2
2 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp
index 8edeebaeeb..6c6eb7c719 100644
--- a/indra/newview/llplacesinventorypanel.cpp
+++ b/indra/newview/llplacesinventorypanel.cpp
@@ -174,6 +174,15 @@ S32 LLPlacesInventoryPanel::notify(const LLSD& info)
// PUBLIC METHODS
//////////////////////////////////////////////////////////////////////////
+LLPlacesFolderView::LLPlacesFolderView(const LLFolderView::Params& p)
+: LLFolderView(p)
+{
+ // we do not need auto select functionality in places landmarks, so override default behavior.
+ // this disables applying of the LLSelectFirstFilteredItem in LLFolderView::doIdle.
+ // Fixed issues: EXT-1631, EXT-4994.
+ mAutoSelectOverride = TRUE;
+}
+
BOOL LLPlacesFolderView::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
// let children to change selection first
diff --git a/indra/newview/llplacesinventorypanel.h b/indra/newview/llplacesinventorypanel.h
index 86937e7c7f..04c6758eae 100644
--- a/indra/newview/llplacesinventorypanel.h
+++ b/indra/newview/llplacesinventorypanel.h
@@ -67,7 +67,7 @@ private:
class LLPlacesFolderView : public LLFolderView
{
public:
- LLPlacesFolderView(const LLFolderView::Params& p) : LLFolderView(p) {};
+ LLPlacesFolderView(const LLFolderView::Params& p);
/**
* Handles right mouse down
*