summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelexperiencelog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelexperiencelog.cpp')
-rw-r--r--indra/newview/llpanelexperiencelog.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llpanelexperiencelog.cpp b/indra/newview/llpanelexperiencelog.cpp
index b4ca76c4b1..5380565ace 100644
--- a/indra/newview/llpanelexperiencelog.cpp
+++ b/indra/newview/llpanelexperiencelog.cpp
@@ -54,7 +54,7 @@ LLPanelExperienceLog::LLPanelExperienceLog( )
buildFromFile("panel_experience_log.xml");
}
-BOOL LLPanelExperienceLog::postBuild( void )
+bool LLPanelExperienceLog::postBuild()
{
LLExperienceLog* log = LLExperienceLog::getInstance();
mEventList = getChild<LLScrollListCtrl>("experience_log_list");
@@ -76,13 +76,13 @@ BOOL LLPanelExperienceLog::postBuild( void )
LLSpinCtrl* spin = getChild<LLSpinCtrl>("logsizespinner");
- spin->set(log->getMaxDays());
+ spin->set((F32)log->getMaxDays());
spin->setCommitCallback(boost::bind(&LLPanelExperienceLog::logSizeChanged, this));
mPageSize = log->getPageSize();
refresh();
mNewEvent = LLExperienceLog::instance().addUpdateSignal(boost::bind(&LLPanelExperienceLog::refresh, this));
- return TRUE;
+ return true;
}
LLPanelExperienceLog* LLPanelExperienceLog::create()
@@ -102,14 +102,14 @@ void LLPanelExperienceLog::refresh()
return;
}
- setAllChildrenEnabled(FALSE);
+ setAllChildrenEnabled(false);
LLSD item;
bool waiting = false;
LLUUID waiting_id;
- int itemsToSkip = mPageSize*mCurrentPage;
- int items = 0;
+ unsigned int itemsToSkip = mPageSize*mCurrentPage;
+ unsigned int items = 0;
bool moreItems = false;
LLSD events_to_save = events;
if (events.isMap() && events.size() != 0)
@@ -126,7 +126,7 @@ void LLPanelExperienceLog::refresh()
events_to_save.erase(day->first);
continue;
}
- int size = dayArray.size();
+ unsigned int size = static_cast<unsigned int>(dayArray.size());
if(itemsToSkip > size)
{
itemsToSkip -= size;
@@ -137,7 +137,7 @@ void LLPanelExperienceLog::refresh()
moreItems = true;
break;
}
- for(int i = dayArray.size() - itemsToSkip - 1; i >= 0; i--)
+ for(int i = static_cast<int>(dayArray.size()) - itemsToSkip - 1; i >= 0; i--)
{
if(items >= mPageSize)
{
@@ -179,9 +179,9 @@ void LLPanelExperienceLog::refresh()
}
else
{
- setAllChildrenEnabled(TRUE);
+ setAllChildrenEnabled(true);
- mEventList->setEnabled(TRUE);
+ mEventList->setEnabled(true);
getChild<LLButton>("btn_next")->setEnabled(moreItems);
getChild<LLButton>("btn_prev")->setEnabled(mCurrentPage>0);
getChild<LLButton>("btn_clear")->setEnabled(mEventList->getItemCount()>0);