diff options
| author | Kitty Barnett <develop@catznip.com> | 2023-02-08 17:18:37 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2023-02-08 17:18:37 +0100 |
| commit | 77afc073c54d6d03b7a24276a08d1924372058d0 (patch) | |
| tree | 95f472eabe4407cca653af3a867808f32402551c /indra/newview/llfilepicker.cpp | |
| parent | 5805bbd8104e66fb9ae7ed3c22e374e377b2f2e1 (diff) | |
| parent | 4df2c0b8d67af267d3c9c6d58d63df3ed063a89e (diff) | |
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 3669fb1eeb..e3a695fc79 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -586,9 +586,9 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename, #elif LL_DARWIN -std::vector<std::string>* LLFilePicker::navOpenFilterProc(ELoadFilter filter) //(AEDesc *theItem, void *info, void *callBackUD, NavFilterModes filterMode) +std::unique_ptr<std::vector<std::string>> LLFilePicker::navOpenFilterProc(ELoadFilter filter) //(AEDesc *theItem, void *info, void *callBackUD, NavFilterModes filterMode) { - std::vector<std::string> *allowedv = new std::vector< std::string >; + std::unique_ptr<std::vector<std::string>> allowedv(new std::vector< std::string >); switch(filter) { case FFLOAD_ALL: @@ -661,9 +661,9 @@ bool LLFilePicker::doNavChooseDialog(ELoadFilter filter) gViewerWindow->getWindow()->beforeDialog(); - std::vector<std::string> *allowed_types=navOpenFilterProc(filter); + std::unique_ptr<std::vector<std::string>> allowed_types = navOpenFilterProc(filter); - std::vector<std::string> *filev = doLoadDialog(allowed_types, + std::unique_ptr<std::vector<std::string>> filev = doLoadDialog(allowed_types.get(), mPickOptions); gViewerWindow->getWindow()->afterDialog(); @@ -780,7 +780,7 @@ bool LLFilePicker::doNavSaveDialog(ESaveFilter filter, const std::string& filena gViewerWindow->getWindow()->beforeDialog(); // Run the dialog - std::string* filev = doSaveDialog(&namestring, + std::unique_ptr<std::string> filev = doSaveDialog(&namestring, &type, &creator, &extension, |