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

Merge branch 'master' into UICleanup

Browse Source
This commit is contained in:
Shyotl
2013-05-27 19:19:38 -05:00
parent d5e1a0dd4b ee1f1cdde2
commit ba9c8f3d6d
260 changed files with 7735 additions and 7937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llviewerwindow.cpp
View File

@@ -5397,7 +5397,8 @@ void LLViewerWindow::calcDisplayScale()
S32 LLViewerWindow::getChatConsoleBottomPad()
{
S32 offset = 0;
static const LLCachedControl<S32> user_offset("ConsoleBottomOffset");
S32 offset = user_offset;
if(gToolBar && gToolBar->getVisible())
offset += TOOL_BAR_HEIGHT;