diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
| commit | 4c8e526b99cb717e9086dec87a94b56fecad8984 (patch) | |
| tree | 45294c593721be9bc8def1563b07438554dfa08b /indra/newview/llhudtext.cpp | |
| parent | d3387faca57c560279a6b8b83711a789b84f0ecd (diff) | |
| parent | a0a61ff61e6cf38ccbd0d0a9eecb10d532feaf55 (diff) | |
merge changes for callum fixes and workarounds
Diffstat (limited to 'indra/newview/llhudtext.cpp')
| -rwxr-xr-x | indra/newview/llhudtext.cpp | 12 |
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; |