diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-22 21:28:07 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-22 21:28:07 +0100 |
| commit | 689beff6698fcb8582c44f58bb9896606850b149 (patch) | |
| tree | 7f567399e152057c1fe80a863ef660b5850bb324 /indra/newview/llfloaterhoverheight.h | |
| parent | 313dbc7fea54cc58ceb8bd3437b91674360a3384 (diff) | |
| parent | 3888de9439c20eb1698e16fb878a47d78cfdf85e (diff) | |
Merge 5.1.5
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); |