summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2010-01-29 19:32:42 +0200
committerAndrew Dyukov <adyukov@productengine.com>2010-01-29 19:32:42 +0200
commitfe90c259daab3a222a80e84db7b8a328d505a5a2 (patch)
tree2bb7dd7d42ae3c39af5a3eac2f9916dc1a2da717 /indra
parent09c2f013623797a165a1cccd539a3a86f8a0027f (diff)
Fixed major bug EXT-4767 (Any docked/undocked window overlaps Gesture menu).
- Changed adding of gestures scrolllist from NonSideTrayView to FloaterViewHolder. --HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llnearbychatbar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 6cf8bcb417..ad98a29fb2 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -97,9 +97,9 @@ LLGestureComboList::LLGestureComboList(const LLGestureComboList::Params& p)
mList = LLUICtrlFactory::create<LLScrollListCtrl>(params);
- // *HACK: adding list as a child to NonSideTrayView to make it fully visible without
+ // *HACK: adding list as a child to FloaterViewHolder to make it fully visible without
// making it top control (because it would cause problems).
- gViewerWindow->getNonSideTrayView()->addChild(mList);
+ gViewerWindow->getFloaterViewHolder()->addChild(mList);
mList->setVisible(FALSE);
//****************************Gesture Part********************************/