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

Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future

Browse Source 
Conflicts:
	indra/llvfs/lldiriterator.cpp
	indra/newview/app_settings/settings.xml
	indra/newview/llviewerregion.cpp
This commit is contained in:
Siana Gearz
2011-07-21 00:20:06 +02:00
parent 2dd733cbaa fe0cd9f702
commit f30c284063
339 changed files with 8700 additions and 4498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewerwindow.cpp
View File

@@ -2005,8 +2005,8 @@ void LLViewerWindow::initWorldUI_postLogin()
gFloaterWorldMap->setVisible(FALSE);
// open teleport history floater and hide it initially
gFloaterTeleportHistory = new LLFloaterTeleportHistory();
gFloaterTeleportHistory->setVisible(FALSE);
LLFloaterTeleportHistory::getInstance()->setVisible(FALSE);
LLFloaterTeleportHistory::loadFile("teleport_history.xml");
LLFloaterChatterBox::createInstance(LLSD());
}
@@ -3069,7 +3069,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
LLRect notify_box_rect = gNotifyBoxView->getRect();
notify_box_rect.mBottom = bar_rect.mBottom;
gNotifyBoxView->reshape(notify_box_rect.getWidth(), notify_box_rect.getHeight());
gNotifyBoxView->setRect(notify_box_rect);
gNotifyBoxView->setShape(notify_box_rect);
// make sure floaters snap to visible rect by adjusting floater view rect
LLRect floater_rect = gFloaterView->getRect();
@@ -3079,7 +3079,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
// Don't bounce the floaters up and down.
gFloaterView->reshapeFloater(floater_rect.getWidth(), floater_rect.getHeight(),
TRUE, ADJUST_VERTICAL_NO);
gFloaterView->setRect(floater_rect);
gFloaterView->setShape(floater_rect);
}
// snap floaters to top of chat bar/button strip