diff options
| author | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
| commit | e4b0e7c82d670081c071d8a3da31b5ec407b8e07 (patch) | |
| tree | 9410962bbb582eedbec448139e217f2714050777 /linden/indra/newview/llfloatertools.h | |
| parent | Started 1.3.0 branch (diff) | |
| parent | Updated and added some Linux libs. (diff) | |
| download | meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.zip meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.gz meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.bz2 meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.xz | |
Merged working branch of 1.2 into LL 1.23 merge
Diffstat (limited to 'linden/indra/newview/llfloatertools.h')
| -rw-r--r-- | linden/indra/newview/llfloatertools.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h index 1d78cb2..2bb3fb7 100644 --- a/linden/indra/newview/llfloatertools.h +++ b/linden/indra/newview/llfloatertools.h | |||
| @@ -102,7 +102,6 @@ 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 | |||
| 106 | private: | 105 | private: |
| 107 | static void setObjectType( void* data ); | 106 | static void setObjectType( void* data ); |
| 108 | 107 | ||