aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatertools.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-11 04:28:24 -0700
committerMcCabe Maxsted2009-06-11 04:28:24 -0700
commit32bb4ace5451a510721158f4cd07b62de1df9a11 (patch)
treea30fcc50027a8b040543989e95084d1e19ba0180 /linden/indra/newview/llfloatertools.h
parentAdded pulldown label and fixed combobox not hiding (diff)
downloadmeta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.zip
meta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.tar.gz
meta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.tar.bz2
meta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.tar.xz
Added Link/Unlink buttons to the Tools floater
Diffstat (limited to 'linden/indra/newview/llfloatertools.h')
-rw-r--r--linden/indra/newview/llfloatertools.h7
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:
102 virtual void onFocusReceived(); 102 virtual void onFocusReceived();
103 static void setEditTool(void* data); 103 static void setEditTool(void* data);
104 void saveLastTool(); 104 void saveLastTool();
105
105private: 106private:
106 static void setObjectType( void* data ); 107 static void setObjectType( void* data );
107 108
@@ -109,6 +110,9 @@ private:
109 110
110 static void onClickGridOptions(void* data); 111 static void onClickGridOptions(void* data);
111 112
113 static void onClickLink(void* data);
114 static void onClickUnlink(void* data);
115
112public: 116public:
113 117
114 LLButton *mBtnFocus; 118 LLButton *mBtnFocus;
@@ -152,6 +156,9 @@ public:
152 LLButton *mBtnDuplicate; 156 LLButton *mBtnDuplicate;
153 LLButton *mBtnDuplicateInPlace; 157 LLButton *mBtnDuplicateInPlace;
154 158
159 LLButton *mBtnLink;
160 LLButton *mBtnUnlink;
161
155 // Create buttons 162 // Create buttons
156 LLComboBox *mComboTreesGrass; 163 LLComboBox *mComboTreesGrass;
157 LLCheckBoxCtrl *mCheckSticky; 164 LLCheckBoxCtrl *mCheckSticky;