diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-22 17:39:03 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-22 17:39:03 -0700 |
| commit | a0714f01804a2a2220bd72c3adf06f097ad21b73 (patch) | |
| tree | db304a8eca349020b48ae927fd8a534264a6ed83 /indra/newview/llnetmap.h | |
| parent | e3ecffc180ae50a0e8b726a061ec39cbe591326e (diff) | |
| parent | de6f7e19c44d267d3224c56941c2ab27677c406f (diff) | |
Merge with viewer-development
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; |