diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llfloaterregioninfo.h | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/llfloaterregioninfo.h')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index b3a1fcb7ca..be4becf7e7 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -59,11 +59,11 @@ class LLPanelRegionTerrainInfo; class LLPanelEstateInfo; class LLPanelEstateCovenant; -class LLFloaterRegionInfo : public LLFloater, public LLFloaterSingleton<LLFloaterRegionInfo> +class LLFloaterRegionInfo : public LLFloater { - friend class LLUISingleton<LLFloaterRegionInfo, VisibilityPolicy<LLFloater> >; + friend class LLFloaterReg; public: - ~LLFloaterRegionInfo(); + /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ BOOL postBuild(); @@ -86,8 +86,12 @@ public: void requestRegionInfo(); -protected: +private: + LLFloaterRegionInfo(const LLSD& seed); + ~LLFloaterRegionInfo(); + +protected: void refreshFromRegion(LLViewerRegion* region); // member data @@ -166,7 +170,7 @@ protected: bool onKickAllCommit(const LLSD& notification, const LLSD& response); static void onClickMessage(void* userdata); bool onMessageCommit(const LLSD& notification, const LLSD& response); - static void onClickManageTelehub(void* data); + void onClickManageTelehub(); }; ///////////////////////////////////////////////////////////////////////////// |