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.cpp | |
| parent | e9f7205ba9f4dfb3422759218609b62d61972722 (diff) | |
| parent | f20e9521a9b70f4e83cbb6888feae08a70681ea7 (diff) | |
merge from latest svn/viewer-2-0 to hg/viewer-2-0
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index bd6e6cd0cb..b6b433c28f 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -65,21 +65,30 @@ static LLDefaultChildRegistry::Register<LLNetMap> r1("net_map"); -const F32 MAP_SCALE_MIN = 64; -const F32 MAP_SCALE_MID = 172; -const F32 MAP_SCALE_MAX = 512; const F32 MAP_SCALE_INCREMENT = 16; const F32 MAP_MIN_PICK_DIST = 4; const F32 MAX_PRIM_RADIUS = 256.0f; // Don't try to draw giant mega-prims on the mini map -LLNetMap::LLNetMap (const Params & p) : - LLUICtrl (p), - mScale(128.0f), +LLNetMap::LLNetMap (const Params & p) +: LLUICtrl (p), mBackgroundColor (p.bg_color()), - mRotateMap(FALSE) + mScale( MAP_SCALE_MID ), + mPixelsPerMeter( MAP_SCALE_MID / REGION_WIDTH_METERS ), + mObjectMapTPM(0.f), + mObjectMapPixels(0.f), + mTargetPanX(0.f), + mTargetPanY(0.f), + mCurPanX(0.f), + mCurPanY(0.f), + mUpdateNow(FALSE), + mObjectImageCenterGlobal( gAgent.getCameraPositionGlobal() ), + mObjectRawImagep(), + mObjectImagep(), + mClosestAgentToCursor(), + mClosestAgentAtLastRightClick(), + mRotateMap(FALSE), + mToolTipMsg() { - mObjectImageCenterGlobal = gAgent.getCameraPositionGlobal(); - mPixelsPerMeter = mScale / REGION_WIDTH_METERS; } LLNetMap::~LLNetMap() |