diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-10 13:22:55 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-10 13:22:55 -0800 |
| commit | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (patch) | |
| tree | 910dbc7db40ddae4c66ad24e9b25346771500a75 /indra/newview/llscreenchannel.h | |
| parent | 95445fb1b56a60145933db0891133230c87274b8 (diff) | |
| parent | 426744df2c9a6c04bab594fefbd8b35970d0948d (diff) | |
Merge from viewer-development
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 38eb1cd86f..023a65d872 100644 --- a/indra/newview/llscreenchannel.h +++ b/indra/newview/llscreenchannel.h @@ -196,10 +196,10 @@ public: /** Stop fading given toast */ - virtual void stopFadingToast(LLToast* toast); + virtual void stopToastTimer(LLToast* toast); /** Start fading given toast */ - virtual void startFadingToast(LLToast* toast); + virtual void startToastTimer(LLToast* toast); // get StartUp Toast's state static bool getStartUpToastShown() { return mWasStartUpToastShown; } |