Merge branch 'main' into 2024.09-ExtraFPS

2 files changed, 0 insertions, 5 deletions

diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp
index 624ecd5030..c160382c17 100644
--- a/indra/llwindow/llwindowcallbacks.cpp
+++ b/indra/llwindow/llwindowcallbacks.cpp
@@ -52,10 +52,6 @@ bool LLWindowCallbacks::handleUnicodeChar(llwchar uni_char, MASK mask)
     return false;
 }
 
-bool LLWindowCallbacks::handleUnicodeString(char *uni_str, bool editing)
-{
-	return FALSE;
-}
 
 bool LLWindowCallbacks::handleMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
 {
diff --git a/indra/llwindow/llwindowcallbacks.h b/indra/llwindow/llwindowcallbacks.h
index 74660e1705..63b585231f 100644
--- a/indra/llwindow/llwindowcallbacks.h
+++ b/indra/llwindow/llwindowcallbacks.h
@@ -37,7 +37,6 @@ public:
     virtual bool handleTranslatedKeyUp(KEY key,  MASK mask);
     virtual void handleScanKey(KEY key, bool key_down, bool key_up, bool key_level);
     virtual bool handleUnicodeChar(llwchar uni_char, MASK mask);
-    virtual bool handleUnicodeString(char *uni_str, bool editing);
 
     virtual bool handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
     virtual bool handleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);