diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/newview/llfloaterregioninfo.h | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/newview/llfloaterregioninfo.h')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 96cf8af667..cdda7e532c 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -58,9 +58,9 @@ class LLPanelRegionTerrainInfo; class LLPanelEstateInfo; class LLPanelEstateCovenant; -class LLFloaterRegionInfo : public LLFloater, public LLUISingleton<LLFloaterRegionInfo> +class LLFloaterRegionInfo : public LLFloater, public LLFloaterSingleton<LLFloaterRegionInfo> { - friend class LLUISingleton<LLFloaterRegionInfo>; + friend class LLUISingleton<LLFloaterRegionInfo, VisibilityPolicy<LLFloater> >; public: ~LLFloaterRegionInfo(); @@ -90,7 +90,7 @@ protected: void refreshFromRegion(LLViewerRegion* region); // member data - LLTabContainerCommon* mTab; + LLTabContainer* mTab; typedef std::vector<LLPanelRegionInfo*> info_panels_t; info_panels_t mInfoPanels; //static S32 sRequestSerial; // serial # of last EstateOwnerRequest |