diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-07-06 15:54:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-07-06 15:54:07 -0700 |
| commit | cca256dcdd785613f29dd00b372ccbf273c7d6a8 (patch) | |
| tree | e2358efa15579f88bc5690bd2726ff7b76afe765 /indra/newview/llavataractions.cpp | |
| parent | 60f6d809262d97de3b41dcf18a43d783b4b485dc (diff) | |
| parent | 6c63a1ae09dca557af67a06c7871bfe287765dd4 (diff) | |
merge
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index eeb4ec8458..4685865bce 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -49,6 +49,7 @@ #include "llfloaterpay.h" #include "llfloaterwebcontent.h" #include "llfloaterworldmap.h" +#include "llfolderview.h" #include "llgiveinventory.h" #include "llinventorybridge.h" #include "llinventorymodel.h" // for gInventory.findCategoryUUIDForType @@ -313,7 +314,9 @@ static void on_avatar_name_show_profile(const LLUUID& agent_id, const LLAvatarNa std::string url = getProfileURL(username); // PROFILES: open in webkit window - LLWeb::loadWebURLInternal(url, "", agent_id.asString()); + const bool show_chrome = false; + static LLCachedControl<LLRect> profile_rect(gSavedSettings, "WebProfileRect"); + LLFloaterWebContent::create(url, "", agent_id.asString(), show_chrome, profile_rect); } // static |