aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-11-10 13:58:38 -0700
committerMcCabe Maxsted2009-11-10 13:58:38 -0700
commit25b13a129b1617a8d3036213472b1c34122a5e7e (patch)
tree0f35b94bd42a753544cdf420ab70230b15013e8c /linden/indra/newview
parentFixed llstartup header issue and removed WIN32_LEAN_AND_MEAN define (diff)
downloadmeta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.zip
meta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.tar.gz
meta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.tar.bz2
meta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.tar.xz
Viewer compiles, but still trying to get everything to link on Windows
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llfloaterhtmlhelp.cpp3
-rw-r--r--linden/indra/newview/llfloaterhtmlhelp.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index 8de489a..607a245 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -307,6 +307,8 @@ public:
307 virtual void draw(); 307 virtual void draw();
308 308
309 static void show(std::string url, std::string title); 309 static void show(std::string url, std::string title);
310
311private:
310 static void onClickBack( void* data ); 312 static void onClickBack( void* data );
311 static void onClickHome( void* data ); 313 static void onClickHome( void* data );
312 static void onClickForward( void* data ); 314 static void onClickForward( void* data );
@@ -321,7 +323,6 @@ public:
321 323
322 static bool onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response); 324 static bool onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response);
323 325
324protected:
325 LLWebBrowserCtrl* mWebBrowser; 326 LLWebBrowserCtrl* mWebBrowser;
326 static LLFloaterHtmlHelp* sInstance; 327 static LLFloaterHtmlHelp* sInstance;
327 LLButton* mBackButton; 328 LLButton* mBackButton;
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/newview/llfloaterhtmlhelp.h
index 5b09634..fa04f06 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.h
+++ b/linden/indra/newview/llfloaterhtmlhelp.h
@@ -69,6 +69,8 @@ public:
69 69
70 static void toggle(); 70 static void toggle();
71 static void helpF1(); 71 static void helpF1();
72
73private:
72 static void onEnterAddress(LLUICtrl* ctrl, void* user_data); 74 static void onEnterAddress(LLUICtrl* ctrl, void* user_data);
73 static void onClickRefresh(void* user_data); 75 static void onClickRefresh(void* user_data);
74 static void onClickBack(void* user_data); 76 static void onClickBack(void* user_data);
@@ -81,7 +83,6 @@ public:
81 static void onClickSetHome(void* user_data); 83 static void onClickSetHome(void* user_data);
82 static bool onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response); 84 static bool onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response);
83 85
84private:
85 LLWebBrowserCtrl* mBrowser; 86 LLWebBrowserCtrl* mBrowser;
86 LLComboBox* mAddressCombo; 87 LLComboBox* mAddressCombo;
87 std::string mCurrentURL; 88 std::string mCurrentURL;