From fd8dff8a448e7d2125a9b91351efb7d69e10e0a3 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 18:38:29 -0800
Subject: SOCIAL-551 WIP add buttons to open people and profile windows
 detecting if a profile window is visible now relies on the key the window was
 opened with and not the current url of that window this way you can navigate
 away from your profile and still close the window with the profile button
 removed unused getURL() function

---
 indra/newview/llavataractions.cpp     | 14 +-------------
 indra/newview/llfloaterwebcontent.cpp |  5 -----
 indra/newview/llfloaterwebcontent.h   |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 014a387276..afa8b62c74 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -341,19 +341,7 @@ void LLAvatarActions::showProfile(const LLUUID& id)
 bool LLAvatarActions::profileVisible(const LLUUID& id)
 {
 	LLFloaterWebContent *browser = dynamic_cast<LLFloaterWebContent*> (LLFloaterReg::findInstance("web_content", id.asString()));
-	if (browser)
-	{
-		// PROFILES: open in webkit window
-		std::string full_name;
-		if (gCacheName->getFullName(id,full_name))
-		{
-			std::string agent_name = LLCacheName::buildUsername(full_name);
-			llinfos << "opening web profile for " << agent_name << llendl;		
-			std::string url = getProfileURL(agent_name);
-			return url == browser->getURL();
-		}
-	}
-	return false;
+	return browser && browser->isShown();
 }
 
 
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index bcbb01ab1d..058567492b 100644
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -400,8 +400,3 @@ void LLFloaterWebContent::onPopExternal()
 		LLWeb::loadURLExternal( url );
 	};
 }
-
-std::string LLFloaterWebContent::getURL() const
-{
-	return mAddressCombo->getValue().asString();
-}
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h
index 6c934158d0..ecc7e970d8 100644
--- a/indra/newview/llfloaterwebcontent.h
+++ b/indra/newview/llfloaterwebcontent.h
@@ -65,7 +65,6 @@ public:
 	void onClickStop();
 	void onEnterAddress();
 	void onPopExternal();
-	std::string getURL() const;
 
 private:
 	void open_media(const std::string& media_url, const std::string& target);
-- 
cgit v1.2.3