Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made compiler detection more reliable and cleanup clang warnings

Browse Source
This commit is contained in:
Drake Arconis
2013-05-05 17:56:16 -07:00
parent a2df4b6693
commit 73b10e6b29
18 changed files with 21 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llui/llcombobox.h
View File

@@ -202,7 +202,6 @@ protected:
LLColor4 mListColor;
private:
S32 mButtonPadding;
LLLineEditor* mTextEntry;
BOOL mAllowTextEntry;
S32 mMaxChars;

7
indra/llui/llmenugl.cpp
View File

@@ -2405,7 +2405,6 @@ void LLMenuGL::arrange( void )
// Scrolling support
item_list_t::iterator first_visible_item_iter;
item_list_t::iterator first_hidden_item_iter = mItems.end();
//S32 height_before_first_visible_item = -1;
//S32 visible_items_height = 0;
//U32 scrollable_items_cnt = 0;
@@ -2903,9 +2902,6 @@ LLMenuItemGL* LLMenuGL::highlightNextItem(LLMenuItemGL* cur_item, BOOL skip_disa
next_item_iter = cur_item_iter;
next_item_iter++;
// First visible item position in the items list
item_list_t::iterator first_visible_item_iter = std::find(mItems.begin(), mItems.end(), mFirstVisibleItem);
if (next_item_iter == mItems.end())
{
next_item_iter = mItems.begin();
@@ -2981,9 +2977,6 @@ LLMenuItemGL* LLMenuGL::highlightPrevItem(LLMenuItemGL* cur_item, BOOL skip_disa
prev_item_iter = cur_item_iter;
prev_item_iter++;
// First visible item reverse position in the items list
item_list_t::reverse_iterator first_visible_item_iter = std::find(mItems.rbegin(), mItems.rend(), mFirstVisibleItem);
if (prev_item_iter == mItems.rend())
{
prev_item_iter = mItems.rbegin();