diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-06-08 16:33:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-06-08 16:33:02 -0400 |
| commit | 949942c730b0b7463338c2cb3bc411ac12f4f648 (patch) | |
| tree | 159b9cf6bb6a9de9b538f17e3d721be25a15b79a /indra/llui/llview.cpp | |
| parent | a219cf1c98527faa0e7addeb9660f679208bb0e7 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
merge changes for 3.7.29-release
Diffstat (limited to 'indra/llui/llview.cpp')
| -rwxr-xr-x | indra/llui/llview.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 9e6bebc93b..a8beb9cfc9 100755 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -2164,10 +2164,6 @@ LLControlVariable *LLView::findControl(const std::string& name) return control_group.getControl(name); } -const S32 FLOATER_H_MARGIN = 15; -const S32 MIN_WIDGET_HEIGHT = 10; -const S32 VPAD = 4; - void LLView::initFromParams(const LLView::Params& params) { LLRect required_rect = getRequiredRect(); |