summaryrefslogtreecommitdiff
path: root/indra/newview/llhudtext.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-24 10:08:13 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-24 10:08:13 -0400
commit76fb5f1542297a7e1afdf983d8a0db459fc0b8ab (patch)
tree0c35366715e4a944361f5ec1cbf61535b04b6ab0 /indra/newview/llhudtext.cpp
parentff42e557848158d5a01cc260bac0bbf974650934 (diff)
parentfde0868231a25b8c9ce03a86cb53f1738d35688d (diff)
merge with viewer tools update
Diffstat (limited to 'indra/newview/llhudtext.cpp')
-rwxr-xr-xindra/newview/llhudtext.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index f648d7baae..2c204170f2 100755
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -48,23 +48,11 @@
#include "pipeline.h"
#include <boost/tokenizer.hpp>
-
-const F32 SPRING_STRENGTH = 0.7f;
-const F32 RESTORATION_SPRING_TIME_CONSTANT = 0.1f;
const F32 HORIZONTAL_PADDING = 15.f;
const F32 VERTICAL_PADDING = 12.f;
const F32 BUFFER_SIZE = 2.f;
-const F32 MIN_EDGE_OVERLAP = 3.f;
const F32 HUD_TEXT_MAX_WIDTH = 190.f;
const F32 HUD_TEXT_MAX_WIDTH_NO_BUBBLE = 1000.f;
-const F32 RESIZE_TIME = 0.f;
-const S32 NUM_OVERLAP_ITERATIONS = 10;
-const F32 NEIGHBOR_FORCE_FRACTION = 1.f;
-const F32 POSITION_DAMPING_TC = 0.2f;
-const F32 MAX_STABLE_CAMERA_VELOCITY = 0.1f;
-//const F32 LOD_0_SCREEN_COVERAGE = 0.15f;
-//const F32 LOD_1_SCREEN_COVERAGE = 0.30f;
-//const F32 LOD_2_SCREEN_COVERAGE = 0.40f;
std::set<LLPointer<LLHUDText> > LLHUDText::sTextObjects;
std::vector<LLPointer<LLHUDText> > LLHUDText::sVisibleTextObjects;