diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/llui/llviewborder.h | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/llui/llviewborder.h')
| -rw-r--r-- | indra/llui/llviewborder.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llui/llviewborder.h b/indra/llui/llviewborder.h index d35663c857..3353103e96 100644 --- a/indra/llui/llviewborder.h +++ b/indra/llui/llviewborder.h @@ -44,8 +44,6 @@ public: LLViewBorder( const LLString& name, const LLRect& rect, EBevel bevel = BEVEL_OUT, EStyle style = STYLE_LINE, S32 width = 1 ); virtual void setValue(const LLSD& val) { setRect(LLRect(val)); } - virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_VIEW_BORDER; } - virtual LLString getWidgetTag() const { return LL_VIEW_BORDER_TAG; } virtual BOOL isCtrl() const { return FALSE; } @@ -85,7 +83,7 @@ private: LLColor4 mShadowDark; LLColor4 mBackgroundColor; S32 mBorderWidth; - LLPointer<LLImageGL> mTexture; + LLUIImagePtr mTexture; BOOL mHasKeyboardFocus; }; |