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

Updated experience profile to remove the permission buttons on privileged 

experiences and fix the enabling of the save button with the checkbox controls.
meow-7.2.2
dolphin 2013-10-17 13:58:52 -07:00
parent 1aed2f848c
commit fa344fdcd9
2 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llfloaterexperienceprofile.cpp
View File

@ -67,6 +67,7 @@
#define PNL_LOC "location panel"
#define PNL_MRKT "marketplace panel"
#define PNL_GROUP "group_panel"
#define PNL_PERMS "perm panel"
#define BTN_EDIT "edit_btn"
#define BTN_ALLOW "allow_btn"
@ -249,8 +250,8 @@ BOOL LLFloaterExperienceProfile::postBuild()
getChild<LLLineEditor>(EDIT TF_MRKT)->setKeystrokeCallback(boost::bind(&LLFloaterExperienceProfile::onFieldChanged, this), NULL);
getChild<LLLineEditor>(EDIT TF_NAME)->setKeystrokeCallback(boost::bind(&LLFloaterExperienceProfile::onFieldChanged, this), NULL);
childSetAction(EDIT BTN_ENABLE, boost::bind(&LLFloaterExperienceProfile::onFieldChanged, this));
childSetAction(EDIT BTN_PRIVATE, boost::bind(&LLFloaterExperienceProfile::onFieldChanged, this));
childSetCommitCallback(EDIT BTN_ENABLE, boost::bind(&LLFloaterExperienceProfile::onFieldChanged, this), NULL);
childSetCommitCallback(EDIT BTN_PRIVATE, boost::bind(&LLFloaterExperienceProfile::onFieldChanged, this), NULL);
getChild<LLTextEditor>(EDIT TF_DESC)->setCommitOnFocusLost(TRUE);
@ -364,6 +365,7 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
LLLayoutPanel* locationPanel = getChild<LLLayoutPanel>(PNL_LOC);
LLLayoutPanel* marketplacePanel = getChild<LLLayoutPanel>(PNL_MRKT);
LLLayoutPanel* topPanel = getChild<LLLayoutPanel>(PNL_TOP);
LLLayoutPanel* permPanel = getChild<LLLayoutPanel>(PNL_PERMS);
imagePanel->setVisible(FALSE);
@ -433,6 +435,9 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
child->setVisible(TRUE);
child->setText(LLTrans::getString("GRID_WIDE"));
}
permPanel->setVisible((properties & LLExperienceCache::PROPERTY_PRIVILEGED) == 0);
value=experience[LLExperienceCache::METADATA].asString();
if(value.empty())
@ -490,7 +495,6 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
}
mDirty=false;
setCanClose(!mDirty);
mForceClose = false;
getChild<LLButton>(BTN_SAVE)->setEnabled(mDirty);
}
@ -548,7 +552,6 @@ void LLFloaterExperienceProfile::setPreferences( const LLSD& content )
void LLFloaterExperienceProfile::onFieldChanged()
{
mDirty=true;
setCanClose(!mDirty);
getChild<LLButton>(BTN_SAVE)->setEnabled(mDirty);
}

64
indra/newview/skins/default/xui/en/floater_experienceprofile.xml
View File

@ -359,37 +359,38 @@
top="5"
width="313"
auto_resize="false"
visible="false"
name="perm panel">
<button
follows="bottom|left"
height="23"
label="Allow"
layout="topleft"
name="allow_btn"
width="80"
top_pad="3"
left="10"
enabled="false"/>
<button
follows="bottom|left"
height="23"
label="Forget"
layout="topleft"
name="forget_btn"
width="80"
top_pad="-23"
left_pad="3"
enabled="false"/>
<button
follows="bottom|left"
height="23"
label="Block"
layout="topleft"
name="block_btn"
width="80"
top_pad="-23"
left_pad="3"
enabled="false"/>
<button
follows="bottom|left"
height="23"
label="Allow"
layout="topleft"
name="allow_btn"
width="80"
top_pad="3"
left="10"
enabled="false"/>
<button
follows="bottom|left"
height="23"
label="Forget"
layout="topleft"
name="forget_btn"
width="80"
top_pad="-23"
left_pad="3"
enabled="false"/>
<button
follows="bottom|left"
height="23"
label="Block"
layout="topleft"
name="block_btn"
width="80"
top_pad="-23"
left_pad="3"
enabled="false"/>
</layout_panel>
</layout_stack>
@ -549,8 +550,9 @@
layout="topleft"
left_pad="5"
top_pad="-14"
use_ellipses="true"
name="edit_LocationTextText"
right="-10">Location</text>
right="-10"></text>
<button
left="10"
width="150"