summaryrefslogtreecommitdiff
path: root/indra/newview/llnavigationbar.cpp
diff options
context:
space:
mode:
authorDenis Serdjuk <dserduk@productengine.com>2010-02-25 19:15:59 +0200
committerDenis Serdjuk <dserduk@productengine.com>2010-02-25 19:15:59 +0200
commite235e71b907d7fa4d6bd15852e0a3eae3cbd07c5 (patch)
treebba20f93df8c5e92d5bcba6d2b197ed9606da8dd /indra/newview/llnavigationbar.cpp
parent087ea1cef62d383821e8e340551e757cb604b553 (diff)
Bug Low EXT-5194 SLURL field dropdown should display empty menu rather than do nothing when empty
Solution: Button of dropdown list will be disabled if there are no items in location history --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
-rw-r--r--indra/newview/llnavigationbar.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index d42e4bc250..e11df06d86 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -451,6 +451,12 @@ void LLNavigationBar::onLocationSelection()
return;
//get selected item from combobox item
LLSD value = mCmbLocation->getSelectedValue();
+ if(value.isUndefined() && !mCmbLocation->getTextEntry()->isDirty())
+ {
+ // At this point we know that: there is no selected item in list and text field has NOT been changed
+ // So there is no sense to try to change the location
+ return;
+ }
/* since navbar list support autocompletion it contains several types of item: landmark, teleport hystory item,
* typed by user slurl or region name. Let's find out which type of item the user has selected
* to make decision about adding this location into typed history. see mSaveToLocationHistory