merge up to 3.8.0-release (and fix for unit tests with a proxy enabled)'

1 files changed, 5 insertions, 0 deletions

diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 6f858cdeb3..4b08798892 100755
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -2094,3 +2094,8 @@ void LLTabContainer::commitHoveredButton(S32 x, S32 y)
 		}
 	}
 }
+
+S32 LLTabContainer::getTotalTabWidth() const
+{
+    return mTotalTabWidth;
+}