diff options
| author | richard <none@none> | 2009-11-16 19:14:59 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-16 19:14:59 -0800 |
| commit | 76d7ecf6ba6dab2d20422f96880e351a02612d01 (patch) | |
| tree | e92a09afb311f435d9b0a5dab5b7defd1e8f0992 | |
| parent | d504efe3018bd0ce616e67c30b0bb31f5637973a (diff) | |
fix for llfasttimer not appearing with tall windows
reviewed by Palmer
| -rw-r--r-- | indra/newview/lldebugview.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp index 20dc4440c2..169a963d0d 100644 --- a/indra/newview/lldebugview.cpp +++ b/indra/newview/lldebugview.cpp @@ -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"); diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 4663e9c8e6..dda7d35f7d 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -740,7 +740,7 @@ void LLViewerMedia::updateMedia() } // Transfer the proximity order to the proximity fields in the objects. - for(int i = 0; i < proximity_order.size(); i++) + for(int i = 0; i < (S32)proximity_order.size(); i++) { proximity_order[i]->mProximity = i; } |