diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-11 12:21:55 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-11 12:21:55 -0400 |
| commit | dc2d11d3de38d42b3d696abeb189c923881b6f63 (patch) | |
| tree | e85be2840a69de1bdccad31e7bdab903803ed1b4 /indra/newview/llfloatertos.h | |
| parent | b2632c50efc12eacdcadace64e6c0f1906b86ff6 (diff) | |
| parent | 8f4811f3fd7f252a5f5bc50ed11fecd8e42f3e68 (diff) | |
Merged in my latest work including improved version of DEV-35401 "doubleton" workaround and LLFloaterTOS post-merge fixups.
Diffstat (limited to 'indra/newview/llfloatertos.h')
| -rw-r--r-- | indra/newview/llfloatertos.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/llfloatertos.h b/indra/newview/llfloatertos.h index 0b15c24bc8..89ad29170c 100644 --- a/indra/newview/llfloatertos.h +++ b/indra/newview/llfloatertos.h @@ -49,11 +49,9 @@ class LLFloaterTOS : public LLWebBrowserCtrlObserver { public: - LLFloaterTOS(const LLSD& message); + LLFloaterTOS(const LLSD& data); virtual ~LLFloaterTOS(); - typedef boost::function<void(bool)> YesNoCallback; - BOOL postBuild(); virtual void draw(); @@ -66,14 +64,11 @@ public: virtual void onNavigateComplete( const EventType& eventIn ); - // *TODO - consider getting rid of this in favor of using an event pump. -brad - void setTOSCallback(YesNoCallback const & callback); - private: std::string mMessage; int mWebBrowserWindowId; int mLoadCompleteCount; - YesNoCallback mCallback; + std::string mReplyPumpName; }; #endif // LL_LLFLOATERTOS_H |