diff options
author | Joshua Bell <josh@lindenlab.com> | 2011-05-16 10:09:53 -0700 |
---|---|---|
committer | Joshua Bell <josh@lindenlab.com> | 2011-05-16 10:09:53 -0700 |
commit | cfad224f1c56556e58cfe7f3fe0606b4ab164ef8 (patch) | |
tree | 1000311071eb6b9d8a1132f860ffd980bb5f5c5b /indra/llui/llstyle.cpp | |
parent | f440cd4af6cb7cd791e5f0eddb8dc9b99a37e0b0 (diff) | |
parent | 0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff) |
Merge
Diffstat (limited to 'indra/llui/llstyle.cpp')
-rw-r--r-- | indra/llui/llstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp index 28a064e6b6..bb731f4f7e 100644 --- a/indra/llui/llstyle.cpp +++ b/indra/llui/llstyle.cpp @@ -88,7 +88,7 @@ void LLStyle::setVisible(BOOL is_visible) mVisible = is_visible; } -LLUIImagePtr LLStyle::getImage() const +LLPointer<LLUIImage> LLStyle::getImage() const { return mImagep; } |