diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:22:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:22:26 -0400 |
| commit | b595bbcf2af03b2a285c2df450379b670bddbfbc (patch) | |
| tree | 121ab3e96f6e72d53c5a4f84d761f13e1996bbda /indra/newview/llfloatermap.h | |
| parent | fbd241da54ad6017825b59c5b0c71086d8b8957a (diff) | |
| parent | 7cb4f2d87dc8619d8ad86cb82f6687f1a9821a69 (diff) | |
merge changes for storm-1019
Diffstat (limited to 'indra/newview/llfloatermap.h')
| -rw-r--r-- | indra/newview/llfloatermap.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llfloatermap.h b/indra/newview/llfloatermap.h index 4cbb48fb3e..5cf66a594b 100644 --- a/indra/newview/llfloatermap.h +++ b/indra/newview/llfloatermap.h @@ -29,7 +29,6 @@ #include "llfloater.h" -class LLMenuGL; class LLNetMap; class LLTextBox; @@ -44,7 +43,6 @@ public: /*virtual*/ BOOL postBuild(); /*virtual*/ BOOL handleDoubleClick( S32 x, S32 y, MASK mask ); - /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask ); /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); /*virtual*/ void draw(); /*virtual*/ void onFocusLost(); @@ -54,14 +52,11 @@ public: private: void handleZoom(const LLSD& userdata); - void handleStopTracking (const LLSD& userdata); void setDirectionPos( LLTextBox* text_box, F32 rotation ); void updateMinorDirections(); void stretchMiniMap(S32 width,S32 height); - LLMenuGL* mPopupMenu; - LLTextBox* mTextBoxEast; LLTextBox* mTextBoxNorth; LLTextBox* mTextBoxWest; |