Merged in graham_linden/viewer-eep-g (pull request #477)

Fix line-endings on new inline file.

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/llrender/lluiimage.inl b/indra/llrender/lluiimage.inl
index 3b23d77d62..f5227556f0 100644
--- a/indra/llrender/lluiimage.inl
+++ b/indra/llrender/lluiimage.inl
@@ -64,14 +64,14 @@ void LLUIImage::drawBorder(S32 x, S32 y, S32 width, S32 height, const LLColor4&
 }
 
 // returns dimensions of underlying textures, which might not be equal to ui image portion
-S32 LLUIImage::getTextureWidth() const

-{

-    mCachedW = (mCachedW == -1) ? getWidth() : mCachedW;

-    return mCachedW;

-}

-

-S32 LLUIImage::getTextureHeight() const

-{

-    mCachedH = (mCachedH == -1) ? getHeight() : mCachedH;

-    return mCachedH;

-}

+S32 LLUIImage::getTextureWidth() const
+{
+    mCachedW = (mCachedW == -1) ? getWidth() : mCachedW;
+    return mCachedW;
+}
+
+S32 LLUIImage::getTextureHeight() const
+{
+    mCachedH = (mCachedH == -1) ? getHeight() : mCachedH;
+    return mCachedH;
+}