more merge from viewer-development

2 files changed, 3 insertions, 18 deletions

diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 80a12e68ae..aea7f00222 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -309,10 +309,10 @@ void LLAvatarActions::showProfile(const LLUUID& id)
 		params["open_tab_name"] = "panel_profile";
 
 		// PROFILES: open in webkit window
-		std::string first_name,last_name;
-		if (gCacheName->getName(id,first_name,last_name))
+		std::string full_name;
+		if (gCacheName->getFullName(id,full_name))
 		{
-			std::string agent_name = first_name + "." + last_name;
+			std::string agent_name = LLCacheName::buildUsername(full_name);
 			llinfos << "opening web profile for " << agent_name << llendl;		
 			std::string url = getProfileURL(agent_name);
 			LLWeb::loadURLInternal(url);
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index f9b3746ac0..186ec96d9e 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -386,23 +386,15 @@ BOOL LLFloaterPreference::postBuild()
 	LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");
 	if (!tabcontainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
 		tabcontainer->selectFirstTab();
-<<<<<<< local
-	
-=======
 
 	updateDoubleClickControls();
 
->>>>>>> other
 	getChild<LLUICtrl>("cache_location")->setEnabled(FALSE); // make it read-only but selectable (STORM-227)
 	std::string cache_location = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "");
 	setCacheLocation(cache_location);
-<<<<<<< local
-	
-=======
 
 	getChild<LLComboBox>("language_combobox")->setCommitCallback(boost::bind(&LLFloaterPreference::onLanguageChange, this));
 
->>>>>>> other
 	// if floater is opened before login set default localized busy message
 	if (LLStartUp::getStartupState() < STATE_STARTED)
 	{
@@ -534,17 +526,14 @@ void LLFloaterPreference::apply()
 			gAgent.sendAgentUpdateUserInfo(new_im_via_email,mDirectoryVisibility);
 		}
 	}
-<<<<<<< local
 	
 	saveAvatarProperties();
-=======
 
 	if (mDoubleClickActionDirty)
 	{
 		updateDoubleClickSettings();
 		mDoubleClickActionDirty = false;
 	}
->>>>>>> other
 }
 
 void LLFloaterPreference::cancel()
@@ -630,14 +619,10 @@ void LLFloaterPreference::onOpen(const LLSD& key)
 		getChild<LLUICtrl>("maturity_desired_textbox")->setValue(maturity_combo->getSelectedItemLabel());
 		getChildView("maturity_desired_combobox")->setVisible( false);
 	}
-<<<<<<< local
-	
-=======
 
 	// Forget previous language changes.
 	mLanguageChanged = false;
 
->>>>>>> other
 	// Display selected maturity icons.
 	onChangeMaturity();