Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a minor ui bug where it kept adding spaces to the end of the

Browse Source 
filter.
This commit is contained in:
phr0z3nt04st
2010-06-14 14:07:41 -05:00
parent 04bb5ca573
commit efe1c95223
2 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llfloatermessagelog.cpp
View File

@@ -859,7 +859,8 @@ void LLFloaterMessageLog::startApplyingFilter(std::string filter, BOOL force)
LLMessageLogFilter new_filter = LLMessageLogFilter(); LLMessageLogFilter new_filter = LLMessageLogFilter();
sMessageLogFilterString = filter; sMessageLogFilterString = filter;
new_filter.set(sMessageLogFilterString); new_filter.set(sMessageLogFilterString);
childSetText("filter_edit", filter + " "); if(filter.at(filter.length()-1) != ' ')
childSetText("filter_edit", filter + " ");
if(force if(force
|| (new_filter.mNegativeNames != sMessageLogFilter.mNegativeNames) || (new_filter.mNegativeNames != sMessageLogFilter.mNegativeNames)
|| (new_filter.mPositiveNames != sMessageLogFilter.mPositiveNames)) || (new_filter.mPositiveNames != sMessageLogFilter.mPositiveNames))

74
indra/newview/llviewermenu.cpp
View File

@@ -740,6 +740,43 @@ void init_client_menu(LLMenuGL* menu)
//menu->append(new LLMenuItemCallGL("Permissions Control", &show_permissions_control)); //menu->append(new LLMenuItemCallGL("Permissions Control", &show_permissions_control));
// this is now in the view menu so we don't need it here! // this is now in the view menu so we don't need it here!
// <edit>
{
LLMenuGL* sub = NULL;
sub = new LLMenuGL("Useful Features");
sub->append(new LLMenuItemCallGL( "Close All Dialogs",
&handle_close_all_notifications, NULL, NULL, 'D', MASK_CONTROL | MASK_ALT | MASK_SHIFT));
sub->append(new LLMenuItemCallGL( "Reopen with Hex Editor",
&handle_reopen_with_hex_editor, NULL));
sub->append(new LLMenuItemCallGL( "Message Log", &handle_open_message_log, NULL));
sub->append(new LLMenuItemCallGL( "Message Builder", &handle_open_message_builder, NULL));
sub->append(new LLMenuItemCheckGL( "Enable AO",
&menu_toggle_control,
NULL,
&menu_check_control,
(void*)"AO.Enabled"));
sub->append(new LLMenuItemCallGL( "Edit AO...",
&handle_edit_ao, NULL));
sub->append(new LLMenuItemCheckGL( "Nimble",
&menu_toggle_control,
NULL,
&menu_check_control,
(void*)"Nimble"));
sub->append(new LLMenuItemCheckGL( "ReSit",
&menu_toggle_control,
NULL,
&menu_check_control,
(void*)"ReSit"));
//these should always be last in a sub menu
sub->createJumpKeys();
menu->appendMenu(sub);
}
menu->appendSeparator();
// </edit>
{ {
// *TODO: Translate // *TODO: Translate
LLMenuGL* sub = new LLMenuGL("Consoles"); LLMenuGL* sub = new LLMenuGL("Consoles");
@@ -1037,43 +1074,6 @@ void init_client_menu(LLMenuGL* menu)
menu->append(new LLMenuItemCallGL("Leave Admin Status", menu->append(new LLMenuItemCallGL("Leave Admin Status",
&handle_leave_god_mode, NULL, NULL, 'G', MASK_ALT | MASK_SHIFT | MASK_CONTROL)); &handle_leave_god_mode, NULL, NULL, 'G', MASK_ALT | MASK_SHIFT | MASK_CONTROL));
// <edit>
menu->appendSeparator();
{
LLMenuGL* sub = NULL;
sub = new LLMenuGL("Useful Features");
sub->append(new LLMenuItemCallGL( "Close All Dialogs",
&handle_close_all_notifications, NULL, NULL, 'D', MASK_CONTROL | MASK_ALT | MASK_SHIFT));
sub->append(new LLMenuItemCallGL( "Reopen with Hex Editor",
&handle_reopen_with_hex_editor, NULL));
sub->append(new LLMenuItemCallGL( "Message Log", &handle_open_message_log, NULL));
sub->append(new LLMenuItemCallGL( "Message Builder", &handle_open_message_builder, NULL));
sub->append(new LLMenuItemCheckGL( "Enable AO",
&menu_toggle_control,
NULL,
&menu_check_control,
(void*)"AO.Enabled"));
sub->append(new LLMenuItemCallGL( "Edit AO...",
&handle_edit_ao, NULL));
sub->append(new LLMenuItemCheckGL( "Nimble",
&menu_toggle_control,
NULL,
&menu_check_control,
(void*)"Nimble"));
sub->append(new LLMenuItemCheckGL( "ReSit",
&menu_toggle_control,
NULL,
&menu_check_control,
(void*)"ReSit"));
//these should always be last in a sub menu
sub->createJumpKeys();
menu->appendMenu(sub);
}
// </edit>
menu->createJumpKeys(); menu->createJumpKeys();
} }