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

merge 

--HG--
branch : product-engine
meow-7.2.2
Ychebotarev ProductEngine 2010-02-18 15:01:01 +02:00
parent ed46f84873 25800b4b37
commit c8fec65544
5 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llsearcheditor.cpp
View File

@ -155,7 +155,7 @@ void LLSearchEditor::setFocus( BOOL b )
void LLSearchEditor::onClearButtonClick(const LLSD& data)
{
setText(LLStringUtil::null);
mSearchEditor->selectAll();
mSearchEditor->doDelete(); // force keystroke callback
}

16
indra/newview/llfloaterpreference.cpp
View File

@ -315,7 +315,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mCommitCallbackRegistrar.add("Pref.ClickEnablePopup", boost::bind(&LLFloaterPreference::onClickEnablePopup, this));
mCommitCallbackRegistrar.add("Pref.ClickDisablePopup", boost::bind(&LLFloaterPreference::onClickDisablePopup, this));
mCommitCallbackRegistrar.add("Pref.LogPath", boost::bind(&LLFloaterPreference::onClickLogPath, this));
mCommitCallbackRegistrar.add("Pref.UpdateMeterText", boost::bind(&LLFloaterPreference::updateMeterText, this, _1));
mCommitCallbackRegistrar.add("Pref.HardwareSettings", boost::bind(&LLFloaterPreference::onOpenHardwareSettings, this));
mCommitCallbackRegistrar.add("Pref.HardwareDefaults", boost::bind(&LLFloaterPreference::setHardwareDefaults, this));
mCommitCallbackRegistrar.add("Pref.VertexShaderEnable", boost::bind(&LLFloaterPreference::onVertexShaderEnable, this));
@ -676,21 +675,6 @@ void LLFloaterPreference::refreshEnabledGraphics()
}
}
void LLFloaterPreference::updateMeterText(LLUICtrl* ctrl)
{
// get our UI widgets
LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
LLTextBox* m1 = getChild<LLTextBox>("DrawDistanceMeterText1");
LLTextBox* m2 = getChild<LLTextBox>("DrawDistanceMeterText2");
// toggle the two text boxes based on whether we have 1 or two digits
F32 val = slider->getValueF32();
bool two_digits = val < 100;
m1->setVisible(two_digits);
m2->setVisible(!two_digits);
}
void LLFloaterPreference::onClickBrowserClearCache()
{
LLNotificationsUtil::add("ConfirmClearBrowserCache", LLSD(), LLSD(), callback_clear_browser_cache);

2
indra/newview/llgrouplist.cpp
View File

@ -287,7 +287,7 @@ bool LLGroupList::onContextMenuItemEnable(const LLSD& userdata)
return gAgent.getGroupID() != selected_group_id;
if (userdata.asString() == "call")
return LLVoiceClient::voiceEnabled()&&gVoiceClient->voiceWorking();
return real_group_selected && LLVoiceClient::voiceEnabled()&&gVoiceClient->voiceWorking();
return real_group_selected;
}

2
indra/newview/skins/default/xui/en/floater_script.xml
View File

@ -12,7 +12,7 @@
can_minimize="true"
visible="true"
width="520"
can_resize="true"
can_resize="false"
min_width="350"
min_height="369">
</floater>

5
indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
View File

@ -366,10 +366,7 @@
min_val="64"
name="DrawDistance"
top="3"
width="255">
<slider.commit_callback
function="Pref.UpdateMeterText" />
</slider>
width="255" />
<text
type="string"
length="1"