Commits

Kent Quirk committed e94c029 Merge

Merge

Comments (0)

Files changed (5)

indra/newview/llappviewer.cpp

 
 		if(data["required"].asBoolean())
 		{
-			apply_callback = &apply_update_ok_callback;
 			if(LLStartUp::getStartupState() <= STATE_LOGIN_WAIT)
 			{
 				// The user never saw the progress bar.
+				apply_callback = &apply_update_ok_callback;
 				notification_name = "RequiredUpdateDownloadedVerboseDialog";
 			}
+			else if(LLStartUp::getStartupState() < STATE_WORLD_INIT)
+			{
+				// The user is logging in but blocked.
+				apply_callback = &apply_update_ok_callback;
+				notification_name = "RequiredUpdateDownloadedDialog";
+			}
 			else
 			{
-				notification_name = "RequiredUpdateDownloadedDialog";
+				// The user is already logged in; treat like an optional update.
+				apply_callback = &apply_update_callback;
+				notification_name = "DownloadBackgroundTip";
 			}
 		}
 		else

indra/newview/llpanelavatar.cpp

 	getChild<LLUICtrl>("sl_groups")->setValue(groups);
 }
 
-void LLPanelAvatarProfile::got_full_name_callback( const LLUUID& id, const std::string& full_name, bool is_group )
-{
+static void got_full_name_callback( LLHandle<LLPanel> profile_panel_handle, const std::string& full_name )
+{
+	if (profile_panel_handle.isDead() ) return;
+
+	LLPanelAvatarProfile* profile_panel = dynamic_cast<LLPanelAvatarProfile*>(profile_panel_handle.get());
+	if ( ! profile_panel ) return;
+
 	LLStringUtil::format_map_t args;
 
 	std::string name;
 
 	args["[NAME]"] = name;
 
-	std::string linden_name = getString("name_text_args", args);
-	getChild<LLUICtrl>("name_descr_text")->setValue(linden_name);
-}
+	std::string linden_name = profile_panel->getString("name_text_args", args);
+	profile_panel->getChild<LLUICtrl>("name_descr_text")->setValue(linden_name);
+}
 
 void LLPanelAvatarProfile::onNameCache(const LLUUID& agent_id, const LLAvatarName& av_name)
 {
 	}
 
 	// ask (asynchronously) for the avatar name
+	LLHandle<LLPanel> profile_panel_handle = getHandle();
 	std::string full_name;
 	if (gCacheName->getFullName(avatar_data->agent_id, full_name))
 	{
 		// name in cache, call callback directly
-		got_full_name_callback( avatar_data->agent_id, full_name, false );
+		got_full_name_callback( profile_panel_handle, full_name );
 	}
 	else
 	{
 		// not in cache, lookup name 
-		gCacheName->get(avatar_data->agent_id, false, boost::bind( &LLPanelAvatarProfile::got_full_name_callback, this, _1, _2, _3 ));
+		gCacheName->get(avatar_data->agent_id, false, boost::bind( got_full_name_callback, profile_panel_handle, _2 ));
 	}
 
 	// get display name

indra/newview/llpanelavatar.h

 	void onShareButtonClick();
 
 private:
-	void got_full_name_callback( const LLUUID& id, const std::string& full_name, bool is_group );
 	void onNameCache(const LLUUID& agent_id, const LLAvatarName& av_name);
 
 	typedef std::map< std::string,LLUUID>	group_map_t;

indra/newview/skins/default/xui/en/panel_profile.xml

 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
 	</string>
+  <string
+  name="name_text_args">
+    [NAME]
+  </string>
+  <string
+    name="display_name_text_args">
+    [DISPLAY_NAME]
+  </string>
     <layout_stack
      name="layout"
      orientation="vertical"

indra/viewer_components/updater/llupdaterservice.cpp

 	stopTimer();
 	mNewVersion = newVersion;
 	mIsDownloading = true;
+	setState(LLUpdaterService::DOWNLOADING);
 	mUpdateDownloader.download(uri, hash, newVersion, false);
-	
-	setState(LLUpdaterService::DOWNLOADING);
 }
 
 void LLUpdaterServiceImpl::requiredUpdate(std::string const & newVersion,
 	stopTimer();
 	mNewVersion = newVersion;
 	mIsDownloading = true;
+	setState(LLUpdaterService::DOWNLOADING);
 	mUpdateDownloader.download(uri, hash, newVersion, true);
-	
-	setState(LLUpdaterService::DOWNLOADING);
 }
 
 void LLUpdaterServiceImpl::upToDate(void)