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

LLPanelLogin code cleanup

Browse Source
This commit is contained in:
Inusaito Sayori
2014-12-12 20:33:36 -05:00
parent 7db5126182
commit 48e6a4f535
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llpanellogin.cpp
View File

@@ -411,26 +411,12 @@ BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask)
return TRUE; return TRUE;
} }
if (('P' == key) && (MASK_CONTROL == mask))
{
LLFloaterPreference::show(NULL);
return TRUE;
}
if (('T' == key) && (MASK_CONTROL == mask)) if (('T' == key) && (MASK_CONTROL == mask))
{ {
new LLFloaterSimple("floater_test.xml"); new LLFloaterSimple("floater_test.xml");
return TRUE; return TRUE;
} }
//Singu TODO: Re-implement f1 help.
/*if ( KEY_F1 == key )
{
llinfos << "Spawning HTML help window" << llendl;
gViewerHtmlHelp.show();
return TRUE;
}*/
# if !LL_RELEASE_FOR_DOWNLOAD # if !LL_RELEASE_FOR_DOWNLOAD
if ( KEY_F2 == key ) if ( KEY_F2 == key )
{ {
@@ -649,9 +635,6 @@ void LLPanelLogin::updateLocationSelectorsVisibility()
// [/RLVa:KB] // [/RLVa:KB]
sInstance->getChildView("location_panel")->setVisible(show_start); sInstance->getChildView("location_panel")->setVisible(show_start);
bool show_server = gSavedSettings.getBOOL("ForceShowGrid");
sInstance->getChildView("grids_panel")->setVisible(show_server);
} }
} }

2
indra/newview/skins/default/xui/en-us/panel_login.xml
View File

@@ -47,7 +47,7 @@
initial_value="false" label="Remember password" initial_value="false" label="Remember password"
left="0" mouse_opaque="true" name="remember_check" width="138" /> left="0" mouse_opaque="true" name="remember_check" width="138" />
</layout_panel> </layout_panel>
<layout_panel name="grids_panel" left="0" user_resize="false" auto_resize="false" width="129" min_width="0"> <layout_panel name="grids_panel" left="0" user_resize="false" auto_resize="false" width="129" min_width="0" visibility_control="ForceShowGrid">
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="44" drop_shadow_visible="true" follows="left|bottom" bottom="44" drop_shadow_visible="true" follows="left|bottom"
font="SansSerif" h_pad="0" halign="left" height="16" font="SansSerif" h_pad="0" halign="left" height="16"