diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-11-03 19:32:27 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-11-03 19:32:27 +0200 |
| commit | 0ffecdcfb203852a8f4a392331a5d177f8480bdd (patch) | |
| tree | 6bdf41771e9d6a5f62b7f3e7c996c2a14508b413 /indra/newview | |
| parent | 0ab5b90e4b0e9d9fb02a4cf7d54fd8443299ece8 (diff) | |
MAINT-1884 FIXED "Shortcut Key" text label is overlapped by drop-down lists in Preview floater when user opened more then one gesture
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpreview.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_preview_gesture.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index 398f4e6e42..3c4d49fe65 100755 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -453,7 +453,6 @@ LLMultiPreview::LLMultiPreview() setTitle(LLTrans::getString("MultiPreviewTitle")); buildTabContainer(); setCanResize(TRUE); - mAutoResize = FALSE; } void LLMultiPreview::onOpen(const LLSD& key) diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml index 8baa0a56f7..c4ac936334 100755 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -2,10 +2,12 @@ <floater legacy_header_height="18" height="460" + min_height="460" layout="topleft" name="gesture_preview" help_topic="gesture_preview" - width="280"> + width="280" + min_width="280"> <floater.string name="step_anim"> Animation to play: |