diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-08-02 15:07:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-08-02 15:07:35 -0700 |
| commit | 0b81c19cbe809f041e628da334c305ea33fae2e9 (patch) | |
| tree | 57a870cb47928bb996c33d2111a0f49c3f28b31f /indra/newview/llavataractions.cpp | |
| parent | 8d081d34fc56fd1b742045dd120b6acbda0d027e (diff) | |
| parent | 6d9158dcaddfe486d91a514c9df92c155f655397 (diff) | |
Pull from richard/viewer-experience
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 5ccd5ff073..f22b02093f 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -318,7 +318,7 @@ static void on_avatar_name_show_profile(const LLUUID& agent_id, const LLAvatarNa static LLCachedControl<LLRect> profile_rect(gSavedSettings, "WebProfileRect"); LLFloaterWebContent::create(LLFloaterWebContent::Params(). url(url). - id(agent_id). + id(agent_id.asString()). show_chrome(show_chrome). window_class("profile"). preferred_media_size(profile_rect)); @@ -338,7 +338,7 @@ bool LLAvatarActions::profileVisible(const LLUUID& id) { LLSD sd; sd["id"] = id; - LLFloaterWebContent *browser = dynamic_cast<LLFloaterWebContent*> (LLFloaterReg::findInstance("web_content", sd)); + LLFloaterWebContent *browser = dynamic_cast<LLFloaterWebContent*> (LLFloaterReg::findInstance("profile", sd)); return browser && browser->isShown(); } @@ -348,7 +348,7 @@ void LLAvatarActions::hideProfile(const LLUUID& id) { LLSD sd; sd["id"] = id; - LLFloaterWebContent *browser = dynamic_cast<LLFloaterWebContent*> (LLFloaterReg::findInstance("web_content", sd)); + LLFloaterWebContent *browser = dynamic_cast<LLFloaterWebContent*> (LLFloaterReg::findInstance("profile", sd)); if (browser) { browser->closeFloater(); |