diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-08-04 15:45:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-08-04 15:45:48 -0700 |
| commit | 7cc7d143837f2b75f750c139e33fdf5afa8a8866 (patch) | |
| tree | 7e37843f06cdd1f163258b5686ac29943aa8558d /indra/llui/llpanel.h | |
| parent | 1b46240ed84e2847dbf7da0d67c67940b646448c (diff) | |
| parent | 0b81c19cbe809f041e628da334c305ea33fae2e9 (diff) | |
Sync with viewer-development
Diffstat (limited to 'indra/llui/llpanel.h')
| -rw-r--r-- | indra/llui/llpanel.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 67674fab7e..790025cb2d 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -35,6 +35,7 @@ #include "lluiimage.h" #include "lluistring.h" #include "v4color.h" +#include "llbadgeholder.h" #include <list> #include <queue> @@ -51,7 +52,7 @@ class LLUIImage; * With or without border, * Can contain LLUICtrls. */ -class LLPanel : public LLUICtrl +class LLPanel : public LLUICtrl, public LLBadgeHolder { public: struct LocalizedString : public LLInitParam::Block<LocalizedString> @@ -252,8 +253,6 @@ public: boost::signals2::connection setVisibleCallback( const commit_signal_t::slot_type& cb ); - bool acceptsBadge() const { return mAcceptsBadge; } - protected: // Override to set not found list LLButton* getDefaultButton() { return mDefaultBtn; } @@ -266,9 +265,11 @@ protected: std::string mHelpTopic; // the name of this panel's help topic to display in the Help Viewer typedef std::deque<const LLCallbackMap::map_t*> factory_stack_t; static factory_stack_t sFactoryStack; + + // for setting the xml filename when building panel in context dependent cases + std::string mXMLFilename; private: - bool mAcceptsBadge; BOOL mBgVisible; // any background at all? BOOL mBgOpaque; // use opaque color or image LLUIColor mBgOpaqueColor; @@ -285,8 +286,6 @@ private: typedef std::map<std::string, std::string> ui_string_map_t; ui_string_map_t mUIStrings; - // for setting the xml filename when building panel in context dependent cases - std::string mXMLFilename; }; // end class LLPanel |