Merge remote-tracking branch 'mccabe/exp' into weekly

Conflicts:  (Keeping these around as a record, there was some strangeness.
	.gitignore
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llfloaterregioninfo.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/skins/default/html/en-us/loading-error/index.html
	linden/indra/newview/skins/default/html/en-us/loading/loading.html
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/install.xml

1 files changed, 3 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index c52f541..931c8b6 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -73,6 +73,7 @@ public:
         LLTabContainer* getTabContainer() { return mTabContainer; }
 
         void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string&  email);
+        void updateIsLoggedIn(bool enable);
 
         static void onTabChanged(void* user_data, bool from_click);
         
@@ -113,6 +114,8 @@ public:
 
         // static data update, called from message handler
         static void updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email);
+        // static data update, called after login
+        static void updateIsLoggedIn(bool enable);
 
         // refresh all the graphics preferences menus
         static void refreshEnabledGraphics();