diff options
Diffstat (limited to 'linden/indra/newview/llfloatertools.h')
-rw-r--r-- | linden/indra/newview/llfloatertools.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h index ae70a04..f56cdbe 100644 --- a/linden/indra/newview/llfloatertools.h +++ b/linden/indra/newview/llfloatertools.h | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file llfloatertools.h | 2 | * @file llfloatertools.h |
3 | * @brief The edit tools, including move, position, land, etc. | 3 | * @brief The edit tools, including move, position, land, etc. |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 7 | * Copyright (c) 2002-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #ifndef LL_LLFLOATERTOOLS_H | 32 | #ifndef LL_LLFLOATERTOOLS_H |
@@ -94,7 +97,7 @@ public: | |||
94 | void showMore(BOOL show_more); | 97 | void showMore(BOOL show_more); |
95 | void showPanel(EInfoPanel panel); | 98 | void showPanel(EInfoPanel panel); |
96 | 99 | ||
97 | void setStatusText(const LLString& text); | 100 | void setStatusText(const std::string& text); |
98 | virtual void onFocusReceived(); | 101 | virtual void onFocusReceived(); |
99 | static void setEditTool(void* data); | 102 | static void setEditTool(void* data); |
100 | void saveLastTool(); | 103 | void saveLastTool(); |
@@ -188,6 +191,8 @@ private: | |||
188 | BOOL mDirty; | 191 | BOOL mDirty; |
189 | S32 mSmallHeight; | 192 | S32 mSmallHeight; |
190 | S32 mLargeHeight; | 193 | S32 mLargeHeight; |
194 | |||
195 | std::map<std::string, std::string> mStatusText; | ||
191 | }; | 196 | }; |
192 | 197 | ||
193 | extern LLFloaterTools *gFloaterTools; | 198 | extern LLFloaterTools *gFloaterTools; |