Merge branch 'develop' into nat/edu-channel

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llsidetraypanelcontainer.cpp b/indra/newview/llsidetraypanelcontainer.cpp
index bf11b08f64..44e0c3b05c 100644
--- a/indra/newview/llsidetraypanelcontainer.cpp
+++ b/indra/newview/llsidetraypanelcontainer.cpp
@@ -62,10 +62,10 @@ void LLSideTrayPanelContainer::onOpen(const LLSD& key)
     getCurrentPanel()->onOpen(key);
 }
 
-void LLSideTrayPanelContainer::openPanel(const std::string& panel_name, const LLSD& key)
+void LLSideTrayPanelContainer::openPanel(std::string_view panel_name, const LLSD& key)
 {
     LLSD combined_key = key;
-    combined_key[PARAM_SUB_PANEL_NAME] = panel_name;
+    combined_key[PARAM_SUB_PANEL_NAME] = std::string(panel_name);
     onOpen(combined_key);
 }
 
@@ -81,12 +81,12 @@ void LLSideTrayPanelContainer::openPreviousPanel()
     }
 }
 
-BOOL LLSideTrayPanelContainer::handleKeyHere(KEY key, MASK mask)
+bool LLSideTrayPanelContainer::handleKeyHere(KEY key, MASK mask)
 {
     // No key press handling code for Panel Container - this disables
     // Tab Container's Alt + Left/Right Button tab switching.
 
-    // Let default handler process key presses, don't simply return TRUE or FALSE
+    // Let default handler process key presses, don't simply return true or false
     // as this may brake some functionality as it did with Copy/Paste for
     // text_editor (ticket EXT-642).
     return LLPanel::handleKeyHere(key, mask);