diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:39:10 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:39:10 +0300 |
| commit | 89e17d1780f498601c51e8c01ca963fb0c1b4d0b (patch) | |
| tree | 8f9a4281a013ac04d3c15affc5ab72ead1df3a50 /indra/newview/llsettingsvo.h | |
| parent | 4ac08f1ac5b003b95fc9087183d03c0291f6554b (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
Merge branch 'master' into DRTVWR-482
Diffstat (limited to 'indra/newview/llsettingsvo.h')
| -rw-r--r-- | indra/newview/llsettingsvo.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h index 1f29013ecf..65136ad2f5 100644 --- a/indra/newview/llsettingsvo.h +++ b/indra/newview/llsettingsvo.h @@ -158,6 +158,9 @@ class LLSettingsVODay : public LLSettingsDay public: typedef std::function<void(LLSettingsDay::ptr_t day)> asset_built_fn; + // Todo: find a way to make this cnstructor private + // It shouldn't be used outside shared_prt and LLSettingsVODay + // outside of settings only use buildDay(settings) LLSettingsVODay(const LLSD &data); static ptr_t buildDay(LLSD settings); |