diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-03 17:16:38 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-03 17:16:38 +0200 |
| commit | 8157e8989102f1585fb13f6ad3822fbb7a4720c6 (patch) | |
| tree | 2c06a63ae230d8c63868078f4e50b92d13c01576 /indra/newview | |
| parent | f838c5d3ae25e90dba80817f98b50df3e58a4010 (diff) | |
| parent | f2e4e9efa9e133e20861275f84b015690e6080a4 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 96c06b1665..6d3d61d4fe 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -391,7 +391,7 @@ bool LLBottomTray::onContextMenuItemEnabled(const LLSD& userdata) } else if (item == "can_select_all") { - return edit_box->canSelectAll(); + return edit_box->canSelectAll() && (edit_box->getLength()>0); } return true; } diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index d97f1d4d18..09c215e660 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -896,7 +896,7 @@ bool LLLocationInputCtrl::onLocationContextMenuItemEnabled(const LLSD& userdata) } else if (item == "can_select_all") { - return mTextEntry->canSelectAll(); + return mTextEntry->canSelectAll() && (mTextEntry->getLength() > 0); } else if(item == "show_coordinates") { |