diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:57:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:57:23 +0000 |
| commit | 73a97010e6c8c7874fdc1778ab46e492f77d9394 (patch) | |
| tree | f0c8efb1cebcc6157c8e6678cf0eb39b5792a1d7 /indra/newview/llpanelplaces.h | |
| parent | dedb5be906b53d1ea8601ff6b9c4b726fda02da8 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llpanelplaces.h')
| -rw-r--r-- | indra/newview/llpanelplaces.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h index 89758fc34f..6fbb7562c9 100644 --- a/indra/newview/llpanelplaces.h +++ b/indra/newview/llpanelplaces.h @@ -32,6 +32,8 @@ #ifndef LL_LLPANELPLACES_H #define LL_LLPANELPLACES_H +#include "lltimer.h" + #include "llpanel.h" #include "llinventory.h" @@ -50,7 +52,6 @@ public: virtual ~LLPanelPlaces(); /*virtual*/ BOOL postBuild(); - /*virtual*/ void draw(); /*virtual*/ void changed(U32 mask); /*virtual*/ void onOpen(const LLSD& key); @@ -62,7 +63,9 @@ public: void onTeleportButtonClicked(); void onShowOnMapButtonClicked(); void onBackButtonClicked(); + void toggleMediaPanel(); void togglePlaceInfoPanel(BOOL visible); + void onAgentParcelChange(); private: LLSearchEditor* mSearchEditor; @@ -73,6 +76,17 @@ private: // Place information type currently shown in Information panel std::string mPlaceInfoType; + + // Helper class to delay the coordinates update + // when agent changes parcel + class LLParcelUpdateTimer : public LLEventTimer + { + public: + LLParcelUpdateTimer(F32 period); + virtual ~LLParcelUpdateTimer() {}; + + virtual BOOL tick(); + }; }; #endif //LL_LLPANELPLACES_H |