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

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

Browse Source 
Conflicts(Actually git being dumb, I already merged these, just lost history):
	indra/newview/llfloateractivespeakers.h - local
	indra/newview/lloverlaybar.cpp - local
	indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml - remote
This commit is contained in:
Lirusaito
2013-06-25 19:37:50 -04:00
parent 306df58793 2793ca9e04
commit c2cc398339
16 changed files with 284 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llviewerwindow.cpp
View File

@@ -1638,7 +1638,8 @@ LLViewerWindow::LLViewerWindow(
mResDirty(false),
//mStatesDirty(false), //Singu Note: No longer needed. State update is now in restoreGL.
mIsFullscreenChecked(false),
mCurrResolutionIndex(0)
mCurrResolutionIndex(0),
mProgressView(NULL)
{
LLNotificationChannel::buildChannel("VW_alerts", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alert"));
LLNotificationChannel::buildChannel("VW_alertmodal", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alertmodal"));
@@ -2203,6 +2204,7 @@ void LLViewerWindow::initWorldUI_postLogin()
LLFloaterChatterBox::createInstance(LLSD());
}
mRootView->sendChildToFront(mProgressView);
}
// Destroy the UI
@@ -5144,6 +5146,13 @@ void LLViewerWindow::setup3DViewport(S32 x_offset, S32 y_offset)
glViewport(gGLViewport[0], gGLViewport[1], gGLViewport[2], gGLViewport[3]);
}
void LLViewerWindow::revealIntroPanel()
{
if (mProgressView)
{
mProgressView->revealIntroPanel();
}
}
void LLViewerWindow::setShowProgress(const BOOL show)
{
@@ -5153,12 +5162,11 @@ void LLViewerWindow::setShowProgress(const BOOL show)
}
}
void LLViewerWindow::moveProgressViewToFront()
void LLViewerWindow::setStartupComplete()
{
if (mProgressView && mRootView)
if (mProgressView)
{
mRootView->removeChild(mProgressView);
mRootView->addChild(mProgressView);
mProgressView->setStartupComplete();
}
}