diff --git a/indra/newview/aihttpview.cpp b/indra/newview/aihttpview.cpp index b5c5c4538..11e5af66b 100644 --- a/indra/newview/aihttpview.cpp +++ b/indra/newview/aihttpview.cpp @@ -291,7 +291,7 @@ AIHTTPView::~AIHTTPView() mGLHTTPHeaderBar = NULL; } -U32 AIHTTPView::updateColumn(int col, U32 start) +U32 AIHTTPView::updateColumn(U32 col, U32 start) { if (col > mStartColumn.size()) { diff --git a/indra/newview/aihttpview.h b/indra/newview/aihttpview.h index 767d37e54..3fb80ea03 100644 --- a/indra/newview/aihttpview.h +++ b/indra/newview/aihttpview.h @@ -52,7 +52,7 @@ class AIHTTPView : public LLContainerView /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); - U32 updateColumn(int col, U32 start); + U32 updateColumn(U32 col, U32 start); void setWidth(S32 width) { mWidth = width; } private: diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 4a67d41ff..d58e1e556 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -153,7 +153,7 @@ void LLLogChat::loadHistory(std::string const& filename , void (*callback)(ELogL char buffer[LOG_RECALL_BUFSIZ]; bool error = false; - int nlines = 0; + U32 nlines = 0; while (pos > 0 && nlines < lines) { // Read the LOG_RECALL_BUFSIZ characters before pos.