diff options
| -rw-r--r-- | indra/llui/lldockcontrol.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/minimal/xui/en/floater_camera.xml | 24 |
2 files changed, 7 insertions, 19 deletions
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index f6f5a0beb3..e18309ac33 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -297,7 +297,7 @@ void LLDockControl::moveDockable() break; } - S32 max_available_height = rootRect.getHeight() - mDockTongueY - mDockTongue->getHeight(); + S32 max_available_height = rootRect.getHeight() - (rootRect.mBottom - mDockTongueY) - mDockTongue->getHeight(); // A floater should be shrunk so it doesn't cover a part of its docking tongue and // there is a space between a dockable floater and a control to which it is docked. diff --git a/indra/newview/skins/minimal/xui/en/floater_camera.xml b/indra/newview/skins/minimal/xui/en/floater_camera.xml index 76d1b97cab..4cf792444f 100644 --- a/indra/newview/skins/minimal/xui/en/floater_camera.xml +++ b/indra/newview/skins/minimal/xui/en/floater_camera.xml @@ -253,21 +253,21 @@ top_pad="0" name="buttons" width="226"> - <button + <button height="23" label="" layout="topleft" - left="70" + left="83" is_toggle="true" image_overlay="Cam_Avatar_Off" image_selected="PushButton_Selected_Press" name="presets_btn" tab_stop="false" tool_tip="Preset Views" - top="13" + top="13" width="25"> - </button> - <button + </button> + <button height="23" label="" layout="topleft" @@ -279,18 +279,6 @@ tab_stop="false" tool_tip="Orbit Zoom Pan" width="25"> - </button> - <button - height="23" - label="" - layout="topleft" - left_pad="1" - image_overlay="Cam_FreeCam_Off" - image_selected="PushButton_Selected_Press" - name="avatarview_btn" - tab_stop="false" - tool_tip="Camera modes" - width="25"> - </button> + </button> </panel> </floater> |