Merge branch 'merge-1.21.6' into rebranding

Conflicts:
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llappviewer.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 636125e..0be5d44 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -202,9 +202,9 @@ public:
 
         void                    setSnapTarget(LLHandle<LLFloater> handle) { mSnappedTo = handle; }
         void                    clearSnapTarget() { mSnappedTo.markDead(); }
-        LLHandle<LLFloater>     getSnapTarget() { return mSnappedTo; }
+        LLHandle<LLFloater>     getSnapTarget() const { return mSnappedTo; }
 
-        LLHandle<LLFloater> getHandle() { return mHandle; }
+        LLHandle<LLFloater> getHandle() const { return mHandle; }
 
         static void             closeFocusedFloater();