diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2024-01-05 14:11:17 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2024-01-05 14:11:17 +0200 |
| commit | 9cfe9e8f78a22d78004d1549bfaaf313bc645e1a (patch) | |
| tree | 2d70eefe5ca4f1e659d4506e9073eceb606d27e4 /indra/newview | |
| parent | 197a1ddef8a0b7bc7872339ec82b2a5bc5cbb3b4 (diff) | |
DRTVWR-589: Post-merge fix
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterluadebug.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llinventorygallery.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterluadebug.cpp b/indra/newview/llfloaterluadebug.cpp index 32e9e4f1b7..64f169777d 100644 --- a/indra/newview/llfloaterluadebug.cpp +++ b/indra/newview/llfloaterluadebug.cpp @@ -87,7 +87,7 @@ void LLFloaterLUADebug::onExecuteClicked() void LLFloaterLUADebug::onBtnBrowse() { - (new LLFilePickerReplyThread(boost::bind(&LLFloaterLUADebug::runSelectedScript, this, _1), LLFilePicker::FFLOAD_LUA, false))->getFile(); + LLFilePickerReplyThread::startPicker(boost::bind(&LLFloaterLUADebug::runSelectedScript, this, _1), LLFilePicker::FFLOAD_LUA, false); } void LLFloaterLUADebug::onBtnRun() diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp index 8e7c97b6d5..68581d04eb 100644 --- a/indra/newview/llinventorygallery.cpp +++ b/indra/newview/llinventorygallery.cpp @@ -2421,7 +2421,7 @@ void LLInventoryGallery::startDrag() ids.push_back(selected_id); } } - LLToolDragAndDrop::getInstance()->beginMultiDrag(types, ids, src); + LLToolDragAndDrop::getInstance()->beginMultiDrag(types, ids, LLToolDragAndDrop::SOURCE_AGENT); } bool LLInventoryGallery::areViewsInitialized() |