diff options
| author | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
| commit | 1df1be10afd14fe80d491617e175f4586a78f71f (patch) | |
| tree | 6e7a55591c2166ae732a7854f329e9bfd800546b /indra/newview/llnavigationbar.cpp | |
| parent | 75e5441f2da7252749174db70719a78637bc4eeb (diff) | |
| parent | b20307a683073c415804966ed5b363fb68879ee5 (diff) | |
merge
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 6 |
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 |