diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-10-26 13:05:54 -0700 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-26 13:05:54 -0700 |
commit | 1d67a9084199910d35a44ac427a07fc1d9d6a4fd (patch) | |
tree | 4d942a13d1fd358a8a10a67554ea9a85b7f04c6f /indra/llui/lliconctrl.h | |
parent | 19fc3fb32c3cd95fcfb5708b59b5620e506c5179 (diff) | |
parent | e84ff39e4c7c5b028a6b8b4f6dc5d37c525eb1c4 (diff) |
merge with remote repo
Diffstat (limited to 'indra/llui/lliconctrl.h')
-rw-r--r-- | indra/llui/lliconctrl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index ff25b0d53e..90f1693060 100644 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -72,10 +72,13 @@ public: std::string getImageName() const; void setColor(const LLColor4& color) { mColor = color; } + +protected: + S32 mPriority; private: LLUIColor mColor; - LLPointer<LLUIImage> mImagep; + LLPointer<LLUIImage> mImagep; }; #endif |