Merge with Tip
commit
0ae9284adb
|
|
@ -79,7 +79,7 @@ void LLDebugView::init()
|
|||
|
||||
r.set(150 - 25, rect.getHeight() - 50, rect.getWidth()/2 - 25, rect.getHeight() - 450);
|
||||
|
||||
r.set(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f),
|
||||
r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f),
|
||||
(S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f));
|
||||
mFastTimerView = new LLFastTimerView(r);
|
||||
mFastTimerView->setFollowsTop();
|
||||
|
|
@ -87,7 +87,7 @@ void LLDebugView::init()
|
|||
mFastTimerView->setVisible(FALSE); // start invisible
|
||||
addChild(mFastTimerView);
|
||||
|
||||
r.set(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f),
|
||||
r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f),
|
||||
(S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f));
|
||||
LLMemoryView::Params mp;
|
||||
mp.name("memory");
|
||||
|
|
|
|||
Loading…
Reference in New Issue