diff options
author | Rider Linden <rider@lindenlab.com> | 2018-05-22 13:16:37 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-05-22 13:16:37 -0700 |
commit | 3888de9439c20eb1698e16fb878a47d78cfdf85e (patch) | |
tree | 1d0b9b739f1429f1387934ce7c6a92cd61f1a857 /indra/newview/llfloaterhoverheight.h | |
parent | 656967b326c59a3966261cd75e256e3a7a27cc0a (diff) | |
parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloaterhoverheight.h')
-rw-r--r-- | indra/newview/llfloaterhoverheight.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterhoverheight.h b/indra/newview/llfloaterhoverheight.h index ee065bc184..a643fa2516 100644 --- a/indra/newview/llfloaterhoverheight.h +++ b/indra/newview/llfloaterhoverheight.h @@ -39,7 +39,7 @@ public: void onFinalCommit(); - static void syncFromPreferenceSetting(void *user_data); + static void syncFromPreferenceSetting(void *user_data, bool update_offset = true); void onRegionChanged(); void onSimulatorFeaturesReceived(const LLUUID ®ion_id); |