Second Life viewer sources 1.19.1.2

3 files changed, 6 insertions, 7 deletions

diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index b616595..5c91cc0 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -2858,7 +2858,7 @@ void LLWindowMacOSX::setCursor(ECursorType cursor)
         mCurrentCursor = cursor;
 }
 
-ECursorType LLWindowMacOSX::getCursor()
+ECursorType LLWindowMacOSX::getCursor() const
 {
         return mCurrentCursor;
 }
diff --git a/linden/indra/llwindow/llwindowmacosx.h b/linden/indra/llwindow/llwindowmacosx.h
index 80145b9..789e2ed 100644
--- a/linden/indra/llwindow/llwindowmacosx.h
+++ b/linden/indra/llwindow/llwindowmacosx.h
@@ -68,7 +68,7 @@ public:
         /*virtual*/ void hideCursorUntilMouseMove();
         /*virtual*/ BOOL isCursorHidden();
         /*virtual*/ void setCursor(ECursorType cursor);
-        /*virtual*/ ECursorType getCursor();
+        /*virtual*/ ECursorType getCursor() const;
         /*virtual*/ void captureMouse();
         /*virtual*/ void releaseMouse();
         /*virtual*/ void setMouseClipping( BOOL b );
@@ -112,7 +112,6 @@ public:
         /*virtual*/ void bringToFront() {};
         
         /*virtual*/ void allowLanguageTextInput(LLPreeditor *preeditor, BOOL b);
-        /*virtual*/ void updateLanguageTextInputArea(const LLCoordGL& caret, const LLRect& bounds);
         /*virtual*/ void interruptLanguageTextInput();
 
 protected:
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index e0a4169..3eb4872 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -138,11 +138,11 @@ BOOL ll_try_gtk_init(void)
                         << gtk_major_version << "."
                         << gtk_minor_version << "."
                         << gtk_micro_version << llendl;
-                gchar *gtk_warning;
                 maybe_lock_display();
-                gtk_warning = gtk_check_version(GTK_MAJOR_VERSION,
-                                                GTK_MINOR_VERSION,
-                                                GTK_MICRO_VERSION);
+                const gchar* gtk_warning = gtk_check_version(
+                        GTK_MAJOR_VERSION,
+                        GTK_MINOR_VERSION,
+                        GTK_MICRO_VERSION);
                 maybe_unlock_display();
                 if (gtk_warning)
                 {