diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/llpanellogin.h | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/llpanellogin.h')
| -rw-r--r-- | indra/newview/llpanellogin.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h index 47d42da7f1..540f938053 100644 --- a/indra/newview/llpanellogin.h +++ b/indra/newview/llpanellogin.h @@ -34,7 +34,7 @@ #define LL_LLPANELLOGIN_H #include "llpanel.h" -#include "llmemory.h" // LLPointer<> +#include "llpointer.h" // LLPointer<> #include "llwebbrowserctrl.h" // LLWebBrowserCtrlObserver class LLUIImage; @@ -72,7 +72,7 @@ public: static BOOL isGridComboDirty(); static void getLocation(std::string &location); - static void close(); + static void closePanel(); void setSiteIsAlive( bool alive ); @@ -84,7 +84,7 @@ public: private: static void onClickConnect(void*); static void onClickNewAccount(void*); - static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response); +// static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response); static void onClickQuit(void*); static void onClickVersion(void*); virtual void onNavigateComplete( const EventType& eventIn ); |