summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellogin.h
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-12-18 14:25:15 -0800
committerRick Pasetto <rick@lindenlab.com>2009-12-18 14:25:15 -0800
commit4d55b5bad0cfabc4c9bb4e4d7234efc77b3547e8 (patch)
tree9bfa670a6cd4b40f20d5ae710f028872d592c0ba /indra/newview/llpanellogin.h
parent0e729489438898d0de062ea5d744be3009e47c57 (diff)
parent064c9be9aedf238530ccdc941861fd057580e5b1 (diff)
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llpanellogin.h')
-rw-r--r--indra/newview/llpanellogin.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index 97350ce5c7..1fdc3a9361 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -71,6 +71,7 @@ public:
static void addServer(const std::string& server, S32 domain_name);
static void refreshLocation( bool force_visible );
+ static void updateLocationUI();
static void getFields(std::string *firstname, std::string *lastname,
std::string *password);
@@ -102,7 +103,7 @@ private:
static void onPassKey(LLLineEditor* caller, void* user_data);
static void onSelectServer(LLUICtrl*, void*);
static void onServerComboLostFocus(LLFocusableElement*);
-
+
private:
LLPointer<LLUIImage> mLogoImage;
boost::scoped_ptr<LLPanelLoginListener> mListener;