summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-12-06 20:06:44 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2011-12-06 20:06:44 +0200
commit2be10e866056d19f01568fe6f569af7ab9ad7686 (patch)
tree5e8f9ad85e32d08cd3683f4929317686ea2993d1 /indra/newview/llavataractions.cpp
parent37ff2f2282a7b9dbac6fb8d33bf65c110347cd24 (diff)
EXP-1577 FOLLOWUP Implemented new requirements on size of profile floaters.
Implemented new requirements from XD: "Profile window should keep last size, regardless of whether it was own profile or another users'. If multiple windows open, last one touched is the size we store."
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rwxr-xr-xindra/newview/llavataractions.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 2f331bdab1..8ca621538f 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -308,20 +308,6 @@ static const char* get_profile_floater_name(const LLUUID& avatar_id)
return avatar_id == gAgentID ? "my_profile" : "profile";
}
-static const LLRect& get_preferred_profile_rect(const LLUUID& avatar_id)
-{
- if (avatar_id == gAgentID &&
- LLFloaterReg::getInstance(get_profile_floater_name(avatar_id))->hasSavedRect())
- {
- return LLRect::null; // no preference, use saved rect
- }
-
- // Preferred size for all residents' profiles
- // and default size for our own profile.
- static LLCachedControl<LLRect> profile_rect(gSavedSettings, "WebProfileRect");
- return profile_rect;
-}
-
static void on_avatar_name_show_profile(const LLUUID& agent_id, const LLAvatarName& av_name)
{
std::string username = av_name.mUsername;
@@ -334,13 +320,9 @@ static void on_avatar_name_show_profile(const LLUUID& agent_id, const LLAvatarNa
std::string url = getProfileURL(username);
// PROFILES: open in webkit window
- const bool show_chrome = false;
LLFloaterWebContent::Params p;
p.url(url).
- id(agent_id.asString()).
- show_chrome(show_chrome).
- window_class("profile").
- preferred_media_size(get_preferred_profile_rect(agent_id));
+ id(agent_id.asString());
LLFloaterReg::showInstance(get_profile_floater_name(agent_id), p);
}