summaryrefslogtreecommitdiff
path: root/indra/newview/llscreenchannel.h
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2009-11-05 17:44:39 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2009-11-05 17:44:39 +0200
commitaa29e39a44458db51cad20eca03be406e4d249f0 (patch)
tree777efa6ec059af0cf47c459005e903af6f5cde93 /indra/newview/llscreenchannel.h
parent4254d1e0f7af0f8f00033bc0edaf74ddd7a49796 (diff)
parent49db6cd157f5da37f962aa36ab791084c202d439 (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llscreenchannel.h')
-rw-r--r--indra/newview/llscreenchannel.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index 987bc4b596..fd31690622 100644
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -204,8 +204,7 @@ public:
// signal on rejecting of a toast event
typedef boost::function<void (LLUUID id)> reject_tost_callback_t;
typedef boost::signals2::signal<void (LLUUID id)> reject_tost_signal_t;
- reject_tost_signal_t mRejectToastSignal;
- boost::signals2::connection setOnRejectToastCallback(reject_tost_callback_t cb) { return mRejectToastSignal.connect(cb); }
+ reject_tost_signal_t mRejectToastSignal; boost::signals2::connection setOnRejectToastCallback(reject_tost_callback_t cb) { return mRejectToastSignal.connect(cb); }
private:
struct ToastElem