diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-03-08 09:17:14 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-03-08 09:17:14 -0800 |
| commit | 0d32b5bf20990a6afa1697469c1f301b902258ad (patch) | |
| tree | 2fc9fb4eb7a94df739e40bf1c1c886ec11fe59c1 /indra/newview/llfloatereditextdaycycle.cpp | |
| parent | 53f3755a4629206754a5695de233d88062a54d3d (diff) | |
| parent | a237325ad64d0930340e2a6f82d4042797ed8e68 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index f05f0fb021..235a9b4d53 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -738,14 +738,7 @@ void LLFloaterEditExtDayCycle::onButtonImport() void LLFloaterEditExtDayCycle::onButtonLoadFrame() { - LLUUID curitemId = mInventoryId; - - if (mCurrentEdit && curitemId.notNull()) - { - curitemId = LLFloaterSettingsPicker::findItemID(mCurrentEdit->getAssetId(), false, false); - } - - doOpenInventoryFloater((mCurrentTrack == LLSettingsDay::TRACK_WATER) ? LLSettingsType::ST_WATER : LLSettingsType::ST_SKY, curitemId); + doOpenInventoryFloater((mCurrentTrack == LLSettingsDay::TRACK_WATER) ? LLSettingsType::ST_WATER : LLSettingsType::ST_SKY, LLUUID::null); } void LLFloaterEditExtDayCycle::onAddFrame() |