diff options
author | dolphin <dolphin@lindenlab.com> | 2013-04-02 15:04:41 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-04-02 15:04:41 -0700 |
commit | f684d897f532bcba87cda1f72bd19efac82f6cb6 (patch) | |
tree | 6222ff28ee7825e987a127383a081297a80d7e6c /indra/newview/lltoastimpanel.h | |
parent | 4bdecca57ec82a5dbc323432b7b5cb6aba9c1303 (diff) | |
parent | 90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/newview/lltoastimpanel.h')
-rw-r--r-- | indra/newview/lltoastimpanel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/lltoastimpanel.h b/indra/newview/lltoastimpanel.h index a803387576..3eb11fb3bc 100644 --- a/indra/newview/lltoastimpanel.h +++ b/indra/newview/lltoastimpanel.h @@ -41,18 +41,18 @@ public: struct Params { LLNotificationPtr notification; - LLUUID avatar_id; - LLUUID session_id; - std::string from; - std::string time; - std::string message; + LLUUID avatar_id, + session_id; + std::string from, + time, + message; Params() {} }; LLToastIMPanel(LLToastIMPanel::Params &p); virtual ~LLToastIMPanel(); - /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask); private: void showInspector(); |