Merge branch 'main' into marchcat/slua-editor-merge

# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/llpreviewscript.h

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index d0442311d2..1b60774deb 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -147,8 +147,8 @@ public:
 
     void            setItemRemoved(bool script_removed) { mScriptRemoved = script_removed; }
 
-    void            setAssetID(const LLUUID& asset_id) { mAssetID = asset_id; }
-    LLUUID          getAssetID() { return mAssetID; }
+    void            setAssetID( const LLUUID& asset_id){ mAssetID = asset_id; };
+    LLUUID          getAssetID() const { return mAssetID; }
 
     bool isFontSizeChecked(const LLSD &userdata);
     void onChangeFontSize(const LLSD &size_name);
@@ -157,7 +157,7 @@ public:
     void selectAll() { mEditor->selectAll(); }
 
     void            enableSave(bool b) { mEnableSave = b; }
-    bool            hasChanged();
+    bool            hasChanged() const;
 
   private:
     void        onBtnDynamicHelp();