diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-10-25 11:48:43 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-10-25 11:48:43 -0700 |
| commit | 970ee73e9a9cd1c94c295c9decb4d632886c19e6 (patch) | |
| tree | 18cc7f08bbc043252bea9a6f687807116585d286 /indra/newview/lltoastnotifypanel.h | |
| parent | d4e622daf2775147c75a75389ffb9b55f8cef799 (diff) | |
Fix release merge issues (included upstream changes not yet in release from bear)
Diffstat (limited to 'indra/newview/lltoastnotifypanel.h')
| -rwxr-xr-x | indra/newview/lltoastnotifypanel.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h index fe7f1cf8f3..d02171b512 100755 --- a/indra/newview/lltoastnotifypanel.h +++ b/indra/newview/lltoastnotifypanel.h @@ -69,8 +69,6 @@ public: virtual void updateNotification() {} - bool isControlPanelEnabled() const; - protected: LLButton* createButton(const LLSD& form_element, BOOL is_option); |