diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-23 07:10:26 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-23 07:10:26 +0300 |
| commit | 638fe8757694b4039e8b88d83fb8b7b7cfafb1a4 (patch) | |
| tree | 2c4fb2a4d4db5022c395bafde44e01666d08a868 /indra/newview/llfloaterlandholdings.h | |
| parent | 7587f0dd88526e61a4741ad8e2d9894027de1ffb (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelpicks.h
# indra/newview/llviewerfloaterreg.cpp
Diffstat (limited to 'indra/newview/llfloaterlandholdings.h')
| -rw-r--r-- | indra/newview/llfloaterlandholdings.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterlandholdings.h b/indra/newview/llfloaterlandholdings.h index d1d510bb40..90e75b1062 100644 --- a/indra/newview/llfloaterlandholdings.h +++ b/indra/newview/llfloaterlandholdings.h @@ -57,6 +57,8 @@ public: static void onGrantList(void* data); + static bool sHasLindenHome; + protected: void refreshAggregates(); |