Merged in 1.2.0-linkintools

1 files changed, 7 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index 360b1df..8f88977 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -102,6 +102,7 @@ public:
         virtual void onFocusReceived();
         static void setEditTool(void* data);
         void saveLastTool();
+
 private:
         static void setObjectType( void* data );
         
@@ -109,6 +110,9 @@ private:
 
         static void onClickGridOptions(void* data);
 
+        static void onClickLink(void* data);
+        static void onClickUnlink(void* data);
+
 public:
 
         LLButton                *mBtnFocus;
@@ -152,6 +156,9 @@ public:
         LLButton        *mBtnDuplicate;
         LLButton        *mBtnDuplicateInPlace;
 
+        LLButton        *mBtnLink;
+        LLButton        *mBtnUnlink;
+
         // Create buttons
         LLComboBox              *mComboTreesGrass;
         LLCheckBoxCtrl  *mCheckSticky;