diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-08-13 15:32:47 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-08-13 15:32:47 -0400 |
| commit | 23f2631d598b6e07450a96ed1ec00670c8867cdd (patch) | |
| tree | 20195c1688ad8cb7e8631c97fa5920624f10972c /indra/newview/llfloaterbuildoptions.cpp | |
| parent | 54334ff6e377e35c97df3a0fe2a859795ec07b21 (diff) | |
| parent | 8ce3323269d95f54e2b768c4c5aa154d4afbbb6b (diff) | |
Merge branch 'develop' into nat/edu-channel
Diffstat (limited to 'indra/newview/llfloaterbuildoptions.cpp')
| -rw-r--r-- | indra/newview/llfloaterbuildoptions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterbuildoptions.cpp b/indra/newview/llfloaterbuildoptions.cpp index 51139477a0..cf3c4d29f3 100644 --- a/indra/newview/llfloaterbuildoptions.cpp +++ b/indra/newview/llfloaterbuildoptions.cpp @@ -49,9 +49,9 @@ LLFloaterBuildOptions::LLFloaterBuildOptions(const LLSD& key) LLFloaterBuildOptions::~LLFloaterBuildOptions() {} -BOOL LLFloaterBuildOptions::postBuild() +bool LLFloaterBuildOptions::postBuild() { - return TRUE; + return true; } // virtual @@ -63,5 +63,5 @@ void LLFloaterBuildOptions::onOpen(const LLSD& key) // virtual void LLFloaterBuildOptions::onClose(bool app_quitting) { - mObjectSelection = NULL; + mObjectSelection = nullptr; } |