summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2009-10-23 14:10:42 -0700
committerLeyla Farazha <leyla@lindenlab.com>2009-10-23 14:10:42 -0700
commit7a7bc8d33bba19530bf71c210d996a3faf711cd1 (patch)
tree5b25df95d39cf2de69cd8b7fd4a8bd6d785936e1 /indra
parentf58857824e71edc39d98180e7750aee9ff1d780e (diff)
EXT-1742 Navbar should have a dropshadow that covers the sidepanel EXT-1563 I18N: Alt-arrow instructions in tab tooltips wont honor their translation
reviewed by james
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/lltabcontainer.cpp5
-rw-r--r--indra/newview/llnavigationbar.cpp9
2 files changed, 12 insertions, 2 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 3ca05ff0ff..10d89dc78d 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -44,6 +44,7 @@
#include "lluictrlfactory.h"
#include "llrender.h"
#include "llfloater.h"
+#include "lltrans.h"
//----------------------------------------------------------------------------
@@ -940,8 +941,8 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
else
{
std::string tooltip = trimmed_label;
- tooltip += "\nAlt-Left arrow for previous tab";
- tooltip += "\nAlt-Right arrow for next tab";
+ tooltip += "\n" + LLTrans::getString("TooltipAltLeft");
+ tooltip += "\n" + LLTrans::getString("TooltipAltRight");
LLButton::Params p;
p.name(std::string(child->getName()) + " tab");
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index b77415dfee..992e244ed9 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -272,6 +272,15 @@ void LLNavigationBar::draw()
onTeleportHistoryChanged();
mPurgeTPHistoryItems = false;
}
+
+ if (isBackgroundVisible())
+ {
+ static LLUICachedControl<S32> drop_shadow_floater ("DropShadowFloater", 0);
+ static LLUIColor color_drop_shadow = LLUIColorTable::instance().getColor("ColorDropShadow");
+ gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0,
+ color_drop_shadow, drop_shadow_floater );
+ }
+
LLPanel::draw();
}