1 files changed, 10 insertions, 12 deletions

diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index 983dd43..e00454a 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -55,8 +55,7 @@ S32 LLCOMBOBOX_WIDTH = 0;
  
 LLComboBox::LLComboBox( const LLString& name, const LLRect &rect, const LLString& label,
         void (*commit_callback)(LLUICtrl*,void*),
-        void *callback_userdata,
-        S32 list_width
+        void *callback_userdata
         )
 :       LLUICtrl(name, rect, TRUE, commit_callback, callback_userdata, 
                          FOLLOWS_LEFT | FOLLOWS_TOP),
@@ -99,10 +98,7 @@ LLComboBox::LLComboBox(	const LLString& name, const LLRect &rect, const LLString
         addChild(mButton);
 
         // Default size, will be set by arrange() call in button callback. 
-        if (list_width == 0)
-        {
-                list_width = mRect.getWidth() + SCROLLBAR_SIZE;
-        }
+        S32 list_width = mRect.getWidth() + SCROLLBAR_SIZE;
         r.setOriginAndSize(0, 16, list_width, 220);
 
         // disallow multiple selection
@@ -503,12 +499,14 @@ void LLComboBox::showList()
         
         LLRect rect = mList->getRect();
 
+        S32 list_width = mRect.getWidth() + SCROLLBAR_SIZE;
+
         if (mListPosition == BELOW)
         {
                 if (rect.getHeight() <= -root_view_local.mBottom)
                 {
                         // Move rect so it hangs off the bottom of this view
-                        rect.setLeftTopAndSize(0, 0, rect.getWidth(), rect.getHeight() );
+                        rect.setLeftTopAndSize(0, 0, list_width, rect.getHeight() );
                 }
                 else
                 {       
@@ -516,12 +514,12 @@ void LLComboBox::showList()
                         if (-root_view_local.mBottom > root_view_local.mTop - mRect.getHeight())
                         {
                                 // Move rect so it hangs off the bottom of this view
-                                rect.setLeftTopAndSize(0, 0, rect.getWidth(), llmin(-root_view_local.mBottom, rect.getHeight()));
+                                rect.setLeftTopAndSize(0, 0, list_width, llmin(-root_view_local.mBottom, rect.getHeight()));
                         }
                         else
                         {
                                 // move rect so it stacks on top of this view (clipped to size of screen)
-                                rect.setOriginAndSize(0, mRect.getHeight(), rect.getWidth(), llmin(root_view_local.mTop - mRect.getHeight(), rect.getHeight()));
+                                rect.setOriginAndSize(0, mRect.getHeight(), list_width, llmin(root_view_local.mTop - mRect.getHeight(), rect.getHeight()));
                         }
                 }
         }
@@ -530,7 +528,7 @@ void LLComboBox::showList()
                 if (rect.getHeight() <= root_view_local.mTop - mRect.getHeight())
                 {
                         // move rect so it stacks on top of this view (clipped to size of screen)
-                        rect.setOriginAndSize(0, mRect.getHeight(), rect.getWidth(), llmin(root_view_local.mTop - mRect.getHeight(), rect.getHeight()));
+                        rect.setOriginAndSize(0, mRect.getHeight(), list_width, llmin(root_view_local.mTop - mRect.getHeight(), rect.getHeight()));
                 }
                 else
                 {
@@ -538,12 +536,12 @@ void LLComboBox::showList()
                         if (-root_view_local.mBottom > root_view_local.mTop - mRect.getHeight())
                         {
                                 // Move rect so it hangs off the bottom of this view
-                                rect.setLeftTopAndSize(0, 0, rect.getWidth(), llmin(-root_view_local.mBottom, rect.getHeight()));
+                                rect.setLeftTopAndSize(0, 0, list_width, llmin(-root_view_local.mBottom, rect.getHeight()));
                         }
                         else
                         {
                                 // move rect so it stacks on top of this view (clipped to size of screen)
-                                rect.setOriginAndSize(0, mRect.getHeight(), rect.getWidth(), llmin(root_view_local.mTop - mRect.getHeight(), rect.getHeight()));
+                                rect.setOriginAndSize(0, mRect.getHeight(), list_width, llmin(root_view_local.mTop - mRect.getHeight(), rect.getHeight()));
                         }
                 }