diff options
| author | Richard Linden <none@none> | 2011-11-26 21:21:56 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-26 21:21:56 -0800 |
| commit | 6293746b59a4368d6e95b8c4e0951cd217aeee2b (patch) | |
| tree | 1e7ff05468ed9ed7bb8aef0fc293f495b8dcec9e /indra/newview/lltoast.h | |
| parent | 5a31ac4aee6b41d1b948dc0aa4420cbd5e765ce3 (diff) | |
| parent | 61570bf84fdf5edad1e34188111d551b262c67e8 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/lltoast.h')
| -rw-r--r-- | indra/newview/lltoast.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h index 242f786bf2..380c2c391a 100644 --- a/indra/newview/lltoast.h +++ b/indra/newview/lltoast.h @@ -196,7 +196,7 @@ public: virtual S32 notifyParent(const LLSD& info); - LLHandle<LLToast> getHandle() { mHandle.bind(this); return mHandle; } + LLHandle<LLToast> getHandle() const { return getDerivedHandle<LLToast>(); } protected: void updateTransparency(); @@ -215,7 +215,7 @@ private: LLUUID mSessionID; LLNotificationPtr mNotification; - LLRootHandle<LLToast> mHandle; + //LLRootHandle<LLToast> mHandle; LLPanel* mWrapperPanel; |