diff options
| author | Signal Linden <signal@lindenlab.com> | 2023-11-21 08:07:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 08:07:20 -0800 |
| commit | 5416d94d07ac85ba384fafb0b0b1b11b8cd0b6e4 (patch) | |
| tree | 1c4fd503f43d628dd6223af44aa14921357ae0ab /indra/newview/llagent.cpp | |
| parent | 9b50c50bf2fe3fab2dbb0bcd18d7c8f5b9a13a1b (diff) | |
| parent | 62c7a17604ba4faec989465a374e7ed7627ec56b (diff) | |
Merge branch 'DRTVWR-587-maint-V' into signal/simple-release
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 77fe601c1e..47fbec30dd 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -487,7 +487,11 @@ void LLAgent::init() // *Note: this is where LLViewerCamera::getInstance() used to be constructed. - setFlying( gSavedSettings.getBOOL("FlyingAtExit") ); + bool is_flying = gSavedSettings.getBOOL("FlyingAtExit"); + if(is_flying) + { + setFlying(is_flying); + } *mEffectColor = LLUIColorTable::instance().getColor("EffectColor"); @@ -2633,12 +2637,6 @@ void LLAgent::setStartPosition( U32 location_id ) if (!requestPostCapability("HomeLocation", body, boost::bind(&LLAgent::setStartPositionSuccess, this, _1))) LL_WARNS() << "Unable to post to HomeLocation capability." << LL_ENDL; - - const U32 HOME_INDEX = 1; - if( HOME_INDEX == location_id ) - { - setHomePosRegion( mRegionp->getHandle(), getPositionAgent() ); - } } void LLAgent::setStartPositionSuccess(const LLSD &result) |