From c864e6a8b3c50c72fe409fddacf0b5ce352819c1 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 11 Mar 2025 03:12:39 +0200
Subject: Build fix

---
 indra/newview/llfloatercreatelandmark.h | 3 ++-
 indra/newview/llpanelemojicomplete.cpp  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llfloatercreatelandmark.h b/indra/newview/llfloatercreatelandmark.h
index e3a258efe9..f97ade2c1b 100644
--- a/indra/newview/llfloatercreatelandmark.h
+++ b/indra/newview/llfloatercreatelandmark.h
@@ -62,13 +62,14 @@ private:
     void onSaveClicked();
     void onCancelClicked();
 
-    static void folderCreatedCallback(LLUUID folder_id);
+    void folderCreatedCallback(LLUUID folder_id);
 
     LLComboBox*     mFolderCombo;
     LLLineEditor*   mLandmarkTitleEditor;
     LLTextEditor*   mNotesEditor;
     LLUUID          mLandmarksID;
     LLUUID          mAssetID;
+    LLUUID          mParentID;
 
     LLLandmarksInventoryObserver*   mInventoryObserver;
     LLPointer<LLInventoryItem>      mItem;
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index 4f1fd5dfca..3a6a6a5ec3 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -68,9 +68,9 @@ LLPanelEmojiComplete::LLPanelEmojiComplete(const LLPanelEmojiComplete::Params& p
     {
         LLScrollbar::Params sbparams;
         sbparams.orientation(LLScrollbar::VERTICAL);
-        sbparams.doc_size(mTotalEmojis);
+        sbparams.doc_size(static_cast<S32>(mTotalEmojis));
         sbparams.doc_pos(0);
-        sbparams.page_size(mVisibleEmojis);
+        sbparams.page_size(static_cast<S32>(mVisibleEmojis));
         sbparams.change_callback([this](S32 index, LLScrollbar*) { onScrollbarChange(index); });
         mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams);
         addChild(mScrollbar);
-- 
cgit v1.2.3