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

Merge Firestorm LGPL

meow-7.2.2
Ansariel 2016-11-15 23:08:59 +01:00
parent ddb8945823 380a250831
commit 8d324397f4
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/lllineeditor.cpp
View File

@ -166,6 +166,11 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
{
llassert( mMaxLengthBytes > 0 );
// <FS:Ansariel> Enabling LLLineEditor via XUI breaks enabled-state
LLUICtrl::setEnabled(TRUE);
setEnabled(p.enabled);
// </FS:Ansariel>
mScrollTimer.reset();
mTripleClickTimer.reset();
setText(p.default_text());
@ -352,7 +357,6 @@ void LLLineEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
void LLLineEditor::setEnabled(BOOL enabled)
{
LLUICtrl::setEnabled(enabled); // <FS:Ansariel> Enabling LLLineEditor via XUI breaks enabled-state
mReadOnly = !enabled;
setTabStop(!mReadOnly);
updateAllowingLanguageInput();

4
indra/newview/fsdroptarget.h
View File

@ -55,7 +55,7 @@ public:
virtual BOOL postBuild()
{
mReadOnly = TRUE;
setEnabled(FALSE);
return LLLineEditor::postBuild();
}
@ -91,7 +91,7 @@ public:
virtual BOOL postBuild()
{
mReadOnly = TRUE;
setEnabled(FALSE);
return LLLineEditor::postBuild();
}

1
indra/newview/skins/default/xui/pl/menu_viewer.xml
View File

@ -131,6 +131,7 @@
<menu_item_call label="Eksplorator animacji" name="Animation Explorer"/>
<menu_item_call label="Czarna lista zasobów danych (assetów)" name="asset_blacklist"/>
<menu_item_call label="Ustawienia renderowania awatarów" name="Avatar Render Settings"/>
<menu_item_check label="Renderuj tylko znajomych" name="Render Friends Only"/>
</menu>
<menu label="Buduj" name="BuildTools">
<menu_item_check label="Pokaż narzędzia budowania" name="Show Build Tools"/>