diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-11-06 06:52:24 +0000 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-11-06 06:52:24 +0000 |
| commit | 35e200881c38eb6c1bfd1f14ef440d4bc4da8c74 (patch) | |
| tree | 8fceb759ef8f8259fd574c398ac02965566a05ff /indra/newview/llfloatermap.h | |
| parent | 2f2bdd83d6e078fb6cdcbb0ba0a9eaa38d45cc90 (diff) | |
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
Diffstat (limited to 'indra/newview/llfloatermap.h')
| -rw-r--r-- | indra/newview/llfloatermap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatermap.h b/indra/newview/llfloatermap.h index 501777ed07..6c9138c6a7 100644 --- a/indra/newview/llfloatermap.h +++ b/indra/newview/llfloatermap.h @@ -51,12 +51,14 @@ 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(); private: void handleZoom(const LLSD& userdata); void handleStopTracking (const LLSD& userdata); void setDirectionPos( LLTextBox* text_box, F32 rotation ); + void updateMinorDirections(); LLMenuGL* mPopupMenu; |