diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-04 15:34:34 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-04 15:34:34 -0700 |
| commit | 33cc363a6813bf6c1268fa85747d1d403e00f8e5 (patch) | |
| tree | d30696b245c4b5eb70575582d0dd9ddc4b20e5c7 /indra/newview/llfavoritesbar.cpp | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
| parent | 89434ef6e64462041368ab26e049011fc84ae1e3 (diff) | |
Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup.
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
| -rw-r--r-- | indra/newview/llfavoritesbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 72bfac70fc..3964fbfa74 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -374,7 +374,7 @@ void LLFavoritesBarCtrl::showDropDownMenu() { if (mPopupMenuHandle.isDead()) { - LLMenuGL::Params menu_p; + LLToggleableMenu::Params menu_p; menu_p.name("favorites menu"); menu_p.can_tear_off(false); menu_p.visible(false); |