livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
meow-7.2.2
Richard Linden 2011-02-24 18:38:29 -08:00
parent 83e92c6190
commit fd8dff8a44
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llavataractions.cpp
View File

@ -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();
}

5
indra/newview/llfloaterwebcontent.cpp
View File

@ -400,8 +400,3 @@ void LLFloaterWebContent::onPopExternal()
LLWeb::loadURLExternal( url );
};
}
std::string LLFloaterWebContent::getURL() const
{
return mAddressCombo->getValue().asString();
}

1
indra/newview/llfloaterwebcontent.h
View File

@ -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);