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/newview/llscreenchannel.h | |
| parent | 19fc3fb32c3cd95fcfb5708b59b5620e506c5179 (diff) | |
| parent | e84ff39e4c7c5b028a6b8b4f6dc5d37c525eb1c4 (diff) | |
merge with remote repo
Diffstat (limited to 'indra/newview/llscreenchannel.h')
| -rw-r--r-- | indra/newview/llscreenchannel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h index 459c28ac7c..987bc4b596 100644 --- a/indra/newview/llscreenchannel.h +++ b/indra/newview/llscreenchannel.h @@ -158,7 +158,7 @@ public: // Operating with toasts // add a toast to a channel - void addToast(LLToast::Params p); + void addToast(const LLToast::Params& p); // kill or modify a toast by its ID void killToastByNotificationID(LLUUID id); void modifyToastByNotificationID(LLUUID id, LLPanel* panel); @@ -256,7 +256,7 @@ private: void createOverflowToast(S32 bottom, F32 timer); // create the StartUp Toast - void createStartUpToast(S32 notif_num, S32 bottom, F32 timer); + void createStartUpToast(S32 notif_num, F32 timer); // Channel's flags static bool mWasStartUpToastShown; |