diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-04 23:10:30 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-04 23:10:30 +0000 |
| commit | 107994a68ff556d0ab7213795fe31bf724bc599c (patch) | |
| tree | 019a6bae50457a40183117c09283a51b5ab108fb /indra/newview/llfloaterfixedenvironment.h | |
| parent | f6b2f4574411af09445db9b78af809f4eb22830f (diff) | |
| parent | 57ff71c915727abe09e794da4aa1615eb43f0abf (diff) | |
Merged in andreykproductengine/maint-eep2 (pull request #129)
SL-9654 [EEP] Settings Picker reliability
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.h')
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.h b/indra/newview/llfloaterfixedenvironment.h index d235491fd9..afab75b4ba 100644 --- a/indra/newview/llfloaterfixedenvironment.h +++ b/indra/newview/llfloaterfixedenvironment.h @@ -120,7 +120,7 @@ private: void onButtonApply(LLUICtrl *ctrl, const LLSD &data); void onButtonLoad(); - void onPickerCommitSetting(LLUUID asset_id); + void onPickerCommitSetting(LLUUID item_id); void onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status); bool mIsDirty; |