diff options
Diffstat (limited to 'linden/indra/newview/llimpanel.h')
-rw-r--r-- | linden/indra/newview/llimpanel.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h index 16d4042..2ed866b 100644 --- a/linden/indra/newview/llimpanel.h +++ b/linden/indra/newview/llimpanel.h | |||
@@ -38,6 +38,7 @@ | |||
38 | #include "lldarray.h" | 38 | #include "lldarray.h" |
39 | #include "llinstantmessage.h" | 39 | #include "llinstantmessage.h" |
40 | #include "llvoiceclient.h" | 40 | #include "llvoiceclient.h" |
41 | #include "llstyle.h" | ||
41 | 42 | ||
42 | class LLLineEditor; | 43 | class LLLineEditor; |
43 | class LLViewerTextEditor; | 44 | class LLViewerTextEditor; |
@@ -202,13 +203,12 @@ public: | |||
202 | // Return TRUE if successful, otherwise FALSE. | 203 | // Return TRUE if successful, otherwise FALSE. |
203 | BOOL inviteToSession(const LLDynamicArray<LLUUID>& agent_ids); | 204 | BOOL inviteToSession(const LLDynamicArray<LLUUID>& agent_ids); |
204 | 205 | ||
205 | void addHistoryLine(const LLUUID& source, | ||
206 | const std::string &utf8msg, | ||
207 | const LLColor4& color = LLColor4::white, | ||
208 | bool log_to_file = true); | ||
209 | void addHistoryLine(const std::string &utf8msg, | 206 | void addHistoryLine(const std::string &utf8msg, |
210 | const LLColor4& color = LLColor4::white, | 207 | const LLColor4& color = LLColor4::white, |
211 | bool log_to_file = true); | 208 | bool log_to_file = true, |
209 | const LLUUID& source = LLUUID::null, | ||
210 | const char *name = NULL); | ||
211 | |||
212 | void setInputFocus( BOOL b ); | 212 | void setInputFocus( BOOL b ); |
213 | 213 | ||
214 | void selectAll(); | 214 | void selectAll(); |
@@ -357,6 +357,9 @@ private: | |||
357 | LLFrameTimer mLastKeystrokeTimer; | 357 | LLFrameTimer mLastKeystrokeTimer; |
358 | 358 | ||
359 | void disableWhileSessionStarting(); | 359 | void disableWhileSessionStarting(); |
360 | |||
361 | typedef std::map<LLUUID, LLStyleSP> styleMap; | ||
362 | static styleMap mStyleMap; | ||
360 | }; | 363 | }; |
361 | 364 | ||
362 | 365 | ||