diff options
| author | James Cook <james@lindenlab.com> | 2010-02-03 14:13:56 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-03 14:13:56 -0800 |
| commit | 88350edbcbec615f3b15fc82bd5ce4005621ac6f (patch) | |
| tree | c244f41159cf32f3e03c6c311e1453bbd383bad5 /indra/newview/llnearbychatbar.cpp | |
| parent | d489216b6ef41f0d22f3a9062ba6daacc67bc038 (diff) | |
| parent | 0bee31de32cb5999e7ec06d74f55d34ce0ac052b (diff) | |
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********************************/ |