summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-09-14 17:04:47 -0500
committerDave Parks <davep@lindenlab.com>2022-09-14 17:04:47 -0500
commitafb7efbfcc39f93bb018de6e0b4e5f0839a68ef5 (patch)
tree476dd03a9af8a753ef9f89803e340d18cbc2a883 /indra/newview/llinventorypanel.cpp
parenta0a87db3d76bc78e245e89254db190ba68b3709e (diff)
parent5d918f98eaacc0eec84edcf23a40d6f6c93807c3 (diff)
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r--indra/newview/llinventorypanel.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index cd24b3ea43..03ca7e7431 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1612,6 +1612,10 @@ void LLInventoryPanel::fileUploadLocation(const LLSD& userdata)
{
gSavedPerAccountSettings.setString("AnimationUploadFolder", LLFolderBridge::sSelf.get()->getUUID().asString());
}
+ else if (param == "pbr_material")
+ {
+ gSavedPerAccountSettings.setString("PBRUploadFolder", LLFolderBridge::sSelf.get()->getUUID().asString());
+ }
}
void LLInventoryPanel::purgeSelectedItems()