diff options
author | Oz Linden <oz@lindenlab.com> | 2013-08-27 10:37:02 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-08-27 10:37:02 -0400 |
commit | a359d9d80c013b7c6cd594bb8d94b8950fdcdf55 (patch) | |
tree | 7b687542962149ec448d436dbe62fe8ebac25d63 /indra/newview/llfavoritesbar.h | |
parent | f46e07c14c11ffd26c0cf0794992d7c08d16fcd4 (diff) | |
parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) |
merge changes for 3.6.4-release
Diffstat (limited to 'indra/newview/llfavoritesbar.h')
-rwxr-xr-x | indra/newview/llfavoritesbar.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h index f06e9b9b64..211d3c4ce3 100755 --- a/indra/newview/llfavoritesbar.h +++ b/indra/newview/llfavoritesbar.h @@ -101,6 +101,7 @@ protected: LLUUID mFavoriteFolderId; const LLFontGL *mFont; S32 mFirstDropDownItem; + S32 mDropDownItemsCount; bool mUpdateDropDownItems; bool mRestoreOverflowMenu; |