diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-05-12 17:09:30 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-05-12 17:09:30 +0000 |
| commit | 44f70be1e447664ec3ee050e85a8e14965fff4e7 (patch) | |
| tree | c1a5c851a06dd77a27cbc135e4625701e743902e /indra/newview/llsearchableui.h | |
| parent | 4cfcbca748e825b4904e7f136fa625b1a0f79dfb (diff) | |
| parent | 915de3eb556c22216fd3c76e2de4a2ab1953dbe0 (diff) | |
Merged DRTVWR-544-maint into SL-12238
Diffstat (limited to 'indra/newview/llsearchableui.h')
| -rw-r--r-- | indra/newview/llsearchableui.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llsearchableui.h b/indra/newview/llsearchableui.h index e033cae3ab..31f11eb8ef 100644 --- a/indra/newview/llsearchableui.h +++ b/indra/newview/llsearchableui.h @@ -41,9 +41,9 @@ namespace ll struct PanelData; struct TabContainerData; - typedef boost::shared_ptr< SearchableItem > SearchableItemPtr; - typedef boost::shared_ptr< PanelData > PanelDataPtr; - typedef boost::shared_ptr< TabContainerData > TabContainerDataPtr; + typedef std::shared_ptr< SearchableItem > SearchableItemPtr; + typedef std::shared_ptr< PanelData > PanelDataPtr; + typedef std::shared_ptr< TabContainerData > TabContainerDataPtr; typedef std::vector< TabContainerData > tTabContainerDataList; typedef std::vector< SearchableItemPtr > tSearchableItemList; @@ -55,7 +55,7 @@ namespace ll LLView const *mView; ll::ui::SearchableControl const *mCtrl; - std::vector< boost::shared_ptr< SearchableItem > > mChildren; + std::vector< std::shared_ptr< SearchableItem > > mChildren; virtual ~SearchableItem(); @@ -68,8 +68,8 @@ namespace ll LLPanel const *mPanel; std::string mLabel; - std::vector< boost::shared_ptr< SearchableItem > > mChildren; - std::vector< boost::shared_ptr< PanelData > > mChildPanel; + std::vector< std::shared_ptr< SearchableItem > > mChildren; + std::vector< std::shared_ptr< PanelData > > mChildPanel; virtual ~PanelData(); |