Commit dd286138 authored by NiranV's avatar NiranV

Misc: Fixed more compile warnings.

parent b9831a71
......@@ -886,7 +886,7 @@ bool LLAppViewerWin32::sendURLToOtherInstance(const std::string& url)
cds.cbData = url.length() + 1;
cds.lpData = (void*)url.c_str();
LRESULT msg_result = SendMessage(other_window, WM_COPYDATA, NULL, (LPARAM)&cds);
/*LRESULT msg_result = */SendMessage(other_window, WM_COPYDATA, NULL, (LPARAM)&cds);
/*// _LL_DEBUGS() << "SendMessage(WM_COPYDATA) to other window '"
<< getWindowTitle() << "' returned " << msg_result << LL_ENDL;*/
return true;
......
......@@ -148,7 +148,7 @@ void LLProgressView::setStartupComplete()
mFadeToWorldTimer.start();
}
void LLProgressView::setVisible(BOOL visible, BOOL logout)
void LLProgressView::setProgressVisible(BOOL visible, BOOL logout)
{
if (!visible && mFadeFromLoginTimer.getStarted())
{
......
......@@ -57,7 +57,9 @@ class LLProgressView :
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
/*virtual*/ void setVisible(BOOL visible, BOOL logout = false);
//BD
void setProgressVisible(BOOL visible, BOOL logout = false);
void setPercent(const F32 percent);
......@@ -68,7 +70,7 @@ class LLProgressView :
void setMessage(const std::string& string);
// turns on (under certain circumstances) the into video after login
void revealIntroPanel();
//void revealIntroPanel();
void fade(BOOL in); // ## Zi: Fade teleport screens
......
......@@ -1250,7 +1250,7 @@ void LLViewerTextureList::decodeAllImages(F32 max_time)
}
max_time -= timer.getElapsedTimeF32();
max_time = llmax(max_time, .001f);
F32 create_time = updateImagesCreateTextures(max_time);
/*F32 create_time = */updateImagesCreateTextures(max_time);
/*// _LL_DEBUGS("ViewerImages") << "decodeAllImages() took " << timer.getElapsedTimeF32() << " seconds. "
<< " fetch_pending " << fetch_pending
......
......@@ -5346,7 +5346,7 @@ void LLViewerWindow::setShowProgress(const BOOL show, BOOL logout)
{
if (logout)
{
mProgressView->setVisible(show, logout);
mProgressView->setProgressVisible(show, logout);
}
else
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment