diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2016-02-04 11:49:37 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2016-02-04 11:49:37 +0200 |
| commit | e5d827bbe9ccca26490f07f69aa467af57e6eeaf (patch) | |
| tree | 4402c01cb95a70dc6232556a1626bf3f0204a306 /indra/newview/llnavigationbar.h | |
| parent | ef2b007a6b5f487a946d9930341591f3f1d0437e (diff) | |
MAINT-1537 Size of navigation/favourites bars is not saved after restart of viewer
Diffstat (limited to 'indra/newview/llnavigationbar.h')
| -rwxr-xr-x | indra/newview/llnavigationbar.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h index 7878bab24e..66e52f47e5 100755 --- a/indra/newview/llnavigationbar.h +++ b/indra/newview/llnavigationbar.h @@ -29,6 +29,7 @@ #include "llpanel.h" #include "llbutton.h" +#include "lllayoutstack.h" class LLLocationInputCtrl; class LLMenuGL; @@ -108,6 +109,7 @@ private: void rebuildTeleportHistoryMenu(); void showTeleportHistoryMenu(LLUICtrl* btn_ctrl); void invokeSearch(std::string search_text); + void resizeLayoutPanel(); // callbacks void onTeleportHistoryMenuItemClicked(const LLSD& userdata); void onTeleportHistoryChanged(); @@ -120,6 +122,7 @@ private: void onLocationPrearrange(const LLSD& data); void onTeleportFinished(const LLVector3d& global_agent_pos); void onTeleportFailed(); + void onNavbarResized(); void onRegionNameResponse( std::string typed_location, std::string region_name, @@ -135,6 +138,7 @@ private: } } + S32 mNavPanWidth; LLMenuGL* mTeleportHistoryMenu; LLPullButton* mBtnBack; LLPullButton* mBtnForward; @@ -142,11 +146,18 @@ private: LLLocationInputCtrl* mCmbLocation; LLRect mDefaultNbRect; LLRect mDefaultFpRect; + LLLayoutPanel* mNavigationPanel; + LLLayoutPanel* mFavoritePanel; boost::signals2::connection mTeleportFailedConnection; boost::signals2::connection mTeleportFinishConnection; boost::signals2::connection mHistoryMenuConnection; // if true, save location to location history when teleport finishes bool mSaveToLocationHistory; + boost::signals2::connection resizeSignalUpNavBar; + boost::signals2::connection resizeSignalDownNavBar; + boost::signals2::connection resizeSignalUpFavPan; + boost::signals2::connection resizeSignalDownFavPan; + }; #endif |