diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-09 20:56:23 +0000 |
|---|---|---|
| committer | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-09 20:56:23 +0000 |
| commit | 7a64aad1def1b0612addbf2e66c66db061d7e182 (patch) | |
| tree | 2e011e8b58933e692c0cae738a4382a37e3e222b /indra/newview/llpanellogin.h | |
| parent | 311aaf7ffd8f7dc95dba84f10fcae97bc93901bb (diff) | |
DEV-34822 - merge 1.23
merge -r119443 - basic slurl handling
ignore dead branch
Diffstat (limited to 'indra/newview/llpanellogin.h')
| -rw-r--r-- | indra/newview/llpanellogin.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h index d33aa2d550..4f18b7bfd8 100644 --- a/indra/newview/llpanellogin.h +++ b/indra/newview/llpanellogin.h @@ -38,6 +38,7 @@ #include "llmediactrl.h" // LLMediaCtrlObserver #include <boost/scoped_ptr.hpp> #include "llsecapi.h" +#include "llslurl.h" class LLLineEditor; class LLUIImage; @@ -68,13 +69,13 @@ public: static void setFields(LLPointer<LLCredential> credential, BOOL remember); - static void refreshLocation( bool force_visible ); - static void getFields(LLPointer<LLCredential>& credential, BOOL& remember); static BOOL isGridComboDirty(); - static void getLocation(std::string &location); - + static BOOL areCredentialFieldsDirty(); + static LLSLURL getLocation(); + + static void updateLocationCombo(bool force_visible); // simply update the combo box static void closePanel(); void setSiteIsAlive( bool alive ); @@ -99,7 +100,11 @@ private: static void onSelectServer(LLUICtrl*, void*); static void onServerComboLostFocus(LLFocusableElement*); static void updateServerCombo(); + static void onSelectLocation(LLUICtrl*, void*); + static void updateServer(std::string grid); // update the combo box, change the login page to the new server, clear the combo + static void updateLoginPanelLinks(); + private: LLPointer<LLUIImage> mLogoImage; boost::scoped_ptr<LLPanelLoginListener> mListener; |