diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_joystick.xml | 6 | 
2 files changed, 4 insertions, 3 deletions
| diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 337ce22eac..1ea428ff03 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3233,6 +3233,7 @@ bool LLAppViewer::initWindow()  	//gViewerWindow->getWindow()->show();  	LL_INFOS("AppInit") << "Window initialization done." << LL_ENDL; +  	return true;  } diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml index ca165d1a29..259acccb68 100755 --- a/indra/newview/skins/default/xui/en/floater_joystick.xml +++ b/indra/newview/skins/default/xui/en/floater_joystick.xml @@ -197,19 +197,18 @@       name="JoystickFlycamEnabled"       width="60" />      <stat_view -     height="250" +     height="270"       label="Joystick Monitor"       layout="topleft"       left="359"       name="axis_view"       show_label="true" -     top="142" +     top="135"       width="200">          <stat_bar           bar_max="2"           bar_min="-2"  				 show_bar="true" -         height="0"           label="Axis 0"           label_spacing="1"           layout="topleft" @@ -258,6 +257,7 @@           bar_max="2"           bar_min="-2"           label="Axis 5" +				 show_bar="true"				            label_spacing="1"           layout="topleft"           name="axis5" | 
