summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDenis Serdjuk <dserduk@productengine.com>2010-02-24 15:02:18 +0200
committerDenis Serdjuk <dserduk@productengine.com>2010-02-24 15:02:18 +0200
commit887d03e55fe0a2086b21f401f74908c395749660 (patch)
tree1472816ded0efef00594000a81538e43fd3336e1 /indra/newview
parent09053688c3b35b7c4e33ed831b806220a77ce662 (diff)
back out a fix for EXT-5194 at changeset a577d1cad9ff
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lllocationinputctrl.cpp9
-rw-r--r--indra/newview/lllocationinputctrl.h7
2 files changed, 0 insertions, 16 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index a9ead36a70..04c684b240 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -674,15 +674,6 @@ void LLLocationInputCtrl::onLocationPrearrange(const LLSD& data)
_1, filter));
}
}
- if(mList->isEmpty())
- {
- /**
- * Add a couple of empty items for a better view.
- * EXT-5194
- */
- for(int i = 0; i < NUMBER_OF_EMPTY_ITEMS; i++ )
- add("", LLSD());
- }
sortByName();
mList->mouseOverHighlightNthItem(-1); // Clear highlight on the last selected item.
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index ee128a5cf7..4bb41f3bf4 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -120,13 +120,6 @@ private:
ICON_COUNT
};
- /**
- * This constant holds number of empty dropdown items, which will be displayed instead of doing nothing when the list is empty.
- * Added due to EXT-5194
- */
- static const S32 NUMBER_OF_EMPTY_ITEMS = 3;
-
-
friend class LLUICtrlFactory;
LLLocationInputCtrl(const Params&);
virtual ~LLLocationInputCtrl();