diff options
author | McCabe Maxsted | 2009-09-04 18:53:30 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-04 18:53:30 -0700 |
commit | e0450b604383f3a0276097496f1935e1b543ec5e (patch) | |
tree | 22f3d9bc82d90d24cfae02dd0d9f7da44fb4e5c6 /linden/indra/newview/llfloatertools.h | |
parent | fix NDOF linking issues when using cmake 2.6 on linux (diff) | |
download | meta-impy-e0450b604383f3a0276097496f1935e1b543ec5e.zip meta-impy-e0450b604383f3a0276097496f1935e1b543ec5e.tar.gz meta-impy-e0450b604383f3a0276097496f1935e1b543ec5e.tar.bz2 meta-impy-e0450b604383f3a0276097496f1935e1b543ec5e.tar.xz |
Integrated 1.23's tool floater with link/unlink buttons
Diffstat (limited to 'linden/indra/newview/llfloatertools.h')
-rw-r--r-- | linden/indra/newview/llfloatertools.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h index 8f88977..1b13b9f 100644 --- a/linden/indra/newview/llfloatertools.h +++ b/linden/indra/newview/llfloatertools.h | |||
@@ -95,14 +95,12 @@ public: | |||
95 | /*virtual*/ void draw(); | 95 | /*virtual*/ void draw(); |
96 | 96 | ||
97 | void dirty(); | 97 | void dirty(); |
98 | void showMore(BOOL show_more); | ||
99 | void showPanel(EInfoPanel panel); | 98 | void showPanel(EInfoPanel panel); |
100 | 99 | ||
101 | void setStatusText(const std::string& text); | 100 | void setStatusText(const std::string& text); |
102 | virtual void onFocusReceived(); | 101 | virtual void onFocusReceived(); |
103 | static void setEditTool(void* data); | 102 | static void setEditTool(void* data); |
104 | void saveLastTool(); | 103 | void saveLastTool(); |
105 | |||
106 | private: | 104 | private: |
107 | static void setObjectType( void* data ); | 105 | static void setObjectType( void* data ); |
108 | 106 | ||
@@ -198,8 +196,6 @@ public: | |||
198 | 196 | ||
199 | private: | 197 | private: |
200 | BOOL mDirty; | 198 | BOOL mDirty; |
201 | S32 mSmallHeight; | ||
202 | S32 mLargeHeight; | ||
203 | 199 | ||
204 | std::map<std::string, std::string> mStatusText; | 200 | std::map<std::string, std::string> mStatusText; |
205 | 201 | ||