diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-24 07:37:50 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-24 07:37:50 +0800 |
| commit | 7f354c70ba623b591c36dadd0f6616b349be4fc7 (patch) | |
| tree | 67557a9981877e6e4b1f08937dfde94e6287dc61 /indra/newview/llpanelprofilepicks.cpp | |
| parent | 5b9cb5bba3c12b1b5c86ba56d43ccf06b83edc14 (diff) | |
| parent | 33e0766ee08cccb480675a75d83b3a6e78849906 (diff) | |
Merge tag '6.6.14-release'
source for viewer 6.6.14.581101
Diffstat (limited to 'indra/newview/llpanelprofilepicks.cpp')
| -rw-r--r-- | indra/newview/llpanelprofilepicks.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp index db3a3c6de5..0535036cb0 100644 --- a/indra/newview/llpanelprofilepicks.cpp +++ b/indra/newview/llpanelprofilepicks.cpp @@ -87,8 +87,10 @@ public: return true; } - bool handle(const LLSD& params, const LLSD& query_map, - LLMediaCtrl* web) + bool handle(const LLSD& params, + const LLSD& query_map, + const std::string& grid, + LLMediaCtrl* web) { if (LLStartUp::getStartupState() < STATE_STARTED) { |