diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-08-23 22:28:01 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-08-23 22:28:01 +0300 |
| commit | d08859f3f4ba8ed68d018fba033b652926d1bf6b (patch) | |
| tree | fd62430b9a2987ca2eab8a8f08114f113de84120 /indra/newview/llagent.h | |
| parent | f40b85c4f495b9079991c41a26b76d397a6168ae (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge branch 'main' into DRTVWR-587-maint-V
# Conflicts:
# autobuild.xml
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 498bea3c07..ea91d2b720 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -294,10 +294,16 @@ public: boost::signals2::connection addRegionChangedCallback(const region_changed_signal_t::slot_type& cb); void removeRegionChangedCallback(boost::signals2::connection callback); + + void changeInterestListMode(const std::string & new_mode); + const std::string & getInterestListMode() const { return mInterestListMode; } + private: LLViewerRegion *mRegionp; region_changed_signal_t mRegionChangedSignal; + std::string mInterestListMode; // How agent wants regions to send updates + //-------------------------------------------------------------------- // History //-------------------------------------------------------------------- @@ -548,7 +554,6 @@ public: void roll(F32 angle); void yaw(F32 angle); LLVector3 getReferenceUpVector(); - F32 clampPitchToLimits(F32 angle); //-------------------------------------------------------------------- // Autopilot |