diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/llui/llui.cpp | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 7561fe8b48..ad523db78b 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1644,7 +1644,7 @@ void LLUI::setCursorPositionScreen(S32 x, S32 y) } //static -void LLUI::setCursorPositionLocal(LLView* viewp, S32 x, S32 y) +void LLUI::setCursorPositionLocal(const LLView* viewp, S32 x, S32 y) { S32 screen_x, screen_y; viewp->localPointToScreen(x, y, &screen_x, &screen_y); @@ -1847,12 +1847,12 @@ void LLUIImage::setScaleRegion(const LLRectf& region) } //TODO: move drawing implementation inside class -void LLUIImage::draw(S32 x, S32 y, const LLColor4& color) +void LLUIImage::draw(S32 x, S32 y, const LLColor4& color) const { gl_draw_image(x, y, mImage, color, mClipRegion); } -void LLUIImage::draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) +void LLUIImage::draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const { if (mUniformScaling) { @@ -1871,7 +1871,7 @@ void LLUIImage::draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) } } -void LLUIImage::drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) +void LLUIImage::drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const { gl_draw_scaled_image_with_border( x, y, @@ -1883,7 +1883,7 @@ void LLUIImage::drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& c mScaleRegion); } -void LLUIImage::drawSolid(S32 x, S32 y, const LLColor4& color) +void LLUIImage::drawSolid(S32 x, S32 y, const LLColor4& color) const { gl_draw_scaled_image_with_border( x, y, @@ -1895,12 +1895,12 @@ void LLUIImage::drawSolid(S32 x, S32 y, const LLColor4& color) mScaleRegion); } -S32 LLUIImage::getWidth() +S32 LLUIImage::getWidth() const { return mImage->getWidth(0); } -S32 LLUIImage::getHeight() +S32 LLUIImage::getHeight() const { return mImage->getHeight(0); } |