diff options
author | RunitaiLinden <davep@lindenlab.com> | 2024-03-12 10:19:19 -0500 |
---|---|---|
committer | RunitaiLinden <davep@lindenlab.com> | 2024-03-12 10:19:19 -0500 |
commit | 522c4b4f0925463d5f30a4a0f314999a11d5def3 (patch) | |
tree | 9e6f25155182f643ace380179592516a08792646 /indra/newview/llpanelprofile.cpp | |
parent | afc943acbc2bb79e2e1aa5d5eaf448e01b6c2b00 (diff) | |
parent | 5fca8915d8f44cdb2a4f7bb4715d61ba47043e5d (diff) |
Merge branch '965-eep-skies-too-bright-after-hdri-local-preview-merge' of https://github.com/secondlife/viewer into 965-eep-skies-too-bright-after-hdri-local-preview-merge
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(); |