Merge branch 'develop' into marchcat/05-develop

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index 9890d3f7ef..b2dcb6dc88 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -154,7 +154,7 @@ public:
             sanitizeRange();
         }
 
-        S32 clamp(S32 input)
+        S32 clamp(S32 input) const
         {
             if (input < mMin) return mMin;
             if (input > mMax) return mMax;
@@ -168,8 +168,8 @@ public:
             sanitizeRange();
         }
 
-        S32 getMin() { return mMin; }
-        S32 getMax() { return mMax; }
+        S32 getMin() const { return mMin; }
+        S32 getMax() const { return mMax; }
 
         bool operator==(const RangeS32& other) const
         {
@@ -223,7 +223,7 @@ public:
             mValue = clamp(value);
         }
 
-        S32 get()
+        S32 get() const
         {
             return mValue;
         }
@@ -253,7 +253,7 @@ public:
     static std::string getLanguage(); // static for lldateutil_test compatibility
 
     //helper functions (should probably move free standing rendering helper functions here)
-    LLView* getRootView() { return mRootView; }
+    LLView* getRootView() const { return mRootView; }
     void setRootView(LLView* view) { mRootView = view; }
     /**
      * Walk the LLView tree to resolve a path
@@ -296,7 +296,7 @@ public:
     LLControlGroup& getControlControlGroup (std::string_view controlname);
     F32 getMouseIdleTime() { return mMouseIdleTimer.getElapsedTimeF32(); }
     void resetMouseIdleTimer() { mMouseIdleTimer.reset(); }
-    LLWindow* getWindow() { return mWindow; }
+    LLWindow* getWindow() const { return mWindow; }
 
     void addPopup(LLView*);
     void removePopup(LLView*);