diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-09-13 15:01:48 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-09-13 15:01:48 -0700 |
| commit | b344b406df30975e6e434a6d90a4bf6c531610ba (patch) | |
| tree | 87bc6d8f96fc72917a36d3a1d1456948b8aa0164 /indra/newview/llnetmap.h | |
| parent | a923da7fc78b44cd5368d26652b0204322f064a4 (diff) | |
| parent | 1df693e6911a97774c63618d95d4a156645e9cf3 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llnetmap.h')
| -rw-r--r-- | indra/newview/llnetmap.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h index e25ada4c95..650bce0da4 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -86,13 +86,14 @@ private: void drawTracking( const LLVector3d& pos_global, const LLColor4& color, BOOL draw_arrow = TRUE); + BOOL handleToolTipAgent(const LLUUID& avatar_id); static void showAvatarInspector(const LLUUID& avatar_id); void createObjectImage(); -private: static bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y, S32 slop); +private: bool mUpdateNow; LLUIColor mBackgroundColor; |