From 0aa2bc4831674e61edf680887eba9acec9f997ed Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 28 Aug 2009 22:58:17 +0000 Subject: svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2 Bug Fixes: * EXT-637 EXT-595 Dev work: * EXT-694 QA: * Be sure feature works on other locales Known issues: * If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts. * It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy. * If friendship is removed when agent is offline, Friend Card is not removed from Inventory. --- indra/llui/llmenugl.cpp | 4 ++++ indra/llui/llmenugl.h | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'indra/llui') diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 4edae46f32..d6dfe6c198 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -1642,6 +1642,7 @@ LLMenuGL::LLMenuGL(const LLMenuGL::Params& p) mHorizontalLayout( p.horizontal_layout ), mScrollable(mHorizontalLayout ? FALSE : p.scrollable), // Scrolling is supported only for vertical layout mMaxScrollableItems(p.max_scrollable_items), + mPreferredWidth(p.preferred_width), mKeepFixedSize( p.keep_fixed_size ), mLabel (p.label), mLastMouseX(0), @@ -2025,6 +2026,9 @@ void LLMenuGL::arrange( void ) } } + if (mPreferredWidth < U32_MAX) + width = llmin(mPreferredWidth, max_width); + if (mScrollable) { S32 max_items_height = max_height - spillover_item_height * 2; diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 44459a6c0e..0bf6301f93 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -383,6 +383,7 @@ public: keep_fixed_size, scrollable; Optional max_scrollable_items; + Optional preferred_width; Optional bg_color; Optional shortcut_pad; @@ -396,7 +397,9 @@ public: bg_color("bg_color", LLUIColorTable::instance().getColor( "MenuDefaultBgColor" )), scrollable("scrollable", false), max_scrollable_items("max_scrollable_items", U32_MAX), + preferred_width("preferred_width", U32_MAX), shortcut_pad("shortcut_pad") + { addSynonym(bg_visible, "opaque"); addSynonym(bg_color, "color"); @@ -544,6 +547,7 @@ protected: S32 mMouseVelX; S32 mMouseVelY; U32 mMaxScrollableItems; + U32 mPreferredWidth; BOOL mHorizontalLayout; BOOL mScrollable; BOOL mKeepFixedSize; -- cgit v1.2.3