2 files changed, 28 insertions, 0 deletions

diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 3c2293f..9635f99 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -103,6 +103,10 @@ struct SortScrollListItem
 LLScrollListIcon::LLScrollListIcon(LLUIImagePtr icon, S32 width)
         : LLScrollListCell(width),
           mIcon(icon),
+          // <edit>
+          mCallback(NULL),
+          mUserData(NULL),
+          // </edit>
           mColor(LLColor4::white)
 {
 }
@@ -145,6 +149,19 @@ void LLScrollListIcon::setValue(const LLSD& value)
         }
 }
 
+// <edit>
+void LLScrollListIcon::setClickCallback(BOOL (*callback)(void*), void* user_data)
+{
+        mCallback = callback;
+        mUserData = user_data;
+}
+
+BOOL LLScrollListIcon::handleClick()
+{
+        if(mCallback) return mCallback(mUserData);
+        return FALSE;
+}
+// </edit>
 
 void LLScrollListIcon::setColor(const LLColor4& color)
 {
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 516e4f1..e875d7a 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -163,10 +163,18 @@ public:
         virtual void    setColor(const LLColor4&);
         virtual BOOL    isText()const { return FALSE; }
         virtual void    setValue(const LLSD& value);
+        // <edit>
+        void setClickCallback(BOOL (*callback)(void*), void* user_data);
+        virtual BOOL handleClick();
+        // </edit>
 
 private:
         LLUIImagePtr mIcon;
         LLColor4 mColor;
+        // <edit>
+        BOOL (*mCallback)(void*);
+        void* mUserData;
+        // </edit>
 };
 
 /*
@@ -493,6 +501,9 @@ public:
 
         virtual S32             getScrollPos() const;
         virtual void    setScrollPos( S32 pos );
+        // <edit>
+        S32 getPageLines() { return mPageLines; }
+        // </edit>
         S32 getSearchColumn();
         void                    setSearchColumn(S32 column) { mSearchColumn = column; }
         S32                             getColumnIndexFromOffset(S32 x);