diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-01-28 21:24:11 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-01-28 21:24:11 +0200 |
| commit | 714df9c4f7c9f24eae1064f45306dea01803ba09 (patch) | |
| tree | fe2188af3c5fb88af486c891ce41693925790cac /indra/newview/llfloatereditextdaycycle.cpp | |
| parent | 54dc80a7091ad2225d8dee610eb50f190a742513 (diff) | |
SL-10426 Fixed Inventory day cycle doesn't apply to the parcel from About Land
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 42c73d5668..3fac5e2b1f 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -1910,7 +1910,14 @@ void LLFloaterEditExtDayCycle::doOpenInventoryFloater(LLSettingsType::type_e typ picker->setSettingsFilter(type); picker->setSettingsItemId(curritem); - picker->setTrackWater(mCurrentTrack == LLSettingsDay::TRACK_WATER); + if (type == LLSettingsType::ST_DAYCYCLE) + { + picker->setTrackMode((mCurrentTrack == LLSettingsDay::TRACK_WATER) ? LLFloaterSettingsPicker::TRACK_WATER : LLFloaterSettingsPicker::TRACK_SKY); + } + else + { + picker->setTrackMode(LLFloaterSettingsPicker::TRACK_NONE); + } picker->openFloater(); picker->setFocus(TRUE); } |