diff options
| author | Don Kjer <don@lindenlab.com> | 2011-05-17 19:21:55 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-05-17 19:21:55 +0000 |
| commit | ae8ed3fc2d4a7dda92ad8fdb34bc559478eb9177 (patch) | |
| tree | 64cd5d3328dbb56b03a03cf873a613005d0394dc /indra/llui/llstyle.cpp | |
| parent | c62ef53863bd01cb96de55e0250c8a8193b6c72b (diff) | |
| parent | 113f532ee57eeeca4dc7eb6ca05f923f1f3543d3 (diff) | |
Merge with viewer-development
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; } |