diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-12-14 12:07:45 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-12-14 12:07:45 -0800 |
| commit | 32de0cb67d824498d0fc9d489ce19731ebfddfdf (patch) | |
| tree | 9fd52f420543a5c4dc45215d7ed49faf94f386fe /indra/newview/llagent.cpp | |
| parent | 7bfe590a3669a005d4269cdcf378891080264dce (diff) | |
| parent | 4c791e098d3abafa406e0e269038c40aae67f66c (diff) | |
Merge branch 'DRTVWR-596' into DRTVWR-601
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 a273afab52..3853aaa8fd 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -486,7 +486,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"); @@ -2628,12 +2632,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) |