diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 10:12:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-27 10:12:53 +0200 |
| commit | 16e638db975278f6018fe1e21ba1954b7f159149 (patch) | |
| tree | 876030bddc3b9e6cd885f829fb4a071aea309508 /indra/newview/llpanelprofile.cpp | |
| parent | f815b015cecda18098dd2d16f65682a37e1bff7c (diff) | |
| parent | 990c8b81dad8bd0580c2c48f77e99b3ac53e581e (diff) | |
Merge pull request #1062 from secondlife/marchcat/yz-merge
Merge main into maint YZ
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
| -rw-r--r-- | indra/newview/llpanelprofile.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index ffbed778c1..8114e05a94 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -1969,7 +1969,8 @@ void LLPanelProfileSecondLife::onShowTexturePicker() PERM_NONE, PERM_NONE, FALSE, - NULL); + NULL, + PICK_TEXTURE); mFloaterTexturePickerHandle = texture_floaterp->getHandle(); @@ -2304,7 +2305,8 @@ void LLPanelProfileFirstLife::onChangePhoto() PERM_NONE, PERM_NONE, FALSE, - NULL); + NULL, + PICK_TEXTURE); mFloaterTexturePickerHandle = texture_floaterp->getHandle(); |