Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Release Blocker: Swimming is on by default incorrectly initially

Browse Source
This commit is contained in:
Lirusaito
2019-03-02 13:19:11 -05:00
parent 0a80dd0d87
commit 1b5b11907e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/floaterao.cpp
View File

@@ -36,7 +36,8 @@ void cmdline_printchat(const std::string& message);
namespace
{
bool sSwimming = false;
bool is_underwater() { return gAgentAvatarp && gAgentAvatarp->mBelowWater; }
const LLCachedControl<bool> sSwim(gSavedSettings, "AOSwimEnabled", false);
bool is_underwater() { return sSwim && gAgentAvatarp && gAgentAvatarp->mBelowWater; }
}
class AONotecardCallback : public LLInventoryCallback
@@ -643,9 +644,8 @@ void LLFloaterAO::ChangeStand()
void LLFloaterAO::toggleSwim(bool underwater)
{
const LLCachedControl<bool> enabled(gSavedSettings, "AOEnabled", false);
const LLCachedControl<bool> swim(gSavedSettings, "AOSwimEnabled", false);
sSwimming = underwater && swim;
sSwimming = underwater && sSwim;
// Don't send requests if we have the AO disabled.
if (enabled)