diff options
| author | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
| commit | 1e0608ff51efc69a14010f2ce5dba3acabe16e49 (patch) | |
| tree | 326e829b4233658ba8698e06ff17267618e93a62 /indra/newview/llfloatermap.h | |
| parent | becc9d09970755f9cc0d95c46b9f2d81d5b856b5 (diff) | |
| parent | e4a4d75104916968ce03337094b1194e0daff438 (diff) | |
Merge with viewer-development
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; |