diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 10:24:45 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 10:24:45 -0800 |
commit | 9459fd9137a2901f964bb307348b13d222c8287b (patch) | |
tree | 580499326c48072051dd6afcdd475e4676d1837c /indra/newview/llnearbychatbar.cpp | |
parent | a328cdc83015a46a87377ad3c822c730c03026a3 (diff) | |
parent | 092f93b0c1084edf68fc0536aa03a3c7b816505b (diff) |
PE merge.
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
-rw-r--r-- | indra/newview/llnearbychatbar.cpp | 4 |
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********************************/ |