diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 16:42:45 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 16:42:45 -0700 |
| commit | 3e10fa4d51a23bf6f1ced23e8d90c636d84fa5db (patch) | |
| tree | d4991e4c1a9dd934f48d33804e55eb8ffa085679 /indra/newview/llnetmap.h | |
| parent | e9f7205ba9f4dfb3422759218609b62d61972722 (diff) | |
| parent | f20e9521a9b70f4e83cbb6888feae08a70681ea7 (diff) | |
merge from latest svn/viewer-2-0 to hg/viewer-2-0
Diffstat (limited to 'indra/newview/llnetmap.h')
| -rw-r--r-- | indra/newview/llnetmap.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h index 821c348835..5ebdd13384 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -38,12 +38,17 @@ #include "v3math.h" #include "v3dmath.h" #include "v4color.h" -#include "llimage.h" +#include "llpointer.h" class LLColor4U; class LLCoordGL; +class LLImageRaw; class LLTextBox; -class LLViewerTexture ; +class LLViewerTexture; + +const F32 MAP_SCALE_MIN = 64.f; +const F32 MAP_SCALE_MID = 172.f; +const F32 MAP_SCALE_MAX = 512.f; class LLNetMap : public LLUICtrl { |