diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-26 09:50:56 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-26 09:50:56 +0000 |
| commit | 044e020bcb7e1dd94f689ba6977bcb07a87d8a35 (patch) | |
| tree | cf549fa816d92f90fc5de775cba08d91d30874be /indra/newview/llnavigationbar.cpp | |
| parent | 9f079954af9ca80498bf6953d65cc7e77e956f26 (diff) | |
| parent | 92facf86d6bf1a7acecdc6e536ac2ad7bcdfdd96 (diff) | |
PE 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 |