livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer

master
Ansariel 2022-05-05 10:45:00 +02:00
parent a4d60d06ec 59d5443905
commit 633a851d74
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llmessage/llcoproceduremanager.h
View File

@ -32,7 +32,6 @@
#include "llcoros.h"
#include "llcorehttputil.h"
#include "lluuid.h"
#include <boost/smart_ptr/shared_ptr.hpp>
class LLCoprocedurePool;
@ -84,7 +83,7 @@ public:
private:
typedef boost::shared_ptr<LLCoprocedurePool> poolPtr_t;
typedef std::shared_ptr<LLCoprocedurePool> poolPtr_t;
typedef std::map<std::string, poolPtr_t> poolMap_t;
poolMap_t mPoolMap;

2
indra/llui/llmenugl.cpp
View File

@ -3975,8 +3975,8 @@ void LLTearOffMenu::draw()
{
// animate towards target height
reshape(getRect().getWidth(), llceil(lerp((F32)getRect().getHeight(), (F32)mTargetHeight, LLSmoothInterpolation::getInterpolant(0.05f))));
mMenu->needsArrange();
}
mMenu->needsArrange();
LLFloater::draw();
}

2
indra/newview/llfloaterpay.cpp
View File

@ -76,7 +76,7 @@ struct LLGiveMoneyInfo
mFloater(floater), mAmount(amount){}
};
typedef boost::shared_ptr<LLGiveMoneyInfo> give_money_ptr;
typedef std::shared_ptr<LLGiveMoneyInfo> give_money_ptr;
///----------------------------------------------------------------------------
/// Class LLFloaterPay

9
indra/newview/llfloaterpreference.cpp
View File

@ -4442,10 +4442,15 @@ void LLPanelPreferenceControls::cancel()
if (mConflictHandler[i].hasUnsavedChanges())
{
mConflictHandler[i].clear();
if (mEditingMode == i)
{
// cancel() can be called either when preferences floater closes
// or when child floater closes (like advanced graphical settings)
// in which case we need to clear and repopulate table
regenerateControls();
}
}
}
pControlsTable->clearRows();
pControlsTable->clearColumns();
}
void LLPanelPreferenceControls::saveSettings()

2
indra/newview/llgesturemgr.h
View File

@ -185,7 +185,7 @@ private:
std::set<LLUUID> mLoadingAssets;
// LLEventHost interface
boost::shared_ptr<LLGestureListener> mListener;
std::shared_ptr<LLGestureListener> mListener;
};
#endif

12
indra/newview/llsearchableui.h
View File

@ -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();